From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Mon, 14 May 2007 22:27:48 +0000 (+0000)
Subject: Finishing the big merge.
X-Git-Tag: 0.1.0~241
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=60bce4937bf006ceae27d012908b644a87865302

Finishing the big merge.
We need Qt 4.3.0 (beta) now, since QByteArray::toHex() does not seem to exist in older versions.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce3267e0..f9007b62 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ INCLUDE_DIRECTORIES(${SDIRS} plugins)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
 # We need Qt4 support.
-SET(QT_MIN_VERSION "4.2.0")
+SET(QT_MIN_VERSION "4.3.0")
 FIND_PACKAGE(Qt4 REQUIRED)
 
 # Set needed libraries
diff --git a/core/server.cpp b/core/server.cpp
index 494cb970..45c9da1a 100644
--- a/core/server.cpp
+++ b/core/server.cpp
@@ -162,18 +162,18 @@ void Server::handleServerMsg(QString msg) {
     QString prefix;
     QString cmd;
     QStringList params;
-    
+
     // check for prefix by checking for a colon as the first char
     if(msg[0] == ':') {
       msg.remove(0,1);
       prefix = msg.section(' ', 0, 0);
       msg = msg.section(' ', 1);
     }
-    
+
     // next string without a whitespace is the command
     cmd = msg.section(' ', 0, 0).toUpper();
     msg = msg.mid(cmd.length());
-    
+
     // get the parameters
     QString trailing = "";
     if(msg.contains(" :")) {
@@ -193,7 +193,7 @@ void Server::handleServerMsg(QString msg) {
       Q_ASSERT(params.count() > 0); // Violation to RFC
       params.removeFirst();
     }
-    
+
     // Now we try to find a handler for this message. BTW, I do love the Trolltech guys ;-)
     QString hname = cmd.toLower();
     hname[0] = hname[0].toUpper();