diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2023-07-28 20:22:09 +0200 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@qt.io> | 2023-08-01 16:26:44 +0200 |
| commit | ee3c0d8a8bef373c53ff81000fe6332621985d05 (patch) | |
| tree | 000de8d83968768c2e05c2991ba1aba78cf8dd19 /src/window-lib | |
| parent | b9da654356d10bdc96b3f6e0ea9cf908157a667f (diff) | |
Clang-Tidy / Clazy warnings and modernization
Change-Id: Iafd5fbd3636068caa36f11e121233c5732f7a545
Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
Diffstat (limited to 'src/window-lib')
| -rw-r--r-- | src/window-lib/waylandcompositor.cpp | 1 | ||||
| -rw-r--r-- | src/window-lib/waylandwindow.cpp | 1 | ||||
| -rw-r--r-- | src/window-lib/windowitem.h | 2 | ||||
| -rw-r--r-- | src/window-lib/windowmanager.cpp | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/src/window-lib/waylandcompositor.cpp b/src/window-lib/waylandcompositor.cpp index 9348c80e..d221b442 100644 --- a/src/window-lib/waylandcompositor.cpp +++ b/src/window-lib/waylandcompositor.cpp @@ -11,7 +11,6 @@ #include "global.h" #include "logging.h" -#include "windowmanager.h" #include "application.h" #include "applicationmanager.h" #include "waylandcompositor.h" diff --git a/src/window-lib/waylandwindow.cpp b/src/window-lib/waylandwindow.cpp index 54b2b47a..e6fc4285 100644 --- a/src/window-lib/waylandwindow.cpp +++ b/src/window-lib/waylandwindow.cpp @@ -9,7 +9,6 @@ #include "logging.h" #include "applicationmanager.h" #include "application.h" -#include "windowmanager.h" #include "waylandwindow.h" #include "waylandcompositor.h" #include "waylandqtamserverextension_p.h" diff --git a/src/window-lib/windowitem.h b/src/window-lib/windowitem.h index ee072adf..1463c8ad 100644 --- a/src/window-lib/windowitem.h +++ b/src/window-lib/windowitem.h @@ -23,6 +23,8 @@ class WindowItem : public QQuickItem Q_OBJECT Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/WindowItem 2.0") + //TODO for Qt7: rename the "window" property, as QQuickItem has a window() getter and a + // windowChanged() signal. Q_PROPERTY(Window* window READ window WRITE setWindow NOTIFY windowChanged FINAL) Q_PROPERTY(bool primary READ primary NOTIFY primaryChanged FINAL) Q_PROPERTY(bool objectFollowsItemSize READ objectFollowsItemSize diff --git a/src/window-lib/windowmanager.cpp b/src/window-lib/windowmanager.cpp index 818d8085..de98d26a 100644 --- a/src/window-lib/windowmanager.cpp +++ b/src/window-lib/windowmanager.cpp @@ -934,7 +934,7 @@ bool WindowManager::makeScreenshot(const QString &filename, const QString &selec return result; }; - QRegularExpression re(QStringLiteral("^([a-z.-]+)?(\\[([a-zA-Z0-9_.]+)=([^\\]]*)\\])?(:([0-9]+))?")); + static const QRegularExpression re(qSL("^([a-z.-]+)?(\\[([a-zA-Z0-9_.]+)=([^\\]]*)\\])?(:([0-9]+))?")); auto match = re.match(selector); QString screenId = match.captured(6); QString appId = match.captured(1); |