Merge pull request #22 from Mazhoon/codeCompatibilityUpdates

Code compatibility updates

Author: Horrendus

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required( VERSION 3.0 FATAL_ERROR )
+cmake_minimum_required( VERSION 3.5 FATAL_ERROR )
 
 project( libmygpo-qt )
 

src/AddRemoveResult.h

@@ -52,7 +52,7 @@ class MYGPO_EXPORT AddRemoveResult : public QObject
     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*/

src/AddRemoveResult_p.h

@@ -49,11 +49,11 @@ class AddRemoveResultPrivate : public QObject
 
     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
+#endif //ADDREMOVERESULT_PRIVATE_H

src/DeviceList.h

@@ -49,7 +49,7 @@ class MYGPO_EXPORT DeviceList : public QObject
     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*/

src/DeviceList_p.h

@@ -47,7 +47,7 @@ class DeviceListPrivate : public QObject
     bool parse( const QVariant& data );
     bool parse( const QByteArray& data );
 
-private slots:
+private Q_SLOTS:
     void parseData();
     void error( QNetworkReply::NetworkError error );
 };

src/DeviceSyncResult.h

@@ -50,7 +50,7 @@ class MYGPO_EXPORT DeviceSyncResult : public QObject
     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*/

src/DeviceSyncResult_p.h

@@ -47,7 +47,7 @@ class DeviceSyncResultPrivate : public QObject
 
     bool parse( const QVariant& data );
     bool parse( const QByteArray& data );
-private slots:
+private Q_SLOTS:
     void parseData();
     void error( QNetworkReply::NetworkError error );
 

src/DeviceUpdates.h

@@ -56,7 +56,7 @@ class MYGPO_EXPORT DeviceUpdates : public QObject
     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*/

src/DeviceUpdates_p.h

@@ -56,7 +56,7 @@ class DeviceUpdatesPrivate : public QObject
     bool parse( const QVariant& data );
     bool parse( const QByteArray& data );
 
-private slots:
+private Q_SLOTS:
     void parseData();
     void error( QNetworkReply::NetworkError error );
 

src/Episode.h

@@ -77,7 +77,7 @@ class MYGPO_EXPORT Episode : public QObject
     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*/

src/EpisodeAction.cpp

@@ -26,7 +26,7 @@
 
 using namespace mygpo;
 
-static qulonglong c_maxlonglong = (2^64)-1;
+static qulonglong c_maxlonglong = ULLONG_MAX;
 
 EpisodeActionPrivate::EpisodeActionPrivate( EpisodeAction* qq, const QVariant& variant, QObject* parent ) : QObject( parent ), q( qq )
 {

src/EpisodeActionList.h

@@ -52,7 +52,7 @@ class MYGPO_EXPORT EpisodeActionList : public QObject
 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*/

src/EpisodeActionList_p.h

@@ -50,7 +50,7 @@ class EpisodeActionListPrivate : public QObject
     bool parse( const QVariant& data );
     bool parse( const QByteArray& data );
 
-private slots:
+private Q_SLOTS:
     void parseData();
     void error( QNetworkReply::NetworkError error );
 

src/EpisodeList.h

@@ -49,7 +49,7 @@ class MYGPO_EXPORT EpisodeList : public QObject
 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*/

src/EpisodeList_p.h

@@ -46,7 +46,7 @@ class EpisodeListPrivate : QObject
     bool parse( const QVariant& data );
     bool parse( const QByteArray& data );
 
-private slots:
+private Q_SLOTS:
     void parseData();
     void error( QNetworkReply::NetworkError error );
 

src/Episode_p.h

@@ -60,7 +60,7 @@ class EpisodePrivate : QObject
     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 );
 

src/JsonCreator.cpp

@@ -32,7 +32,7 @@
 
 using namespace mygpo;
 
-static qulonglong c_maxlonglong = (2^64)-1;
+static qulonglong c_maxlonglong = ULLONG_MAX;
 
 QByteArray JsonCreator::addRemoveSubsToJSON( const QList< QUrl >& add, const QList< QUrl >& remove )
 {

src/Podcast.h

@@ -66,7 +66,7 @@ class MYGPO_EXPORT Podcast : public QObject
     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*/

src/PodcastList.h

@@ -50,7 +50,7 @@ class MYGPO_EXPORT PodcastList : public QObject
     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*/

src/PodcastList_p.h

@@ -45,7 +45,7 @@ class PodcastListPrivate : QObject
 
     bool parse( const QVariant& data );
     bool parse( const QByteArray& data );
-private slots:
+private Q_SLOTS:
     void parseData();
     void error( QNetworkReply::NetworkError error );
 };

src/Podcast_p.h

@@ -61,7 +61,7 @@ class PodcastPrivate : QObject
 
     bool parse( const QVariant& data );
     bool parse( const QByteArray& data );
-private slots:
+private Q_SLOTS:
     void parseData();
     void error( QNetworkReply::NetworkError error );
 };

src/Settings.h

@@ -50,7 +50,7 @@ class MYGPO_EXPORT Settings : public QObject
     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*/

src/Settings_p.h

@@ -47,7 +47,7 @@ class SettingsPrivate : public QObject
     bool parse( const QVariant& data );
     bool parse( const QByteArray& data );
 
-private slots:
+private Q_SLOTS:
     void parseData();
     void error( QNetworkReply::NetworkError error );
 

src/TagList.h

@@ -48,7 +48,7 @@ class MYGPO_EXPORT TagList : public QObject
     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*/

src/TagList_p.h

@@ -46,7 +46,7 @@ class TagListPrivate : public QObject
 
     bool parse( const QVariant& data );
     bool parse( const QByteArray& data );
-private slots:
+private Q_SLOTS:
     void parseData();
     void error( QNetworkReply::NetworkError error );
 };

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();

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();