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 --- kjumpingcube/kcubeboxwidget.cpp | 16 ++++++++-------- kjumpingcube/kcubeboxwidget.h | 4 ++-- kjumpingcube/kcubewidget.cpp | 2 +- kjumpingcube/kjumpingcube.cpp | 18 +++++++++--------- kjumpingcube/settings.ui | 8 ++++---- 5 files changed, 24 insertions(+), 24 deletions(-) (limited to 'kjumpingcube') diff --git a/kjumpingcube/kcubeboxwidget.cpp b/kjumpingcube/kcubeboxwidget.cpp index 815acb6d..e68b2277 100644 --- a/kjumpingcube/kcubeboxwidget.cpp +++ b/kjumpingcube/kcubeboxwidget.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include @@ -453,13 +453,13 @@ void KCubeBoxWidget::initCubes() int i,j; // create Layout - tqlayout=new TQGridLayout(this,s,s); + layout=new TQGridLayout(this,s,s); for(i=0;isetRowStretch(i,1); - tqlayout->setColStretch(i,1); + layout->setRowStretch(i,1); + layout->setColStretch(i,1); } @@ -474,7 +474,7 @@ void KCubeBoxWidget::initCubes() { cubes[i][j]=new KCubeWidget(this); cubes[i][j]->setCoordinates(i,j); - tqlayout->addWidget(cubes[i][j],i,j); + layout->addWidget(cubes[i][j],i,j); cubes[i][j]->show(); connect(cubes[i][j],TQT_SIGNAL(clicked(int,int,bool)),TQT_SLOT(stopHint())); connect(cubes[i][j],TQT_SIGNAL(clicked(int,int,bool)),TQT_SLOT(checkClick(int,int,bool))); @@ -504,15 +504,15 @@ void KCubeBoxWidget::initCubes() } -TQSize KCubeBoxWidget::tqsizeHint() const +TQSize KCubeBoxWidget::sizeHint() const { return TQSize(400,400); } void KCubeBoxWidget::deleteCubes() { - if(tqlayout) - delete tqlayout; + if(layout) + delete layout; CubeBoxBase::deleteCubes(); } diff --git a/kjumpingcube/kcubeboxwidget.h b/kjumpingcube/kcubeboxwidget.h index d1cc160c..5e21fa57 100644 --- a/kjumpingcube/kcubeboxwidget.h +++ b/kjumpingcube/kcubeboxwidget.h @@ -131,7 +131,7 @@ signals: void stoppedThinking(); protected: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual void deleteCubes(); virtual void initCubes(); @@ -147,7 +147,7 @@ protected slots: private: void init(); - TQGridLayout *tqlayout; + TQGridLayout *layout; CubeBox *undoBox; Brain brain; diff --git a/kjumpingcube/kcubewidget.cpp b/kjumpingcube/kcubewidget.cpp index 9757da99..f3db2828 100644 --- a/kjumpingcube/kcubewidget.cpp +++ b/kjumpingcube/kcubewidget.cpp @@ -93,7 +93,7 @@ KCubeWidget::KCubeWidget(TQWidget* parent,const char* name setPalette(kapp->palette()); // show values - tqrepaint(false); + repaint(false); } KCubeWidget::~KCubeWidget() diff --git a/kjumpingcube/kjumpingcube.cpp b/kjumpingcube/kjumpingcube.cpp index a35dcf19..32b19673 100644 --- a/kjumpingcube/kjumpingcube.cpp +++ b/kjumpingcube/kjumpingcube.cpp @@ -64,7 +64,7 @@ KJumpingCube::KJumpingCube() statusBar()->insertItem(s,ID_STATUS_TURN_TEXT, false); statusBar()->changeItem(s,ID_STATUS_TURN_TEXT); statusBar()->setItemAlignment (ID_STATUS_TURN_TEXT, AlignLeft | AlignVCenter); - statusBar()->setFixedHeight( statusBar()->tqsizeHint().height() ); + statusBar()->setFixedHeight( statusBar()->sizeHint().height() ); currentPlayer = new TQWidget(this, "currentPlayer"); currentPlayer->setFixedWidth(40); @@ -123,7 +123,7 @@ void KJumpingCube::saveGame(bool saveAs) if(KIO::NetAccess::exists(url,false,this)) { TQString mes=i18n("The file %1 exists.\n" - "Do you want to overwrite it?").tqarg(url.url()); + "Do you want to overwrite it?").arg(url.url()); result = KMessageBox::warningContinueCancel(this, mes, TQString(), i18n("Overwrite")); if(result==KMessageBox::Cancel) return; @@ -147,12 +147,12 @@ void KJumpingCube::saveGame(bool saveAs) if(KIO::NetAccess::upload( tempFile.name(),gameURL,this )) { TQString s=i18n("game saved as %1"); - s=s.tqarg(gameURL.url()); + s=s.arg(gameURL.url()); statusBar()->message(s,MESSAGE_TIME); } else { - KMessageBox::sorry(this,i18n("There was an error in saving file\n%1").tqarg(gameURL.url())); + KMessageBox::sorry(this,i18n("There was an error in saving file\n%1").arg(gameURL.url())); } } @@ -168,7 +168,7 @@ void KJumpingCube::openGame() return; if(!KIO::NetAccess::exists(url,true,this)) { - TQString mes=i18n("The file %1 does not exist!").tqarg(url.url()); + TQString mes=i18n("The file %1 does not exist!").arg(url.url()); KMessageBox::sorry(this,mes); fileOk=false; } @@ -183,7 +183,7 @@ void KJumpingCube::openGame() if(!config.hasKey("Version")) { TQString mes=i18n("The file %1 isn't a KJumpingCube gamefile!") - .tqarg(url.url()); + .arg(url.url()); KMessageBox::sorry(this,mes); return; } @@ -197,7 +197,7 @@ void KJumpingCube::openGame() KIO::NetAccess::removeTempFile( tempFile ); } else - KMessageBox::sorry(this,i18n("There was an error loading file\n%1").tqarg( url.url() )); + KMessageBox::sorry(this,i18n("There was an error loading file\n%1").arg( url.url() )); } void KJumpingCube::stop() @@ -223,11 +223,11 @@ void KJumpingCube::changePlayer(int newPlayer) { undoAction->setEnabled(true); currentPlayer->setBackgroundColor(newPlayer == 1 ? Prefs::color1() : Prefs::color2()); - currentPlayer->tqrepaint(); + currentPlayer->repaint(); } void KJumpingCube::showWinner(int player) { - TQString s=i18n("Winner is Player %1!").tqarg(player); + TQString s=i18n("Winner is Player %1!").arg(player); KMessageBox::information(this,s,i18n("Winner")); view->reset(); } diff --git a/kjumpingcube/settings.ui b/kjumpingcube/settings.ui index 30b4010a..b0d16132 100644 --- a/kjumpingcube/settings.ui +++ b/kjumpingcube/settings.ui @@ -94,7 +94,7 @@ 10x10 - + AlignVCenter|AlignRight @@ -110,7 +110,7 @@ Expanding - + 20 16 @@ -180,7 +180,7 @@ Average - + AlignCenter @@ -199,7 +199,7 @@ Expert - + AlignVCenter|AlignRight -- cgit v1.2.3