Remove legacy core/client protocol version checks

[quassel.git] / src / client / clientsyncer.cpp

diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp
index 79d8c91..2b53270 100644 (file)
--- a/src/client/clientsyncer.cpp
+++ b/src/client/clientsyncer.cpp
@@ -25,15 +25,14 @@
 #endif
 
 #include "client.h"
 #endif
 
 #include "client.h"

-#include "global.h"

 #include "identity.h"
 #include "ircuser.h"
 #include "ircchannel.h"
 #include "network.h"
 #include "networkmodel.h"
 #include "identity.h"
 #include "ircuser.h"
 #include "ircchannel.h"
 #include "network.h"
 #include "networkmodel.h"

+#include "quassel.h"

 #include "signalproxy.h"
 
 #include "signalproxy.h"
 

-

 ClientSyncer::ClientSyncer(QObject *parent)
   : QObject(parent)
 {
 ClientSyncer::ClientSyncer(QObject *parent)
   : QObject(parent)
 {


@@ -124,7 +123,7 @@ void ClientSyncer::connectToCore(const QVariantMap &conn) {
     //emit coreConnectionMsg(tr("Connecting..."));
     Q_ASSERT(!socket);
 
     //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()) {
     QSslSocket *sock = new QSslSocket(Client::instance());
 #else
     if(conn["useSsl"].toBool()) {


@@ -157,10 +156,9 @@ void ClientSyncer::coreSocketConnected() {
   //emit coreConnectionMsg(tr("Synchronizing to core..."));
   QVariantMap clientInit;
   clientInit["MsgType"] = "ClientInit";
   //emit coreConnectionMsg(tr("Synchronizing to core..."));
   QVariantMap clientInit;
   clientInit["MsgType"] = "ClientInit";

-  clientInit["ClientVersion"] = Global::quasselVersion;
-  clientInit["ClientBuild"] = 860; // FIXME legacy!
-  clientInit["ClientDate"] = Global::quasselBuildDate;
-  clientInit["ProtocolVersion"] = Global::protocolVersion;
+  clientInit["ClientVersion"] = Quassel::buildInfo().fancyVersionString;
+  clientInit["ClientDate"] = Quassel::buildInfo().buildDate;
+  clientInit["ProtocolVersion"] = Quassel::buildInfo().protocolVersion;

   clientInit["UseSsl"] = coreConnectionInfo["useSsl"];
 #ifndef QT_NO_COMPRESS
   clientInit["UseCompression"] = true;
   clientInit["UseSsl"] = coreConnectionInfo["useSsl"];
 #ifndef QT_NO_COMPRESS
   clientInit["UseCompression"] = true;


@@ -185,18 +183,16 @@ void ClientSyncer::coreSocketDisconnected() {
 
 void ClientSyncer::clientInitAck(const QVariantMap &msg) {
   // Core has accepted our version info and sent its own. Let's see if we accept it as well...
 
 void ClientSyncer::clientInitAck(const QVariantMap &msg) {
   // Core has accepted our version info and sent its own. Let's see if we accept it as well...

-  uint ver = 0;
-  if(!msg.contains("ProtocolVersion") && msg["CoreBuild"].toUInt() >= 732) ver = 1; // legacy!
-  if(msg.contains("ProtocolVersion")) ver = msg["ProtocolVersion"].toUInt();
-  if(ver < Global::clientNeedsProtocol) {
+  uint ver = msg["ProtocolVersion"].toUInt();
+  if(ver < Quassel::buildInfo().clientNeedsProtocol) {

     emit connectionError(tr("<b>The Quassel Core you are trying to connect to is too old!</b><br>"
     emit connectionError(tr("<b>The Quassel Core you are trying to connect to is too old!</b><br>"

-        "Need at least core/client protocol v%1 to connect.").arg(Global::clientNeedsProtocol));
+        "Need at least core/client protocol v%1 to connect.").arg(Quassel::buildInfo().clientNeedsProtocol));

     disconnectFromCore();
     return;
   }
   emit connectionMsg(msg["CoreInfo"].toString());
 
     disconnectFromCore();
     return;
   }
   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);
   if(coreConnectionInfo["useSsl"].toBool()) {
     if(msg["SupportSsl"].toBool()) {
       QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket);


@@ -219,7 +215,7 @@ void ClientSyncer::clientInitAck(const QVariantMap &msg) {
     socket->setProperty("UseCompression", true);
   }
 #endif
     socket->setProperty("UseCompression", true);
   }
 #endif

-  
+

   if(!msg["Configured"].toBool()) {
     // start wizard
     emit startCoreSetup(msg["StorageBackends"].toList());
   if(!msg["Configured"].toBool()) {
     // start wizard
     emit startCoreSetup(msg["StorageBackends"].toList());


@@ -299,7 +295,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)
 void ClientSyncer::sslErrors(const QList<QSslError> &errors) {
   qDebug() << "SSL Errors:";
   foreach(QSslError err, errors)