From 3823d16b0db8b9c05da0a68b173756600f9c4e01 Mon Sep 17 00:00:00 2001 From: Markus Mittendrein Date: Wed, 7 Oct 2015 13:49:01 +0200 Subject: Use QString::mid instead of QString::right where appropriate --- src/crsm.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/crsm.cpp') diff --git a/src/crsm.cpp b/src/crsm.cpp index d003720..dd8605d 100644 --- a/src/crsm.cpp +++ b/src/crsm.cpp @@ -461,11 +461,15 @@ void CRSM::ircMessageReceived(IrcMessage *message) } else if(mess.length() > QString(CMD_SIGN).length() && mess.left(QString(CMD_SIGN).length()) == CMD_SIGN) { +<<<<<<< HEAD <<<<<<< HEAD QString command = mess.right(mess.length() - QString(CMD_SIGN).length()); ======= QString command = mess.mid(Config.CRSM.CommandSign.length()).trimmed(); >>>>>>> 49e362f... fixup! Add command groups +======= + QString command = mess.mid(QString(CMD_SIGN).length()); +>>>>>>> 3791e42... Use QString::mid instead of QString::right where appropriate const ClientInfo& client = ClientInfo::ircClient(message->nick(), target); if(!cmd(command, client)) { @@ -871,7 +875,7 @@ QString CRSM::scenPath(QString scenName) else { QStringList split = scenName.split('/'); - QString name = scenName.right(scenName.length() - split.first().length() - 1); + QString name = scenName.mid(split.first().length() + 1); if(split.length() >= 2) { if(split.first().right(4) == ".c4f") @@ -1037,7 +1041,7 @@ void CRSM::writeToServer(const QString &message) wordSplit = true; } linePart = line.left(pos); - line = line.right(line.length() - pos); + line = line.mid(pos); if(wordSplit) { linePart += "-"; -- cgit v1.2.3-54-g00ecf