Complete and pimp DesktopNotificationBackend.

[quassel.git] / src / core / networkconnection.cpp

diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp
index 6713765..5815a91 100644 (file)
--- a/src/core/networkconnection.cpp
+++ b/src/core/networkconnection.cpp
@@ -89,7 +89,7 @@ NetworkConnection::NetworkConnection(Network *network, CoreSession *session)
   connect(network, SIGNAL(autoReconnectIntervalSet(quint32)), this, SLOT(autoReconnectSettingsChanged()));
   connect(network, SIGNAL(autoReconnectRetriesSet(quint16)), this, SLOT(autoReconnectSettingsChanged()));
 
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
   connect(&socket, SIGNAL(encrypted()), this, SLOT(socketEncrypted()));
   connect(&socket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
 #endif
@@ -291,7 +291,7 @@ void NetworkConnection::socketError(QAbstractSocket::SocketError) {
   //exit(1);
 }
 
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
 
 void NetworkConnection::sslErrors(const QList<QSslError> &sslErrors) {
   Q_UNUSED(sslErrors)
@@ -315,10 +315,10 @@ void NetworkConnection::socketEncrypted() {
   socketInitialized();
 }
 
-#endif  // QT_NO_OPENSSL
+#endif  // HAVE_SSL
 
 void NetworkConnection::socketConnected() {
-#ifdef QT_NO_OPENSSL
+#ifndef HAVE_SSL
   socketInitialized();
   return;
 #else
@@ -470,12 +470,9 @@ void NetworkConnection::putCmd(const QString &cmd, const QList<QByteArray> &para
   if(cmd == "PRIVMSG" && params.count() > 1) {
     int overrun = lastParamOverrun(cmd, params);
     if(overrun) {
-      QList<QByteArray> paramCopy1;
-      QList<QByteArray> paramCopy2;
-      for(int i = 0; i < params.count() - 1; i++) {
-       paramCopy1 << params[i];
-       paramCopy2 << params[i];
-      }
+      QList<QByteArray> paramCopy1 = params;
+      paramCopy1.removeLast();
+      QList<QByteArray> paramCopy2 = paramCopy1;
 
       QByteArray lastPart = params.last();
       QByteArray splitter(" .,-");
@@ -484,8 +481,7 @@ void NetworkConnection::putCmd(const QString &cmd, const QList<QByteArray> &para
       for(int i = 0; i < splitter.size(); i++) {
        splitPos = qMax(splitPos, lastPart.lastIndexOf(splitter[i], maxSplitPos));
       }
-
-      if(splitPos == -1) {
+      if(splitPos <= 0) {
        splitPos = maxSplitPos;
       }