Removed some whitespaces..

diff --git a/src/core/abstractsqlstorage.cpp b/src/core/abstractsqlstorage.cpp
index d5cfe63..3919825 100644 (file)
--- a/src/core/abstractsqlstorage.cpp
+++ b/src/core/abstractsqlstorage.cpp
@@ -52,8 +52,8 @@ QSqlDatabase AbstractSqlStorage::logDb() {
     return db;
 
   if(!openDb()) {
     return db;
 
   if(!openDb()) {

-    quWarning() << "Unable to Open Database " << displayName();
-    quWarning() << " - " << db.lastError().text();
+    quWarning() << "Unable to Open Database" << displayName();
+    quWarning() << "-" << db.lastError().text();

   }
 
   return QSqlDatabase::database("quassel_connection");
   }
 
   return QSqlDatabase::database("quassel_connection");


@@ -100,7 +100,7 @@ bool AbstractSqlStorage::init(const QVariantMap &settings) {
       return false;
   }
   
       return false;
   }
   

-  quInfo() << "Storage Backend is ready. Quassel Schema Version: " << installedSchemaVersion();
+  quInfo() << "Storage Backend is ready. Quassel Schema Version:" << installedSchemaVersion();

   return true;
 }
 
   return true;
 }
 


@@ -120,7 +120,7 @@ QString AbstractSqlStorage::queryString(const QString &queryName, int version) {
     
   QFileInfo queryInfo(QString(":/SQL/%1/%2/%3.sql").arg(displayName()).arg(version).arg(queryName));
   if(!queryInfo.exists() || !queryInfo.isFile() || !queryInfo.isReadable()) {
     
   QFileInfo queryInfo(QString(":/SQL/%1/%2/%3.sql").arg(displayName()).arg(version).arg(queryName));
   if(!queryInfo.exists() || !queryInfo.isFile() || !queryInfo.isReadable()) {

-    quError() << "Unable to read SQL-Query " << queryName << " for engine " << displayName();
+    quError() << "Unable to read SQL-Query" << queryName << "for engine" << displayName();

     return QString();
   }
 
     return QString();
   }
 


@@ -234,14 +234,14 @@ bool AbstractSqlStorage::watchQuery(QSqlQuery *query) {
     quError() << "unhandled Error in QSqlQuery!";
     quError() << "                  last Query:\n" << query->lastQuery();
     quError() << "              executed Query:\n" << query->executedQuery();
     quError() << "unhandled Error in QSqlQuery!";
     quError() << "                  last Query:\n" << query->lastQuery();
     quError() << "              executed Query:\n" << query->executedQuery();

-    quError() << "                bound Values: ";
+    quError() << "                bound Values:";

     QList<QVariant> list = query->boundValues().values();
     for (int i = 0; i < list.size(); ++i)
       quError() << i << ": " << list.at(i).toString().toAscii().data();
     QList<QVariant> list = query->boundValues().values();
     for (int i = 0; i < list.size(); ++i)
       quError() << i << ": " << list.at(i).toString().toAscii().data();

-    quError() << "                Error Number: "   << query->lastError().number();
-    quError() << "               Error Message: "   << query->lastError().text();
-    quError() << "              Driver Message: "   << query->lastError().driverText();
-    quError() << "                  DB Message: "   << query->lastError().databaseText();
+    quError() << "                Error Number:"   << query->lastError().number();
+    quError() << "               Error Message:"   << query->lastError().text();
+    quError() << "              Driver Message:"   << query->lastError().driverText();
+    quError() << "                  DB Message:"   << query->lastError().databaseText();

     
     return false;
   }
     
     return false;
   }

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 6efa622..dd33cec 100644 (file)
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -354,7 +354,7 @@ bool Core::startListening(uint port) {
   if(!success) {
     quError() << qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(server.errorString()));
   } else {
   if(!success) {
     quError() << qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(server.errorString()));
   } else {

-    quInfo() << "Listening for GUI clients on port " << server.serverPort() << " using protocol version " << Global::protocolVersion;
+    quInfo() << "Listening for GUI clients on port" << server.serverPort() << "using protocol version" << Global::protocolVersion;

   }
   
   return success;
   }
   
   return success;


