compile without QCA

CCMAIL:r.scheepmaker@student.utwente.nl

svn path=/trunk/KDE/kdelibs/; revision=1021723

private/authorizationmanager_p.h

@@ -20,9 +20,14 @@
 #ifndef AUTHORIZATIONMANAGER_P_H
 #define AUTHORIZATIONMANAGER_P_H
 
+#include "config-plasma.h"
+
 #include <QtCore/QMap>
 #include <QtCore/QString>
+
+#ifdef ENABLE_REMOTE_WIDGETS
 #include <QtCrypto>
+#endif
 
 #include <kconfiggroup.h>
 
@@ -63,7 +68,9 @@ class AuthorizationManagerPrivate
         void addCredentials(const Credentials &identity);
         void saveRules();
 
+#ifdef ENABLE_REMOTE_WIDGETS
         QCA::Initializer            initializer;
+#endif
 
         AuthorizationManager        *q;
         Jolie::Server               *server;

private/joliemessagehelper_p.h

@@ -23,7 +23,6 @@
 #include <QByteArray>
 #include <QtJolie/Message>
 #include <QtJolie/Value>
-#include <QtCrypto>
 #include <kdebug.h>
 #include <klocalizedstring.h>
 

private/serviceprovider.cpp

@@ -22,6 +22,8 @@
 #include "authorizationmanager_p.h"
 #include "joliemessagehelper_p.h"
 
+#include "config-plasma.h"
+
 #include <plasma/remote/authorizationinterface.h>
 #include <plasma/remote/authorizationmanager.h>
 #include <plasma/remote/authorizationrule.h>
@@ -35,6 +37,10 @@
 
 #include <QtJolie/Server>
 
+#ifdef ENABLE_REMOTE_WIDGETS
+#include <QtCrypto>
+#endif
+
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
@@ -297,7 +303,9 @@ Jolie::Message ServiceProvider::appendToken(Jolie::Message message,
                                             const QByteArray &caller,
                                             const QByteArray &uuid)
 {
+#ifdef ENABLE_REMOTE_WIDGETS
     m_tokens[caller + uuid] = QCA::Random::randomArray(256).toByteArray();
+#endif
     //kDebug() << "setting token: " << m_tokens[caller + uuid].toBase64()
              //<< " for caller: " << caller.toBase64()
              //<< " with uuid caller: " << uuid.toBase64();

remote/authorizationmanager.cpp

@@ -42,8 +42,6 @@
 #include <QtJolie/Message>
 #include <QtJolie/Server>
 
-#include <QtCrypto>
-
 #include <kauthaction.h>
 #include <kconfiggroup.h>
 #include <kdebug.h>

remote/authorizationrule.cpp

@@ -27,8 +27,6 @@
 #include <QtCore/QObject>
 #include <QtCore/QTimer>
 
-#include <QtCrypto>
-
 #include <kurl.h>
 #include <klocalizedstring.h>