summaryrefslogtreecommitdiffstats
path: root/libtdegames
diff options
context:
space:
mode:
Diffstat (limited to 'libtdegames')
-rwxr-xr-xlibtdegames/carddecks/convertpysols104
-rw-r--r--libtdegames/highscore/kexthighscore_gui.cpp6
-rw-r--r--libtdegames/highscore/kexthighscore_internal.cpp16
-rw-r--r--libtdegames/highscore/kexthighscore_item.cpp6
-rw-r--r--libtdegames/highscore/kexthighscore_item.h10
-rw-r--r--libtdegames/highscore/kexthighscore_tab.cpp2
-rw-r--r--libtdegames/highscore/khighscore.cpp18
-rw-r--r--libtdegames/highscore/khighscore.h2
-rw-r--r--libtdegames/highscore/kscoredialog.cpp2
-rw-r--r--libtdegames/kchatbase.cpp12
-rw-r--r--libtdegames/kchatbase.h2
-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
-rw-r--r--libtdegames/kgameprogress.cpp4
22 files changed, 114 insertions, 114 deletions
diff --git a/libtdegames/carddecks/convertpysols b/libtdegames/carddecks/convertpysols
index f2434475..5ed10b25 100755
--- a/libtdegames/carddecks/convertpysols
+++ b/libtdegames/carddecks/convertpysols
@@ -2,68 +2,68 @@
cd $1
-convert -format png -tqgeometry "72x96" 01c.gif 1.png
-convert -format png -tqgeometry "72x96" 01s.gif 2.png
-convert -format png -tqgeometry "72x96" 01h.gif 3.png
-convert -format png -tqgeometry "72x96" 01d.gif 4.png
+convert -format png -geometry "72x96" 01c.gif 1.png
+convert -format png -geometry "72x96" 01s.gif 2.png
+convert -format png -geometry "72x96" 01h.gif 3.png
+convert -format png -geometry "72x96" 01d.gif 4.png
-convert -format png -tqgeometry "72x96" 13c.gif 5.png
-convert -format png -tqgeometry "72x96" 13s.gif 6.png
-convert -format png -tqgeometry "72x96" 13h.gif 7.png
-convert -format png -tqgeometry "72x96" 13d.gif 8.png
+convert -format png -geometry "72x96" 13c.gif 5.png
+convert -format png -geometry "72x96" 13s.gif 6.png
+convert -format png -geometry "72x96" 13h.gif 7.png
+convert -format png -geometry "72x96" 13d.gif 8.png
-convert -format png -tqgeometry "72x96" 12c.gif 9.png
-convert -format png -tqgeometry "72x96" 12s.gif 10.png
-convert -format png -tqgeometry "72x96" 12h.gif 11.png
-convert -format png -tqgeometry "72x96" 12d.gif 12.png
+convert -format png -geometry "72x96" 12c.gif 9.png
+convert -format png -geometry "72x96" 12s.gif 10.png
+convert -format png -geometry "72x96" 12h.gif 11.png
+convert -format png -geometry "72x96" 12d.gif 12.png
-convert -format png -tqgeometry "72x96" 11c.gif 13.png
-convert -format png -tqgeometry "72x96" 11s.gif 14.png
-convert -format png -tqgeometry "72x96" 11h.gif 15.png
-convert -format png -tqgeometry "72x96" 11d.gif 16.png
+convert -format png -geometry "72x96" 11c.gif 13.png
+convert -format png -geometry "72x96" 11s.gif 14.png
+convert -format png -geometry "72x96" 11h.gif 15.png
+convert -format png -geometry "72x96" 11d.gif 16.png
-convert -format png -tqgeometry "72x96" 10c.gif 17.png
-convert -format png -tqgeometry "72x96" 10s.gif 18.png
-convert -format png -tqgeometry "72x96" 10h.gif 19.png
-convert -format png -tqgeometry "72x96" 10d.gif 20.png
+convert -format png -geometry "72x96" 10c.gif 17.png
+convert -format png -geometry "72x96" 10s.gif 18.png
+convert -format png -geometry "72x96" 10h.gif 19.png
+convert -format png -geometry "72x96" 10d.gif 20.png
-convert -format png -tqgeometry "72x96" 09c.gif 21.png
-convert -format png -tqgeometry "72x96" 09s.gif 22.png
-convert -format png -tqgeometry "72x96" 09h.gif 23.png
-convert -format png -tqgeometry "72x96" 09d.gif 24.png
+convert -format png -geometry "72x96" 09c.gif 21.png
+convert -format png -geometry "72x96" 09s.gif 22.png
+convert -format png -geometry "72x96" 09h.gif 23.png
+convert -format png -geometry "72x96" 09d.gif 24.png
-convert -format png -tqgeometry "72x96" 08c.gif 25.png
-convert -format png -tqgeometry "72x96" 08s.gif 26.png
-convert -format png -tqgeometry "72x96" 08h.gif 27.png
-convert -format png -tqgeometry "72x96" 08d.gif 28.png
+convert -format png -geometry "72x96" 08c.gif 25.png
+convert -format png -geometry "72x96" 08s.gif 26.png
+convert -format png -geometry "72x96" 08h.gif 27.png
+convert -format png -geometry "72x96" 08d.gif 28.png
-convert -format png -tqgeometry "72x96" 07c.gif 29.png
-convert -format png -tqgeometry "72x96" 07s.gif 30.png
-convert -format png -tqgeometry "72x96" 07h.gif 31.png
-convert -format png -tqgeometry "72x96" 07d.gif 32.png
+convert -format png -geometry "72x96" 07c.gif 29.png
+convert -format png -geometry "72x96" 07s.gif 30.png
+convert -format png -geometry "72x96" 07h.gif 31.png
+convert -format png -geometry "72x96" 07d.gif 32.png
-convert -format png -tqgeometry "72x96" 06c.gif 33.png
-convert -format png -tqgeometry "72x96" 06s.gif 34.png
-convert -format png -tqgeometry "72x96" 06h.gif 35.png
-convert -format png -tqgeometry "72x96" 06d.gif 36.png
+convert -format png -geometry "72x96" 06c.gif 33.png
+convert -format png -geometry "72x96" 06s.gif 34.png
+convert -format png -geometry "72x96" 06h.gif 35.png
+convert -format png -geometry "72x96" 06d.gif 36.png
-convert -format png -tqgeometry "72x96" 05c.gif 37.png
-convert -format png -tqgeometry "72x96" 05s.gif 38.png
-convert -format png -tqgeometry "72x96" 05h.gif 39.png
-convert -format png -tqgeometry "72x96" 05d.gif 40.png
+convert -format png -geometry "72x96" 05c.gif 37.png
+convert -format png -geometry "72x96" 05s.gif 38.png
+convert -format png -geometry "72x96" 05h.gif 39.png
+convert -format png -geometry "72x96" 05d.gif 40.png
-convert -format png -tqgeometry "72x96" 04c.gif 41.png
-convert -format png -tqgeometry "72x96" 04s.gif 42.png
-convert -format png -tqgeometry "72x96" 04h.gif 43.png
-convert -format png -tqgeometry "72x96" 04d.gif 44.png
+convert -format png -geometry "72x96" 04c.gif 41.png
+convert -format png -geometry "72x96" 04s.gif 42.png
+convert -format png -geometry "72x96" 04h.gif 43.png
+convert -format png -geometry "72x96" 04d.gif 44.png
-convert -format png -tqgeometry "72x96" 03c.gif 45.png
-convert -format png -tqgeometry "72x96" 03s.gif 46.png
-convert -format png -tqgeometry "72x96" 03h.gif 47.png
-convert -format png -tqgeometry "72x96" 03d.gif 48.png
+convert -format png -geometry "72x96" 03c.gif 45.png
+convert -format png -geometry "72x96" 03s.gif 46.png
+convert -format png -geometry "72x96" 03h.gif 47.png
+convert -format png -geometry "72x96" 03d.gif 48.png
-convert -format png -tqgeometry "72x96" 02c.gif 49.png
-convert -format png -tqgeometry "72x96" 02s.gif 50.png
-convert -format png -tqgeometry "72x96" 02h.gif 51.png
-convert -format png -tqgeometry "72x96" 02d.gif 52.png
+convert -format png -geometry "72x96" 02c.gif 49.png
+convert -format png -geometry "72x96" 02s.gif 50.png
+convert -format png -geometry "72x96" 02h.gif 51.png
+convert -format png -geometry "72x96" 02d.gif 52.png
diff --git a/libtdegames/highscore/kexthighscore_gui.cpp b/libtdegames/highscore/kexthighscore_gui.cpp
index 02ea99b6..a7e1fe57 100644
--- a/libtdegames/highscore/kexthighscore_gui.cpp
+++ b/libtdegames/highscore/kexthighscore_gui.cpp
@@ -92,7 +92,7 @@ void ScoresList::addLineItem(const ItemArray &items,
if (line) line->setText(k, itemText(container, index));
else {
addColumn( container.item()->label() );
- setColumnAlignment(k, container.item()->tqalignment());
+ setColumnAlignment(k, container.item()->alignment());
}
k++;
}
@@ -289,7 +289,7 @@ void LastMultipleScoresList::addLineItem(const ItemArray &si,
if (line) line->setText(i, itemText(*container, index));
else {
addColumn( container->item()->label() );
- setColumnAlignment(i, container->item()->tqalignment());
+ setColumnAlignment(i, container->item()->alignment());
}
}
}
@@ -333,7 +333,7 @@ void TotalMultipleScoresList::addLineItem(const ItemArray &si,
TQString label =
(i==2 ? i18n("Won Games") : container->item()->label());
addColumn(label);
- setColumnAlignment(i, container->item()->tqalignment());
+ setColumnAlignment(i, container->item()->alignment());
}
}
}
diff --git a/libtdegames/highscore/kexthighscore_internal.cpp b/libtdegames/highscore/kexthighscore_internal.cpp
index 388c8a88..dbc3db58 100644
--- a/libtdegames/highscore/kexthighscore_internal.cpp
+++ b/libtdegames/highscore/kexthighscore_internal.cpp
@@ -314,7 +314,7 @@ PlayerInfos::PlayerInfos()
#ifdef HIGHSCORE_DIRECTORY
if (_oldLocalPlayer) { // player already exists in local config file
// copy player data
- TQString prefix = TQString("%1_").tqarg(_oldLocalId+1);
+ TQString prefix = TQString("%1_").arg(_oldLocalId+1);
TQMap<TQString, TQString> entries =
cg.config()->entryMap("KHighscore_players");
TQMap<TQString, TQString>::const_iterator it;
@@ -378,8 +378,8 @@ TQString PlayerInfos::histoName(uint i) const
const TQMemArray<uint> &sh = _histogram;
Q_ASSERT( i<sh.size() || (_bound || i==sh.size()) );
if ( i==sh.size() )
- return TQString("nb scores greater than %1").tqarg(sh[sh.size()-1]);
- return TQString("nb scores less than %1").tqarg(sh[i]);
+ return TQString("nb scores greater than %1").arg(sh[sh.size()-1]);
+ return TQString("nb scores less than %1").arg(sh[i]);
}
uint PlayerInfos::histoSize() const
@@ -497,10 +497,10 @@ void PlayerInfos::removeKey()
TQString sk;
do {
i++;
- sk = str.tqarg(HS_KEY).tqarg(i);
+ sk = str.arg(HS_KEY).arg(i);
} while ( !cg.config()->readEntry(sk, TQString()).isEmpty() );
cg.config()->writeEntry(sk, key());
- cg.config()->writeEntry(str.tqarg(HS_REGISTERED_NAME).tqarg(i),
+ cg.config()->writeEntry(str.arg(HS_REGISTERED_NAME).arg(i),
registeredName());
// clear current key/nickname
@@ -609,7 +609,7 @@ bool ManagerPrivate::doQuery(const KURL &url, TQWidget *parent,
TQString tmpFile;
if ( !KIO::NetAccess::download(url, tmpFile, parent) ) {
- TQString details = i18n("Server URL: %1").tqarg(url.host());
+ TQString details = i18n("Server URL: %1").arg(url.host());
KMessageBox::detailedSorry(parent, i18n(UNABLE_TO_CONTACT), details);
return false;
}
@@ -647,7 +647,7 @@ bool ManagerPrivate::doQuery(const KURL &url, TQWidget *parent,
}
}
TQString msg = i18n("Invalid answer from world-wide highscores server.");
- TQString details = i18n("Raw message: %1").tqarg(content);
+ TQString details = i18n("Raw message: %1").arg(content);
KMessageBox::detailedSorry(parent, msg, details);
return false;
}
@@ -660,7 +660,7 @@ bool ManagerPrivate::getFromQuery(const TQDomNamedNodeMap &map,
if ( attr.isNull() ) {
KMessageBox::sorry(parent,
i18n("Invalid answer from world-wide "
- "highscores server (missing item: %1).").tqarg(name));
+ "highscores server (missing item: %1).").arg(name));
return false;
}
value = attr.value();
diff --git a/libtdegames/highscore/kexthighscore_item.cpp b/libtdegames/highscore/kexthighscore_item.cpp
index 4b48a0ee..98a42a10 100644
--- a/libtdegames/highscore/kexthighscore_item.cpp
+++ b/libtdegames/highscore/kexthighscore_item.cpp
@@ -33,8 +33,8 @@ namespace KExtHighscore
{
//-----------------------------------------------------------------------------
-Item::Item(const TQVariant &def, const TQString &label, int tqalignment)
- : _default(def), _label(label), _tqalignment(tqalignment),
+Item::Item(const TQVariant &def, const TQString &label, int alignment)
+ : _default(def), _label(label), _alignment(alignment),
_format(NoFormat), _special(NoSpecial)
{}
@@ -287,7 +287,7 @@ void MultiplayerScores::show(TQWidget *parent)
vbox = new TQVBox(dialog.plainPage());
hbox->addWidget(vbox);
(void)new TQLabel(i18n("Scores for the last %1 games:")
- .tqarg(_nbGames[0]), vbox);
+ .arg(_nbGames[0]), vbox);
(void)new TotalMultipleScoresList(ordered, vbox);
}
diff --git a/libtdegames/highscore/kexthighscore_item.h b/libtdegames/highscore/kexthighscore_item.h
index b32f32e7..8379433b 100644
--- a/libtdegames/highscore/kexthighscore_item.h
+++ b/libtdegames/highscore/kexthighscore_item.h
@@ -79,10 +79,10 @@ class KDE_EXPORT Item
* Be sure to cast the value to the required type (for e.g. with uint).
* @param label the label corresponding to the item. If empty, the item
* is not shown.
- * @param tqalignment the tqalignment of the item.
+ * @param alignment the alignment of the item.
*/
Item(const TQVariant &def = TQVariant::Invalid,
- const TQString &label = TQString(), int tqalignment = TQt::AlignRight);
+ const TQString &label = TQString(), int alignment = TQt::AlignRight);
virtual ~Item();
@@ -114,9 +114,9 @@ class KDE_EXPORT Item
TQString label() const { return _label; }
/**
- * @return the tqalignment.
+ * @return the alignment.
*/
- int tqalignment() const { return _tqalignment; }
+ int alignment() const { return _alignment; }
/**
* Set default value.
@@ -149,7 +149,7 @@ class KDE_EXPORT Item
private:
TQVariant _default;
TQString _label;
- int _tqalignment;
+ int _alignment;
Format _format;
Special _special;
diff --git a/libtdegames/highscore/kexthighscore_tab.cpp b/libtdegames/highscore/kexthighscore_tab.cpp
index d47b35a6..b3fdecd1 100644
--- a/libtdegames/highscore/kexthighscore_tab.cpp
+++ b/libtdegames/highscore/kexthighscore_tab.cpp
@@ -97,7 +97,7 @@ void AdditionalTab::allSelected()
TQString AdditionalTab::percent(uint n, uint total, bool withBraces)
{
if ( n==0 || total==0 ) return TQString();
- TQString s = TQString("%1%").tqarg(100.0 * n / total, 0, 'f', 1);
+ TQString s = TQString("%1%").arg(100.0 * n / total, 0, 'f', 1);
return (withBraces ? TQString("(") + s + ")" : s);
}
diff --git a/libtdegames/highscore/khighscore.cpp b/libtdegames/highscore/khighscore.cpp
index 6d696020..3ff2d248 100644
--- a/libtdegames/highscore/khighscore.cpp
+++ b/libtdegames/highscore/khighscore.cpp
@@ -96,7 +96,7 @@ void KHighscore::init(const char *appname)
{
#ifdef HIGHSCORE_DIRECTORY
const TQString filename = TQString::fromLocal8Bit("%1/%2.scores")
- .tqarg(HIGHSCORE_DIRECTORY).tqarg(appname);
+ .arg(HIGHSCORE_DIRECTORY).arg(appname);
int fd = open(filename.local8Bit(), O_RDWR);
if ( fd<0 ) kdFatal(11002) << "cannot open global highscore file \""
<< filename << "\"" << endl;
@@ -169,7 +169,7 @@ void KHighscore::writeEntry(int entry, const TQString& key, const TQVariant& val
{
Q_ASSERT( isLocked() );
KConfigGroupSaver cg(config(), group());
- TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key);
+ TQString confKey = TQString("%1_%2").arg(entry).arg(key);
cg.config()->writeEntry(confKey, value);
}
@@ -177,7 +177,7 @@ void KHighscore::writeEntry(int entry, const TQString& key, int value)
{
Q_ASSERT( isLocked() );
KConfigGroupSaver cg(config(), group());
- TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key);
+ TQString confKey = TQString("%1_%2").arg(entry).arg(key);
cg.config()->writeEntry(confKey, value);
}
@@ -185,35 +185,35 @@ void KHighscore::writeEntry(int entry, const TQString& key, const TQString &valu
{
Q_ASSERT (isLocked() );
KConfigGroupSaver cg(config(), group());
- TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key);
+ TQString confKey = TQString("%1_%2").arg(entry).arg(key);
cg.config()->writeEntry(confKey, value);
}
TQVariant KHighscore::readPropertyEntry(int entry, const TQString& key, const TQVariant& pDefault) const
{
KConfigGroupSaver cg(config(), group());
- TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key);
+ TQString confKey = TQString("%1_%2").arg(entry).arg(key);
return cg.config()->readPropertyEntry(confKey, pDefault);
}
TQString KHighscore::readEntry(int entry, const TQString& key, const TQString& pDefault) const
{
KConfigGroupSaver cg(config(), group());
- TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key);
+ TQString confKey = TQString("%1_%2").arg(entry).arg(key);
return cg.config()->readEntry(confKey, pDefault);
}
int KHighscore::readNumEntry(int entry, const TQString& key, int pDefault) const
{
KConfigGroupSaver cg(config(), group());
- TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key);
+ TQString confKey = TQString("%1_%2").arg(entry).arg(key);
return cg.config()->readNumEntry(confKey, pDefault);
}
bool KHighscore::hasEntry(int entry, const TQString& key) const
{
KConfigGroupSaver cg(config(), group());
- TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key);
+ TQString confKey = TQString("%1_%2").arg(entry).arg(key);
return cg.config()->hasKey(confKey);
}
@@ -248,7 +248,7 @@ TQString KHighscore::group() const
if ( highscoreGroup().isNull() )
return (d->global ? TQString() : GROUP);
return (d->global ? highscoreGroup()
- : TQString("%1_%2").tqarg(GROUP).tqarg(highscoreGroup()));
+ : TQString("%1_%2").arg(GROUP).arg(highscoreGroup()));
}
bool KHighscore::hasTable() const
diff --git a/libtdegames/highscore/khighscore.h b/libtdegames/highscore/khighscore.h
index b7b6fb5e..3cd14e8c 100644
--- a/libtdegames/highscore/khighscore.h
+++ b/libtdegames/highscore/khighscore.h
@@ -67,7 +67,7 @@ class KHighscorePrivate;
* single player, so the "best times" of a player. To write highscores for a
* specific player in a specific level you will have to use a more complex way:
* \code
- * TQString group = TQString("%1_%2").tqarg(player).tqarg(level);
+ * TQString group = TQString("%1_%2").arg(player).arg(level);
* table->setGroup(group);
* writeHighscore(table, player, level);
* \endcode
diff --git a/libtdegames/highscore/kscoredialog.cpp b/libtdegames/highscore/kscoredialog.cpp
index 365e7aed..03170939 100644
--- a/libtdegames/highscore/kscoredialog.cpp
+++ b/libtdegames/highscore/kscoredialog.cpp
@@ -164,7 +164,7 @@ void KScoreDialog::setupDialog()
for (int i = 1; i <= 10; ++i) {
TQLabel *label;
num.setNum(i);
- label = new TQLabel(i18n("#%1").tqarg(num), d->page);
+ label = new TQLabel(i18n("#%1").arg(num), d->page);
d->labels.insert((i-1)*d->nrCols + 0, label);
d->tqlayout->addWidget(label, i+4, 0);
if (d->fields & Name)
diff --git a/libtdegames/kchatbase.cpp b/libtdegames/kchatbase.cpp
index f08f3a55..e105989c 100644
--- a/libtdegames/kchatbase.cpp
+++ b/libtdegames/kchatbase.cpp
@@ -73,14 +73,14 @@ void KChatBaseText::init()
void KChatBaseText::setName(const TQString& n)
{
// d->mName = n;
- d->mName = TQString("%1: ").tqarg(n);
- setText(TQString("%1: %2").tqarg(name()).tqarg(message())); // esp. for sorting
+ d->mName = TQString("%1: ").arg(n);
+ setText(TQString("%1: %2").arg(name()).arg(message())); // esp. for sorting
}
void KChatBaseText::setMessage(const TQString& m)
{
d->mMessage = m;
- setText(TQString("%1: %2").tqarg(name()).tqarg(message())); // esp. for sorting
+ setText(TQString("%1: %2").arg(name()).arg(message())); // esp. for sorting
}
const TQString& KChatBaseText::name() const
@@ -368,7 +368,7 @@ TQListBoxItem* KChatBase::layoutMessage(const TQString& fromName, const TQString
//TODO KChatBasePixmap? Should change the font here!
- message = (TQListBoxItem*)new TQListBoxPixmap(pix, i18n("%1 %2").tqarg(fromName).tqarg(text.mid(3)));
+ message = (TQListBoxItem*)new TQListBoxPixmap(pix, i18n("%1 %2").arg(fromName).arg(text.mid(3)));
} else {
// the text is not edited in any way. just return an item
KChatBaseText* m = new KChatBaseText(fromName, text);
@@ -384,7 +384,7 @@ TQListBoxItem* KChatBase::layoutSystemMessage(const TQString& fromName, const TQ
//TODO: KChatBaseConfigure? - e.g. color
// no need to check for /me etc.
- KChatBaseText* m = new KChatBaseText(i18n("--- %1").tqarg(fromName), text);
+ KChatBaseText* m = new KChatBaseText(i18n("--- %1").arg(fromName), text);
m->setNameFont(&d->mSystemNameFont);
m->setMessageFont(&d->mSystemMessageFont);
return (TQListBoxItem*)m;
@@ -406,7 +406,7 @@ void KChatBase::slotReturnPressed(const TQString& text)
TQString KChatBase::comboBoxItem(const TQString& name) const
{ // TODO: such a function for "send to all" and "send to my group"
- return i18n("Send to %1").tqarg(name);
+ return i18n("Send to %1").arg(name);
}
void KChatBase::slotClear()
diff --git a/libtdegames/kchatbase.h b/libtdegames/kchatbase.h
index 892e5859..33ba3d76 100644
--- a/libtdegames/kchatbase.h
+++ b/libtdegames/kchatbase.h
@@ -471,7 +471,7 @@ protected:
/**
* Replace to customise the combo box.
*
- * Default: i18n("Send to %1).tqarg(name)
+ * Default: i18n("Send to %1).arg(name)
* @param name The name of the player
* @return The string as it will be shown in the combo box
**/
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:
diff --git a/libtdegames/kgameprogress.cpp b/libtdegames/kgameprogress.cpp
index 0bb56014..de32cd14 100644
--- a/libtdegames/kgameprogress.cpp
+++ b/libtdegames/kgameprogress.cpp
@@ -196,13 +196,13 @@ int KGameProgress::recalcValue(int range)
void KGameProgress::valueChange()
{
- tqrepaint(contentsRect(), FALSE);
+ repaint(contentsRect(), FALSE);
emit percentageChanged(recalcValue(100));
}
void KGameProgress::rangeChange()
{
- tqrepaint(contentsRect(), FALSE);
+ repaint(contentsRect(), FALSE);
emit percentageChanged(recalcValue(100));
}