From 9d2c3ebad33a0b7895f77db316fdb9ab57d86a79 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Mon, 25 Feb 2013 09:54:19 +0100 Subject: Move config.h out of header files. --- src/mirall/credentialstore.cpp | 5 +++++ src/mirall/credentialstore.h | 12 +----------- src/mirall/folder.cpp | 1 + src/mirall/folder.h | 1 - 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/mirall/credentialstore.cpp b/src/mirall/credentialstore.cpp index 0343a80dd..7338a5655 100644 --- a/src/mirall/credentialstore.cpp +++ b/src/mirall/credentialstore.cpp @@ -20,6 +20,11 @@ #include "mirall/mirallconfigfile.h" #include "mirall/theme.h" +#ifdef WITH_QTKEYCHAIN +#include +using namespace QKeychain; +#endif + #define MAX_LOGIN_ATTEMPTS 3 namespace Mirall { diff --git a/src/mirall/credentialstore.h b/src/mirall/credentialstore.h index 0179c04f4..51030a2f9 100644 --- a/src/mirall/credentialstore.h +++ b/src/mirall/credentialstore.h @@ -14,22 +14,12 @@ #ifndef CREDENTIALSTORE_H #define CREDENTIALSTORE_H -#include "config.h" #include #include -#ifdef WITH_QTKEYCHAIN -#include "qtkeychain/keychain.h" - -using namespace QKeychain; -#else -// FIXME: If the slot definition below is ifdefed for some reason the slot is -// not there even if WITH_QTKEYCHAIN is defined. namespace QKeychain { - typedef void Job; + class Job; } -#endif - namespace Mirall { diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp index b2fa7b4d6..3ac7b54d4 100644 --- a/src/mirall/folder.cpp +++ b/src/mirall/folder.cpp @@ -11,6 +11,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. */ +#include "config.h" #include "mirall/folder.h" #include "mirall/folderwatcher.h" diff --git a/src/mirall/folder.h b/src/mirall/folder.h index 321dacf1b..85d1ae682 100644 --- a/src/mirall/folder.h +++ b/src/mirall/folder.h @@ -15,7 +15,6 @@ #ifndef MIRALL_FOLDER_H #define MIRALL_FOLDER_H -#include "config.h" #include #include -- cgit v1.2.3