From 97d1732e257f8700488d7ca1660ae7eba8fc6065 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:47:36 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- ktron/ai.ui | 4 ++-- ktron/appearance.ui | 8 ++++---- ktron/general.ui | 8 ++++---- ktron/ktron.cpp | 14 +++++++------- ktron/ktron.h | 2 +- ktron/tron.cpp | 12 ++++++------ 6 files changed, 24 insertions(+), 24 deletions(-) (limited to 'ktron') diff --git a/ktron/ai.ui b/ktron/ai.ui index dc84bc32..7fcf5df8 100644 --- a/ktron/ai.ui +++ b/ktron/ai.ui @@ -78,7 +78,7 @@ Expanding - + 101 20 @@ -126,7 +126,7 @@ Expanding - + 20 60 diff --git a/ktron/appearance.ui b/ktron/appearance.ui index d6176a69..0c817317 100644 --- a/ktron/appearance.ui +++ b/ktron/appearance.ui @@ -90,7 +90,7 @@ Large - + AlignVCenter|AlignRight @@ -101,7 +101,7 @@ Small - + AlignVCenter|AlignLeft @@ -112,7 +112,7 @@ Medium - + AlignCenter @@ -261,7 +261,7 @@ Expanding - + 20 16 diff --git a/ktron/general.ui b/ktron/general.ui index 0971ec1a..c2f1cf4b 100644 --- a/ktron/general.ui +++ b/ktron/general.ui @@ -154,7 +154,7 @@ - tqlayout1 + layout1 @@ -175,7 +175,7 @@ Default - + AlignCenter @@ -186,7 +186,7 @@ Fast - + AlignVCenter|AlignRight @@ -204,7 +204,7 @@ Expanding - + 20 21 diff --git a/ktron/ktron.cpp b/ktron/ktron.cpp index 9057f7c0..31437999 100644 --- a/ktron/ktron.cpp +++ b/ktron/ktron.cpp @@ -46,7 +46,7 @@ KTron::KTron(TQWidget *parent, const char *name) : KMainWindow(parent, name) { playerPoints[0]=playerPoints[1]=0; tron=new Tron(this, "Tron"); - connect(tron,TQT_SIGNAL(gameEnds(Player)),TQT_SLOT(changetqStatus(Player))); + connect(tron,TQT_SIGNAL(gameEnds(Player)),TQT_SLOT(changeStatus(Player))); setCentralWidget(tron); tron->setMinimumSize(200,180); @@ -108,17 +108,17 @@ void KTron::updateStatusbar(){ TQString name; if(tron->isComputer(Both)) - name=i18n("Computer(%1)").tqarg(i+1); + name=i18n("Computer(%1)").arg(i+1); else if(tron->isComputer(player)) name=i18n("Computer"); else name=playerName[i]; - TQString string = TQString("%1: %2").tqarg(name).tqarg(playerPoints[i]); + TQString string = TQString("%1: %2").arg(name).arg(playerPoints[i]); statusBar()->changeItem(string,ID_STATUS_BASE+i+1); } } -void KTron::changetqStatus(Player player) { +void KTron::changeStatus(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!").tqarg(winnerName); + TQString message=i18n("%1 has won!").arg(winnerName); statusBar()->message(message,MESSAGE_TIME); message = i18n("%1 has won versus %2 with %3 : %4 points!"); - message=message.tqarg(winnerName).tqarg(loserName); - message=message.tqarg(playerPoints[winner]).tqarg(playerPoints[loser]); + message=message.arg(winnerName).arg(loserName); + message=message.arg(playerPoints[winner]).arg(playerPoints[loser]); KMessageBox::information(this, message, i18n("Winner")); tron->newGame(); diff --git a/ktron/ktron.h b/ktron/ktron.h index a46c008c..6008009d 100644 --- a/ktron/ktron.h +++ b/ktron/ktron.h @@ -58,7 +58,7 @@ protected: private slots: void loadSettings(); /** updates players points in statusbar and checks if someone has won */ - void changetqStatus(Player); + void changeStatus(Player); void showWinner(Player winner); void showSettings(); diff --git a/ktron/tron.cpp b/ktron/tron.cpp index 9ed00d8c..40a384e4 100644 --- a/ktron/tron.cpp +++ b/ktron/tron.cpp @@ -81,7 +81,7 @@ void Tron::loadSettings(){ // Style if(pixmap){ updatePixmap(); - tqrepaint(); + repaint(); } // Backgroundimage @@ -96,7 +96,7 @@ void Tron::loadSettings(){ setBackgroundPix(pix); } else { TQString msg=i18n("Wasn't able to load wallpaper\n%1"); - msg=msg.tqarg(tmpFile); + msg=msg.arg(tmpFile); KMessageBox::sorry(this, msg); } KIO::NetAccess::removeTempFile(tmpFile); @@ -268,7 +268,7 @@ void Tron::showWinner(Player player) updatePixmap(); } - tqrepaint(); + repaint(); emit gameEnds(player); @@ -313,8 +313,8 @@ void Tron::updatePixmap() } // draw frame - TQColor light=parentWidget()->tqcolorGroup().midlight(); - TQColor dark=parentWidget()->tqcolorGroup().mid(); + TQColor light=parentWidget()->colorGroup().midlight(); + TQColor dark=parentWidget()->colorGroup().mid(); p.setPen(NoPen); p.setBrush(light); @@ -810,7 +810,7 @@ void Tron::showBeginHint() if(players[0].score==0 && players[1].score==0) { beginHint=true; - tqrepaint(); + repaint(); } } } -- cgit v1.2.1