@@ -374,7 +374,7 @@ void Core::incomingConnection() {
     
     QVariantMap clientInfo;
     blocksizes.insert(socket, (quint32)0);
     
     QVariantMap clientInfo;
     blocksizes.insert(socket, (quint32)0);

-    quInfo() << qPrintable(tr("Client connected from "))  << qPrintable(socket->peerAddress().toString());
+    quInfo() << qPrintable(tr("Client connected from"))  << qPrintable(socket->peerAddress().toString());

 
     if (!configured) {
       server.close();
 
     if (!configured) {
       server.close();


@@ -484,7 +484,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
 #ifndef QT_NO_COMPRESS
     if(supportsCompression && msg["UseCompression"].toBool()) {
       socket->setProperty("UseCompression", true);
 #ifndef QT_NO_COMPRESS
     if(supportsCompression && msg["UseCompression"].toBool()) {
       socket->setProperty("UseCompression", true);

-      quDebug() << "Using compression for Client: " << qPrintable(socket->peerAddress().toString());
+      quDebug() << "Using compression for Client:" << qPrintable(socket->peerAddress().toString());

     }
 #endif
     
     }
 #endif
     


@@ -521,7 +521,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
       }
       reply["MsgType"] = "ClientLoginAck";
       SignalProxy::writeDataToDevice(socket, reply);
       }
       reply["MsgType"] = "ClientLoginAck";
       SignalProxy::writeDataToDevice(socket, reply);

-      quInfo() << qPrintable(tr("Client ")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr(" initialized and authenticated successfully as \"%1\" (UserId: %2).").arg(msg["User"].toString()).arg(uid.toInt()));
+      quInfo() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("initialized and authenticated successfully as \"%1\" (UserId: %2).").arg(msg["User"].toString()).arg(uid.toInt()));

       setupClientSession(socket, uid);
     }
   }
       setupClientSession(socket, uid);
     }
   }

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 2be0e09..73369a9 100644 (file)
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -186,7 +186,7 @@ void CoreSession::updateBufferInfo(UserId uid, const BufferInfo &bufinfo) {
 void CoreSession::connectToNetwork(NetworkId id) {
   CoreNetwork *net = network(id);
   if(!net) {
 void CoreSession::connectToNetwork(NetworkId id) {
   CoreNetwork *net = network(id);
   if(!net) {

-    quWarning() << "Connect to unknown network requested! net: " << id << " user: " << user();
+    quWarning() << "Connect to unknown network requested! net:" << id << "user:" << user();

     return;
   }
 
     return;
   }
 


@@ -247,7 +247,7 @@ void CoreSession::removeClient(QIODevice *iodev) {
   // no checks for validity check - privateslot...
   QTcpSocket *socket = qobject_cast<QTcpSocket *>(iodev);
   if(socket)
   // no checks for validity check - privateslot...
   QTcpSocket *socket = qobject_cast<QTcpSocket *>(iodev);
   if(socket)

-    quInfo() << qPrintable(tr("Client ")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr(" disconnected (UserId: %1).").arg(user().toInt()));
+    quInfo() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("disconnected (UserId: %1).").arg(user().toInt()));

   else
     quInfo() << "Local client disconnedted.";
   disconnect(socket, 0, this, 0);
   else
     quInfo() << "Local client disconnedted.";
   disconnect(socket, 0, this, 0);


@@ -481,7 +481,7 @@ void CoreSession::destroyNetwork(NetworkId id) {
 void CoreSession::removeBufferRequested(BufferId bufferId) {
   BufferInfo bufferInfo = Core::getBufferInfo(user(), bufferId);
   if(!bufferInfo.isValid()) {
 void CoreSession::removeBufferRequested(BufferId bufferId) {
   BufferInfo bufferInfo = Core::getBufferInfo(user(), bufferId);
   if(!bufferInfo.isValid()) {

-    quWarning() << "CoreSession::removeBufferRequested(): invalid BufferId: " << bufferId << " for User: " << user();
+    quWarning() << "CoreSession::removeBufferRequested(): invalid BufferId:" << bufferId << "for User:" << user();

     return;
   }
   
     return;
   }
   


@@ -498,7 +498,7 @@ void CoreSession::removeBufferRequested(BufferId bufferId) {
     }
     IrcChannel *chan = net->ircChannel(bufferInfo.bufferName());
     if(chan) {
     }
     IrcChannel *chan = net->ircChannel(bufferInfo.bufferName());
     if(chan) {

-      quWarning() << "CoreSession::removeBufferRequested(): Unable to remove Buffer for joined Channel: " << bufferInfo.bufferName();
+      quWarning() << "CoreSession::removeBufferRequested(): Unable to remove Buffer for joined Channel:" << bufferInfo.bufferName();

       return;
     }
   }
       return;
     }
   }

diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp
index 7604cd2..58a2302 100644 (file)
--- a/src/core/ircserverhandler.cpp
+++ b/src/core/ircserverhandler.cpp
@@ -238,7 +238,7 @@ void IrcServerHandler::handleMode(const QString &prefix, const QList<QByteArray>
          else
            channel->removeUserMode(ircUser, QString(modes[c]));
        } else {
          else
            channel->removeUserMode(ircUser, QString(modes[c]));
        } else {

-         quWarning() << "Received MODE with too few parameters: " << serverDecode(params);
+         quWarning() << "Received MODE with too few parameters:" << serverDecode(params);

        }
        paramOffset++;
       } else {
        }
        paramOffset++;
       } else {


@@ -249,7 +249,7 @@ void IrcServerHandler::handleMode(const QString &prefix, const QList<QByteArray>
            if(paramOffset < params.count()) {
              value = params[paramOffset];
            } else {
            if(paramOffset < params.count()) {
              value = params[paramOffset];
            } else {

-             quWarning() << "Received MODE with too few parameters: " << serverDecode(params);
+             quWarning() << "Received MODE with too few parameters:" << serverDecode(params);

            }
            paramOffset++;
        }
            }
            paramOffset++;
        }


@@ -382,7 +382,7 @@ void IrcServerHandler::handlePrivmsg(const QString &prefix, const QList<QByteArr
   }
 
   if(params.isEmpty()) {
   }
 
   if(params.isEmpty()) {

-    quWarning() << "IrcServerHandler::handlePrivmsg(): received PRIVMSG without target or message from: " << prefix;
+    quWarning() << "IrcServerHandler::handlePrivmsg(): received PRIVMSG without target or message from:" << prefix;

     return;
   }
      
     return;
   }
      


