X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreuserinputhandler.cpp;h=6a53cad29c3f9e290aaf022bb9da2e452cfac081;hp=cc508cf8c23230458a03be3c64c5d74f21d49ceb;hb=921e54680da16fcf2adb7a90506875aceb6633a4;hpb=0dfaab93892aee333f7b838658ef85b9ff270ba7

diff --git a/src/core/coreuserinputhandler.cpp b/src/core/coreuserinputhandler.cpp
index cc508cf8..6a53cad2 100644
--- a/src/core/coreuserinputhandler.cpp
+++ b/src/core/coreuserinputhandler.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -767,7 +767,7 @@ void CoreUserInputHandler::putPrivmsg(const QByteArray &target, const QByteArray
     //       For example, blowfish-ebc seems to create 8-char chunks.
 
     static const char *cmd = "PRIVMSG";
-    static const char *splitter = " .,-";
+    static const char *splitter = " .,-!?";
 
     int maxSplitPos = message.count();
     int splitPos = maxSplitPos;
@@ -819,10 +819,10 @@ int CoreUserInputHandler::lastParamOverrun(const QString &cmd, const QList<QByte
     // that means that the last message can be as long as:
     // 512 - nicklen - userlen - hostlen - commandlen - sum(param[0]..param[n-1])) - 2 (for CRLF) - 4 (":!@" + 1space between prefix and command) - max(paramcount - 1, 0) (space for simple params) - 2 (space and colon for last param)
     IrcUser *me = network()->me();
-    int maxLen = 480 - cmd.toAscii().count(); // educated guess in case we don't know us (yet?)
+    int maxLen = 480 - cmd.toLatin1().count(); // educated guess in case we don't know us (yet?)
 
     if (me)
-        maxLen = 512 - serverEncode(me->nick()).count() - serverEncode(me->user()).count() - serverEncode(me->host()).count() - cmd.toAscii().count() - 6;
+        maxLen = 512 - serverEncode(me->nick()).count() - serverEncode(me->user()).count() - serverEncode(me->host()).count() - cmd.toLatin1().count() - 6;
 
     if (!params.isEmpty()) {
         for (int i = 0; i < params.count() - 1; i++) {