diff options
| author | Volker Krause <vkrause@kde.org> | 2022-02-18 15:46:03 +0100 |
|---|---|---|
| committer | Volker Krause <vkrause@kde.org> | 2022-02-18 15:46:03 +0100 |
| commit | 13173f56b91a49995a1239646add37689e8aac6e (patch) | |
| tree | 943621e099b19b42d41fdec5c752dba55ff9228d /src/core | |
| parent | 828f52439fb02f224cc034e65dd82a0138a60662 (diff) | |
| download | kconfig-13173f56b91a49995a1239646add37689e8aac6e.tar.gz kconfig-13173f56b91a49995a1239646add37689e8aac6e.tar.bz2 | |
Use our deprecation macros rather than Q_DECL_DEPRECATED directly
This fixes the build with Qt6 on Android.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/kconfiggroup.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/core/kconfiggroup.h b/src/core/kconfiggroup.h index 6a6a74da..222a0145 100644 --- a/src/core/kconfiggroup.h +++ b/src/core/kconfiggroup.h @@ -754,7 +754,7 @@ private: const QByteArray M_data = readEntry(key, QByteArray(M_enum.valueToKey(def))); \ return static_cast<Class::Enum>(M_enum.keyToValue(M_data.constData())); \ } \ - inline Class::Enum Q_DECL_DEPRECATED readEntry(const KConfigGroup &group, const char *key, const Class::Enum &def) \ + inline Class::Enum KCONFIGCORE_DECL_DEPRECATED readEntry(const KConfigGroup &group, const char *key, const Class::Enum &def) \ { \ return group.readEntry(key, def); \ } \ @@ -768,10 +768,10 @@ private: const QMetaEnum M_enum = M_obj->enumerator(M_index); \ writeEntry(key, QByteArray(M_enum.valueToKey(value)), flags); \ } \ - inline void Q_DECL_DEPRECATED writeEntry(KConfigGroup &group, \ - const char *key, \ - const Class::Enum &value, \ - KConfigBase::WriteConfigFlags flags = KConfigBase::Normal) \ + inline void KCONFIGCORE_DECL_DEPRECATED writeEntry(KConfigGroup &group, \ + const char *key, \ + const Class::Enum &value, \ + KConfigBase::WriteConfigFlags flags = KConfigBase::Normal) \ { \ group.writeEntry(key, value, flags); \ } @@ -792,7 +792,7 @@ private: const QByteArray M_data = readEntry(key, QByteArray(M_enum.valueToKeys(def))); \ return static_cast<Class::Flags>(M_enum.keysToValue(M_data.constData())); \ } \ - inline Class::Flags Q_DECL_DEPRECATED readEntry(const KConfigGroup &group, const char *key, const Class::Flags &def) \ + inline Class::Flags KCONFIGCORE_DECL_DEPRECATED readEntry(const KConfigGroup &group, const char *key, const Class::Flags &def) \ { \ return group.readEntry(key, def); \ } \ @@ -806,10 +806,10 @@ private: const QMetaEnum M_enum = M_obj->enumerator(M_index); \ writeEntry(key, QByteArray(M_enum.valueToKeys(value)), flags); \ } \ - inline void Q_DECL_DEPRECATED writeEntry(KConfigGroup &group, \ - const char *key, \ - const Class::Flags &value, \ - KConfigBase::WriteConfigFlags flags = KConfigBase::Normal) \ + inline void KCONFIGCORE_DECL_DEPRECATED writeEntry(KConfigGroup &group, \ + const char *key, \ + const Class::Flags &value, \ + KConfigBase::WriteConfigFlags flags = KConfigBase::Normal) \ { \ group.writeEntry(key, value, flags); \ } |