From c0f375feba0103bed2bac1b1f05e76e9ae28fa89 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:55:35 -0600 Subject: Remove additional unneeded tq method conversions --- libksirtet/base/field.cpp | 6 +++--- libksirtet/common/ai.cpp | 4 ++-- libksirtet/common/highscores.cpp | 6 +++--- libksirtet/common/misc_ui.cpp | 6 +++--- libksirtet/lib/defines.cpp | 2 +- libksirtet/lib/keys.cpp | 6 +++--- libksirtet/lib/keys.h | 2 +- libksirtet/lib/meeting.cpp | 12 ++++++------ libksirtet/lib/mp_interface.cpp | 8 ++++---- libksirtet/lib/pline.cpp | 4 ++-- libksirtet/lib/types.cpp | 6 +++--- libksirtet/lib/wizard.cpp | 14 +++++++------- 12 files changed, 38 insertions(+), 38 deletions(-) (limited to 'libksirtet') diff --git a/libksirtet/base/field.cpp b/libksirtet/base/field.cpp index ec5b4f23..f31ec06c 100644 --- a/libksirtet/base/field.cpp +++ b/libksirtet/base/field.cpp @@ -41,8 +41,8 @@ void BaseField::init(bool AI, bool multiplayer, bool server, bool first, _flags.multiplayer = multiplayer; _flags.server = server; _flags.first = first; - TQString text = (AI ? i18n("%1\n(AI player)").tqarg(name) - : (multiplayer ? i18n("%1\n(Human player)").tqarg(name) + TQString text = (AI ? i18n("%1\n(AI player)").arg(name) + : (multiplayer ? i18n("%1\n(Human player)").arg(name) : TQString())); if ( first && !server ) text += i18n("\nWaiting for server"); setMessage(text, (first && server ? StartButton : NoButton)); @@ -128,7 +128,7 @@ void BaseField::stop(bool gameover) if ( board->arcadeStage()==bfactory->bbi.nbArcadeStages ) msg = i18n("The End"); else { - msg = i18n("Stage #%1 done").tqarg(board->arcadeStage()); + msg = i18n("Stage #%1 done").arg(board->arcadeStage()); button = ProceedButton; } } diff --git a/libksirtet/common/ai.cpp b/libksirtet/common/ai.cpp index 3960291e..3f48035f 100644 --- a/libksirtet/common/ai.cpp +++ b/libksirtet/common/ai.cpp @@ -343,14 +343,14 @@ TQCString AIConfig::coefficientKey(const char *name) double AIConfig::coefficient(const AI::Data &data) { - KConfigSkeletonItem *item = CommonPrefs::self()->findItem( TQString("Coefficient_%1").tqarg(data.name) ); + KConfigSkeletonItem *item = CommonPrefs::self()->findItem( TQString("Coefficient_%1").arg(data.name) ); assert(item); return item->property().toDouble(); } int AIConfig::trigger(const AI::Data &data) { - KConfigSkeletonItem *item = CommonPrefs::self()->findItem( TQString("Trigger_%1").tqarg(data.name) ); + KConfigSkeletonItem *item = CommonPrefs::self()->findItem( TQString("Trigger_%1").arg(data.name) ); assert(item); return item->property().toInt(); } diff --git a/libksirtet/common/highscores.cpp b/libksirtet/common/highscores.cpp index fb1642c0..bd9be550 100644 --- a/libksirtet/common/highscores.cpp +++ b/libksirtet/common/highscores.cpp @@ -23,13 +23,13 @@ void CommonHighscores::convertLegacy(uint) KConfigGroupSaver cg(kapp->config(), "High Scores"); for (uint i=0; i<10; i++) { TQString name - = cg.config()->readEntry(TQString("name%1").tqarg(i), TQString()); + = cg.config()->readEntry(TQString("name%1").arg(i), TQString()); if ( name.isNull() ) break; if ( name.isEmpty() ) name = i18n("anonymous"); uint score - = cg.config()->readUnsignedNumEntry(TQString("score%1").tqarg(i), 0); + = cg.config()->readUnsignedNumEntry(TQString("score%1").arg(i), 0); uint level - = cg.config()->readUnsignedNumEntry(TQString("level%1").tqarg(i), 1); + = cg.config()->readUnsignedNumEntry(TQString("level%1").arg(i), 1); Score s(Won); s.setScore(score); s.setData("name", name); diff --git a/libksirtet/common/misc_ui.cpp b/libksirtet/common/misc_ui.cpp index f6426a4d..376c0c57 100644 --- a/libksirtet/common/misc_ui.cpp +++ b/libksirtet/common/misc_ui.cpp @@ -88,9 +88,9 @@ class Led : public TQWidget { return TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); } TQSize sizeHint() const { return TQSize(LED_WIDTH, LED_HEIGHT); } - void on() { if (!_on) { _on = TRUE; tqrepaint(); } } - void off() { if (_on) {_on = FALSE; tqrepaint(); } } - void setColor(const TQColor &c) { if (c!=col) { col = c; tqrepaint(); } } + void on() { if (!_on) { _on = TRUE; repaint(); } } + void off() { if (_on) {_on = FALSE; repaint(); } } + void setColor(const TQColor &c) { if (c!=col) { col = c; repaint(); } } protected: void paintEvent(TQPaintEvent *) { diff --git a/libksirtet/lib/defines.cpp b/libksirtet/lib/defines.cpp index 7eef441e..baf91083 100644 --- a/libksirtet/lib/defines.cpp +++ b/libksirtet/lib/defines.cpp @@ -6,7 +6,7 @@ void errorBox(const TQString &msg1, const TQString &msg2, TQWidget *parent) { TQString str; if ( msg2.isNull() ) str = msg1; - else str = i18n("%1:\n%2").tqarg(msg1).tqarg(msg2); + else str = i18n("%1:\n%2").arg(msg1).arg(msg2); KMessageBox::error(parent, str); } diff --git a/libksirtet/lib/keys.cpp b/libksirtet/lib/keys.cpp index 599f7372..acf4d7ac 100644 --- a/libksirtet/lib/keys.cpp +++ b/libksirtet/lib/keys.cpp @@ -46,7 +46,7 @@ void KeyData::createActionCollection(uint index, TQWidget *receiver) _cols[index] = new KActionCollection(receiver, this); for (uint k=0; k<_data.size(); k++) { TQString label = i18n(_data[k].label); - TQString name = TQString("%2 %3").tqarg(index+1).tqarg(_data[k].name); + TQString name = TQString("%2 %3").arg(index+1).arg(_data[k].name); const char *slot = (_data[k].slotRelease ? 0 : _data[k].slot); KAction *a = new KAction(label, _keycodes[_cols.size()-1][index][k], TQT_TQOBJECT(receiver), slot, _cols[index], name.utf8()); @@ -78,8 +78,8 @@ void KeyData::setEnabled(uint index, bool enabled) void KeyData::addKeys(KKeyDialog &d) { for (uint i=0; i<_cols.size(); i++) - d.insert(_cols[i], i18n("Shortcuts for player #%1/%2").tqarg(i+1) - .tqarg(_cols.size())); + d.insert(_cols[i], i18n("Shortcuts for player #%1/%2").arg(i+1) + .arg(_cols.size())); } void KeyData::save() diff --git a/libksirtet/lib/keys.h b/libksirtet/lib/keys.h index a5227a9b..52099228 100644 --- a/libksirtet/lib/keys.h +++ b/libksirtet/lib/keys.h @@ -37,7 +37,7 @@ class KeyData : public TQObject TQMap _specActions; TQString group() const - { return TQString("Keys (%1 humans)").tqarg(_cols.size()); } + { return TQString("Keys (%1 humans)").arg(_cols.size()); } }; #endif // KEYS_H diff --git a/libksirtet/lib/meeting.cpp b/libksirtet/lib/meeting.cpp index c6c81cbe..58acf205 100644 --- a/libksirtet/lib/meeting.cpp +++ b/libksirtet/lib/meeting.cpp @@ -68,7 +68,7 @@ void NetMeeting::appendLine(const MeetingLineData &pld, bool server) if (pld.own) connect(pl, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChanged(const TQString &))); else message(i18n("A new client has just arrived (#%1)") - .tqarg(wl->size()+1)); + .arg(wl->size()+1)); pl->setData(pld.ed); connect(pl, TQT_SIGNAL(typeChanged(MeetingCheckBox::Type)), TQT_SLOT(typeChanged(MeetingCheckBox::Type))); @@ -241,7 +241,7 @@ void ServerNetMeeting::writeToAll(uint i) void ServerNetMeeting::netError(uint i, const TQString &type) { Q_ASSERT( i!=0 ); - disconnectHost(i, i18n("%1 client #%2: disconnect it").tqarg(type).tqarg(i)); + disconnectHost(i, i18n("%1 client #%2: disconnect it").arg(type).arg(i)); } void ServerNetMeeting::disconnectHost(uint i, const TQString &str) @@ -265,7 +265,7 @@ void ServerNetMeeting::newHost(int) int res = sm[0]->accept(s); if ( res!=0 ) { message(i18n("Failed to accept incoming client:\n%1") - .tqarg(socketError(s))); + .arg(socketError(s))); return; } players.append(NewPlayer); @@ -301,7 +301,7 @@ void ServerNetMeeting::idFlag(uint i) void ServerNetMeeting::endFlag(uint i) { - disconnectHost(i, i18n("Client #%1 has left").tqarg(i)); + disconnectHost(i, i18n("Client #%1 has left").arg(i)); } void ServerNetMeeting::newFlag(uint i) @@ -462,7 +462,7 @@ ClientNetMeeting::ClientNetMeeting(const cId &id, void ClientNetMeeting::netError(uint, const TQString &str) { - cleanReject(i18n("%1 server: aborting connection.").tqarg(str)); + cleanReject(i18n("%1 server: aborting connection.").arg(str)); } void ClientNetMeeting::writeToAll(uint) @@ -529,7 +529,7 @@ void ClientNetMeeting::delFlag(uint) sm[0]->readingStream() >> k; CHECK_READ(0); removeLine(k-1); - message(i18n("Client %1 has left").tqarg(k)); + message(i18n("Client %1 has left").arg(k)); } void ClientNetMeeting::textChanged(const TQString &text) diff --git a/libksirtet/lib/mp_interface.cpp b/libksirtet/lib/mp_interface.cpp index e28ebdf8..1799c270 100644 --- a/libksirtet/lib/mp_interface.cpp +++ b/libksirtet/lib/mp_interface.cpp @@ -100,14 +100,14 @@ void MPInterface::specialLocalGame(uint nbHumans, uint nbAIs) bd.type = (ireadNumEntry(TQString(MP_PLAYER_TYPE).tqarg(i), + cg.config()->readNumEntry(TQString(MP_PLAYER_TYPE).arg(i), PlayerComboBox::None); if ( bd.type==t ) - bd.name = cg.config()->readEntry(TQString(MP_PLAYER_NAME).tqarg(i), + bd.name = cg.config()->readEntry(TQString(MP_PLAYER_NAME).arg(i), TQString()); if ( bd.name.isNull() ) - bd.name = (isetText(i18n("Hu=%1").tqarg(nbh)); - labAI->setText(i18n("AI=%1").tqarg(nba)); + labH->setText(i18n("Hu=%1").arg(nbh)); + labAI->setText(i18n("AI=%1").arg(nba)); lname->setText(bds[0].name); setType(ed.type); setText(ed.text); diff --git a/libksirtet/lib/types.cpp b/libksirtet/lib/types.cpp index 86f7bfba..9d2149d8 100644 --- a/libksirtet/lib/types.cpp +++ b/libksirtet/lib/types.cpp @@ -23,13 +23,13 @@ TQString cId::errorMessage(const cId &id) const case Accepted: return TQString(); case LibIdClash: return i18n("The MultiPlayer library of the server is incompatible") - + str.tqarg(libId).tqarg(id.libId); + + str.arg(libId).arg(id.libId); case GameNameClash: return i18n("Trying to connect a server for another game type") - + str.tqarg(gameName).tqarg(id.gameName); + + str.arg(gameName).arg(id.gameName); case GameIdClash: return i18n("The server game version is incompatible") - + str.tqarg(gameId).tqarg(id.gameId); + + str.arg(gameId).arg(id.gameId); } Q_ASSERT(0); return TQString(); diff --git a/libksirtet/lib/wizard.cpp b/libksirtet/lib/wizard.cpp index 29508e26..a3fd4f2b 100644 --- a/libksirtet/lib/wizard.cpp +++ b/libksirtet/lib/wizard.cpp @@ -94,10 +94,10 @@ void MPWizard::setupLocalPage(const MPGameInfo &gi) Q_ASSERT( gi.maxNbLocalPlayers>0 ); for (uint i=0; ireadNumEntry(TQString(MP_PLAYER_TYPE).tqarg(i), + cg.config()->readNumEntry(TQString(MP_PLAYER_TYPE).arg(i), (i==0 ? PlayerComboBox::Human : PlayerComboBox::None)); - n = cg.config()->readEntry(TQString(MP_PLAYER_NAME).tqarg(i), - i18n("Player #%1").tqarg(i)); + n = cg.config()->readEntry(TQString(MP_PLAYER_NAME).arg(i), + i18n("Player #%1").arg(i)); pl = new PlayerLine(type, n, gi.humanSettingSlot, gi.AISettingSlot, i!=0, gi.AIAllowed, wl); @@ -122,7 +122,7 @@ void MPWizard::setupLocalPage(const MPGameInfo &gi) TQString MPWizard::name(uint i) const { TQString s = wl->widget(i)->name(); - if ( s.length()==0 ) s = i18n("Player #%1").tqarg(i); + if ( s.length()==0 ) s = i18n("Player #%1").arg(i); return s; } @@ -177,7 +177,7 @@ void MPWizard::accept() // do lookup int res = socket->lookup(); if ( checkSocket(res, socket, i18n("Error looking up for \"%1\"") - .tqarg(host), this) ) { + .arg(host), this) ) { delete socket; return; } @@ -206,9 +206,9 @@ void MPWizard::accept() cg.config()->writeEntry(MP_GAMETYPE, (int)type); for (uint i=0; isize(); i++) { - cg.config()->writeEntry(TQString(MP_PLAYER_TYPE).tqarg(i), + cg.config()->writeEntry(TQString(MP_PLAYER_TYPE).arg(i), (int)wl->widget(i)->type()); - cg.config()->writeEntry(TQString(MP_PLAYER_NAME).tqarg(i), name(i)); + cg.config()->writeEntry(TQString(MP_PLAYER_NAME).arg(i), name(i)); } KWizard::accept(); -- cgit v1.2.1