356 lines
10 KiB
Diff
356 lines
10 KiB
Diff
From ef1c1c1b2c36eaa21f73fc095cd801c15e6e736d Mon Sep 17 00:00:00 2001
|
|
From: Tuomas Nurmi <tuomas@norsumanageri.org>
|
|
Date: Mon, 8 Jul 2024 16:42:07 +0300
|
|
Subject: [PATCH 09/10] Update signals and slots to use Q_SIGNALS and Q_SLOTS
|
|
|
|
When including in projects with KDE Frameworks 5.85+, signals and slots keywords
|
|
don't work by default anymore and cause compilation to fail with default setup.
|
|
---
|
|
src/AddRemoveResult.h | 2 +-
|
|
src/AddRemoveResult_p.h | 4 ++--
|
|
src/DeviceList.h | 2 +-
|
|
src/DeviceList_p.h | 2 +-
|
|
src/DeviceSyncResult.h | 2 +-
|
|
src/DeviceSyncResult_p.h | 2 +-
|
|
src/DeviceUpdates.h | 2 +-
|
|
src/DeviceUpdates_p.h | 2 +-
|
|
src/Episode.h | 2 +-
|
|
src/EpisodeActionList.h | 2 +-
|
|
src/EpisodeActionList_p.h | 2 +-
|
|
src/EpisodeList.h | 2 +-
|
|
src/EpisodeList_p.h | 2 +-
|
|
src/Episode_p.h | 2 +-
|
|
src/Podcast.h | 2 +-
|
|
src/PodcastList.h | 2 +-
|
|
src/PodcastList_p.h | 2 +-
|
|
src/Podcast_p.h | 2 +-
|
|
src/Settings.h | 2 +-
|
|
src/Settings_p.h | 2 +-
|
|
src/TagList.h | 2 +-
|
|
src/TagList_p.h | 2 +-
|
|
tests/JsonCreatorTest.h | 2 +-
|
|
tests/UrlBuilderTest.h | 2 +-
|
|
24 files changed, 25 insertions(+), 25 deletions(-)
|
|
|
|
diff --git a/src/AddRemoveResult.h b/src/AddRemoveResult.h
|
|
index cd31846..fc46b37 100644
|
|
--- a/src/AddRemoveResult.h
|
|
+++ b/src/AddRemoveResult.h
|
|
@@ -52,7 +52,7 @@ private:
|
|
Q_DISABLE_COPY( AddRemoveResult )
|
|
AddRemoveResultPrivate* const d;
|
|
friend class AddRemoveResultPrivate;
|
|
-signals:
|
|
+Q_SIGNALS:
|
|
/**Gets emitted when the data is ready to read*/
|
|
void finished();
|
|
/**Gets emitted when an parse error ocurred*/
|
|
diff --git a/src/AddRemoveResult_p.h b/src/AddRemoveResult_p.h
|
|
index cd17cdc..999e8be 100644
|
|
--- a/src/AddRemoveResult_p.h
|
|
+++ b/src/AddRemoveResult_p.h
|
|
@@ -49,11 +49,11 @@ private:
|
|
|
|
bool parse( const QVariant& data );
|
|
bool parse( const QByteArray& data );
|
|
-private slots:
|
|
+private Q_SLOTS:
|
|
void parseData();
|
|
void error( QNetworkReply::NetworkError error );
|
|
};
|
|
|
|
}
|
|
|
|
-#endif //ADDREMOVERESULT_PRIVATE_H
|
|
\ No newline at end of file
|
|
+#endif //ADDREMOVERESULT_PRIVATE_H
|
|
diff --git a/src/DeviceList.h b/src/DeviceList.h
|
|
index 04109fe..4e12ee7 100644
|
|
--- a/src/DeviceList.h
|
|
+++ b/src/DeviceList.h
|
|
@@ -49,7 +49,7 @@ private:
|
|
Q_DISABLE_COPY( DeviceList )
|
|
DeviceListPrivate* const d;
|
|
friend class DeviceListPrivate;
|
|
-signals:
|
|
+Q_SIGNALS:
|
|
/**Gets emitted when the data is ready to read*/
|
|
void finished();
|
|
/**Gets emitted when an parse error ocurred*/
|
|
diff --git a/src/DeviceList_p.h b/src/DeviceList_p.h
|
|
index 91dfd26..c908b92 100644
|
|
--- a/src/DeviceList_p.h
|
|
+++ b/src/DeviceList_p.h
|
|
@@ -47,7 +47,7 @@ private:
|
|
bool parse( const QVariant& data );
|
|
bool parse( const QByteArray& data );
|
|
|
|
-private slots:
|
|
+private Q_SLOTS:
|
|
void parseData();
|
|
void error( QNetworkReply::NetworkError error );
|
|
};
|
|
diff --git a/src/DeviceSyncResult.h b/src/DeviceSyncResult.h
|
|
index 82925d2..6cab821 100644
|
|
--- a/src/DeviceSyncResult.h
|
|
+++ b/src/DeviceSyncResult.h
|
|
@@ -50,7 +50,7 @@ private:
|
|
Q_DISABLE_COPY( DeviceSyncResult )
|
|
DeviceSyncResultPrivate* const d;
|
|
friend class DeviceSyncResultPrivate;
|
|
-signals:
|
|
+Q_SIGNALS:
|
|
/**Gets emitted when the data is ready to read*/
|
|
void finished();
|
|
/**Gets emitted when an parse error ocurred*/
|
|
diff --git a/src/DeviceSyncResult_p.h b/src/DeviceSyncResult_p.h
|
|
index 8bcca95..8e980a1 100644
|
|
--- a/src/DeviceSyncResult_p.h
|
|
+++ b/src/DeviceSyncResult_p.h
|
|
@@ -47,7 +47,7 @@ private:
|
|
|
|
bool parse( const QVariant& data );
|
|
bool parse( const QByteArray& data );
|
|
-private slots:
|
|
+private Q_SLOTS:
|
|
void parseData();
|
|
void error( QNetworkReply::NetworkError error );
|
|
|
|
diff --git a/src/DeviceUpdates.h b/src/DeviceUpdates.h
|
|
index a1308f5..324902e 100644
|
|
--- a/src/DeviceUpdates.h
|
|
+++ b/src/DeviceUpdates.h
|
|
@@ -56,7 +56,7 @@ private:
|
|
Q_DISABLE_COPY( DeviceUpdates )
|
|
DeviceUpdatesPrivate* const d;
|
|
friend class DeviceUpdatesPrivate;
|
|
-signals:
|
|
+Q_SIGNALS:
|
|
/**Gets emitted when the data is ready to read*/
|
|
void finished();
|
|
/**Gets emitted when an parse error ocurred*/
|
|
diff --git a/src/DeviceUpdates_p.h b/src/DeviceUpdates_p.h
|
|
index 18197b3..b8c5b43 100644
|
|
--- a/src/DeviceUpdates_p.h
|
|
+++ b/src/DeviceUpdates_p.h
|
|
@@ -56,7 +56,7 @@ private:
|
|
bool parse( const QVariant& data );
|
|
bool parse( const QByteArray& data );
|
|
|
|
-private slots:
|
|
+private Q_SLOTS:
|
|
void parseData();
|
|
void error( QNetworkReply::NetworkError error );
|
|
|
|
diff --git a/src/Episode.h b/src/Episode.h
|
|
index 7121f78..12699b1 100644
|
|
--- a/src/Episode.h
|
|
+++ b/src/Episode.h
|
|
@@ -77,7 +77,7 @@ private:
|
|
Q_DISABLE_COPY( Episode )
|
|
EpisodePrivate* const d;
|
|
friend class EpisodePrivate;
|
|
-signals:
|
|
+Q_SIGNALS:
|
|
/**Gets emitted when the data is ready to read*/
|
|
void finished();
|
|
/**Gets emitted when an parse error ocurred*/
|
|
diff --git a/src/EpisodeActionList.h b/src/EpisodeActionList.h
|
|
index 416b536..0372e23 100644
|
|
--- a/src/EpisodeActionList.h
|
|
+++ b/src/EpisodeActionList.h
|
|
@@ -52,7 +52,7 @@ public:
|
|
private:
|
|
EpisodeActionListPrivate* const d;
|
|
friend class EpisodeActionListPrivate;
|
|
-signals:
|
|
+Q_SIGNALS:
|
|
/**Gets emitted when the data is ready to read*/
|
|
void finished();
|
|
/**Gets emitted when an parse error ocurred*/
|
|
diff --git a/src/EpisodeActionList_p.h b/src/EpisodeActionList_p.h
|
|
index 0e93e9c..6f82d4f 100644
|
|
--- a/src/EpisodeActionList_p.h
|
|
+++ b/src/EpisodeActionList_p.h
|
|
@@ -50,7 +50,7 @@ private:
|
|
bool parse( const QVariant& data );
|
|
bool parse( const QByteArray& data );
|
|
|
|
-private slots:
|
|
+private Q_SLOTS:
|
|
void parseData();
|
|
void error( QNetworkReply::NetworkError error );
|
|
|
|
diff --git a/src/EpisodeList.h b/src/EpisodeList.h
|
|
index b75e33d..bddbf8e 100644
|
|
--- a/src/EpisodeList.h
|
|
+++ b/src/EpisodeList.h
|
|
@@ -49,7 +49,7 @@ public:
|
|
private:
|
|
EpisodeListPrivate* const d;
|
|
friend class EpisodeListPrivate;
|
|
-signals:
|
|
+Q_SIGNALS:
|
|
/**Gets emitted when the data is ready to read*/
|
|
void finished();
|
|
/**Gets emitted when an parse error ocurred*/
|
|
diff --git a/src/EpisodeList_p.h b/src/EpisodeList_p.h
|
|
index f8153ee..5442702 100644
|
|
--- a/src/EpisodeList_p.h
|
|
+++ b/src/EpisodeList_p.h
|
|
@@ -46,7 +46,7 @@ private:
|
|
bool parse( const QVariant& data );
|
|
bool parse( const QByteArray& data );
|
|
|
|
-private slots:
|
|
+private Q_SLOTS:
|
|
void parseData();
|
|
void error( QNetworkReply::NetworkError error );
|
|
|
|
diff --git a/src/Episode_p.h b/src/Episode_p.h
|
|
index 2b84f78..e8c2359 100644
|
|
--- a/src/Episode_p.h
|
|
+++ b/src/Episode_p.h
|
|
@@ -60,7 +60,7 @@ private:
|
|
QNetworkReply::NetworkError m_error;
|
|
bool parse ( const QVariant& data );
|
|
bool parse ( const QByteArray& data );
|
|
-private slots:
|
|
+private Q_SLOTS:
|
|
void parseData();
|
|
void error ( QNetworkReply::NetworkError error );
|
|
|
|
diff --git a/src/Podcast.h b/src/Podcast.h
|
|
index 9905c9a..b5889cf 100644
|
|
--- a/src/Podcast.h
|
|
+++ b/src/Podcast.h
|
|
@@ -66,7 +66,7 @@ private:
|
|
PodcastPrivate* const d;
|
|
friend class PodcastPrivate;
|
|
bool m_copy; //true if this object was created by the copy-ctor
|
|
-signals:
|
|
+Q_SIGNALS:
|
|
/**Gets emitted when the data is ready to read*/
|
|
void finished();
|
|
/**Gets emitted when an parse error ocurred*/
|
|
diff --git a/src/PodcastList.h b/src/PodcastList.h
|
|
index e650736..38e956c 100644
|
|
--- a/src/PodcastList.h
|
|
+++ b/src/PodcastList.h
|
|
@@ -50,7 +50,7 @@ private:
|
|
PodcastListPrivate* const d;
|
|
friend class PodcastListPrivate;
|
|
|
|
-signals:
|
|
+Q_SIGNALS:
|
|
/**Gets emitted when the data is ready to read*/
|
|
void finished();
|
|
/**Gets emitted when an parse error ocurred*/
|
|
diff --git a/src/PodcastList_p.h b/src/PodcastList_p.h
|
|
index 07706c1..9647c3f 100644
|
|
--- a/src/PodcastList_p.h
|
|
+++ b/src/PodcastList_p.h
|
|
@@ -45,7 +45,7 @@ private:
|
|
|
|
bool parse( const QVariant& data );
|
|
bool parse( const QByteArray& data );
|
|
-private slots:
|
|
+private Q_SLOTS:
|
|
void parseData();
|
|
void error( QNetworkReply::NetworkError error );
|
|
};
|
|
diff --git a/src/Podcast_p.h b/src/Podcast_p.h
|
|
index 83cbed9..025f7eb 100644
|
|
--- a/src/Podcast_p.h
|
|
+++ b/src/Podcast_p.h
|
|
@@ -61,7 +61,7 @@ private:
|
|
|
|
bool parse( const QVariant& data );
|
|
bool parse( const QByteArray& data );
|
|
-private slots:
|
|
+private Q_SLOTS:
|
|
void parseData();
|
|
void error( QNetworkReply::NetworkError error );
|
|
};
|
|
diff --git a/src/Settings.h b/src/Settings.h
|
|
index 0c8c2fd..34acdaf 100644
|
|
--- a/src/Settings.h
|
|
+++ b/src/Settings.h
|
|
@@ -50,7 +50,7 @@ private:
|
|
Q_DISABLE_COPY( Settings )
|
|
SettingsPrivate* d;
|
|
friend class SettingsPrivate;
|
|
-signals:
|
|
+Q_SIGNALS:
|
|
/**Gets emitted when the data is ready to read*/
|
|
void finished();
|
|
/**Gets emitted when an parse error ocurred*/
|
|
diff --git a/src/Settings_p.h b/src/Settings_p.h
|
|
index 8de1b76..df26cc2 100644
|
|
--- a/src/Settings_p.h
|
|
+++ b/src/Settings_p.h
|
|
@@ -47,7 +47,7 @@ private:
|
|
bool parse( const QVariant& data );
|
|
bool parse( const QByteArray& data );
|
|
|
|
-private slots:
|
|
+private Q_SLOTS:
|
|
void parseData();
|
|
void error( QNetworkReply::NetworkError error );
|
|
|
|
diff --git a/src/TagList.h b/src/TagList.h
|
|
index f641307..8847f14 100644
|
|
--- a/src/TagList.h
|
|
+++ b/src/TagList.h
|
|
@@ -48,7 +48,7 @@ private:
|
|
Q_DISABLE_COPY( TagList )
|
|
TagListPrivate* const d;
|
|
friend class TagListPrivate;
|
|
-signals:
|
|
+Q_SIGNALS:
|
|
/**Gets emitted when the data is ready to read*/
|
|
void finished();
|
|
/**Gets emitted when an parse error ocurred*/
|
|
diff --git a/src/TagList_p.h b/src/TagList_p.h
|
|
index 5320241..0f01f2b 100644
|
|
--- a/src/TagList_p.h
|
|
+++ b/src/TagList_p.h
|
|
@@ -46,7 +46,7 @@ private:
|
|
|
|
bool parse( const QVariant& data );
|
|
bool parse( const QByteArray& data );
|
|
-private slots:
|
|
+private Q_SLOTS:
|
|
void parseData();
|
|
void error( QNetworkReply::NetworkError error );
|
|
};
|
|
diff --git a/tests/JsonCreatorTest.h b/tests/JsonCreatorTest.h
|
|
index 0f49f5c..eed2117 100644
|
|
--- a/tests/JsonCreatorTest.h
|
|
+++ b/tests/JsonCreatorTest.h
|
|
@@ -36,7 +36,7 @@ class JsonCreatorTest : public QObject {
|
|
public:
|
|
JsonCreatorTest();
|
|
virtual ~JsonCreatorTest();
|
|
-private slots:
|
|
+private Q_SLOTS:
|
|
void initTestCase();
|
|
void cleanupTestCase();
|
|
void init();
|
|
diff --git a/tests/UrlBuilderTest.h b/tests/UrlBuilderTest.h
|
|
index 91fd9d0..cbcf7cd 100644
|
|
--- a/tests/UrlBuilderTest.h
|
|
+++ b/tests/UrlBuilderTest.h
|
|
@@ -36,7 +36,7 @@ class UrlBuilderTest : public QObject {
|
|
public:
|
|
UrlBuilderTest();
|
|
virtual ~UrlBuilderTest();
|
|
-private slots:
|
|
+private Q_SLOTS:
|
|
void initTestCase();
|
|
void cleanupTestCase();
|
|
void init();
|
|
--
|
|
2.47.0
|
|
|