aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2014-03-28 17:07:43 +0100
committerDavid Faure <faure@kde.org>2014-03-28 17:08:05 +0100
commita306f1faf40846998f0c0cc0d9d10756d65248a5 (patch)
treeb5d77ad961495f1996c9f0c815c1b33b55d0d54e
parent3b99ed63af318f5a43f24cd051fae57d7bb0280b (diff)
downloadkconfig-a306f1faf40846998f0c0cc0d9d10756d65248a5.tar.gz
kconfig-a306f1faf40846998f0c0cc0d9d10756d65248a5.tar.bz2
guard gcc-specific things with Q_CC_GNU to avoid problems elsewhere
-rw-r--r--src/core/kcoreconfigskeleton.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/core/kcoreconfigskeleton.cpp b/src/core/kcoreconfigskeleton.cpp
index 04b8b071..f9c9f268 100644
--- a/src/core/kcoreconfigskeleton.cpp
+++ b/src/core/kcoreconfigskeleton.cpp
@@ -1107,10 +1107,14 @@ void KCoreConfigSkeleton::usrSetDefaults()
void KCoreConfigSkeleton::usrRead()
{
+#ifdef Q_CC_GNU
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- usrReadConfig();
+#endif
+ usrReadConfig();
+#ifdef Q_CC_GNU
#pragma GCC diagnostic pop
+#endif
}
void KCoreConfigSkeleton::usrReadConfig()
@@ -1119,10 +1123,14 @@ void KCoreConfigSkeleton::usrReadConfig()
bool KCoreConfigSkeleton::usrSave()
{
+#ifdef Q_CC_GNU
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
return usrWriteConfig();
+#ifdef Q_CC_GNU
#pragma GCC diagnostic pop
+#endif
}
bool KCoreConfigSkeleton::usrWriteConfig()