From 63850186fde2ef260b25fa98b3aa0f64d5b0b443 Mon Sep 17 00:00:00 2001 From: Digital Artifex <7929434+DigitalArtifex@users.noreply.github.com> Date: Sat, 6 Jun 2026 22:39:51 -0400 Subject: [PATCH] Renamed InstalledPackManager header and source files --- KomplexHubPlugin/Komplex_global.h | 10 ---------- ...stalledPackManager.cpp => installedpackmanager.cpp} | 6 +++--- .../{InstalledPackManager.h => installedpackmanager.h} | 8 ++++---- 3 files changed, 7 insertions(+), 17 deletions(-) delete mode 100644 KomplexHubPlugin/Komplex_global.h rename KomplexHubPlugin/{InstalledPackManager.cpp => installedpackmanager.cpp} (98%) rename KomplexHubPlugin/{InstalledPackManager.h => installedpackmanager.h} (90%) diff --git a/KomplexHubPlugin/Komplex_global.h b/KomplexHubPlugin/Komplex_global.h deleted file mode 100644 index 86c539e..0000000 --- a/KomplexHubPlugin/Komplex_global.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef KOMPLEX_GLOBAL_H -#define KOMPLEX_GLOBAL_H - -#ifdef KOMPLEX_PLUGIN -#define KOMPLEX_EXPORT Q_DECL_EXPORT -#else -#define KOMPLEX_EXPORT Q_DECL_IMPORT -#endif - -#endif // KOMPLEX_GLOBAL_H \ No newline at end of file diff --git a/KomplexHubPlugin/InstalledPackManager.cpp b/KomplexHubPlugin/installedpackmanager.cpp similarity index 98% rename from KomplexHubPlugin/InstalledPackManager.cpp rename to KomplexHubPlugin/installedpackmanager.cpp index 28fe06e..9d7f404 100644 --- a/KomplexHubPlugin/InstalledPackManager.cpp +++ b/KomplexHubPlugin/installedpackmanager.cpp @@ -1,4 +1,4 @@ -#include "InstalledPackManager.h" +#include "installedpackmanager.h" InstalledPackManager::InstalledPackManager(QObject *parent) : QAbstractListModel{parent} @@ -100,7 +100,7 @@ auto InstalledPackManager::setData(const QModelIndex &index, const QVariant &val return true; } -auto InstalledPackManager::installedWallpapers() const -> QList +auto InstalledPackManager::installedWallpapers() const -> QList { return m_installedWallpapers; } @@ -159,7 +159,7 @@ auto InstalledPackManager::rescan() -> void QFileInfo packFileInfo(packFile); - WallpaperMetaData data + WallpaperInstallData data { packDirectory.absoluteFilePath(QString("pack.json")), rootObject["name"].toString(), diff --git a/KomplexHubPlugin/InstalledPackManager.h b/KomplexHubPlugin/installedpackmanager.h similarity index 90% rename from KomplexHubPlugin/InstalledPackManager.h rename to KomplexHubPlugin/installedpackmanager.h index 2caac55..b230dba 100644 --- a/KomplexHubPlugin/InstalledPackManager.h +++ b/KomplexHubPlugin/installedpackmanager.h @@ -15,7 +15,7 @@ #include #include -#include "WallpaperMetaData.h" +#include "common/wallpapercache.h" class InstalledPackManager : public QAbstractListModel { @@ -64,7 +64,7 @@ public: int role = Qt::EditRole ) -> bool override; - auto installedWallpapers() const -> QList; + auto installedWallpapers() const -> QList; auto resetInstalledWallpapers() -> void; Q_INVOKABLE auto rescan() -> void; @@ -118,9 +118,9 @@ private: QString m_errorString = QString(); QString m_installDirectoryUri; - QList m_installedWallpapers; + QList m_installedWallpapers; - Q_PROPERTY(QList installedWallpapers READ installedWallpapers RESET resetInstalledWallpapers NOTIFY installedWallpapersChanged FINAL) + Q_PROPERTY(QList installedWallpapers READ installedWallpapers RESET resetInstalledWallpapers NOTIFY installedWallpapersChanged FINAL) Q_PROPERTY(State state READ state WRITE setState RESET resetState NOTIFY stateChanged FINAL) Q_PROPERTY(QString errorString READ errorString WRITE setErrorString NOTIFY errorStringChanged FINAL) };