diff options
Diffstat (limited to 'twin4')
-rw-r--r-- | twin4/twin4/kspritecache.h | 4 | ||||
-rw-r--r-- | twin4/twin4/twin4.cpp | 62 | ||||
-rw-r--r-- | twin4/twin4/twin4doc.cpp | 42 | ||||
-rw-r--r-- | twin4/twin4/twin4player.cpp | 4 | ||||
-rw-r--r-- | twin4/twin4/twin4proc.cpp | 12 | ||||
-rw-r--r-- | twin4/twin4/twin4view.cpp | 12 |
6 files changed, 68 insertions, 68 deletions
diff --git a/twin4/twin4/kspritecache.h b/twin4/twin4/kspritecache.h index 39c48d7b..63a88c02 100644 --- a/twin4/twin4/kspritecache.h +++ b/twin4/twin4/kspritecache.h @@ -151,8 +151,8 @@ class KSprite : public TQCanvasSprite * animation is finished. * Example: * <pre> - * connect(sprite->createNotify(),TQT_SIGNAL(signalNotify(TQCanvasItem *,int)), - * this,TQT_SLOT(moveDone(TQCanvasItem *,int))); + * connect(sprite->createNotify(),TQ_SIGNAL(signalNotify(TQCanvasItem *,int)), + * this,TQ_SLOT(moveDone(TQCanvasItem *,int))); * </pre> * In the move done function you best delete the notify again with * @ref deleteNotify diff --git a/twin4/twin4/twin4.cpp b/twin4/twin4/twin4.cpp index 391f1a9e..9db99536 100644 --- a/twin4/twin4/twin4.cpp +++ b/twin4/twin4/twin4.cpp @@ -82,7 +82,7 @@ ChatDlg::ChatDlg(KGame *game,TQWidget *parent) adjustSize(); mChatDlg=new KChatDialog(mChat,plainPage(),true); - connect(mButton,TQT_SIGNAL(clicked()),mChatDlg,TQT_SLOT(show())); + connect(mButton,TQ_SIGNAL(clicked()),mChatDlg,TQ_SLOT(show())); } /** @@ -188,50 +188,50 @@ void Kwin4App::checkMenus(CheckFlags menu) */ void Kwin4App::initGUI() { - KStdGameAction::gameNew(this, TQT_SLOT(newGame()), actionCollection(), "new_game"); + KStdGameAction::gameNew(this, TQ_SLOT(newGame()), actionCollection(), "new_game"); ACTION("new_game")->setStatusText(i18n("Start a new game")); - KStdGameAction::load(this, TQT_SLOT(slotOpenGame()), actionCollection(), "open"); + KStdGameAction::load(this, TQ_SLOT(slotOpenGame()), actionCollection(), "open"); ACTION("open")->setStatusText(i18n("Open a saved game...")); - KStdGameAction::save(this, TQT_SLOT(slotSaveGame()), actionCollection(), "save"); + KStdGameAction::save(this, TQ_SLOT(slotSaveGame()), actionCollection(), "save"); ACTION("save")->setStatusText(i18n("Save a game...")); - KStdGameAction::end(this, TQT_SLOT(endGame()), actionCollection(), "end_game"); + KStdGameAction::end(this, TQ_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, this, TQT_SLOT(slotInitNetwork()), + new TDEAction(i18n("&Network Configuration..."),0, this, TQ_SLOT(slotInitNetwork()), actionCollection(), "network_conf"); - new TDEAction(i18n("Network Chat..."),0, this, TQT_SLOT(slotChat()), + new TDEAction(i18n("Network Chat..."),0, this, TQ_SLOT(slotChat()), actionCollection(), "network_chat"); if (global_debug>0) - new TDEAction(i18n("Debug KGame"), 0, this, TQT_SLOT(slotDebugKGame()), + new TDEAction(i18n("Debug KGame"), 0, this, TQ_SLOT(slotDebugKGame()), actionCollection(), "file_debug"); new TDEAction(i18n("&Show Statistics"),"flag", 0, this, - TQT_SLOT(showStatistics()), actionCollection(), "statistics"); + TQ_SLOT(showStatistics()), actionCollection(), "statistics"); ACTION("statistics")->setStatusText(i18n("Show statistics.")); - KStdGameAction::hint(doc, TQT_SLOT(calcHint()), actionCollection(), "hint"); + KStdGameAction::hint(doc, TQ_SLOT(calcHint()), actionCollection(), "hint"); ACTION("hint")->setStatusText(i18n("Shows a hint on how to move.")); - KStdGameAction::quit(this, TQT_SLOT(close()), actionCollection(), "game_exit"); + KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection(), "game_exit"); ACTION("game_exit")->setStatusText(i18n("Quits the program.")); - KStdGameAction::undo(this, TQT_SLOT(slotUndo()), actionCollection(), "edit_undo"); + KStdGameAction::undo(this, TQ_SLOT(slotUndo()), actionCollection(), "edit_undo"); ACTION("edit_undo")->setStatusText(i18n("Undo last move.")); - KStdGameAction::redo(this, TQT_SLOT(slotRedo()), actionCollection(), "edit_redo"); + KStdGameAction::redo(this, TQ_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())); + connect(actionCollection(), TQ_SIGNAL(actionStatusText(const TQString &)), TQ_SLOT(slotStatusMsg(const TQString &))); + connect(actionCollection(), TQ_SIGNAL(clearStatusText()), TQ_SLOT(slotClearStatusText())); - KStdAction::preferences(this, TQT_SLOT(showSettings()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(showSettings()), actionCollection()); } /** @@ -263,17 +263,17 @@ void Kwin4App::initDocument() { doc = new Kwin4Doc(this); // Game Over signal - connect(doc,TQT_SIGNAL(signalGameOver(int, KPlayer *,KGame *)), - this,TQT_SLOT(slotGameOver(int, KPlayer *,KGame *))); - connect(doc,TQT_SIGNAL(signalMoveDone(int, int)), - this,TQT_SLOT(slotMoveDone(int, int))); - connect(doc,TQT_SIGNAL(signalClientLeftGame(int, int,KGame *)), - this,TQT_SLOT(slotNetworkBroken(int, int, KGame *))); - connect(doc,TQT_SIGNAL(signalNextPlayer()), - this,TQT_SLOT(slotStatusNames())); + connect(doc,TQ_SIGNAL(signalGameOver(int, KPlayer *,KGame *)), + this,TQ_SLOT(slotGameOver(int, KPlayer *,KGame *))); + connect(doc,TQ_SIGNAL(signalMoveDone(int, int)), + this,TQ_SLOT(slotMoveDone(int, int))); + connect(doc,TQ_SIGNAL(signalClientLeftGame(int, int,KGame *)), + this,TQ_SLOT(slotNetworkBroken(int, int, KGame *))); + connect(doc,TQ_SIGNAL(signalNextPlayer()), + this,TQ_SLOT(slotStatusNames())); - connect(doc,TQT_SIGNAL(signalGameRun()), - this,TQT_SLOT(slotNewGame())); + connect(doc,TQ_SIGNAL(signalGameRun()), + this,TQ_SLOT(slotNewGame())); } void Kwin4App::changeAction(const char *action, bool enable){ @@ -542,8 +542,8 @@ void Kwin4App::slotInitNetwork() TQVBoxLayout *l=(TQVBoxLayout *)(box->layout()); mColorGroup=new TQVButtonGroup(box); - connect(mColorGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotRemoteChanged(int))); - connect(dlg.networkConfig(), TQT_SIGNAL(signalServerTypeChanged(int)), this, TQT_SLOT(slotServerTypeChanged(int))); + connect(mColorGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotRemoteChanged(int))); + connect(dlg.networkConfig(), TQ_SIGNAL(signalServerTypeChanged(int)), this, TQ_SLOT(slotServerTypeChanged(int))); new TQRadioButton(i18n("Yellow should be played by remote"), mColorGroup); new TQRadioButton(i18n("Red should be played by remote"), mColorGroup); @@ -590,8 +590,8 @@ void Kwin4App::slotChat() mMyChatDlg->setPlayer(doc->getPlayer(Gelb)); else mMyChatDlg->setPlayer(doc->getPlayer(Rot)); - connect(doc,TQT_SIGNAL(signalChatChanged(Kwin4Player *)), - mMyChatDlg,TQT_SLOT(setPlayer(Kwin4Player *))); + connect(doc,TQ_SIGNAL(signalChatChanged(Kwin4Player *)), + mMyChatDlg,TQ_SLOT(setPlayer(Kwin4Player *))); } if (mMyChatDlg->isHidden()) @@ -619,7 +619,7 @@ void Kwin4App::showSettings(){ TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Prefs::self(), KDialogBase::Swallow); Settings *general = new Settings(0, "General"); dialog->addPage(general, i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), doc, TQT_SLOT(loadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), doc, TQ_SLOT(loadSettings())); dialog->show(); } diff --git a/twin4/twin4/twin4doc.cpp b/twin4/twin4/twin4doc.cpp index 1ee5e25b..07deb165 100644 --- a/twin4/twin4/twin4doc.cpp +++ b/twin4/twin4/twin4doc.cpp @@ -38,8 +38,8 @@ 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 *))); + connect(this,TQ_SIGNAL(signalPropertyChanged(KGamePropertyBase *,KGame *)), + this,TQ_SLOT(slotPropertyChanged(KGamePropertyBase *,KGame *))); dataHandler()->Debug(); //kdDebug(12010) << "Property 7 policy=" << dataHandler()->find(7)->policy() << endl; @@ -93,14 +93,14 @@ Kwin4Doc::Kwin4Doc(TQWidget *parent, const char *) : KGame(1234,parent), pView(0 setGameStatus(Intro); // Listen to network - connect(this,TQT_SIGNAL(signalMessageUpdate(int,TQ_UINT32,TQ_UINT32)), - this,TQT_SLOT(slotMessageUpdate(int, TQ_UINT32,TQ_UINT32))); - connect(this,TQT_SIGNAL(signalClientJoinedGame(TQ_UINT32,KGame *)), - this,TQT_SLOT(slotClientConnected(TQ_UINT32, KGame *))); + connect(this,TQ_SIGNAL(signalMessageUpdate(int,TQ_UINT32,TQ_UINT32)), + this,TQ_SLOT(slotMessageUpdate(int, TQ_UINT32,TQ_UINT32))); + connect(this,TQ_SIGNAL(signalClientJoinedGame(TQ_UINT32,KGame *)), + this,TQ_SLOT(slotClientConnected(TQ_UINT32, KGame *))); // Debug only - connect(this,TQT_SIGNAL(signalGameOver(int, KPlayer *,KGame *)), - this,TQT_SLOT(slotGameOver(int, KPlayer *,KGame *))); + connect(this,TQ_SIGNAL(signalGameOver(int, KPlayer *,KGame *)), + this,TQ_SLOT(slotGameOver(int, KPlayer *,KGame *))); // Change global KGame policy //dataHandler()->setPolicy(KGamePropertyBase::PolicyDirty,false); @@ -813,8 +813,8 @@ KPlayer *Kwin4Doc::createPlayer(int /*rtti*/,int io,bool isvirtual) if (!isvirtual) createIO(player,(KGameIO::IOMode)io); - connect(player,TQT_SIGNAL(signalPropertyChanged(KGamePropertyBase *, KPlayer *)), - this,TQT_SLOT(slotPlayerPropertyChanged(KGamePropertyBase *, KPlayer *))); + connect(player,TQ_SIGNAL(signalPropertyChanged(KGamePropertyBase *, KPlayer *)), + this,TQ_SLOT(slotPlayerPropertyChanged(KGamePropertyBase *, KPlayer *))); ((Kwin4Player *)player)->setWidget(pView->statusWidget()); return player; } @@ -828,7 +828,7 @@ bool Kwin4Doc::playerInput(TQDataStream &msg, KPlayer * /*player*/) int move, pl; msg >> pl >> move; if (!Move(move,pl)) - TQTimer::singleShot(0, this,TQT_SLOT(slotRepeatMove())); + TQTimer::singleShot(0, this,TQ_SLOT(slotRepeatMove())); return false; } @@ -907,8 +907,8 @@ void Kwin4Doc::createIO(KPlayer *player,KGameIO::IOMode io) input=new KGameMouseIO(pView); if (global_debug>1) kdDebug(12010) << "MOUSE IO added " << endl; // Connect mouse input to a function to process the actual input - connect(input,TQT_SIGNAL(signalMouseEvent(KGameIO *,TQDataStream &,TQMouseEvent *,bool *)), - pView,TQT_SLOT(slotMouseInput(KGameIO *,TQDataStream &,TQMouseEvent *,bool *))); + connect(input,TQ_SIGNAL(signalMouseEvent(KGameIO *,TQDataStream &,TQMouseEvent *,bool *)), + pView,TQ_SLOT(slotMouseInput(KGameIO *,TQDataStream &,TQMouseEvent *,bool *))); player->addGameIO(input); } else if (io&KGameIO::ProcessIO) @@ -920,11 +920,11 @@ void Kwin4Doc::createIO(KPlayer *player,KGameIO::IOMode io) // We want a computer player input=new KGameProcessIO(file); // Connect computer player to the setTurn - connect(input,TQT_SIGNAL(signalPrepareTurn(TQDataStream &,bool,KGameIO *,bool *)), - this,TQT_SLOT(slotPrepareTurn(TQDataStream &,bool,KGameIO *,bool *))); + connect(input,TQ_SIGNAL(signalPrepareTurn(TQDataStream &,bool,KGameIO *,bool *)), + this,TQ_SLOT(slotPrepareTurn(TQDataStream &,bool,KGameIO *,bool *))); - connect(input,TQT_SIGNAL(signalProcessQuery(TQDataStream &,KGameProcessIO *)), - this,TQT_SLOT(slotProcessQuery(TQDataStream &,KGameProcessIO *))); + connect(input,TQ_SIGNAL(signalProcessQuery(TQDataStream &,KGameProcessIO *)), + this,TQ_SLOT(slotProcessQuery(TQDataStream &,KGameProcessIO *))); player->addGameIO(input); } else if (io&KGameIO::KeyIO) @@ -934,8 +934,8 @@ void Kwin4Doc::createIO(KPlayer *player,KGameIO::IOMode io) KGameKeyIO *input; input=new KGameKeyIO(pView->parentWidget()); // Connect keys input to a function to process the actual input - connect((KGameKeyIO *)input,TQT_SIGNAL(signalKeyEvent(KGameIO *,TQDataStream &,TQKeyEvent *,bool *)), - pView,TQT_SLOT(slotKeyInput(KGameIO *,TQDataStream &,TQKeyEvent *,bool *))); + connect((KGameKeyIO *)input,TQ_SIGNAL(signalKeyEvent(KGameIO *,TQDataStream &,TQKeyEvent *,bool *)), + pView,TQ_SLOT(slotKeyInput(KGameIO *,TQDataStream &,TQKeyEvent *,bool *))); player->addGameIO(input); } } @@ -1104,8 +1104,8 @@ void Kwin4Doc::calcHint() // We want a computer player mHintProcess=new KGameProcessIO(file); - connect(mHintProcess,TQT_SIGNAL(signalProcessQuery(TQDataStream &,KGameProcessIO *)), - this,TQT_SLOT(slotProcessHint(TQDataStream &,KGameProcessIO *))); + connect(mHintProcess,TQ_SIGNAL(signalProcessQuery(TQDataStream &,KGameProcessIO *)), + this,TQ_SLOT(slotProcessHint(TQDataStream &,KGameProcessIO *))); } TQ_INT32 pl; TQByteArray buffer; diff --git a/twin4/twin4/twin4player.cpp b/twin4/twin4/twin4player.cpp index 5992c400..30b8ce26 100644 --- a/twin4/twin4/twin4player.cpp +++ b/twin4/twin4/twin4player.cpp @@ -39,8 +39,8 @@ Kwin4Player::Kwin4Player() : KPlayer(), sWidget(0) dataHandler()->setPolicy(KGamePropertyBase::PolicyDirty,false); resetStats(); - connect(this,TQT_SIGNAL(signalPropertyChanged(KGamePropertyBase *,KPlayer *)), - this,TQT_SLOT(slotPlayerPropertyChanged(KGamePropertyBase *,KPlayer *))); + connect(this,TQ_SIGNAL(signalPropertyChanged(KGamePropertyBase *,KPlayer *)), + this,TQ_SLOT(slotPlayerPropertyChanged(KGamePropertyBase *,KPlayer *))); } #include <tqlabel.h> diff --git a/twin4/twin4/twin4proc.cpp b/twin4/twin4/twin4proc.cpp index b47dbe48..a17b4ad7 100644 --- a/twin4/twin4/twin4proc.cpp +++ b/twin4/twin4/twin4proc.cpp @@ -51,12 +51,12 @@ TDEComputer::TDEComputer() : TQObject(0,0) for (i=0;i<strlen(s2);i++) startofrow[i]=s2[i]-'0'; - connect(&proc,TQT_SIGNAL(signalCommand(TQDataStream &,int ,int ,int )), - this,TQT_SLOT(slotCommand(TQDataStream & ,int ,int ,int ))); - connect(&proc,TQT_SIGNAL(signalInit(TQDataStream &,int)), - this,TQT_SLOT(slotInit(TQDataStream & ,int ))); - connect(&proc,TQT_SIGNAL(signalTurn(TQDataStream &,bool )), - this,TQT_SLOT(slotTurn(TQDataStream & ,bool ))); + connect(&proc,TQ_SIGNAL(signalCommand(TQDataStream &,int ,int ,int )), + this,TQ_SLOT(slotCommand(TQDataStream & ,int ,int ,int ))); + connect(&proc,TQ_SIGNAL(signalInit(TQDataStream &,int)), + this,TQ_SLOT(slotInit(TQDataStream & ,int ))); + connect(&proc,TQ_SIGNAL(signalTurn(TQDataStream &,bool )), + this,TQ_SLOT(slotTurn(TQDataStream & ,bool ))); fprintf(stderr, "----------------->\nTDEComputer::Computer\n"); } diff --git a/twin4/twin4/twin4view.cpp b/twin4/twin4/twin4view.cpp index d1996db9..5a559fe4 100644 --- a/twin4/twin4/twin4view.cpp +++ b/twin4/twin4/twin4view.cpp @@ -371,8 +371,8 @@ void Kwin4View::drawIntro(bool /*remove*/) if (sprite) { KIntroMove *move=new KIntroMove; - connect(sprite->createNotify(),TQT_SIGNAL(signalNotify(TQCanvasItem *,int)), - this,TQT_SLOT(introMoveDone(TQCanvasItem *,int))); + connect(sprite->createNotify(),TQ_SIGNAL(signalNotify(TQCanvasItem *,int)), + this,TQ_SLOT(introMoveDone(TQCanvasItem *,int))); sprite->setMoveObject(move); if (no%2==0) { @@ -531,8 +531,8 @@ void Kwin4View::setPiece(int x,int y,int color,int no,bool animation) mBoardY-sprite->height()-mSpreadY); sprite->moveTo(sprite->x(), sprite->y()+y*(sprite->height()+mSpreadY)+mBoardY); - connect(sprite->createNotify(),TQT_SIGNAL(signalNotify(TQCanvasItem *,int)), - doc,TQT_SLOT(moveDone(TQCanvasItem *,int))); + connect(sprite->createNotify(),TQ_SIGNAL(signalNotify(TQCanvasItem *,int)), + doc,TQ_SLOT(moveDone(TQCanvasItem *,int))); } else { @@ -541,8 +541,8 @@ void Kwin4View::setPiece(int x,int y,int color,int no,bool animation) y*(sprite->height()+mSpreadY)+mBoardY); // Prevent moving (== speed =0) sprite->moveTo(sprite->x(),sprite->y()); - connect(sprite->createNotify(),TQT_SIGNAL(signalNotify(TQCanvasItem *,int)), - doc,TQT_SLOT(moveDone(TQCanvasItem *,int))); + connect(sprite->createNotify(),TQ_SIGNAL(signalNotify(TQCanvasItem *,int)), + doc,TQ_SLOT(moveDone(TQCanvasItem *,int))); sprite->emitNotify(3); } |