# HG changeset patch # User unc0rr # Date 1346747155 -14400 # Node ID e556b44f5bd85c189400d4e9f8e740d87bff3cc9 # Parent 4bc4b739f6e0d2c87de6165c1e9c0a92fce66870 More Qt-ish code, fix couple warnings. diff -r 4bc4b739f6e0 -r e556b44f5bd8 QTfrontend/game.cpp --- a/QTfrontend/game.cpp Tue Sep 04 12:16:36 2012 +0400 +++ b/QTfrontend/game.cpp Tue Sep 04 12:25:55 2012 +0400 @@ -431,7 +431,7 @@ RawSendIPC(buf); } -void HWGame::sendCampaignVar(QByteArray varToSend) +void HWGame::sendCampaignVar(const QByteArray &varToSend) { QString varToFind(varToSend); QSettings teamfile(cfgdir->absolutePath() + "/Teams/" + campaignTeam + ".hwt", QSettings::IniFormat, 0); @@ -442,22 +442,14 @@ RawSendIPC(command); } -void HWGame::writeCampaignVar(QByteArray varVal) +void HWGame::writeCampaignVar(const QByteArray & varVal) { - QString varToWrite(""); - QString varValue(""); - unsigned int i = 0; - while (i < varVal.size() && varVal.at(i) != ' ') - { - varToWrite.append(varVal.at(i)); - i++; - } - i++; - while (i < varVal.size() && varVal.at(i) != '\0') - { - varValue.append(varVal.at(i)); - i++; - } + int i = varVal.indexOf(" "); + if(i < 0) + return; + + QString varToWrite = QString::fromUtf8(varVal.left(i)); + QString varValue = QString::fromUtf8(varVal.mid(i + 1)); QSettings teamfile(cfgdir->absolutePath() + "/Teams/" + campaignTeam + ".hwt", QSettings::IniFormat, 0); teamfile.setIniCodec("UTF-8"); diff -r 4bc4b739f6e0 -r e556b44f5bd8 QTfrontend/game.h --- a/QTfrontend/game.h Tue Sep 04 12:16:36 2012 +0400 +++ b/QTfrontend/game.h Tue Sep 04 12:25:55 2012 +0400 @@ -111,8 +111,8 @@ void SendCampaignConfig(); void ParseMessage(const QByteArray & msg); void SetGameState(GameState state); - void sendCampaignVar(QByteArray varToSend); - void writeCampaignVar(QByteArray varVal); + void sendCampaignVar(const QByteArray & varToSend); + void writeCampaignVar(const QByteArray &varVal); }; #endif