From 226fddd72210312e0018be5fed818b8bb25dda20 Mon Sep 17 00:00:00 2001 From: Elias Steurer Date: Thu, 23 Nov 2023 11:39:45 +0100 Subject: [PATCH] Refactor code for const and explicitly disable qml creation --- ScreenPlay/inc/public/ScreenPlay/create.h | 1 + ScreenPlay/inc/public/ScreenPlay/globalvariables.h | 1 + ScreenPlay/inc/public/ScreenPlay/monitorlistmodel.h | 1 + ScreenPlay/inc/public/ScreenPlay/screenplaymanager.h | 1 + ScreenPlay/inc/public/ScreenPlay/screenplaywallpaper.h | 8 +------- ScreenPlay/inc/public/ScreenPlay/screenplaywidget.h | 1 + ScreenPlay/src/screenplaymanager.cpp | 6 +++--- ScreenPlay/src/screenplaywallpaper.cpp | 2 +- 8 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ScreenPlay/inc/public/ScreenPlay/create.h b/ScreenPlay/inc/public/ScreenPlay/create.h index ebadca23..511540be 100644 --- a/ScreenPlay/inc/public/ScreenPlay/create.h +++ b/ScreenPlay/inc/public/ScreenPlay/create.h @@ -32,6 +32,7 @@ namespace ScreenPlay { class Create : public QObject { Q_OBJECT QML_ELEMENT + QML_UNCREATABLE("") Q_PROPERTY(QString workingDir READ workingDir WRITE setWorkingDir NOTIFY workingDirChanged) Q_PROPERTY(float progress READ progress WRITE setProgress NOTIFY progressChanged) diff --git a/ScreenPlay/inc/public/ScreenPlay/globalvariables.h b/ScreenPlay/inc/public/ScreenPlay/globalvariables.h index 7b7a6a15..9d317aa2 100644 --- a/ScreenPlay/inc/public/ScreenPlay/globalvariables.h +++ b/ScreenPlay/inc/public/ScreenPlay/globalvariables.h @@ -16,6 +16,7 @@ namespace ScreenPlay { class GlobalVariables : public QObject { Q_OBJECT QML_ELEMENT + QML_UNCREATABLE("") Q_PROPERTY(QVersionNumber version READ version CONSTANT) Q_PROPERTY(QUrl localStoragePath READ localStoragePath WRITE setLocalStoragePath NOTIFY localStoragePathChanged FINAL) diff --git a/ScreenPlay/inc/public/ScreenPlay/monitorlistmodel.h b/ScreenPlay/inc/public/ScreenPlay/monitorlistmodel.h index ed80ce6e..068c8d28 100644 --- a/ScreenPlay/inc/public/ScreenPlay/monitorlistmodel.h +++ b/ScreenPlay/inc/public/ScreenPlay/monitorlistmodel.h @@ -41,6 +41,7 @@ struct Monitor { class MonitorListModel : public QAbstractListModel { Q_OBJECT QML_ELEMENT + QML_UNCREATABLE("") public: explicit MonitorListModel(QObject* parent = nullptr); diff --git a/ScreenPlay/inc/public/ScreenPlay/screenplaymanager.h b/ScreenPlay/inc/public/ScreenPlay/screenplaymanager.h index 7c15c7de..8de67422 100644 --- a/ScreenPlay/inc/public/ScreenPlay/screenplaymanager.h +++ b/ScreenPlay/inc/public/ScreenPlay/screenplaymanager.h @@ -24,6 +24,7 @@ namespace ScreenPlay { class ScreenPlayManager : public QObject { Q_OBJECT QML_ELEMENT + QML_UNCREATABLE("") Q_PROPERTY(int activeWallpaperCounter READ activeWallpaperCounter WRITE setActiveWallpaperCounter NOTIFY activeWallpaperCounterChanged) Q_PROPERTY(int activeWidgetsCounter READ activeWidgetsCounter WRITE setActiveWidgetsCounter NOTIFY activeWidgetsCounterChanged) diff --git a/ScreenPlay/inc/public/ScreenPlay/screenplaywallpaper.h b/ScreenPlay/inc/public/ScreenPlay/screenplaywallpaper.h index 33fd323e..81c7f38b 100644 --- a/ScreenPlay/inc/public/ScreenPlay/screenplaywallpaper.h +++ b/ScreenPlay/inc/public/ScreenPlay/screenplaywallpaper.h @@ -22,27 +22,21 @@ namespace ScreenPlay { class ScreenPlayWallpaper : public QObject { Q_OBJECT QML_ELEMENT + QML_UNCREATABLE("") Q_PROPERTY(bool isConnected READ isConnected WRITE setIsConnected NOTIFY isConnectedChanged) - Q_PROPERTY(QVector screenNumber READ screenNumber WRITE setScreenNumber NOTIFY screenNumberChanged) - Q_PROPERTY(float volume READ volume WRITE setVolume NOTIFY volumeChanged) Q_PROPERTY(float playbackRate READ playbackRate WRITE setPlaybackRate NOTIFY playbackRateChanged) Q_PROPERTY(bool isLooping READ isLooping WRITE setIsLooping NOTIFY isLoopingChanged) - Q_PROPERTY(QString file READ file WRITE setFile NOTIFY fileChanged) Q_PROPERTY(QString absolutePath READ absolutePath WRITE setAbsolutePath NOTIFY absolutePathChanged) Q_PROPERTY(QString previewImage READ previewImage WRITE setPreviewImage NOTIFY previewImageChanged) Q_PROPERTY(QString appID READ appID WRITE setAppID NOTIFY appIDChanged) - Q_PROPERTY(FillMode::FillMode fillMode READ fillMode WRITE setFillMode NOTIFY fillModeChanged) Q_PROPERTY(InstalledType::InstalledType type READ type WRITE setType NOTIFY typeChanged) public: - // Default constructor needed for qml engine - ScreenPlayWallpaper() { } - explicit ScreenPlayWallpaper( const QVector& screenNumber, const std::shared_ptr& globalVariables, diff --git a/ScreenPlay/inc/public/ScreenPlay/screenplaywidget.h b/ScreenPlay/inc/public/ScreenPlay/screenplaywidget.h index fa6e587f..9090902f 100644 --- a/ScreenPlay/inc/public/ScreenPlay/screenplaywidget.h +++ b/ScreenPlay/inc/public/ScreenPlay/screenplaywidget.h @@ -23,6 +23,7 @@ namespace ScreenPlay { class ScreenPlayWidget : public QObject { Q_OBJECT QML_ELEMENT + QML_UNCREATABLE("") Q_PROPERTY(QString absolutePath READ absolutePath WRITE setAbsolutePath NOTIFY absolutePathChanged) Q_PROPERTY(QString previewImage READ previewImage WRITE setPreviewImage NOTIFY previewImageChanged) diff --git a/ScreenPlay/src/screenplaymanager.cpp b/ScreenPlay/src/screenplaymanager.cpp index ebc8dec2..7357bcb6 100644 --- a/ScreenPlay/src/screenplaymanager.cpp +++ b/ScreenPlay/src/screenplaymanager.cpp @@ -303,7 +303,7 @@ bool ScreenPlayManager::removeWallpaperAt(int index) */ bool ScreenPlayManager::requestProjectSettingsAtMonitorIndex(const int index) { - for (const std::shared_ptr& uPtrWallpaper : qAsConst(m_screenPlayWallpapers)) { + for (const std::shared_ptr& uPtrWallpaper : std::as_const(m_screenPlayWallpapers)) { if (uPtrWallpaper->screenNumber()[0] == index) { emit projectSettingsListModelResult( @@ -514,12 +514,12 @@ bool ScreenPlayManager::saveProfiles() m_saveLimiter.stop(); QJsonArray wallpaper {}; - for (const auto& activeWallpaper : qAsConst(m_screenPlayWallpapers)) { + for (const auto& activeWallpaper : std::as_const(m_screenPlayWallpapers)) { wallpaper.append(activeWallpaper->getActiveSettingsJson()); } QJsonArray widgets {}; - for (const auto& activeWidget : qAsConst(m_screenPlayWidgets)) { + for (const auto& activeWidget : std::as_const(m_screenPlayWidgets)) { widgets.append(activeWidget->getActiveSettingsJson()); } diff --git a/ScreenPlay/src/screenplaywallpaper.cpp b/ScreenPlay/src/screenplaywallpaper.cpp index 2732c3a4..6b90cad0 100644 --- a/ScreenPlay/src/screenplaywallpaper.cpp +++ b/ScreenPlay/src/screenplaywallpaper.cpp @@ -139,7 +139,7 @@ bool ScreenPlayWallpaper::start() QJsonObject ScreenPlayWallpaper::getActiveSettingsJson() { QJsonArray screenNumber; - for (const int i : qAsConst(m_screenNumber)) { + for (const int i : std::as_const(m_screenNumber)) { screenNumber.append(i); }