alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

compile without QCA

Browse Source 
CCMAIL:r.scheepmaker@student.utwente.nl

svn path=/trunk/KDE/kdelibs/; revision=1021723
This commit is contained in:
André Wöbbeking 2009-09-09 21:54:31 +00:00
parent 92fc9efd2e
commit e1c7e86bcf
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
private/authorizationmanager_p.h
View File

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

1
private/joliemessagehelper_p.h
View File

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

8
private/serviceprovider.cpp
View File

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

2
remote/authorizationmanager.cpp
View File

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

2
remote/authorizationrule.cpp
View File

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