From b660519e1915356214c31bd401b01aa750a961a1 Mon Sep 17 00:00:00 2001 From: Markus Mittendrein Date: Sat, 15 Jan 2022 17:27:33 +0100 Subject: Use Qt::SplitBehavior instead of deprecated QString::SplitBehavior --- src/CRSMStats.hpp | 4 ++-- src/PatchedClonkParser.cpp | 2 +- src/crsm.cpp | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/CRSMStats.hpp b/src/CRSMStats.hpp index 5124348..cbf60ae 100644 --- a/src/CRSMStats.hpp +++ b/src/CRSMStats.hpp @@ -52,7 +52,7 @@ public: ConfigValue(WishStartStats& config) : config(config), wishConfig(config.WishCount), startConfig(config.StartCount) {} void setValue(const QString& value) { - QStringList parts = value.split(',', QString::KeepEmptyParts); + QStringList parts = value.split(',', Qt::KeepEmptyParts); if(parts.length() != 2) { throw ConfigException("Can not parse corrupt WishStartStats"); @@ -78,7 +78,7 @@ public: ConfigValue(CommandUseStats& config) : config(config), useConfig(config.UseCount), successConfig(config.SuccessCount), rightsFailConfig(config.RightsFailCount), syntaxFailConfig(config.SyntaxFailCount) {} void setValue(const QString& value) { - QStringList parts = value.split(',', QString::KeepEmptyParts); + QStringList parts = value.split(',', Qt::KeepEmptyParts); if(parts.length() != 4) { throw ConfigException("Can not parse corrupt CommandUseStats"); diff --git a/src/PatchedClonkParser.cpp b/src/PatchedClonkParser.cpp index e5abd7d..7eea65d 100644 --- a/src/PatchedClonkParser.cpp +++ b/src/PatchedClonkParser.cpp @@ -8,7 +8,7 @@ PatchedClonkParser::PatchedClonkParser(CRSMSession& session) : ClonkParser(sessi namespace { void parseClientInfo(QString& message, QString& pcName, QString& user) { - if(message.length() > 5 && message.at(0) == '\\') + if(!message.isEmpty() && message.at(0) == '\\') { QString parts[2]; for(int i = 1, part = 0; i < message.length() && part < 2; ++i) diff --git a/src/crsm.cpp b/src/crsm.cpp index e178504..93dc9d7 100644 --- a/src/crsm.cpp +++ b/src/crsm.cpp @@ -337,7 +337,7 @@ bool CRSM::raw(const QString &line) { if(Config.IRC.Use) { - foreach(const QString &mess, line.split("\n", QString::SkipEmptyParts)) + foreach(const QString &mess, line.split("\n", Qt::SkipEmptyParts)) foreach(const QString &mod, ircModIOList) { sendIrcMessage(mess, mod, false, true, true); @@ -452,7 +452,7 @@ void CRSM::ircMessageReceived(IrcMessage *message) IrcNoticeMessage* noticeMessage = (IrcNoticeMessage*)message; if(message->nick() == "NickServ") { - QStringList split = message->parameters().at(1).split(' ', QString::SkipEmptyParts); + QStringList split = message->parameters().at(1).split(' ', Qt::SkipEmptyParts); if(noticeMessage->content().contains("nickname is registered")) { sendIrcMessage("IDENTIFY " + Config.IRC.Nick + " " + Config.IRC.Password, "NickServ", false, false); @@ -495,7 +495,7 @@ void CRSM::ircMessageReceived(IrcMessage *message) { if(privMessage->content().startsWith("DCC CHAT CHAT ", Qt::CaseInsensitive)) { - const QStringList& parts = privMessage->content().split(' ', QString::SkipEmptyParts); + const QStringList& parts = privMessage->content().split(' ', Qt::SkipEmptyParts); if(parts.size() == 5) { dccChatRequest(ClientInfo::ircClient(message->nick())); @@ -861,7 +861,7 @@ void CRSM::readScenarios() scenfile.close(); } scenfile.open(QFile::ReadOnly); - QStringList scenlist = QString(scenfile.readAll()).trimmed().split("\n",QString::SkipEmptyParts); + QStringList scenlist = QString(scenfile.readAll()).trimmed().split("\n",Qt::SkipEmptyParts); out("Scenarios in list:\n"); autolist.clear(); nextAutoScens.clear(); @@ -869,7 +869,7 @@ void CRSM::readScenarios() foreach(const QString &args, scenlist) { ScenarioSettings scen(args, ClientInfo::autoClient()); - QStringList argList = args.split(' ', QString::KeepEmptyParts); + QStringList argList = args.split(' ', Qt::KeepEmptyParts); if(argList.first().trimmed() == "--league") { argList.removeFirst(); @@ -1140,7 +1140,7 @@ void CRSM::writeToServer(const QString &message) if(!processManager->isWritable()) return; int i = 0; - QStringList split = message.split('\n', QString::KeepEmptyParts); + QStringList split = message.split('\n', Qt::KeepEmptyParts); foreach(QString line, split) { if(!line.isEmpty()) @@ -1449,7 +1449,7 @@ QStringList CRSM::guessCmd(const QString& name, ClientInterface interface) CmdFunctionRef* CRSM::findCommand(const QString &cmd, ClientInterface interface, QString &args, QStringList& corrections) { - return findCommand(cmd.split(QRegularExpression(R"(\s)"), QString::KeepEmptyParts), interface, args, corrections); + return findCommand(cmd.split(QRegularExpression(R"(\s)"), Qt::KeepEmptyParts), interface, args, corrections); } CmdFunctionRef* CRSM::findCommand(QStringList&& cmd, ClientInterface interface, QString &realCmd, QStringList& corrections) @@ -1714,7 +1714,7 @@ void CRSM::respond(const ClientInfo &client, const QString &message, const Respo control.serverMessage(message); break; case IRC: - foreach(const QString line, message.split('\n', QString::SkipEmptyParts)) + foreach(const QString line, message.split('\n', Qt::SkipEmptyParts)) { switch(type) { @@ -2649,7 +2649,7 @@ CMD_FUNCTION_IMPL(host) else { ScenarioSettings scen(args, client); - QStringList argList = args.split(' ', QString::KeepEmptyParts); + QStringList argList = args.split(' ', Qt::KeepEmptyParts); QString ligaText = ""; if(argList.first().trimmed() == "--league") { @@ -3246,7 +3246,7 @@ CMD_FUNCTION_IMPL(setConfigValue) } CMD_FUNCTION_IMPL(ircSay) - QStringList parts = args.split(' ', QString::KeepEmptyParts); + QStringList parts = args.split(' ', Qt::KeepEmptyParts); if(parts.length() < 2) { respond(client, "Es wird ein Empfänger und eine Nachricht benötigt.\n"); -- cgit v1.2.3-54-g00ecf