From 7909152750670148360093b2519955fbfa555154 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 20 Dec 2023 22:30:18 +0900 Subject: Replace various '#define' strings - part 6 Signed-off-by: Michele Calgaro --- twin4/twin4/twin4.cpp | 30 +++++++++++++++--------------- twin4/twin4/twin4doc.cpp | 2 +- twin4/twin4/twin4view.cpp | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) (limited to 'twin4') diff --git a/twin4/twin4/twin4.cpp b/twin4/twin4/twin4.cpp index d97d31f2..391f1a9e 100644 --- a/twin4/twin4/twin4.cpp +++ b/twin4/twin4/twin4.cpp @@ -188,50 +188,50 @@ void Kwin4App::checkMenus(CheckFlags menu) */ void Kwin4App::initGUI() { - KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(newGame()), actionCollection(), "new_game"); + KStdGameAction::gameNew(this, TQT_SLOT(newGame()), actionCollection(), "new_game"); ACTION("new_game")->setStatusText(i18n("Start a new game")); - KStdGameAction::load(TQT_TQOBJECT(this), TQT_SLOT(slotOpenGame()), actionCollection(), "open"); + KStdGameAction::load(this, TQT_SLOT(slotOpenGame()), actionCollection(), "open"); ACTION("open")->setStatusText(i18n("Open a saved game...")); - KStdGameAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotSaveGame()), actionCollection(), "save"); + KStdGameAction::save(this, TQT_SLOT(slotSaveGame()), actionCollection(), "save"); ACTION("save")->setStatusText(i18n("Save a game...")); - KStdGameAction::end(TQT_TQOBJECT(this), TQT_SLOT(endGame()), actionCollection(), "end_game"); + KStdGameAction::end(this, TQT_SLOT(endGame()), actionCollection(), "end_game"); ACTION("end_game")->setStatusText(i18n("Ending the current game...")); ACTION("end_game")->setWhatsThis(i18n("Aborts a currently played game. No winner will be declared.")); - new TDEAction(i18n("&Network Configuration..."),0, TQT_TQOBJECT(this), TQT_SLOT(slotInitNetwork()), + new TDEAction(i18n("&Network Configuration..."),0, this, TQT_SLOT(slotInitNetwork()), actionCollection(), "network_conf"); - new TDEAction(i18n("Network Chat..."),0, TQT_TQOBJECT(this), TQT_SLOT(slotChat()), + new TDEAction(i18n("Network Chat..."),0, this, TQT_SLOT(slotChat()), actionCollection(), "network_chat"); if (global_debug>0) - new TDEAction(i18n("Debug KGame"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDebugKGame()), + new TDEAction(i18n("Debug KGame"), 0, this, TQT_SLOT(slotDebugKGame()), actionCollection(), "file_debug"); - new TDEAction(i18n("&Show Statistics"),"flag", 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Show Statistics"),"flag", 0, this, TQT_SLOT(showStatistics()), actionCollection(), "statistics"); ACTION("statistics")->setStatusText(i18n("Show statistics.")); - KStdGameAction::hint(TQT_TQOBJECT(doc), TQT_SLOT(calcHint()), actionCollection(), "hint"); + KStdGameAction::hint(doc, TQT_SLOT(calcHint()), actionCollection(), "hint"); ACTION("hint")->setStatusText(i18n("Shows a hint on how to move.")); - KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "game_exit"); + KStdGameAction::quit(this, TQT_SLOT(close()), actionCollection(), "game_exit"); ACTION("game_exit")->setStatusText(i18n("Quits the program.")); - KStdGameAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actionCollection(), "edit_undo"); + KStdGameAction::undo(this, TQT_SLOT(slotUndo()), actionCollection(), "edit_undo"); ACTION("edit_undo")->setStatusText(i18n("Undo last move.")); - KStdGameAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actionCollection(), "edit_redo"); + KStdGameAction::redo(this, TQT_SLOT(slotRedo()), actionCollection(), "edit_redo"); ACTION("edit_redo")->setStatusText(i18n("Redo last move.")); actionCollection()->setHighlightingEnabled(true); connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), TQT_SLOT(slotStatusMsg(const TQString &))); connect(actionCollection(), TQT_SIGNAL(clearStatusText()), TQT_SLOT(slotClearStatusText())); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection()); + KStdAction::preferences(this, TQT_SLOT(showSettings()), actionCollection()); } /** @@ -542,8 +542,8 @@ void Kwin4App::slotInitNetwork() TQVBoxLayout *l=(TQVBoxLayout *)(box->layout()); mColorGroup=new TQVButtonGroup(box); - connect(mColorGroup, TQT_SIGNAL(clicked(int)), TQT_TQOBJECT(this), TQT_SLOT(slotRemoteChanged(int))); - connect(dlg.networkConfig(), TQT_SIGNAL(signalServerTypeChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(slotServerTypeChanged(int))); + connect(mColorGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotRemoteChanged(int))); + connect(dlg.networkConfig(), TQT_SIGNAL(signalServerTypeChanged(int)), this, TQT_SLOT(slotServerTypeChanged(int))); new TQRadioButton(i18n("Yellow should be played by remote"), mColorGroup); new TQRadioButton(i18n("Red should be played by remote"), mColorGroup); diff --git a/twin4/twin4/twin4doc.cpp b/twin4/twin4/twin4doc.cpp index 4014043a..1ee5e25b 100644 --- a/twin4/twin4/twin4doc.cpp +++ b/twin4/twin4/twin4doc.cpp @@ -36,7 +36,7 @@ #include "prefs.h" #include "statuswidget.h" -Kwin4Doc::Kwin4Doc(TQWidget *parent, const char *) : KGame(1234,TQT_TQOBJECT(parent)), pView(0), mHintProcess(0) +Kwin4Doc::Kwin4Doc(TQWidget *parent, const char *) : KGame(1234,parent), pView(0), mHintProcess(0) { connect(this,TQT_SIGNAL(signalPropertyChanged(KGamePropertyBase *,KGame *)), this,TQT_SLOT(slotPropertyChanged(KGamePropertyBase *,KGame *))); diff --git a/twin4/twin4/twin4view.cpp b/twin4/twin4/twin4view.cpp index 81bb159b..d1996db9 100644 --- a/twin4/twin4/twin4view.cpp +++ b/twin4/twin4/twin4view.cpp @@ -129,13 +129,13 @@ Kwin4View::Kwin4View(Kwin4Doc *theDoc, TQWidget *parent, const char *name) //setBackgroundMode(PaletteBase); setBackgroundColor(TQColor(0,0,128)); - mCanvas=new TQCanvas(TQT_TQOBJECT(parent)); + mCanvas=new TQCanvas(parent); mCanvas->resize(parent->width(),parent->height()); mCanvas->setDoubleBuffering(true); mCanvas->setBackgroundColor(TQColor(0,0,128)); setCanvas(mCanvas); - mCache=new KSpriteCache(mGrafix,TQT_TQOBJECT(this)); + mCache=new KSpriteCache(mGrafix,this); mCache->setCanvas(mCanvas); TDEConfig *config=mCache->config(); -- cgit v1.2.1