Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-07 03:22:33 +01:00
Code Issues Projects Releases Activity

Remove all Q_INVOKALBE from the codebase because there are a synonym for public slots:

Browse Source
This commit is contained in:
kelteseth 2018-03-07 16:35:05 +01:00
parent 908d2541b4
commit c55d5470b9
6 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ScreenPlay/src/installedlistfilter.h
View File

@ -12,9 +12,10 @@ class InstalledListFilter : public QSortFilterProxyModel
public:
InstalledListFilter(InstalledListModel *ilm);
Q_INVOKABLE void sortByRoleType(QString type);
Q_INVOKABLE void sortByName(QString name);
Q_INVOKABLE void resetFilter();
public slots:
void sortByRoleType(QString type);
void sortByName(QString name);
void resetFilter();
};

5
ScreenPlay/src/installedlistmodel.h
View File

@ -30,8 +30,7 @@ public:
bool getProjectByAbsoluteStoragePath(QUrl *path, ProjectFile* spf);
Q_INVOKABLE void loadScreens();
Q_INVOKABLE QVariantMap get(QString folderId);
Q_PROPERTY(QUrl absoluteStoragePath READ absoluteStoragePath WRITE setabsoluteStoragePath NOTIFY absoluteStoragePathChanged)
enum InstalledRole {
@ -51,6 +50,8 @@ public:
}
public slots:
void loadScreens();
QVariantMap get(QString folderId);
void append(const QJsonObject, const QString);
void setabsoluteStoragePath(QUrl absoluteStoragePath)
{

8
ScreenPlay/src/monitorlistmodel.h
View File

@ -21,9 +21,6 @@ public:
explicit MonitorListModel(QGuiApplication* guiapp, QObject* parent = nullptr);
QHash<int, QByteArray> roleNames() const override;
Q_INVOKABLE QRect getAbsoluteDesktopSize();
Q_INVOKABLE void reloadMonitors();
Q_INVOKABLE int size();
enum MonitorRole {
IDRole,
@ -51,6 +48,11 @@ public:
void setWallpaperActiveMonitor(QScreen* screen, QString fullPreviewImagePath);
public slots:
QRect getAbsoluteDesktopSize();
void reloadMonitors();
int size();
private:
QVector<Monitor> m_monitorList;
QGuiApplication* m_qGuiApplication;

5
ScreenPlay/src/steamworkshop.h
View File

@ -58,8 +58,6 @@ public:
explicit SteamWorkshop(QObject* parent = nullptr);
SteamWorkshop(AppId_t nConsumerAppId, SteamWorkshopListModel* wlm, Settings* s);
Q_INVOKABLE int getItemUpdateProcess();
Q_INVOKABLE bool contentFolderExist(QString folder);
Q_PROPERTY(unsigned int itemProcessed READ itemProcessed WRITE setItemProcessed NOTIFY itemProcessedChanged)
Q_PROPERTY(unsigned int bytesTotal READ bytesTotal WRITE setBytesTotal NOTIFY bytesTotalChanged)
@ -69,6 +67,9 @@ public:
unsigned int bytesTotal() const { return m_bytesTotal; }
public slots:
int getItemUpdateProcess();
bool contentFolderExist(QString folder);
void searchWorkshop();
void createWorkshopItem();
void submitWorkshopItem(QString title, QString description, QString language, int remoteStoragePublishedFileVisibility, const QUrl projectFile, const QUrl videoFile, int publishedFileId);

8
ScreenPlay/src/steamworkshoplistmodel.h
View File

@ -30,10 +30,6 @@ public:
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
Q_INVOKABLE QUrl getBannerUrl();
Q_INVOKABLE QString getBannerText();
Q_INVOKABLE unsigned int getBannerID();
Q_INVOKABLE void clear();
// Editable:
@ -53,6 +49,10 @@ public slots:
void append(unsigned int id, QString title, QUrl imgUrl, int numSubscriptions);
void addWorkshopItem(WorkshopItem wi);
QUrl getBannerUrl();
QString getBannerText();
unsigned int getBannerID();
void clear();
private:
QVector<QSharedPointer<WorkshopItem>> m_workshopItemList;
WorkshopItem m_workshopBannerItem;

4
ScreenPlay/src/wallpaper.h
View File

@ -33,7 +33,7 @@ public:
Q_PROPERTY(float volume READ volume WRITE setVolume NOTIFY volumeChanged)
Q_PROPERTY(float opacity READ opacity WRITE setOpacity NOTIFY opacityChanged)
Q_INVOKABLE void setupWindow();
QString absoluteFilePath() const
{
@ -70,7 +70,7 @@ public:
}
public slots:
void setupWindow();
void destroyWallpaper(){
emit prepareDestroy();
}