@@ -863,7 +863,7 @@ void IrcServerHandler::handle353(const QString &prefix, const QList<QByteArray>
 
   IrcChannel *channel = network()->ircChannel(channelname);
   if(!channel) {
 
   IrcChannel *channel = network()->ircChannel(channelname);
   if(!channel) {

-    quWarning() << "IrcServerHandler::handle353(): received unknown target channel: " << channelname;
+    quWarning() << "IrcServerHandler::handle353(): received unknown target channel:" << channelname;

     return;
   }
 
     return;
   }
 


@@ -947,7 +947,7 @@ void IrcServerHandler::tryNextNick(const QString &errnick) {
 
 bool IrcServerHandler::checkParamCount(const QString &methodName, const QList<QByteArray> &params, int minParams) {
   if(params.count() < minParams) {
 
 bool IrcServerHandler::checkParamCount(const QString &methodName, const QList<QByteArray> &params, int minParams) {
   if(params.count() < minParams) {

-    quWarning() << qPrintable(methodName) << " requires " << minParams << " parameters but received only " << params.count() << serverDecode(params);
+    quWarning() << qPrintable(methodName) << "requires" << minParams << "parameters but received only" << params.count() << serverDecode(params);

     return false;
   } else {
     return true;
     return false;
   } else {
     return true;

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 84b7776..7f4dd78 100644 (file)
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -491,7 +491,7 @@ BufferInfo SqliteStorage::getBufferInfo(UserId user, const NetworkId &networkId,
     query->exec();
     if(!query->first()) {
       watchQuery(query);
     query->exec();
     if(!query->first()) {
       watchQuery(query);

-      quWarning() << "unable to create BufferInfo for: " << user << networkId << buffer;
+      quWarning() << "unable to create BufferInfo for:" << user << networkId << buffer;

       return BufferInfo();
     }
   }
       return BufferInfo();
     }
   }


@@ -499,11 +499,11 @@ BufferInfo SqliteStorage::getBufferInfo(UserId user, const NetworkId &networkId,
   BufferInfo bufferInfo = BufferInfo(query->value(0).toInt(), networkId, (BufferInfo::Type)query->value(1).toInt(), 0, buffer);
   if(query->next()) {
     quError() << "SqliteStorage::getBufferInfo(): received more then one Buffer!";
   BufferInfo bufferInfo = BufferInfo(query->value(0).toInt(), networkId, (BufferInfo::Type)query->value(1).toInt(), 0, buffer);
   if(query->next()) {
     quError() << "SqliteStorage::getBufferInfo(): received more then one Buffer!";

-    quError() << "         Query: " << query->lastQuery();
+    quError() << "         Query:" << query->lastQuery();

     quError() << "  bound Values:";
     QList<QVariant> list = query->boundValues().values();
     for (int i = 0; i < list.size(); ++i)
     quError() << "  bound Values:";
     QList<QVariant> list = query->boundValues().values();
     for (int i = 0; i < list.size(); ++i)

-      quError() << i << ": " << list.at(i).toString().toAscii().data();
+      quError() << i << ":" << list.at(i).toString().toAscii().data();

     Q_ASSERT(false);
   }
 
     Q_ASSERT(false);
   }