summaryrefslogtreecommitdiffstats
path: root/libkdegames/highscore
diff options
context:
space:
mode:
Diffstat (limited to 'libkdegames/highscore')
-rw-r--r--libkdegames/highscore/kconfigrawbackend.cpp2
-rw-r--r--libkdegames/highscore/kconfigrawbackend.h1
-rw-r--r--libkdegames/highscore/kexthighscore.cpp18
-rw-r--r--libkdegames/highscore/kexthighscore.h8
-rw-r--r--libkdegames/highscore/kexthighscore_gui.cpp48
-rw-r--r--libkdegames/highscore/kexthighscore_gui.h26
-rw-r--r--libkdegames/highscore/kexthighscore_internal.cpp50
-rw-r--r--libkdegames/highscore/kexthighscore_internal.h18
-rw-r--r--libkdegames/highscore/kexthighscore_item.cpp18
-rw-r--r--libkdegames/highscore/kexthighscore_item.h12
-rw-r--r--libkdegames/highscore/kexthighscore_tab.cpp30
-rw-r--r--libkdegames/highscore/kexthighscore_tab.h16
-rw-r--r--libkdegames/highscore/khighscore.cpp30
-rw-r--r--libkdegames/highscore/khighscore.h21
-rw-r--r--libkdegames/highscore/kscoredialog.cpp48
-rw-r--r--libkdegames/highscore/kscoredialog.h7
16 files changed, 184 insertions, 169 deletions
diff --git a/libkdegames/highscore/kconfigrawbackend.cpp b/libkdegames/highscore/kconfigrawbackend.cpp
index 29ffa845..c2643056 100644
--- a/libkdegames/highscore/kconfigrawbackend.cpp
+++ b/libkdegames/highscore/kconfigrawbackend.cpp
@@ -25,7 +25,7 @@
KConfigRawBackEnd::KConfigRawBackEnd(KConfigBase *_config, int fd)
- : KConfigINIBackEnd(_config, TQString::null, "config", false),
+ : KConfigINIBackEnd(_config, TQString(), "config", false),
_fd(fd), _stream(0)
{
_file.open(IO_ReadOnly, _fd);
diff --git a/libkdegames/highscore/kconfigrawbackend.h b/libkdegames/highscore/kconfigrawbackend.h
index 0c5fde03..6a1ea4b9 100644
--- a/libkdegames/highscore/kconfigrawbackend.h
+++ b/libkdegames/highscore/kconfigrawbackend.h
@@ -48,6 +48,7 @@ private:
class KRawConfig : public KSimpleConfig
{
Q_OBJECT
+ TQ_OBJECT
public:
KRawConfig(int fd, bool readOnly)
: KSimpleConfig(new KConfigRawBackEnd(this, fd), readOnly) {}
diff --git a/libkdegames/highscore/kexthighscore.cpp b/libkdegames/highscore/kexthighscore.cpp
index 585dafd4..22fa4a85 100644
--- a/libkdegames/highscore/kexthighscore.cpp
+++ b/libkdegames/highscore/kexthighscore.cpp
@@ -44,19 +44,19 @@ void setGameType(uint type)
internal->setGameType(type);
}
-bool configure(TQWidget *parent)
+bool configure(TQWidget *tqparent)
{
internal->checkFirst();
- ConfigDialog *cd = new ConfigDialog(parent);
+ ConfigDialog *cd = new ConfigDialog(tqparent);
cd->exec();
bool saved = cd->hasBeenSaved();
delete cd;
return saved;
}
-void show(TQWidget *parent, int rank)
+void show(TQWidget *tqparent, int rank)
{
- HighscoresDialog *hd = new HighscoresDialog(rank, parent);
+ HighscoresDialog *hd = new HighscoresDialog(rank, tqparent);
hd->exec();
delete hd;
}
@@ -208,19 +208,19 @@ Item *Manager::createItem(ItemType type)
Item *item = 0;
switch (type) {
case ScoreDefault:
- item = new Item((uint)0, i18n("Score"), Qt::AlignRight);
+ item = new Item((uint)0, i18n("Score"), TQt::AlignRight);
break;
case MeanScoreDefault:
- item = new Item((double)0, i18n("Mean Score"), Qt::AlignRight);
+ item = new Item((double)0, i18n("Mean Score"), TQt::AlignRight);
item->setPrettyFormat(Item::OneDecimal);
item->setPrettySpecial(Item::DefaultNotDefined);
break;
case BestScoreDefault:
- item = new Item((uint)0, i18n("Best Score"), Qt::AlignRight);
+ item = new Item((uint)0, i18n("Best Score"), TQt::AlignRight);
item->setPrettySpecial(Item::DefaultNotDefined);
break;
case ElapsedTime:
- item = new Item((uint)0, i18n("Elapsed Time"), Qt::AlignRight);
+ item = new Item((uint)0, i18n("Elapsed Time"), TQt::AlignRight);
item->setPrettyFormat(Item::MinuteTime);
item->setPrettySpecial(Item::ZeroNotDefined);
break;
@@ -272,7 +272,7 @@ TQString Manager::gameTypeLabel(uint gameType, LabelType type) const
case I18N: break;
case WW: return "normal";
}
- return TQString::null;
+ return TQString();
}
void Manager::addToQueryURL(KURL &url, const TQString &item,
diff --git a/libkdegames/highscore/kexthighscore.h b/libkdegames/highscore/kexthighscore.h
index 5809a896..575ab592 100644
--- a/libkdegames/highscore/kexthighscore.h
+++ b/libkdegames/highscore/kexthighscore.h
@@ -51,17 +51,17 @@ KDE_EXPORT void setGameType(uint gameType);
* Configure the highscores.
* @return true if the configuration has been modified and saved
*/
-KDE_EXPORT bool configure(TQWidget *parent);
+KDE_EXPORT bool configure(TQWidget *tqparent);
/**
* Show the highscores lists.
*/
-KDE_EXPORT void show(TQWidget *parent);
+KDE_EXPORT void show(TQWidget *tqparent);
/**
* Submit a score. See @ref Manager for usage example.
*
- * @param widget a widget used as parent for error message box.
+ * @param widget a widget used as tqparent for error message box.
*/
KDE_EXPORT void submitScore(const Score &score, TQWidget *widget);
@@ -111,7 +111,7 @@ KDE_EXPORT Score firstScore();
* You can replace the score item (for e.g. displaying it differently) with
* setScoreItem or add an item with addScoreItem.
*
- * The players list contains :
+ * The players list tqcontains :
* <ul>
* <li> the player name (as defined by the user in the configuration
* dialog) </li>
diff --git a/libkdegames/highscore/kexthighscore_gui.cpp b/libkdegames/highscore/kexthighscore_gui.cpp
index 3786f529..9aa28e89 100644
--- a/libkdegames/highscore/kexthighscore_gui.cpp
+++ b/libkdegames/highscore/kexthighscore_gui.cpp
@@ -58,8 +58,8 @@ void ShowItem::paintCell(TQPainter *p, const TQColorGroup &cg,
}
//-----------------------------------------------------------------------------
-ScoresList::ScoresList(TQWidget *parent)
- : KListView(parent)
+ScoresList::ScoresList(TQWidget *tqparent)
+ : KListView(tqparent)
{
setSelectionMode(TQListView::NoSelection);
setItemMargin(3);
@@ -92,15 +92,15 @@ void ScoresList::addLineItem(const ItemArray &items,
if (line) line->setText(k, itemText(container, index));
else {
addColumn( container.item()->label() );
- setColumnAlignment(k, container.item()->alignment());
+ setColumnAlignment(k, container.item()->tqalignment());
}
k++;
}
}
//-----------------------------------------------------------------------------
-HighscoresList::HighscoresList(TQWidget *parent)
- : ScoresList(parent)
+HighscoresList::HighscoresList(TQWidget *tqparent)
+ : ScoresList(tqparent)
{}
TQString HighscoresList::itemText(const ItemContainer &item, uint row) const
@@ -120,8 +120,8 @@ void HighscoresList::load(const ItemArray &items, int highlight)
}
//-----------------------------------------------------------------------------
-HighscoresWidget::HighscoresWidget(TQWidget *parent)
- : TQWidget(parent, "show_highscores_widget"),
+HighscoresWidget::HighscoresWidget(TQWidget *tqparent)
+ : TQWidget(tqparent, "show_highscores_widget"),
_scoresUrl(0), _playersUrl(0), _statsTab(0), _histoTab(0)
{
const ScoreInfos &s = internal->scoreInfos();
@@ -197,10 +197,10 @@ void HighscoresWidget::load(int rank)
}
//-----------------------------------------------------------------------------
-HighscoresDialog::HighscoresDialog(int rank, TQWidget *parent)
+HighscoresDialog::HighscoresDialog(int rank, TQWidget *tqparent)
: KDialogBase(internal->nbGameTypes()>1 ? TreeList : Plain,
i18n("Highscores"), Close|User1|User2, Close,
- parent, "show_highscores", true, true,
+ tqparent, "show_highscores", true, true,
KGuiItem(i18n("Configure..."), "configure"),
KGuiItem(i18n("Export..."))), _rank(rank), _tab(0)
{
@@ -210,7 +210,7 @@ HighscoresDialog::HighscoresDialog(int rank, TQWidget *parent)
for (uint i=0; i<internal->nbGameTypes(); i++) {
TQString title = internal->manager.gameTypeLabel(i, Manager::I18N);
TQString icon = internal->manager.gameTypeLabel(i, Manager::Icon);
- TQWidget *w = addVBoxPage(title, TQString::null,
+ TQWidget *w = addVBoxPage(title, TQString(),
BarIcon(icon, KIcon::SizeLarge));
if ( i==internal->gameType() ) createPage(w);
}
@@ -251,7 +251,7 @@ void HighscoresDialog::slotUser1()
void HighscoresDialog::slotUser2()
{
- KURL url = KFileDialog::getSaveURL(TQString::null, TQString::null, this);
+ KURL url = KFileDialog::getSaveURL(TQString(), TQString(), this);
if ( url.isEmpty() ) return;
if ( KIO::NetAccess::exists(url, true, this) ) {
KGuiItem gi = KStdGuiItem::save();
@@ -270,8 +270,8 @@ void HighscoresDialog::slotUser2()
//-----------------------------------------------------------------------------
LastMultipleScoresList::LastMultipleScoresList(
- const TQValueVector<Score> &scores, TQWidget *parent)
- : ScoresList(parent), _scores(scores)
+ const TQValueVector<Score> &scores, TQWidget *tqparent)
+ : ScoresList(tqparent), _scores(scores)
{
const ScoreInfos &s = internal->scoreInfos();
addHeader(s);
@@ -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()->alignment());
+ setColumnAlignment(i, container->item()->tqalignment());
}
}
}
@@ -299,7 +299,7 @@ TQString LastMultipleScoresList::itemText(const ItemContainer &item,
{
TQString name = item.name();
if ( name=="rank" )
- return (_scores[row].type()==Won ? i18n("Winner") : TQString::null);
+ return (_scores[row].type()==Won ? i18n("Winner") : TQString());
TQVariant v = _scores[row].data(name);
if ( name=="name" ) return v.toString();
return item.item()->pretty(row, v);
@@ -307,8 +307,8 @@ TQString LastMultipleScoresList::itemText(const ItemContainer &item,
//-----------------------------------------------------------------------------
TotalMultipleScoresList::TotalMultipleScoresList(
- const TQValueVector<Score> &scores, TQWidget *parent)
- : ScoresList(parent), _scores(scores)
+ const TQValueVector<Score> &scores, TQWidget *tqparent)
+ : ScoresList(tqparent), _scores(scores)
{
const ScoreInfos &s = internal->scoreInfos();
addHeader(s);
@@ -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()->alignment());
+ setColumnAlignment(i, container->item()->tqalignment());
}
}
}
@@ -352,10 +352,10 @@ TQString TotalMultipleScoresList::itemText(const ItemContainer &item,
//-----------------------------------------------------------------------------
-ConfigDialog::ConfigDialog(TQWidget *parent)
+ConfigDialog::ConfigDialog(TQWidget *tqparent)
: KDialogBase(Swallow, i18n("Configure Highscores"),
Ok|Apply|Cancel, Cancel,
- parent, "configure_highscores", true, true),
+ tqparent, "configure_highscores", true, true),
_saved(false), _WWHEnabled(0)
{
TQWidget *page = 0;
@@ -456,7 +456,7 @@ void ConfigDialog::removeSlot()
i18n("This will permanently remove your "
"registration key. You will not be able to use "
"the currently registered nickname anymore."),
- TQString::null, gi);
+ TQString(), gi);
if ( res==KMessageBox::Continue ) {
internal->playerInfos().removeKey();
_registeredName->clear();
@@ -471,7 +471,7 @@ void ConfigDialog::load()
{
internal->hsConfig().readCurrentConfig();
const PlayerInfos &infos = internal->playerInfos();
- _nickname->setText(infos.isAnonymous() ? TQString::null : infos.name());
+ _nickname->setText(infos.isAnonymous() ? TQString() : infos.name());
_comment->setText(infos.comment());
if (_WWHEnabled) {
_WWHEnabled->setChecked(infos.isWWEnabled());
@@ -516,9 +516,9 @@ bool ConfigDialog::save()
}
//-----------------------------------------------------------------------------
-AskNameDialog::AskNameDialog(TQWidget *parent)
+AskNameDialog::AskNameDialog(TQWidget *tqparent)
: KDialogBase(Plain, i18n("Enter Your Nickname"), Ok | Cancel, Ok,
- parent, "ask_name_dialog")
+ tqparent, "ask_name_dialog")
{
internal->hsConfig().readCurrentConfig();
diff --git a/libkdegames/highscore/kexthighscore_gui.h b/libkdegames/highscore/kexthighscore_gui.h
index 2a142856..fc2d3912 100644
--- a/libkdegames/highscore/kexthighscore_gui.h
+++ b/libkdegames/highscore/kexthighscore_gui.h
@@ -58,8 +58,9 @@ class ShowItem : public KListViewItem
class ScoresList : public KListView
{
Q_OBJECT
+ TQ_OBJECT
public:
- ScoresList(TQWidget *parent);
+ ScoresList(TQWidget *tqparent);
void addHeader(const ItemArray &);
@@ -76,8 +77,9 @@ class ScoresList : public KListView
class HighscoresList : public ScoresList
{
Q_OBJECT
+ TQ_OBJECT
public:
- HighscoresList(TQWidget *parent);
+ HighscoresList(TQWidget *tqparent);
void load(const ItemArray &, int highlight);
@@ -85,11 +87,12 @@ class HighscoresList : public ScoresList
TQString itemText(const ItemContainer &, uint row) const;
};
-class HighscoresWidget : public QWidget
+class HighscoresWidget : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- HighscoresWidget(TQWidget *parent);
+ HighscoresWidget(TQWidget *tqparent);
void load(int rank);
@@ -113,8 +116,9 @@ class HighscoresWidget : public QWidget
class HighscoresDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- HighscoresDialog(int rank, TQWidget *parent);
+ HighscoresDialog(int rank, TQWidget *tqparent);
private slots:
void slotUser1();
@@ -132,8 +136,9 @@ class HighscoresDialog : public KDialogBase
class LastMultipleScoresList : public ScoresList
{
Q_OBJECT
+ TQ_OBJECT
public:
- LastMultipleScoresList(const TQValueVector<Score> &, TQWidget *parent);
+ LastMultipleScoresList(const TQValueVector<Score> &, TQWidget *tqparent);
private:
void addLineItem(const ItemArray &, uint index, TQListViewItem *line);
@@ -146,8 +151,9 @@ private:
class TotalMultipleScoresList : public ScoresList
{
Q_OBJECT
+ TQ_OBJECT
public:
- TotalMultipleScoresList(const TQValueVector<Score> &, TQWidget *parent);
+ TotalMultipleScoresList(const TQValueVector<Score> &, TQWidget *tqparent);
private:
void addLineItem(const ItemArray &, uint index, TQListViewItem *line);
@@ -161,8 +167,9 @@ private:
class ConfigDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- ConfigDialog(TQWidget *parent);
+ ConfigDialog(TQWidget *tqparent);
bool hasBeenSaved() const { return _saved; }
@@ -188,8 +195,9 @@ class ConfigDialog : public KDialogBase
class AskNameDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- AskNameDialog(TQWidget *parent);
+ AskNameDialog(TQWidget *tqparent);
TQString name() const { return _edit->text(); }
bool dontAskAgain() const { return _checkbox->isChecked(); }
diff --git a/libkdegames/highscore/kexthighscore_internal.cpp b/libkdegames/highscore/kexthighscore_internal.cpp
index 3c73c3aa..a1dfd747 100644
--- a/libkdegames/highscore/kexthighscore_internal.cpp
+++ b/libkdegames/highscore/kexthighscore_internal.cpp
@@ -160,8 +160,8 @@ void ItemArray::_setItem(uint i, const TQString &name, Item *item,
{
at(i)->setItem(item);
at(i)->setName(name);
- at(i)->setGroup(stored ? _group : TQString::null);
- at(i)->setSubGroup(canHaveSubGroup ? _subGroup : TQString::null);
+ at(i)->setGroup(stored ? _group : TQString());
+ at(i)->setSubGroup(canHaveSubGroup ? _subGroup : TQString());
}
void ItemArray::setGroup(const TQString &group)
@@ -262,14 +262,14 @@ PlayerInfos::PlayerInfos()
// standard items
addItem("name", new NameItem);
- Item *it = new Item((uint)0, i18n("Games Count"),Qt::AlignRight);
+ Item *it = new Item((uint)0, i18n("Games Count"),TQt::AlignRight);
addItem("nb games", it, true, true);
it = Manager::createItem(Manager::MeanScoreDefault);
addItem("mean score", it, true, true);
it = Manager::createItem(Manager::BestScoreDefault);
addItem("best score", it, true, true);
addItem("date", new DateItem, true, true);
- it = new Item(TQString::null, i18n("Comment"), Qt::AlignLeft);
+ it = new Item(TQString(), i18n("Comment"), TQt::AlignLeft);
addItem("comment", it);
// statistics items
@@ -314,13 +314,13 @@ PlayerInfos::PlayerInfos()
#ifdef HIGHSCORE_DIRECTORY
if (_oldLocalPlayer) { // player already exists in local config file
// copy player data
- TQString prefix = TQString("%1_").arg(_oldLocalId+1);
+ TQString prefix = TQString("%1_").tqarg(_oldLocalId+1);
TQMap<TQString, TQString> entries =
cg.config()->entryMap("KHighscore_players");
TQMap<TQString, TQString>::const_iterator it;
for (it=entries.begin(); it!=entries.end(); ++it) {
TQString key = it.key();
- if ( key.find(prefix)==0 ) {
+ if ( key.tqfind(prefix)==0 ) {
TQString name = key.right(key.length()-prefix.length());
if ( name!="name" || !isNameUsed(it.data()) )
internal->hsConfig().writeEntry(_id+1, name, it.data());
@@ -364,7 +364,7 @@ uint PlayerInfos::nbEntries() const
TQString PlayerInfos::key() const
{
ConfigGroup cg;
- return cg.config()->readEntry(HS_KEY, TQString::null);
+ return cg.config()->readEntry(HS_KEY, TQString());
}
bool PlayerInfos::isWWEnabled() const
@@ -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").arg(sh[sh.size()-1]);
- return TQString("nb scores less than %1").arg(sh[i]);
+ return TQString("nb scores greater than %1").tqarg(sh[sh.size()-1]);
+ return TQString("nb scores less than %1").tqarg(sh[i]);
}
uint PlayerInfos::histoSize() const
@@ -484,7 +484,7 @@ void PlayerInfos::modifySettings(const TQString &newName,
TQString PlayerInfos::registeredName() const
{
ConfigGroup cg;
- return cg.config()->readEntry(HS_REGISTERED_NAME, TQString::null);
+ return cg.config()->readEntry(HS_REGISTERED_NAME, TQString());
}
void PlayerInfos::removeKey()
@@ -497,10 +497,10 @@ void PlayerInfos::removeKey()
TQString sk;
do {
i++;
- sk = str.arg(HS_KEY).arg(i);
- } while ( !cg.config()->readEntry(sk, TQString::null).isEmpty() );
+ sk = str.tqarg(HS_KEY).tqarg(i);
+ } while ( !cg.config()->readEntry(sk, TQString()).isEmpty() );
cg.config()->writeEntry(sk, key());
- cg.config()->writeEntry(str.arg(HS_REGISTERED_NAME).arg(i),
+ cg.config()->writeEntry(str.tqarg(HS_REGISTERED_NAME).tqarg(i),
registeredName());
// clear current key/nickname
@@ -602,15 +602,15 @@ const char *DUMMY_STRINGS[] = {
const char *UNABLE_TO_CONTACT =
I18N_NOOP("Unable to contact world-wide highscore server");
-bool ManagerPrivate::doQuery(const KURL &url, TQWidget *parent,
+bool ManagerPrivate::doQuery(const KURL &url, TQWidget *tqparent,
TQDomNamedNodeMap *map)
{
KIO::http_update_cache(url, true, 0); // remove cache !
TQString tmpFile;
- if ( !KIO::NetAccess::download(url, tmpFile, parent) ) {
- TQString details = i18n("Server URL: %1").arg(url.host());
- KMessageBox::detailedSorry(parent, i18n(UNABLE_TO_CONTACT), details);
+ if ( !KIO::NetAccess::download(url, tmpFile, tqparent) ) {
+ TQString details = i18n("Server URL: %1").tqarg(url.host());
+ KMessageBox::detailedSorry(tqparent, i18n(UNABLE_TO_CONTACT), details);
return false;
}
@@ -618,7 +618,7 @@ bool ManagerPrivate::doQuery(const KURL &url, TQWidget *parent,
if ( !file.open(IO_ReadOnly) ) {
KIO::NetAccess::removeTempFile(tmpFile);
TQString details = i18n("Unable to open temporary file.");
- KMessageBox::detailedSorry(parent, i18n(UNABLE_TO_CONTACT), details);
+ KMessageBox::detailedSorry(tqparent, i18n(UNABLE_TO_CONTACT), details);
return false;
}
@@ -641,26 +641,26 @@ bool ManagerPrivate::doQuery(const KURL &url, TQWidget *parent,
TQString msg = i18n(attr.value().latin1());
TQString caption = i18n("Message from world-wide highscores "
"server");
- KMessageBox::sorry(parent, msg, caption);
+ KMessageBox::sorry(tqparent, msg, caption);
return false;
}
}
}
TQString msg = i18n("Invalid answer from world-wide highscores server.");
- TQString details = i18n("Raw message: %1").arg(content);
- KMessageBox::detailedSorry(parent, msg, details);
+ TQString details = i18n("Raw message: %1").tqarg(content);
+ KMessageBox::detailedSorry(tqparent, msg, details);
return false;
}
bool ManagerPrivate::getFromQuery(const TQDomNamedNodeMap &map,
const TQString &name, TQString &value,
- TQWidget *parent)
+ TQWidget *tqparent)
{
TQDomAttr attr = map.namedItem(name).toAttr();
if ( attr.isNull() ) {
- KMessageBox::sorry(parent,
+ KMessageBox::sorry(tqparent,
i18n("Invalid answer from world-wide "
- "highscores server (missing item: %1).").arg(name));
+ "highscores server (missing item: %1).").tqarg(name));
return false;
}
value = attr.value();
@@ -780,7 +780,7 @@ int ManagerPrivate::submitScore(const Score &ascore,
Score score = ascore;
score.setData("id", _playerInfos->id() + 1);
- score.setData("date", TQDateTime::currentDateTime());
+ score.setData("date", TQDateTime::tqcurrentDateTime());
// ask new name if anonymous and winner
const char *dontAskAgainName = "highscore_ask_name_dialog";
diff --git a/libkdegames/highscore/kexthighscore_internal.h b/libkdegames/highscore/kexthighscore_internal.h
index ff70c5cd..e0aa8ca5 100644
--- a/libkdegames/highscore/kexthighscore_internal.h
+++ b/libkdegames/highscore/kexthighscore_internal.h
@@ -46,7 +46,7 @@ class RankItem : public Item
{
public:
RankItem()
- : Item((uint)0, i18n("Rank"), Qt::AlignRight) {}
+ : Item((uint)0, i18n("Rank"), TQt::AlignRight) {}
TQVariant read(uint rank, const TQVariant &) const { return rank; }
TQString pretty(uint rank, const TQVariant &) const
@@ -57,7 +57,7 @@ class NameItem : public Item
{
public:
NameItem()
- : Item(TQString::null, i18n("Name"), Qt::AlignLeft) {
+ : Item(TQString(), i18n("Name"), TQt::AlignLeft) {
setPrettySpecial(Anonymous);
}
};
@@ -66,7 +66,7 @@ class DateItem : public Item
{
public:
DateItem()
- : Item(TQDateTime(), i18n("Date"), Qt::AlignRight) {
+ : Item(TQDateTime(), i18n("Date"), TQt::AlignRight) {
setPrettyFormat(DateTime);
}
};
@@ -75,7 +75,7 @@ class SuccessPercentageItem : public Item
{
public:
SuccessPercentageItem()
- : Item((double)-1, i18n("Success"), Qt::AlignRight) {
+ : Item((double)-1, i18n("Success"), TQt::AlignRight) {
setPrettyFormat(Percentage);
setPrettySpecial(NegativeNotDefined);
}
@@ -176,7 +176,7 @@ class ScoreInfos : public ItemArray
class ConfigGroup : public KConfigGroupSaver
{
public:
- ConfigGroup(const TQString &group = TQString::null)
+ ConfigGroup(const TQString &group = TQString())
: KConfigGroupSaver(kapp->config(), group) {}
};
@@ -243,7 +243,7 @@ class ManagerPrivate
PlayerInfos &playerInfos() { return *_playerInfos; }
KHighscore &hsConfig() { return *_hsConfig; }
enum QueryType { Submit, Register, Change, Players, Scores };
- KURL queryURL(QueryType type, const TQString &newName=TQString::null) const;
+ KURL queryURL(QueryType type, const TQString &newName=TQString()) const;
void exportHighscores(TQTextStream &);
@@ -264,11 +264,11 @@ class ManagerPrivate
// return -1 if not a local best score
int rank(const Score &score) const;
- bool submitWorldWide(const Score &score, TQWidget *parent) const;
- static bool doQuery(const KURL &url, TQWidget *parent,
+ bool submitWorldWide(const Score &score, TQWidget *tqparent) const;
+ static bool doQuery(const KURL &url, TQWidget *tqparent,
TQDomNamedNodeMap *map = 0);
static bool getFromQuery(const TQDomNamedNodeMap &map, const TQString &name,
- TQString &value, TQWidget *parent);
+ TQString &value, TQWidget *tqparent);
void convertToGlobal();
};
diff --git a/libkdegames/highscore/kexthighscore_item.cpp b/libkdegames/highscore/kexthighscore_item.cpp
index fa6c7e2c..44fe64fa 100644
--- a/libkdegames/highscore/kexthighscore_item.cpp
+++ b/libkdegames/highscore/kexthighscore_item.cpp
@@ -33,8 +33,8 @@ namespace KExtHighscore
{
//-----------------------------------------------------------------------------
-Item::Item(const TQVariant &def, const TQString &label, int alignment)
- : _default(def), _label(label), _alignment(alignment),
+Item::Item(const TQVariant &def, const TQString &label, int tqalignment)
+ : _default(def), _label(label), _tqalignment(tqalignment),
_format(NoFormat), _special(NoSpecial)
{}
@@ -154,13 +154,13 @@ Score::~Score()
const TQVariant &Score::data(const TQString &name) const
{
- Q_ASSERT( _data.contains(name) );
+ Q_ASSERT( _data.tqcontains(name) );
return _data[name];
}
void Score::setData(const TQString &name, const TQVariant &value)
{
- Q_ASSERT( _data.contains(name) );
+ Q_ASSERT( _data.tqcontains(name) );
Q_ASSERT( _data[name].type()==value.type() );
_data[name] = value;
}
@@ -178,14 +178,14 @@ bool Score::operator <(const Score &score)
TQDataStream &operator <<(TQDataStream &s, const Score &score)
{
- s << (Q_UINT8)score.type();
+ s << (TQ_UINT8)score.type();
s << score._data;
return s;
}
TQDataStream &operator >>(TQDataStream &s, Score &score)
{
- Q_UINT8 type;
+ TQ_UINT8 type;
s >> type;
score._type = (ScoreType)type;
s >> score._data;
@@ -238,7 +238,7 @@ void MultiplayerScores::addScore(uint i, const Score &score)
_scores[i]._data["nb won games"] = won;
}
-void MultiplayerScores::show(TQWidget *parent)
+void MultiplayerScores::show(TQWidget *tqparent)
{
// check consistency
if ( _nbGames.size()<2 ) kdWarning(11002) << "less than 2 players" << endl;
@@ -271,7 +271,7 @@ void MultiplayerScores::show(TQWidget *parent)
// show the scores
KDialogBase dialog(KDialogBase::Plain, i18n("Multiplayers Scores"),
KDialogBase::Close, KDialogBase::Close,
- parent, "show_multiplayers_score", true, true);
+ tqparent, "show_multiplayers_score", true, true);
TQHBoxLayout *hbox = new TQHBoxLayout(dialog.plainPage(),
KDialog::marginHint(), KDialog::spacingHint());
@@ -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:")
- .arg(_nbGames[0]), vbox);
+ .tqarg(_nbGames[0]), vbox);
(void)new TotalMultipleScoresList(ordered, vbox);
}
diff --git a/libkdegames/highscore/kexthighscore_item.h b/libkdegames/highscore/kexthighscore_item.h
index 490908d7..d5faa380 100644
--- a/libkdegames/highscore/kexthighscore_item.h
+++ b/libkdegames/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 alignment the alignment of the item.
+ * @param tqalignment the tqalignment of the item.
*/
Item(const TQVariant &def = TQVariant::Invalid,
- const TQString &label = TQString::null, int alignment = Qt::AlignRight);
+ const TQString &label = TQString(), int tqalignment = TQt::AlignRight);
virtual ~Item();
@@ -114,9 +114,9 @@ class KDE_EXPORT Item
TQString label() const { return _label; }
/**
- * @return the alignment.
+ * @return the tqalignment.
*/
- int alignment() const { return _alignment; }
+ int tqalignment() const { return _tqalignment; }
/**
* Set default value.
@@ -149,7 +149,7 @@ class KDE_EXPORT Item
private:
TQVariant _default;
TQString _label;
- int _alignment;
+ int _tqalignment;
Format _format;
Special _special;
@@ -294,7 +294,7 @@ class KDE_EXPORT MultiplayerScores
/**
* Show scores.
*/
- void show(TQWidget *parent);
+ void show(TQWidget *tqparent);
private:
TQValueVector<uint> _nbGames;
diff --git a/libkdegames/highscore/kexthighscore_tab.cpp b/libkdegames/highscore/kexthighscore_tab.cpp
index 3b2b5852..8c41227c 100644
--- a/libkdegames/highscore/kexthighscore_tab.cpp
+++ b/libkdegames/highscore/kexthighscore_tab.cpp
@@ -39,8 +39,8 @@ namespace KExtHighscore
{
//-----------------------------------------------------------------------------
-PlayersCombo::PlayersCombo(TQWidget *parent, const char *name)
- : TQComboBox(parent, name)
+PlayersCombo::PlayersCombo(TQWidget *tqparent, const char *name)
+ : TQComboBox(tqparent, name)
{
const PlayerInfos &p = internal->playerInfos();
for (uint i = 0; i<p.nbEntries(); i++)
@@ -65,8 +65,8 @@ void PlayersCombo::load()
}
//-----------------------------------------------------------------------------
-AdditionalTab::AdditionalTab(TQWidget *parent, const char *name)
- : TQWidget(parent, name)
+AdditionalTab::AdditionalTab(TQWidget *tqparent, const char *name)
+ : TQWidget(tqparent, name)
{
TQVBoxLayout *top = new TQVBoxLayout(this, KDialogBase::marginHint(),
KDialogBase::spacingHint());
@@ -96,8 +96,8 @@ void AdditionalTab::allSelected()
TQString AdditionalTab::percent(uint n, uint total, bool withBraces)
{
- if ( n==0 || total==0 ) return TQString::null;
- TQString s = TQString("%1%").arg(100.0 * n / total, 0, 'f', 1);
+ if ( n==0 || total==0 ) return TQString();
+ TQString s = TQString("%1%").tqarg(100.0 * n / total, 0, 'f', 1);
return (withBraces ? TQString("(") + s + ")" : s);
}
@@ -116,11 +116,11 @@ const char *StatisticsTab::TREND_LABELS[Nb_Trends] = {
I18N_NOOP("Current:"), I18N_NOOP("Max won:"), I18N_NOOP("Max lost:")
};
-StatisticsTab::StatisticsTab(TQWidget *parent)
- : AdditionalTab(parent, "statistics_tab")
+StatisticsTab::StatisticsTab(TQWidget *tqparent)
+ : AdditionalTab(tqparent, "statistics_tab")
{
// construct GUI
- TQVBoxLayout *top = static_cast<TQVBoxLayout *>(layout());
+ TQVBoxLayout *top = static_cast<TQVBoxLayout *>(tqlayout());
TQHBoxLayout *hbox = new TQHBoxLayout(top);
TQVBoxLayout *vbox = new TQVBoxLayout(hbox);
@@ -184,7 +184,7 @@ void StatisticsTab::load()
TQString StatisticsTab::percent(const Data &d, Count count) const
{
- if ( count==Total ) return TQString::null;
+ if ( count==Total ) return TQString();
return AdditionalTab::percent(d.count[count], d.count[Total], true);
}
@@ -205,11 +205,11 @@ void StatisticsTab::display(uint i)
}
//-----------------------------------------------------------------------------
-HistogramTab::HistogramTab(TQWidget *parent)
- : AdditionalTab(parent, "histogram_tab")
+HistogramTab::HistogramTab(TQWidget *tqparent)
+ : AdditionalTab(tqparent, "histogram_tab")
{
// construct GUI
- TQVBoxLayout *top = static_cast<TQVBoxLayout *>(layout());
+ TQVBoxLayout *top = static_cast<TQVBoxLayout *>(tqlayout());
_list = new KListView(this);
_list->setSelectionMode(TQListView::NoSelection);
@@ -225,7 +225,7 @@ HistogramTab::HistogramTab(TQWidget *parent)
_list->addColumn(i18n("Count"));
_list->addColumn(i18n("Percent"));
for (uint i=0; i<4; i++) _list->setColumnAlignment(i, AlignRight);
- _list->addColumn(TQString::null);
+ _list->addColumn(TQString());
const Item *sitem = internal->scoreInfos().item("score")->item();
const PlayerInfos &pi = internal->playerInfos();
@@ -270,7 +270,7 @@ void HistogramTab::display(uint i)
uint nb = _counts[i*s + k];
item->setText(2, TQString::number(nb));
item->setText(3, percent(nb, _data[i]));
- uint width = (_data[i]==0 ? 0 : qRound(150.0 * nb / _data[i]));
+ uint width = (_data[i]==0 ? 0 : tqRound(150.0 * nb / _data[i]));
TQPixmap pixmap(width, 10);
pixmap.fill(blue);
item->setPixmap(4, pixmap);
diff --git a/libkdegames/highscore/kexthighscore_tab.h b/libkdegames/highscore/kexthighscore_tab.h
index 4303209d..dc0d7536 100644
--- a/libkdegames/highscore/kexthighscore_tab.h
+++ b/libkdegames/highscore/kexthighscore_tab.h
@@ -31,11 +31,12 @@ namespace KExtHighscore
{
//-----------------------------------------------------------------------------
-class PlayersCombo : public QComboBox
+class PlayersCombo : public TQComboBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- PlayersCombo(TQWidget *parent = 0, const char *name = 0);
+ PlayersCombo(TQWidget *tqparent = 0, const char *name = 0);
void load();
@@ -49,11 +50,12 @@ class PlayersCombo : public QComboBox
};
//-----------------------------------------------------------------------------
-class AdditionalTab : public QWidget
+class AdditionalTab : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- AdditionalTab(TQWidget *parent, const char *name);
+ AdditionalTab(TQWidget *tqparent, const char *name);
virtual void load();
@@ -74,8 +76,9 @@ class AdditionalTab : public QWidget
class StatisticsTab : public AdditionalTab
{
Q_OBJECT
+ TQ_OBJECT
public:
- StatisticsTab(TQWidget *parent);
+ StatisticsTab(TQWidget *tqparent);
void load();
@@ -99,8 +102,9 @@ class StatisticsTab : public AdditionalTab
class HistogramTab : public AdditionalTab
{
Q_OBJECT
+ TQ_OBJECT
public:
- HistogramTab(TQWidget *parent);
+ HistogramTab(TQWidget *tqparent);
void load();
diff --git a/libkdegames/highscore/khighscore.cpp b/libkdegames/highscore/khighscore.cpp
index 26bb47c3..dd10f2ab 100644
--- a/libkdegames/highscore/khighscore.cpp
+++ b/libkdegames/highscore/khighscore.cpp
@@ -56,14 +56,14 @@ static KStaticDeleter<KFileLock> lockSD;
static KStaticDeleter<KRawConfig> configSD;
-KHighscore::KHighscore(TQObject* parent)
- : TQObject(parent)
+KHighscore::KHighscore(TQObject* tqparent)
+ : TQObject(tqparent)
{
init(true);
}
-KHighscore::KHighscore(bool forceLocal, TQObject* parent)
- : TQObject(parent)
+KHighscore::KHighscore(bool forceLocal, TQObject* tqparent)
+ : TQObject(tqparent)
{
init(forceLocal);
}
@@ -96,7 +96,7 @@ void KHighscore::init(const char *appname)
{
#ifdef HIGHSCORE_DIRECTORY
const TQString filename = TQString::fromLocal8Bit("%1/%2.scores")
- .arg(HIGHSCORE_DIRECTORY).arg(appname);
+ .tqarg(HIGHSCORE_DIRECTORY).tqarg(appname);
int fd = open(filename.local8Bit(), O_RDWR);
if ( fd<0 ) kdFatal(11002) << "cannot open global highscore file \""
<< filename << "\"" << endl;
@@ -132,7 +132,7 @@ bool KHighscore::lockForWriting(TQWidget *widget)
if ( !first ) {
KGuiItem item = KStdGuiItem::cont();
item.setText(i18n("Retry"));
- int res = KMessageBox::warningContinueCancel(widget, i18n("Cannot access the highscore file. Another user is probably currently writing to it."), TQString::null, item, "ask_lock_global_highscore_file");
+ int res = KMessageBox::warningContinueCancel(widget, i18n("Cannot access the highscore file. Another user is probably currently writing to it."), TQString(), item, "ask_lock_global_highscore_file");
if ( res==KMessageBox::Cancel ) break;
} else sleep(1);
first = false;
@@ -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").arg(entry).arg(key);
+ TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(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").arg(entry).arg(key);
+ TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(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").arg(entry).arg(key);
+ TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(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").arg(entry).arg(key);
+ TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(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").arg(entry).arg(key);
+ TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(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").arg(entry).arg(key);
+ TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(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").arg(entry).arg(key);
+ TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key);
return cg.config()->hasKey(confKey);
}
@@ -246,9 +246,9 @@ const TQString& KHighscore::highscoreGroup() const
TQString KHighscore::group() const
{
if ( highscoreGroup().isNull() )
- return (d->global ? TQString::null : GROUP);
+ return (d->global ? TQString() : GROUP);
return (d->global ? highscoreGroup()
- : TQString("%1_%2").arg(GROUP).arg(highscoreGroup()));
+ : TQString("%1_%2").tqarg(GROUP).tqarg(highscoreGroup()));
}
bool KHighscore::hasTable() const
diff --git a/libkdegames/highscore/khighscore.h b/libkdegames/highscore/khighscore.h
index 42c9fcda..ba7a4bd0 100644
--- a/libkdegames/highscore/khighscore.h
+++ b/libkdegames/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").arg(player).arg(level);
+ * TQString group = TQString("%1_%2").tqarg(player).tqarg(level);
* table->setGroup(group);
* writeHighscore(table, player, level);
* \endcode
@@ -81,15 +81,16 @@ class KHighscorePrivate;
* Easy, what?
* @author Andreas Beckermann <b_mann@gmx.de>
**/
-class KDE_EXPORT KHighscore : public QObject
+class KDE_EXPORT KHighscore : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
/** @obsolete
* Constructor. The highscore file is forced to be local to support
* games using the old behaviour.
*/
- KHighscore(TQObject* parent = 0);
+ KHighscore(TQObject* tqparent = 0);
/**
* Constructor.
@@ -97,10 +98,10 @@ public:
* @param forceLocal if true, the local highscore file is used even
* when the configuration has been set to use a system-wide file. This
* is convenient for converting highscores from legacy applications.
- * @param parent parent widget for this widget
+ * @param tqparent tqparent widget for this widget
* @since 3.2
*/
- KHighscore(bool forceLocal, TQObject *parent);
+ KHighscore(bool forceLocal, TQObject *tqparent);
/**
* Read the current state of the highscore file. Remember that when
@@ -132,7 +133,7 @@ public:
* If the config file cannot be locked,
* the method waits for 1 second and, if it failed again, displays
* a message box asking for retry or cancel.
- * @param widget used as the parent of the message box.
+ * @param widget used as the tqparent of the message box.
*
* @return false on error or if the config file is locked by another
* process. In such case, the config stays read-only.
@@ -193,7 +194,7 @@ public:
* @return The value of this entry+key pair or pDefault if the entry+key
* pair doesn't exist
**/
- TQString readEntry(int entry, const TQString& key, const TQString& pDefault = TQString::null) const;
+ TQString readEntry(int entry, const TQString& key, const TQString& pDefault = TQString()) const;
/**
* Read a numeric value.
@@ -273,15 +274,15 @@ public:
* Set the new highscore group. The group is being prefixed with
* "KHighscore_" in the table.
* @param groupname The new groupname. E.g. use "easy" for the easy
- * level of your game. If you use TQString::null (the default) the
+ * level of your game. If you use TQString() (the default) the
* default group is used.
**/
- void setHighscoreGroup(const TQString& groupname = TQString::null);
+ void setHighscoreGroup(const TQString& groupname = TQString());
/**
* @return The currently used group. This doesn't contain the prefix
* ("KHighscore_") but the same as setHighscoreGroup uses. The
- * default is TQString::null
+ * default is TQString()
**/
const TQString& highscoreGroup() const;
diff --git a/libkdegames/highscore/kscoredialog.cpp b/libkdegames/highscore/kscoredialog.cpp
index 7bed0c6b..0a3710f4 100644
--- a/libkdegames/highscore/kscoredialog.cpp
+++ b/libkdegames/highscore/kscoredialog.cpp
@@ -44,7 +44,7 @@ class KScoreDialog::KScoreDialogPrivate
public:
TQPtrList<FieldInfo> scores;
TQWidget *page;
- TQGridLayout *layout;
+ TQGridLayout *tqlayout;
TQLineEdit *edit;
TQPtrVector<TQWidgetStack> stack;
TQPtrVector<TQLabel> labels;
@@ -64,8 +64,8 @@ public:
};
-KScoreDialog::KScoreDialog(int fields, TQWidget *parent, const char *oname)
- : KDialogBase(parent, oname, true, i18n("High Scores"), Ok, Ok, true)
+KScoreDialog::KScoreDialog(int fields, TQWidget *tqparent, const char *oname)
+ : KDialogBase(tqparent, oname, true, i18n("High Scores"), Ok, Ok, true)
{
d = new KScoreDialogPrivate();
d->edit = 0;
@@ -126,36 +126,36 @@ void KScoreDialog::setupDialog()
d->col[field] = d->nrCols++;
}
- d->layout = new TQGridLayout(d->page, 15, d->nrCols, marginHint() + 20, spacingHint());
- d->layout->addRowSpacing(4, 15);
+ d->tqlayout = new TQGridLayout(d->page, 15, d->nrCols, marginHint() + 20, spacingHint());
+ d->tqlayout->addRowSpacing(4, 15);
d->commentLabel = new TQLabel(d->page);
- d->commentLabel->setAlignment(AlignVCenter | AlignHCenter);
- d->layout->addMultiCellWidget(d->commentLabel, 1, 1, 0, d->nrCols-1);
+ d->commentLabel->tqsetAlignment(AlignVCenter | AlignHCenter);
+ d->tqlayout->addMultiCellWidget(d->commentLabel, 1, 1, 0, d->nrCols-1);
TQFont bold = font();
bold.setBold(true);
TQLabel *label;
- d->layout->addColSpacing(0, 50);
+ d->tqlayout->addColSpacing(0, 50);
label = new TQLabel(i18n("Rank"), d->page);
- d->layout->addWidget(label, 3, 0);
+ d->tqlayout->addWidget(label, 3, 0);
label->setFont(bold);
for(int field = 1; field < d->fields; field = field * 2)
{
if (d->fields & field)
{
- d->layout->addColSpacing(d->col[field], 50);
+ d->tqlayout->addColSpacing(d->col[field], 50);
label = new TQLabel(d->header[field], d->page);
- d->layout->addWidget(label, 3, d->col[field], field <= Name ? AlignLeft : AlignRight);
+ d->tqlayout->addWidget(label, 3, d->col[field], field <= Name ? AlignLeft : AlignRight);
label->setFont(bold);
}
}
- KSeparator *sep = new KSeparator(Horizontal, d->page);
- d->layout->addMultiCellWidget(sep, 4, 4, 0, d->nrCols-1);
+ KSeparator *sep = new KSeparator(Qt::Horizontal, d->page);
+ d->tqlayout->addMultiCellWidget(sep, 4, 4, 0, d->nrCols-1);
d->labels.resize(d->nrCols * 10);
d->stack.resize(10);
@@ -164,14 +164,14 @@ void KScoreDialog::setupDialog()
for (int i = 1; i <= 10; ++i) {
TQLabel *label;
num.setNum(i);
- label = new TQLabel(i18n("#%1").arg(num), d->page);
+ label = new TQLabel(i18n("#%1").tqarg(num), d->page);
d->labels.insert((i-1)*d->nrCols + 0, label);
- d->layout->addWidget(label, i+4, 0);
+ d->tqlayout->addWidget(label, i+4, 0);
if (d->fields & Name)
{
TQWidgetStack *stack = new TQWidgetStack(d->page);
d->stack.insert(i-1, stack);
- d->layout->addWidget(stack, i+4, d->col[Name]);
+ d->tqlayout->addWidget(stack, i+4, d->col[Name]);
label = new TQLabel(d->page);
d->labels.insert((i-1)*d->nrCols + d->col[Name], label);
stack->addWidget(label);
@@ -183,7 +183,7 @@ void KScoreDialog::setupDialog()
{
label = new TQLabel(d->page);
d->labels.insert((i-1)*d->nrCols + d->col[field], label);
- d->layout->addWidget(label, i+4, d->col[field], AlignRight);
+ d->tqlayout->addWidget(label, i+4, d->col[field], AlignRight);
}
}
}
@@ -202,17 +202,17 @@ void KScoreDialog::aboutToShow()
{
d->commentLabel->setMinimumSize(TQSize(1,1));
d->commentLabel->hide();
- d->layout->addRowSpacing(0, -15);
- d->layout->addRowSpacing(2, -15);
+ d->tqlayout->addRowSpacing(0, -15);
+ d->tqlayout->addRowSpacing(2, -15);
}
else
{
- d->commentLabel->setMinimumSize(d->commentLabel->sizeHint());
+ d->commentLabel->setMinimumSize(d->commentLabel->tqsizeHint());
d->commentLabel->show();
- d->layout->addRowSpacing(0, -10);
- d->layout->addRowSpacing(2, 10);
+ d->tqlayout->addRowSpacing(0, -10);
+ d->tqlayout->addRowSpacing(2, 10);
}
- d->comment = TQString::null;
+ d->comment = TQString();
TQFont normal = font();
TQFont bold = normal;
@@ -267,7 +267,7 @@ void KScoreDialog::aboutToShow()
}
}
d->latest = -1;
- setFixedSize(minimumSizeHint());
+ setFixedSize(tqminimumSizeHint());
}
void KScoreDialog::loadScores()
diff --git a/libkdegames/highscore/kscoredialog.h b/libkdegames/highscore/kscoredialog.h
index d5a7eac0..35a593b3 100644
--- a/libkdegames/highscore/kscoredialog.h
+++ b/libkdegames/highscore/kscoredialog.h
@@ -39,6 +39,7 @@ class TQWidgetStack;
*/
class KDE_EXPORT KScoreDialog : public KDialogBase {
Q_OBJECT
+ TQ_OBJECT
public:
enum Fields { Name = 1 << 0,
@@ -56,10 +57,10 @@ public:
/**
* @param fields Which fields should be listed.
- * @param parent passed to parent TQWidget constructor
- * @param name passed to parent TQWidget constructor
+ * @param tqparent passed to tqparent TQWidget constructor
+ * @param name passed to tqparent TQWidget constructor
*/
- KScoreDialog(int fields, TQWidget *parent=0, const char *name=0);
+ KScoreDialog(int fields, TQWidget *tqparent=0, const char *name=0);
~KScoreDialog();
generated by cgit v1.2.1 (git 2.18.0) at 2024-08-23 05:53:10 +0000