fixing some merge weirdness

diff --git a/src/client/client.cpp b/src/client/client.cpp
index ea1738b..a307a8a 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -72,8 +72,8 @@ Client::Client(QObject *parent)
     _bufferSyncer(0),
     _backlogManager(new ClientBacklogManager(this)),
     _bufferViewManager(0),
-    _messageModel(0),
     _ircListHelper(new ClientIrcListHelper(this)),
+    _messageModel(0),
     _connectedToCore(false),
     _syncedToCore(false)
 {

diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp
index ab45311..4ded4a8 100644 (file)
--- a/src/core/networkconnection.cpp
+++ b/src/core/networkconnection.cpp
@@ -59,12 +59,7 @@ NetworkConnection::NetworkConnection(Network *network, CoreSession *session)
     // TokenBucket to avaid sending too much at once
     _messagesPerSecond(1),
     _burstSize(5),
-    _tokenBucket(5), // init with a full bucket
-
-    // TODO: 
-    // should be 510 (2 bytes are added when writing to the socket)
-    // maxMsgSize is 510 minus the hostmask which will be added by the server
-    _maxMsgSize(450)
+    _tokenBucket(5) // init with a full bucket
 {
   _autoReconnectTimer.setSingleShot(true);
   _socketCloseTimer.setSingleShot(true);
@@ -501,23 +496,6 @@ void NetworkConnection::putCmd(const QString &cmd, const QList<QByteArray> &para
   if(!params.isEmpty())
     msg += " :" + params.last();
 
-  if(cmd == "PRIVMSG" && params.count() > 1) {
-    QByteArray msghead = "PRIVMSG " + params[0].toByteArray() + " :";
-
-    while (msg.size() > _maxMsgSize) {
-      QByteArray splitter(" .,-");
-      int splitPosition = 0;
-      for(int i = 0; i < splitter.size(); i++) {
-        splitPosition = qMax(splitPosition, msg.lastIndexOf(splitter[i], _maxMsgSize));
-      }
-      if(splitPosition < 300) {
-        splitPosition = _maxMsgSize;
-      }
-      putRawLine(msg.left(splitPosition)); 
-      msg = msghead + msg.mid(splitPosition);
-    }
-  }
-
   putRawLine(msg);
 }
 

diff --git a/src/core/networkconnection.h b/src/core/networkconnection.h
index cebf837..c28da18 100644 (file)
--- a/src/core/networkconnection.h
+++ b/src/core/networkconnection.h
@@ -195,8 +195,6 @@ private:
   int _tokenBucket; // the virtual bucket that holds the tokens
   QList<QByteArray> _msgQueue;
 
-  int _maxMsgSize;
-
   void writeToSocket(QByteArray s);