X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclientsyncer.cpp;h=e24d8300d9a1d4009b5f993cc264867cff2ab651;hb=17b8c981d7c47800392b7fd1c043c5ac1bcb19ef;hp=79d8c91fb09b89ee6ac953e3cb143dcd47ce4c5f;hpb=332069a1830ed3a055ac6f2d7661bae1cc83e40c;p=quassel.git

diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp
index 79d8c91f..e24d8300 100644
--- a/src/client/clientsyncer.cpp
+++ b/src/client/clientsyncer.cpp
@@ -25,15 +25,14 @@
 #endif
 
 #include "client.h"
-#include "global.h"
 #include "identity.h"
 #include "ircuser.h"
 #include "ircchannel.h"
 #include "network.h"
 #include "networkmodel.h"
+#include "quassel.h"
 #include "signalproxy.h"
 
-
 ClientSyncer::ClientSyncer(QObject *parent)
   : QObject(parent)
 {
@@ -124,7 +123,7 @@ void ClientSyncer::connectToCore(const QVariantMap &conn) {
     //emit coreConnectionMsg(tr("Connecting..."));
     Q_ASSERT(!socket);
 
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
     QSslSocket *sock = new QSslSocket(Client::instance());
 #else
     if(conn["useSsl"].toBool()) {
@@ -196,7 +195,7 @@ void ClientSyncer::clientInitAck(const QVariantMap &msg) {
   }
   emit connectionMsg(msg["CoreInfo"].toString());
 
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
   if(coreConnectionInfo["useSsl"].toBool()) {
     if(msg["SupportSsl"].toBool()) {
       QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket);
@@ -219,7 +218,7 @@ void ClientSyncer::clientInitAck(const QVariantMap &msg) {
     socket->setProperty("UseCompression", true);
   }
 #endif
-  
+
   if(!msg["Configured"].toBool()) {
     // start wizard
     emit startCoreSetup(msg["StorageBackends"].toList());
@@ -299,7 +298,7 @@ void ClientSyncer::checkSyncState() {
   }
 }
 
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
 void ClientSyncer::sslErrors(const QList<QSslError> &errors) {
   qDebug() << "SSL Errors:";
   foreach(QSslError err, errors)