From 54754a237fe785433801cf0a593106a5186b98eb Mon Sep 17 00:00:00 2001 From: a-sum-duma Date: Fri, 31 Jul 2020 18:30:40 +0200 Subject: [PATCH] Fix: Q_DECL_DEPRECATED_X was not in QT 5.2 yet, replace with Q_DECL_DEPRECATED --- libqnapi/src/config/generalconfig.h | 2 +- libqnapi/src/qnapi.h | 4 ++-- libqnapi/src/subtitlematcher.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libqnapi/src/config/generalconfig.h b/libqnapi/src/config/generalconfig.h index caddbd6..5cd4eff 100644 --- a/libqnapi/src/config/generalconfig.h +++ b/libqnapi/src/config/generalconfig.h @@ -73,7 +73,7 @@ class GeneralConfig { * @deprecated Since X.X.X. Will be removed in X.X.X. * Use constructor that accepts #LangCodeType. */ - Q_DECL_DEPRECATED_X("use constructor that accepts LangCodeType") + Q_DECL_DEPRECATED GeneralConfig(const QString& uiLanguage, const QString& p7zipPath, const QString& tmpPath, const QString& language, const QString& backupLanguage, const bool& noBackup, diff --git a/libqnapi/src/qnapi.h b/libqnapi/src/qnapi.h index 6072c3a..5df1d11 100644 --- a/libqnapi/src/qnapi.h +++ b/libqnapi/src/qnapi.h @@ -67,7 +67,7 @@ class QNapi { * @deprecated Since X.X.X. Will be removed in X.X.X. * Use selectSubtitlesByIdx(i) + download(). */ - Q_DECL_DEPRECATED_X("use selectSubtitlesByIdx(i) + download()") + Q_DECL_DEPRECATED bool download(int i) { return selectSubtitlesByIdx(i), download(); } /* TODO: Fill in versions. */ @@ -75,7 +75,7 @@ class QNapi { * @deprecated Since X.X.X. Will be removed in X.X.X. * Use unpack(). */ - Q_DECL_DEPRECATED_X("use unpack()") + Q_DECL_DEPRECATED bool unpack(int) { return unpack(); }; void cleanup(); diff --git a/libqnapi/src/subtitlematcher.h b/libqnapi/src/subtitlematcher.h index 8eed15a..49636fd 100644 --- a/libqnapi/src/subtitlematcher.h +++ b/libqnapi/src/subtitlematcher.h @@ -36,7 +36,7 @@ class SubtitleMatcher : public QObject { * @deprecated Since X.X.X. Will be removed in X.X.X. * Use constructor that accepts #LangCodeType. */ - Q_DECL_DEPRECATED_X("use constructor that accepts LangCodeType") + Q_DECL_DEPRECATED SubtitleMatcher(bool _noBackup, bool _isPostProcessingEnabled, QString _ppSubFormat, QString _ppSubExtension, bool _changePermissions, QString _changePermissionsTo,