Renamed InstalledPackManager header and source files
This commit is contained in:
@@ -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
|
|
||||||
+3
-3
@@ -1,4 +1,4 @@
|
|||||||
#include "InstalledPackManager.h"
|
#include "installedpackmanager.h"
|
||||||
|
|
||||||
InstalledPackManager::InstalledPackManager(QObject *parent)
|
InstalledPackManager::InstalledPackManager(QObject *parent)
|
||||||
: QAbstractListModel{parent}
|
: QAbstractListModel{parent}
|
||||||
@@ -100,7 +100,7 @@ auto InstalledPackManager::setData(const QModelIndex &index, const QVariant &val
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto InstalledPackManager::installedWallpapers() const -> QList<WallpaperMetaData>
|
auto InstalledPackManager::installedWallpapers() const -> QList<WallpaperInstallData>
|
||||||
{
|
{
|
||||||
return m_installedWallpapers;
|
return m_installedWallpapers;
|
||||||
}
|
}
|
||||||
@@ -159,7 +159,7 @@ auto InstalledPackManager::rescan() -> void
|
|||||||
|
|
||||||
QFileInfo packFileInfo(packFile);
|
QFileInfo packFileInfo(packFile);
|
||||||
|
|
||||||
WallpaperMetaData data
|
WallpaperInstallData data
|
||||||
{
|
{
|
||||||
packDirectory.absoluteFilePath(QString("pack.json")),
|
packDirectory.absoluteFilePath(QString("pack.json")),
|
||||||
rootObject["name"].toString(),
|
rootObject["name"].toString(),
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
#include <QAbstractListModel>
|
#include <QAbstractListModel>
|
||||||
#include <QProcess>
|
#include <QProcess>
|
||||||
|
|
||||||
#include "WallpaperMetaData.h"
|
#include "common/wallpapercache.h"
|
||||||
|
|
||||||
class InstalledPackManager : public QAbstractListModel
|
class InstalledPackManager : public QAbstractListModel
|
||||||
{
|
{
|
||||||
@@ -64,7 +64,7 @@ public:
|
|||||||
int role = Qt::EditRole
|
int role = Qt::EditRole
|
||||||
) -> bool override;
|
) -> bool override;
|
||||||
|
|
||||||
auto installedWallpapers() const -> QList<WallpaperMetaData>;
|
auto installedWallpapers() const -> QList<WallpaperInstallData>;
|
||||||
|
|
||||||
auto resetInstalledWallpapers() -> void;
|
auto resetInstalledWallpapers() -> void;
|
||||||
Q_INVOKABLE auto rescan() -> void;
|
Q_INVOKABLE auto rescan() -> void;
|
||||||
@@ -118,9 +118,9 @@ private:
|
|||||||
QString m_errorString = QString();
|
QString m_errorString = QString();
|
||||||
|
|
||||||
QString m_installDirectoryUri;
|
QString m_installDirectoryUri;
|
||||||
QList<WallpaperMetaData> m_installedWallpapers;
|
QList<WallpaperInstallData> m_installedWallpapers;
|
||||||
|
|
||||||
Q_PROPERTY(QList<WallpaperMetaData> installedWallpapers READ installedWallpapers RESET resetInstalledWallpapers NOTIFY installedWallpapersChanged FINAL)
|
Q_PROPERTY(QList<WallpaperInstallData> installedWallpapers READ installedWallpapers RESET resetInstalledWallpapers NOTIFY installedWallpapersChanged FINAL)
|
||||||
Q_PROPERTY(State state READ state WRITE setState RESET resetState NOTIFY stateChanged 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)
|
Q_PROPERTY(QString errorString READ errorString WRITE setErrorString NOTIFY errorStringChanged FINAL)
|
||||||
};
|
};
|
||||||
Reference in New Issue
Block a user