From 838baf3f99ec5ab81b063eb5449a3381d860f377 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 04:58:26 +0000 Subject: TQt4 port kdegames This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegames@1236074 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ktron/ai.ui | 22 +++++++++++----------- ktron/appearance.ui | 40 ++++++++++++++++++++-------------------- ktron/general.ui | 46 +++++++++++++++++++++++----------------------- ktron/ktron.cpp | 24 ++++++++++++------------ ktron/ktron.h | 5 +++-- ktron/tron.cpp | 24 ++++++++++++------------ ktron/tron.h | 5 +++-- 7 files changed, 84 insertions(+), 82 deletions(-) (limited to 'ktron') diff --git a/ktron/ai.ui b/ktron/ai.ui index 3abcef57..63284c9a 100644 --- a/ktron/ai.ui +++ b/ktron/ai.ui @@ -1,10 +1,10 @@ Ai - + Ai - + 0 0 @@ -22,7 +22,7 @@ 0 - + frame9 @@ -39,7 +39,7 @@ unnamed - + groupBox3 @@ -50,7 +50,7 @@ unnamed - + kcfg_Computerplayer1 @@ -58,7 +58,7 @@ Player &1 - + kcfg_Computerplayer2 @@ -78,14 +78,14 @@ Expanding - + 101 20 - + textLabel15 @@ -93,7 +93,7 @@ Intelligence: - + Beginner @@ -126,7 +126,7 @@ Expanding - + 20 60 @@ -137,5 +137,5 @@ - + diff --git a/ktron/appearance.ui b/ktron/appearance.ui index af50183f..9c2ef5a6 100644 --- a/ktron/appearance.ui +++ b/ktron/appearance.ui @@ -1,10 +1,10 @@ Appearance - + Appearance - + 0 0 @@ -22,7 +22,7 @@ 0 - + frame4 @@ -39,7 +39,7 @@ unnamed - + textLabel16 @@ -47,7 +47,7 @@ Line style: - + 3D Line @@ -72,7 +72,7 @@ kcfg_Style - + groupBox4 @@ -83,40 +83,40 @@ unnamed - + textLabel13 Large - + AlignVCenter|AlignRight - + textLabel11 Small - + AlignVCenter|AlignLeft - + textLabel12 Medium - + AlignCenter - + kcfg_RectSize @@ -147,7 +147,7 @@ - + kcfg_BackgroundImageChoice @@ -158,7 +158,7 @@ unnamed - + BackgroundColorChoice @@ -177,7 +177,7 @@ false - + BackgroundImageChoice @@ -205,7 +205,7 @@ - + textLabel7 @@ -228,7 +228,7 @@ - + textLabel8 @@ -261,7 +261,7 @@ Expanding - + 20 16 @@ -292,7 +292,7 @@ kcfg_Color_Player1 kcfg_Color_Player2 - + kurlrequester.h klineedit.h diff --git a/ktron/general.ui b/ktron/general.ui index ca492b9e..22827e7b 100644 --- a/ktron/general.ui +++ b/ktron/general.ui @@ -1,10 +1,10 @@ General - + General - + 0 0 @@ -22,7 +22,7 @@ 0 - + frame4 @@ -39,7 +39,7 @@ unnamed - + groupBox1 @@ -50,7 +50,7 @@ unnamed - + kcfg_ChangeWinnerColor @@ -58,7 +58,7 @@ &Show winner by changing color - + kcfg_AcceleratorBlocked @@ -66,7 +66,7 @@ &Disable acceleration - + kcfg_OppositeDirCrashes @@ -76,7 +76,7 @@ - + groupBox2 @@ -87,17 +87,17 @@ unnamed - + kcfg_NamePlayer1 - + kcfg_NamePlayer2 - + textLabel1 @@ -105,7 +105,7 @@ Player 1: - + textLabel2 @@ -115,7 +115,7 @@ - + groupBox3 @@ -126,7 +126,7 @@ unnamed - + kcfg_Velocity @@ -152,15 +152,15 @@ 1 - + - layout1 + tqlayout1 unnamed - + textLabel4 @@ -168,25 +168,25 @@ Slow - + textLabel5 Default - + AlignCenter - + textLabel6 Fast - + AlignVCenter|AlignRight @@ -204,7 +204,7 @@ Expanding - + 20 21 @@ -215,5 +215,5 @@ - + diff --git a/ktron/ktron.cpp b/ktron/ktron.cpp index c9a5ea77..16628fd9 100644 --- a/ktron/ktron.cpp +++ b/ktron/ktron.cpp @@ -42,11 +42,11 @@ /** * Constuctor */ -KTron::KTron(TQWidget *parent, const char *name) : KMainWindow(parent, name) { +KTron::KTron(TQWidget *tqparent, const char *name) : KMainWindow(tqparent, name) { playerPoints[0]=playerPoints[1]=0; tron=new Tron(this, "Tron"); - connect(tron,TQT_SIGNAL(gameEnds(Player)),TQT_SLOT(changeStatus(Player))); + connect(tron,TQT_SIGNAL(gameEnds(Player)),TQT_SLOT(changetqStatus(Player))); setCentralWidget(tron); tron->setMinimumSize(200,180); @@ -81,10 +81,10 @@ KTron::KTron(TQWidget *parent, const char *name) : KMainWindow(parent, name) { tron->setActionCollection(actionCollection()); - KStdGameAction::pause(tron, TQT_SLOT(togglePause()), actionCollection()); - KStdGameAction::gameNew( tron, TQT_SLOT( newGame() ), actionCollection() ); - KStdGameAction::quit(this, TQT_SLOT( close() ), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(showSettings()), actionCollection()); + KStdGameAction::pause(TQT_TQOBJECT(tron), TQT_SLOT(togglePause()), actionCollection()); + KStdGameAction::gameNew( TQT_TQOBJECT(tron), TQT_SLOT( newGame() ), actionCollection() ); + KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection()); + KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection()); setupGUI( KMainWindow::Keys | StatusBar | Save | Create); loadSettings(); @@ -108,17 +108,17 @@ void KTron::updateStatusbar(){ TQString name; if(tron->isComputer(Both)) - name=i18n("Computer(%1)").arg(i+1); + name=i18n("Computer(%1)").tqarg(i+1); else if(tron->isComputer(player)) name=i18n("Computer"); else name=playerName[i]; - TQString string = TQString("%1: %2").arg(name).arg(playerPoints[i]); + TQString string = TQString("%1: %2").tqarg(name).tqarg(playerPoints[i]); statusBar()->changeItem(string,ID_STATUS_BASE+i+1); } } -void KTron::changeStatus(Player player) { +void KTron::changetqStatus(Player player) { // if player=Nobody, then new game if(player==Nobody){ playerPoints[0]=playerPoints[1]=0; @@ -158,12 +158,12 @@ void KTron::showWinner(Player winner){ if(!tron->isComputer(winner)) winnerName = playerName[winner]; - TQString message=i18n("%1 has won!").arg(winnerName); + TQString message=i18n("%1 has won!").tqarg(winnerName); statusBar()->message(message,MESSAGE_TIME); message = i18n("%1 has won versus %2 with %3 : %4 points!"); - message=message.arg(winnerName).arg(loserName); - message=message.arg(playerPoints[winner]).arg(playerPoints[loser]); + message=message.tqarg(winnerName).tqarg(loserName); + message=message.tqarg(playerPoints[winner]).tqarg(playerPoints[loser]); KMessageBox::information(this, message, i18n("Winner")); tron->newGame(); diff --git a/ktron/ktron.h b/ktron/ktron.h index c61bf42b..e4b9b218 100644 --- a/ktron/ktron.h +++ b/ktron/ktron.h @@ -39,9 +39,10 @@ class Tron; class KTron : public KMainWindow { Q_OBJECT + TQ_OBJECT public: - KTron(TQWidget *parent=0, const char *name=0); + KTron(TQWidget *tqparent=0, const char *name=0); private: KAccel *accel; @@ -57,7 +58,7 @@ protected: private slots: void loadSettings(); /** updates players points in statusbar and checks if someone has won */ - void changeStatus(Player); + void changetqStatus(Player); void showWinner(Player winner); void showSettings(); diff --git a/ktron/tron.cpp b/ktron/tron.cpp index 1c7bf72c..92a5d296 100644 --- a/ktron/tron.cpp +++ b/ktron/tron.cpp @@ -41,8 +41,8 @@ * init-functions **/ -Tron::Tron(TQWidget *parent,const char *name) - : TQWidget(parent,name) +Tron::Tron(TQWidget *tqparent,const char *name) + : TQWidget(tqparent,name) { pixmap=0; playfield=0; @@ -51,7 +51,7 @@ Tron::Tron(TQWidget *parent,const char *name) random.setSeed(0); - setFocusPolicy(TQWidget::StrongFocus); + setFocusPolicy(TQ_StrongFocus); setBackgroundMode(NoBackground); gameBlocked=false; @@ -81,7 +81,7 @@ void Tron::loadSettings(){ // Style if(pixmap){ updatePixmap(); - repaint(); + tqrepaint(); } // Backgroundimage @@ -96,7 +96,7 @@ void Tron::loadSettings(){ setBackgroundPix(pix); } else { TQString msg=i18n("Wasn't able to load wallpaper\n%1"); - msg=msg.arg(tmpFile); + msg=msg.tqarg(tmpFile); KMessageBox::sorry(this, msg); } KIO::NetAccess::removeTempFile(tmpFile); @@ -268,7 +268,7 @@ void Tron::showWinner(Player player) updatePixmap(); } - repaint(); + tqrepaint(); emit gameEnds(player); @@ -302,7 +302,7 @@ void Tron::updatePixmap() TQPainter p; p.begin(pixmap); - // alle Pixel prüfen und evt. zeichnen + // alle Pixel pr�fen und evt. zeichnen for(i=0;icolorGroup().midlight(); - TQColor dark=parentWidget()->colorGroup().mid(); + TQColor light=tqparentWidget()->tqcolorGroup().midlight(); + TQColor dark=tqparentWidget()->tqcolorGroup().mid(); p.setPen(NoPen); p.setBrush(light); @@ -810,18 +810,18 @@ void Tron::showBeginHint() if(players[0].score==0 && players[1].score==0) { beginHint=true; - repaint(); + tqrepaint(); } } } -// doMove() is called from QTimer +// doMove() is called from TQTimer void Tron::doMove() { int i; for(i=0;i<2;i++) { - // Überprüfen, ob Acceleratortaste gedrückt wurde... + // �berpr�fen, ob Acceleratortaste gedr�ckt wurde... if(players[i].accelerated) { updateDirections(i); diff --git a/ktron/tron.h b/ktron/tron.h index 188604d8..16e8722b 100644 --- a/ktron/tron.h +++ b/ktron/tron.h @@ -43,12 +43,13 @@ enum {BACKGROUND=0, PLAYER1=1,PLAYER2=2,TOP=4,BOTTOM=8,LEFT=16,RIGHT=32}; /** * @short The playingfield */ -class Tron : public QWidget +class Tron : public TQWidget { Q_OBJECT + TQ_OBJECT public: - Tron(TQWidget *parent=0, const char *name=0); + Tron(TQWidget *tqparent=0, const char *name=0); ~Tron(); void setActionCollection(KActionCollection*); void updatePixmap(); -- cgit v1.2.1