summaryrefslogtreecommitdiffstats
path: root/libtdegames/kgame
diff options
context:
space:
mode:
Diffstat (limited to 'libtdegames/kgame')
-rw-r--r--libtdegames/kgame/dialogs/kgamedialogconfig.cpp2
-rw-r--r--libtdegames/kgame/dialogs/kgameerrordialog.cpp6
-rw-r--r--libtdegames/kgame/kgame.h2
-rw-r--r--libtdegames/kgame/kgamechat.cpp6
-rw-r--r--libtdegames/kgame/kgameerror.cpp6
-rw-r--r--libtdegames/kgame/kgamepropertyhandler.cpp6
-rw-r--r--libtdegames/kgame/kmessageclient.cpp6
-rw-r--r--libtdegames/kgame/kmessageclient.h6
-rw-r--r--libtdegames/kgame/kmessageio.cpp2
-rw-r--r--libtdegames/kgame/kmessageserver.h2
10 files changed, 22 insertions, 22 deletions
diff --git a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp
index f6845650..a3f11835 100644
--- a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp
+++ b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp
@@ -743,7 +743,7 @@ void KGameDialogConnectionConfig::slotKickPlayerOut(TQListBoxItem* item)
return;
}
- if (KMessageBox::questionYesNo(this, i18n("Do you want to ban player \"%1\" from the game?").tqarg(
+ if (KMessageBox::questionYesNo(this, i18n("Do you want to ban player \"%1\" from the game?").arg(
p->name()), TQString(), i18n("Ban Player"), i18n("Do Not Ban")) == KMessageBox::Yes) {
kdDebug(11001) << "will remove player " << p << endl;
game()->removePlayer(p);
diff --git a/libtdegames/kgame/dialogs/kgameerrordialog.cpp b/libtdegames/kgame/dialogs/kgameerrordialog.cpp
index 6ab9d71c..e22211c3 100644
--- a/libtdegames/kgame/dialogs/kgameerrordialog.cpp
+++ b/libtdegames/kgame/dialogs/kgameerrordialog.cpp
@@ -86,7 +86,7 @@ void KGameErrorDialog::slotClientConnectionLost(TQ_UINT32 /*id*/,bool)
//TODO: add IP/port of the client
TQString message;
// if (c) {
-// message = i18n("Connection to client has been lost!\nID: %1\nIP: %2").tqarg(c->id()).tqarg(c->IP());
+// message = i18n("Connection to client has been lost!\nID: %1\nIP: %2").arg(c->id()).arg(c->IP());
// } else {
// message = i18n("Connection to client has been lost!");
// }
@@ -96,7 +96,7 @@ void KGameErrorDialog::slotClientConnectionLost(TQ_UINT32 /*id*/,bool)
void KGameErrorDialog::slotError(int errorNo, TQString text)
{
- TQString message = i18n("Received a network error!\nError number: %1\nError message: %2").tqarg(errorNo).tqarg(text);
+ TQString message = i18n("Received a network error!\nError number: %1\nError message: %2").arg(errorNo).arg(text);
error(message, (TQWidget*)parent());
}
@@ -106,7 +106,7 @@ void KGameErrorDialog::connectionError(TQString s)
if (s.isNull()) {
message = i18n("No connection could be created.");
} else {
- message = i18n("No connection could be created.\nThe error message was:\n%1").tqarg(s);
+ message = i18n("No connection could be created.\nThe error message was:\n%1").arg(s);
}
error(message, (TQWidget*)parent());
}
diff --git a/libtdegames/kgame/kgame.h b/libtdegames/kgame/kgame.h
index 486397e2..7ad010fc 100644
--- a/libtdegames/kgame/kgame.h
+++ b/libtdegames/kgame/kgame.h
@@ -433,7 +433,7 @@ public:
* @param msg the message which will be send. See messages.txt for contents
* @param msgid an id for this message
* @param sender the id of the sender
- * @param group the group of the tqreceivers
+ * @param group the group of the receivers
* @return true if worked
*/
bool sendGroupMessage(const TQByteArray& msg, int msgid, TQ_UINT32 sender, const TQString& group);
diff --git a/libtdegames/kgame/kgamechat.cpp b/libtdegames/kgame/kgamechat.cpp
index 11f47f7b..c2469906 100644
--- a/libtdegames/kgame/kgamechat.cpp
+++ b/libtdegames/kgame/kgamechat.cpp
@@ -92,7 +92,7 @@ void KGameChat::addMessage(int fromId, const TQString& text)
{
if (!d->mGame) {
kdWarning(11001) << "no KGame object has been set" << endl;
- addMessage(i18n("Player %1").tqarg(fromId), text);
+ addMessage(i18n("Player %1").arg(fromId), text);
} else {
KPlayer* p = d->mGame->findPlayer(fromId);
if (p) {
@@ -165,7 +165,7 @@ bool KGameChat::isToPlayerMessage(int id) const
return d->mSendId2PlayerId.contains(id); }
TQString KGameChat::sendToPlayerEntry(const TQString& name) const
-{ return i18n("Send to %1").tqarg(name); }
+{ return i18n("Send to %1").arg(name); }
int KGameChat::playerId(int id) const
{
@@ -211,7 +211,7 @@ void KGameChat::setFromPlayer(KPlayer* p)
removeSendingEntry(d->mToMyGroup);
}
d->mToMyGroup = nextId();
- addSendingEntry(i18n("Send to My Group (\"%1\")").tqarg(p->group()), d->mToMyGroup);
+ addSendingEntry(i18n("Send to My Group (\"%1\")").arg(p->group()), d->mToMyGroup);
}
d->mFromPlayer = p;
kdDebug(11001) << k_funcinfo << " player=" << p << endl;
diff --git a/libtdegames/kgame/kgameerror.cpp b/libtdegames/kgame/kgameerror.cpp
index ef6145fb..4ed64e0d 100644
--- a/libtdegames/kgame/kgameerror.cpp
+++ b/libtdegames/kgame/kgameerror.cpp
@@ -60,7 +60,7 @@ TQString KGameError::errorText(int errorCode, TQDataStream& s)
TQ_INT32 cookie2;
s >> cookie1;
s >> cookie2;
- text = i18n("Cookie mismatch!\nExpected Cookie: %1\nReceived Cookie: %2").tqarg(cookie1).tqarg(cookie2);
+ text = i18n("Cookie mismatch!\nExpected Cookie: %1\nReceived Cookie: %2").arg(cookie1).arg(cookie2);
break;
}
case Version:
@@ -69,11 +69,11 @@ TQString KGameError::errorText(int errorCode, TQDataStream& s)
TQ_INT32 version2;
s >> version1;
s >> version2;
- text = i18n("KGame Version mismatch!\nExpected Version: %1\nReceived Version: %2\n").tqarg(version1).tqarg(version2);
+ text = i18n("KGame Version mismatch!\nExpected Version: %1\nReceived Version: %2\n").arg(version1).arg(version2);
break;
}
default:
- text = i18n("Unknown error code %1").tqarg(errorCode);
+ text = i18n("Unknown error code %1").arg(errorCode);
}
return text;
}
diff --git a/libtdegames/kgame/kgamepropertyhandler.cpp b/libtdegames/kgame/kgamepropertyhandler.cpp
index 405d433e..9ad43a69 100644
--- a/libtdegames/kgame/kgamepropertyhandler.cpp
+++ b/libtdegames/kgame/kgamepropertyhandler.cpp
@@ -174,13 +174,13 @@ TQString KGamePropertyHandler::propertyName(int id) const
TQString s;
if (d->mIdDict.find(id)) {
if (d->mNameMap.contains(id)) {
- s = i18n("%1 (%2)").tqarg(d->mNameMap[id]).tqarg(id);
+ s = i18n("%1 (%2)").arg(d->mNameMap[id]).arg(id);
} else {
- s = i18n("Unnamed - ID: %1").tqarg(id);
+ s = i18n("Unnamed - ID: %1").arg(id);
}
} else {
// Should _never_ happen
- s = i18n("%1 unregistered").tqarg(id);
+ s = i18n("%1 unregistered").arg(id);
}
return s;
}
diff --git a/libtdegames/kgame/kmessageclient.cpp b/libtdegames/kgame/kmessageclient.cpp
index ca90bbd1..056ca879 100644
--- a/libtdegames/kgame/kmessageclient.cpp
+++ b/libtdegames/kgame/kmessageclient.cpp
@@ -228,9 +228,9 @@ void KMessageClient::processMessage (const TQByteArray &msg)
case KMessageServer::MSG_FORWARD:
{
TQ_UINT32 clientID;
- TQValueList <TQ_UINT32> tqreceivers;
- in_stream >> clientID >> tqreceivers;
- emit forwardReceived (in_buffer.readAll(), clientID, tqreceivers);
+ TQValueList <TQ_UINT32> receivers;
+ in_stream >> clientID >> receivers;
+ emit forwardReceived (in_buffer.readAll(), clientID, receivers);
}
break;
diff --git a/libtdegames/kgame/kmessageclient.h b/libtdegames/kgame/kmessageclient.h
index 8a35234d..da15f16d 100644
--- a/libtdegames/kgame/kmessageclient.h
+++ b/libtdegames/kgame/kmessageclient.h
@@ -284,7 +284,7 @@ signals:
senderID contains the ID of the client that sent the broadcast message. You can
use this e.g. to send a reply message to only that client.
- tqreceivers contains the list of the clients that got the message. (If this list
+ receivers contains the list of the clients that got the message. (If this list
only contains one number, this will be your client ID, and it was exclusivly
sent to you.)
@@ -302,9 +302,9 @@ signals:
Then connect the broadcast signal to your slot that analyzes the message.
@param msg The message that has been sent to us
@param senderID The ID of the client which sent the message
- @param tqreceivers All clients which receive this message
+ @param receivers All clients which receive this message
*/
- void forwardReceived (const TQByteArray &msg, TQ_UINT32 senderID, const TQValueList <TQ_UINT32> &tqreceivers);
+ void forwardReceived (const TQByteArray &msg, TQ_UINT32 senderID, const TQValueList <TQ_UINT32> &receivers);
/**
This signal is emitted when the connection to the KMessageServer is broken.
diff --git a/libtdegames/kgame/kmessageio.cpp b/libtdegames/kgame/kmessageio.cpp
index b35382b0..b3dd1875 100644
--- a/libtdegames/kgame/kmessageio.cpp
+++ b/libtdegames/kgame/kmessageio.cpp
@@ -245,7 +245,7 @@ KMessageProcess::KMessageProcess(TQObject *parent, TQString file) : KMessageIO(p
mProcessName=file;
mProcess=new KProcess;
int id=0;
- *mProcess << mProcessName << TQString("%1").tqarg(id);
+ *mProcess << mProcessName << TQString("%1").arg(id);
kdDebug(11001) << "@@@KMessageProcess::Init:Id= " << id << endl;
kdDebug(11001) << "@@@KMessgeProcess::Init:Processname: " << mProcessName << endl;
connect(mProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )),
diff --git a/libtdegames/kgame/kmessageserver.h b/libtdegames/kgame/kmessageserver.h
index 9042fca2..067ea3f9 100644
--- a/libtdegames/kgame/kmessageserver.h
+++ b/libtdegames/kgame/kmessageserver.h
@@ -83,7 +83,7 @@ class KMessageServerPrivate;
TQ_UINT32 clientID; // the ID of the client that sent the broadcast request
- TQByteArray << static_cast&lt;TQ_UINT32>( RETQ_FORWARD ) << client_list << raw_data
- TQValueList &lt;TQ_UINT32> client_list; // list of tqreceivers
+ TQValueList &lt;TQ_UINT32> client_list; // list of receivers
When the server receives this message, it sends the following message to
the clients in client_list:
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-27 19:51:57 +0000