aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2021-05-07 03:43:32 +0200
committerFriedrich W. H. Kossebau <kossebau@kde.org>2021-05-07 03:43:32 +0200
commit728c44c81c23401056484b7ab39a33821aa7e2f5 (patch)
tree821526ff846c4eca339bec170974bcedb3a524a6 /src
parentf5f12926b1ead2f36b2f7e8fc34ff864b5b6d60e (diff)
downloadkconfig-728c44c81c23401056484b7ab39a33821aa7e2f5.tar.gz
kconfig-728c44c81c23401056484b7ab39a33821aa7e2f5.tar.bz2
Order macro for attribute for symbol export before that for deprecated
The symbol export/visibility attribute is not standardized so far and needs to be set by language extension attribute declaration at least with clang & MSVC, who both support that when it appears before the standard attribute declaration. NO_CHANGELOG
Diffstat (limited to 'src')
-rw-r--r--src/core/kauthorized.h3
-rw-r--r--src/gui/kconfiggui.h3
-rw-r--r--src/gui/kstandardshortcut.h3
3 files changed, 6 insertions, 3 deletions
diff --git a/src/core/kauthorized.h b/src/core/kauthorized.h
index ac3cfa7e..a61e0927 100644
--- a/src/core/kauthorized.h
+++ b/src/core/kauthorized.h
@@ -110,8 +110,9 @@ KCONFIGCORE_EXPORT bool authorizeAction(const QString &action);
* @see authorize()
* @deprecated since 5.24, use authorizeAction() instead.
*/
+KCONFIGCORE_EXPORT
KCONFIGCORE_DEPRECATED_VERSION(5, 24, "Use KAuthorized::authorizeAction(const QString&)")
-KCONFIGCORE_EXPORT bool authorizeKAction(const QString &action);
+bool authorizeKAction(const QString &action);
#endif
/**
diff --git a/src/gui/kconfiggui.h b/src/gui/kconfiggui.h
index c32e108f..8f4b739a 100644
--- a/src/gui/kconfiggui.h
+++ b/src/gui/kconfiggui.h
@@ -53,8 +53,9 @@ KCONFIGGUI_EXPORT bool hasSessionConfig();
* @return the application session name
* @deprecated since 5.11, use sessionConfig()->name()
*/
+KCONFIGGUI_EXPORT
KCONFIGGUI_DEPRECATED_VERSION(5, 11, "Use KConfigGui::sessionConfig()->name()")
-KCONFIGGUI_EXPORT QString sessionConfigName();
+QString sessionConfigName();
#endif
}
diff --git a/src/gui/kstandardshortcut.h b/src/gui/kstandardshortcut.h
index 305cf8ed..7986486a 100644
--- a/src/gui/kstandardshortcut.h
+++ b/src/gui/kstandardshortcut.h
@@ -211,8 +211,9 @@ KCONFIGGUI_EXPORT StandardShortcut find(const QKeySequence &keySeq);
* is none
* @deprecated since 5.71, use findByName(const QString &name) instead
*/
+KCONFIGGUI_EXPORT
KCONFIGGUI_DEPRECATED_VERSION(5, 71, "Use findByName(const QString &name) instead")
-KCONFIGGUI_EXPORT StandardShortcut find(const char *keyName);
+StandardShortcut find(const char *keyName);
#endif
/**