From 36770452958a79a095f9d9e605e79f66cfa79a2b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:20:47 -0600 Subject: Rename obsolete tq methods to standard names --- atlantik/client/configdlg.cpp | 34 ++++----- kasteroids/toplevel.cpp | 2 +- kbackgammon/engines/fibs/kplayerlist.cpp | 2 +- kenolaba/AbTop.cpp | 4 +- kjumpingcube/kcubeboxwidget.cpp | 12 ++-- kjumpingcube/kcubeboxwidget.h | 2 +- klines/povray/povray.ini | 2 +- kmahjongg/BoardLayout.h | 2 +- kmahjongg/Editor.cpp | 16 ++--- kmahjongg/HighScore.cpp | 4 +- kmahjongg/HighScore.h | 2 +- kmahjongg/Preview.cpp | 46 ++++++------ kmahjongg/Preview.h | 2 +- kmahjongg/boardwidget.cpp | 12 ++-- kmahjongg/kmahjongg.cpp | 2 +- kmahjongg/pics/cross.layout | 2 +- kmahjongg/pics/default.layout | 2 +- kmahjongg/pics/default.theme | 2 +- kmahjongg/pics/pirates.layout | 2 +- kmahjongg/pics/pirates.theme | 2 +- kmahjongg/pics/pyramid.layout | 2 +- kmahjongg/pics/stax.layout | 2 +- kmahjongg/pics/test.layout | 2 +- kmahjongg/pics/test2.layout | 2 +- kmahjongg/pics/tower.layout | 2 +- kmahjongg/pics/triangle.layout | 2 +- kmines/frame.cpp | 8 +-- kmines/status.cpp | 2 +- kolf/config.cpp | 4 +- kolf/editor.cpp | 14 ++-- kolf/editor.h | 2 +- kolf/floater.cpp | 12 ++-- kolf/game.cpp | 96 ++++++++++++------------- kolf/game.h | 4 +- kolf/kolf.cpp | 10 +-- kolf/kolf.h | 2 +- kolf/newgame.cpp | 28 ++++---- kolf/newgame.h | 2 +- kolf/objects/poolball/poolball.cpp | 10 +-- kolf/objects/test/test.cpp | 16 ++--- kolf/printdialogpage.cpp | 4 +- kolf/slope.cpp | 16 ++--- konquest/fleetdlg.cc | 14 ++-- konquest/gameboard.cc | 42 +++++------ konquest/newGameDlg_ui.ui | 14 ++-- konquest/planet_info.cc | 16 ++--- konquest/scoredlg.cc | 14 ++-- kpat/gamestats.ui | 6 +- kpoker/defines.h | 2 +- kpoker/kpaint.cpp | 2 +- kpoker/kpoker.h | 2 +- kreversi/qreversigameview.cpp | 12 ++-- kshisen/app.cpp | 6 +- ksnake/startroom.cpp | 10 +-- kspaceduel/dialogs.cpp | 8 +-- kspaceduel/topwidget.cpp | 10 +-- ktron/general.ui | 2 +- ktuberling/pics/layout.i18n | 2 +- ktuberling/pics/layout.xml | 2 +- ktuberling/toplevel.cpp | 4 +- libksirtet/lib/meeting.cpp | 2 +- libksirtet/lib/mp_option.h | 2 +- libksirtet/lib/pline.cpp | 4 +- libtdegames/highscore/kexthighscore_tab.cpp | 4 +- libtdegames/highscore/kscoredialog.cpp | 32 ++++----- libtdegames/kcarddialog.cpp | 18 ++--- libtdegames/kchatdialog.cpp | 22 +++--- libtdegames/kgame/COMPAT | 2 +- libtdegames/kgame/dialogs/kgamedebugdialog.cpp | 28 ++++---- libtdegames/kgame/dialogs/kgamedialogconfig.cpp | 2 +- libtdegames/kgame/dialogs/kgamedialogconfig.h | 2 +- libtdegames/kgamelcd.cpp | 4 +- libtdegames/kgamelcd.h | 2 +- libtdegames/kgameprogress.cpp | 2 +- lskat/lskat/KEMessage.cpp | 2 +- lskat/lskat/namedlg.cpp | 6 +- lskat/lskat/networkdlgbase.ui | 4 +- lskat/lskatproc/KEMessage.cpp | 2 +- twin4/twin4/statistics.ui | 2 +- twin4/twin4/twin4.cpp | 2 +- 80 files changed, 354 insertions(+), 354 deletions(-) diff --git a/atlantik/client/configdlg.cpp b/atlantik/client/configdlg.cpp index 793ff254..947e2455 100644 --- a/atlantik/client/configdlg.cpp +++ b/atlantik/client/configdlg.cpp @@ -114,23 +114,23 @@ AtlantikConfig ConfigDialog::config() ConfigPlayer::ConfigPlayer(ConfigDialog* configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name) { m_configDialog = configDialog; - TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint()); TQLabel *label = new TQLabel(i18n("Player name:"), parent); - tqlayout->addWidget(label); + layout->addWidget(label); m_playerName = new TQLineEdit(parent); - tqlayout->addWidget(m_playerName); + layout->addWidget(m_playerName); TQLabel *label2 = new TQLabel(i18n("Player image:"), parent); - tqlayout->addWidget(label2); + layout->addWidget(label2); m_playerIcon = new KPushButton(parent, "playerIcon"); - tqlayout->addWidget(m_playerIcon); + layout->addWidget(m_playerIcon); connect( m_playerIcon, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseImage()) ); - tqlayout->addStretch(1); + layout->addStretch(1); reset(); } @@ -185,10 +185,10 @@ void ConfigPlayer::reset() ConfigMonopigator::ConfigMonopigator(ConfigDialog *configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name) { m_configDialog = configDialog; - TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint()); m_connectOnStart = new TQCheckBox(i18n("Request list of Internet servers on start-up"), parent); - tqlayout->addWidget(m_connectOnStart); + layout->addWidget(m_connectOnStart); TQString message=i18n( "If checked, Atlantik connects to a meta server on start-up to\n" @@ -196,7 +196,7 @@ ConfigMonopigator::ConfigMonopigator(ConfigDialog *configDialog, TQWidget *paren TQWhatsThis::add(m_connectOnStart, message); m_hideDevelopmentServers = new TQCheckBox(i18n("Hide development servers"), parent); - tqlayout->addWidget(m_hideDevelopmentServers); + layout->addWidget(m_hideDevelopmentServers); message=i18n( "Some of the Internet servers might be running development\n" @@ -204,7 +204,7 @@ ConfigMonopigator::ConfigMonopigator(ConfigDialog *configDialog, TQWidget *paren "display these servers.\n"); TQWhatsThis::add(m_hideDevelopmentServers, message); - tqlayout->addStretch(1); + layout->addStretch(1); reset(); } @@ -228,17 +228,17 @@ void ConfigMonopigator::reset() ConfigGeneral::ConfigGeneral(ConfigDialog *configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name) { m_configDialog = configDialog; - TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint()); m_chatTimestamps = new TQCheckBox(i18n("Show timestamps in chat messages"), parent); - tqlayout->addWidget(m_chatTimestamps); + layout->addWidget(m_chatTimestamps); TQString message=i18n( "If checked, Atlantik will add timestamps in front of chat\n" "messages.\n"); TQWhatsThis::add(m_chatTimestamps, message); - tqlayout->addStretch(1); + layout->addStretch(1); reset(); } @@ -256,10 +256,10 @@ void ConfigGeneral::reset() ConfigBoard::ConfigBoard(ConfigDialog *configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name) { m_configDialog = configDialog; - TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint()); TQGroupBox *box = new TQGroupBox(1, Qt::Horizontal, i18n("Game Status Feedback"), parent); - tqlayout->addWidget(box); + layout->addWidget(box); m_indicateUnowned = new TQCheckBox(i18n("Display title deed card on unowned properties"), box); TQString message=i18n( @@ -292,9 +292,9 @@ ConfigBoard::ConfigBoard(ConfigDialog *configDialog, TQWidget *parent, const cha TQWhatsThis::add(m_quartzEffects, message); // box = new TQGroupBox(1, Qt::Horizontal, i18n("Size"), parent); -// tqlayout->addWidget(box); +// layout->addWidget(box); - tqlayout->addStretch(1); + layout->addStretch(1); reset(); } diff --git a/kasteroids/toplevel.cpp b/kasteroids/toplevel.cpp index 5cd48ed5..99bdbb8e 100644 --- a/kasteroids/toplevel.cpp +++ b/kasteroids/toplevel.cpp @@ -151,7 +151,7 @@ KAstTopLevel::KAstTopLevel() vb->addWidget( view, 10 ); -// -- bottom tqlayout: +// -- bottom layout: TQFrame *sep2 = new TQFrame( mainWin ); sep2->setMaximumHeight( 1 ); sep2->setFrameStyle( TQFrame::HLine | TQFrame::Raised ); diff --git a/kbackgammon/engines/fibs/kplayerlist.cpp b/kbackgammon/engines/fibs/kplayerlist.cpp index 8505d797..cc44aef3 100644 --- a/kbackgammon/engines/fibs/kplayerlist.cpp +++ b/kbackgammon/engines/fibs/kplayerlist.cpp @@ -469,7 +469,7 @@ void KFibsPlayerList::getSetupPages(KTabCtl *nb, int space) gl = new TQGridLayout(gbl, LVEnd, 2, 20); gl->addWidget(lb, 0, 0); - // two column tqlayout.... + // two column layout.... for (i = 1; i < LVEnd/2; i++) { gl->addWidget(d->mCol[2*i-1]->cb, i, 0); gl->addWidget(d->mCol[2*i ]->cb, i, 1); diff --git a/kenolaba/AbTop.cpp b/kenolaba/AbTop.cpp index 1a921b34..594d8db7 100644 --- a/kenolaba/AbTop.cpp +++ b/kenolaba/AbTop.cpp @@ -733,7 +733,7 @@ void AbTop::newGame() /* Copy ASCII representation into Clipboard */ void AbTop::copy() { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText( board->getASCIIState( moveNo ).ascii() ); } @@ -741,7 +741,7 @@ void AbTop::paste() { if (!pastePossible) return; - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); pastePosition( cb->text().ascii() ); /* don't do this in pastePosition: RECURSION !! */ diff --git a/kjumpingcube/kcubeboxwidget.cpp b/kjumpingcube/kcubeboxwidget.cpp index c30bdef5..bca13210 100644 --- a/kjumpingcube/kcubeboxwidget.cpp +++ b/kjumpingcube/kcubeboxwidget.cpp @@ -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))); @@ -511,8 +511,8 @@ TQSize KCubeBoxWidget::sizeHint() const void KCubeBoxWidget::deleteCubes() { - if(tqlayout) - delete tqlayout; + if(layout) + delete layout; CubeBoxBase::deleteCubes(); } diff --git a/kjumpingcube/kcubeboxwidget.h b/kjumpingcube/kcubeboxwidget.h index b0e8c142..5e21fa57 100644 --- a/kjumpingcube/kcubeboxwidget.h +++ b/kjumpingcube/kcubeboxwidget.h @@ -147,7 +147,7 @@ protected slots: private: void init(); - TQGridLayout *tqlayout; + TQGridLayout *layout; CubeBox *undoBox; Brain brain; diff --git a/klines/povray/povray.ini b/klines/povray/povray.ini index 6c01d50a..22ddf8ec 100644 --- a/klines/povray/povray.ini +++ b/klines/povray/povray.ini @@ -10,7 +10,7 @@ ; ; The general form of the options is "Variable=value". Everything ; between the equals sign and the end of the line is considered part -; of the value. The spacing and tqlayout is free-form but only one option +; of the value. The spacing and layout is free-form but only one option ; per line is allowed. Variables and values are not case-sensitive. ; ; Note: characters after a semi-colon are treated as a comment diff --git a/kmahjongg/BoardLayout.h b/kmahjongg/BoardLayout.h index a9a809c7..468bf5bc 100644 --- a/kmahjongg/BoardLayout.h +++ b/kmahjongg/BoardLayout.h @@ -4,7 +4,7 @@ #include #include "KmTypes.h" -const TQString layoutMagic1_0 = "kmahjongg-tqlayout-v1.0"; +const TQString layoutMagic1_0 = "kmahjongg-layout-v1.0"; class BoardLayout { diff --git a/kmahjongg/Editor.cpp b/kmahjongg/Editor.cpp index 0c6333c5..b1da62b0 100644 --- a/kmahjongg/Editor.cpp +++ b/kmahjongg/Editor.cpp @@ -35,7 +35,7 @@ // When we assign a tile to draw in a slot we do it in order from te following -// table, wrapping on the tile number. It makes the tile tqlayout look more +// table, wrapping on the tile number. It makes the tile layout look more // random. @@ -69,10 +69,10 @@ Editor::Editor // setup the tool bar setupToolbar(); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 1); - tqlayout->addWidget(topToolbar,0); - tqlayout->addWidget(drawFrame,1); - tqlayout->activate(); + TQVBoxLayout *layout = new TQVBoxLayout(this, 1); + layout->addWidget(topToolbar,0); + layout->addWidget(drawFrame,1); + layout->activate(); resize( sWidth+60, sHeight+60); setMinimumSize( sWidth+60, sHeight+60); @@ -272,7 +272,7 @@ void Editor::loadBoard() { KURL url = KFileDialog::getOpenURL( NULL, - i18n("*.tqlayout|Board Layout (*.tqlayout)\n" + i18n("*.layout|Board Layout (*.layout)\n" "*|All Files"), this, i18n("Open Board Layout" )); @@ -309,7 +309,7 @@ bool Editor::saveBoard() { // get a save file name KURL url = KFileDialog::getSaveURL( NULL, - i18n("*.tqlayout|Board Layout (*.tqlayout)\n" + i18n("*.layout|Board Layout (*.layout)\n" "*|All Files"), this, i18n("Save Board Layout" )); @@ -373,7 +373,7 @@ bool Editor::testSave() // The main paint event, draw in the grid and blit in -// the tiles as specified by the tqlayout. +// the tiles as specified by the layout. void Editor::paintEvent( TQPaintEvent* ) { diff --git a/kmahjongg/HighScore.cpp b/kmahjongg/HighScore.cpp index 33d0d096..637fdf25 100644 --- a/kmahjongg/HighScore.cpp +++ b/kmahjongg/HighScore.cpp @@ -399,8 +399,8 @@ void HighScore::copyTableToScreen(const TQString &name) { repaint(false); } -int HighScore::exec(TQString &tqlayout) { - copyTableToScreen(tqlayout); +int HighScore::exec(TQString &layout) { + copyTableToScreen(layout); return(TQDialog::exec()); } diff --git a/kmahjongg/HighScore.h b/kmahjongg/HighScore.h index a154b3e1..d5513508 100644 --- a/kmahjongg/HighScore.h +++ b/kmahjongg/HighScore.h @@ -41,7 +41,7 @@ public: virtual ~HighScore(); - int exec(TQString &tqlayout); + int exec(TQString &layout); void checkHighScore(int score, int elapsed, long game, TQString &board); diff --git a/kmahjongg/Preview.cpp b/kmahjongg/Preview.cpp index f6ff021a..9c6ac478 100644 --- a/kmahjongg/Preview.cpp +++ b/kmahjongg/Preview.cpp @@ -76,7 +76,7 @@ void Preview::initialise(const PreviewType type) TQString extension; TQString tile = Prefs::tileSet(); TQString back = Prefs::background(); - TQString tqlayout = Prefs::layout(); + TQString layout = Prefs::layout(); // set up the concept of the current file. Initialised to the preferences // value initially. Set the caption to indicate what we are doing @@ -98,10 +98,10 @@ void Preview::initialise(const PreviewType type) break; case board: - m_fileSelector = i18n("*.tqlayout|Board Layout File (*.tqlayout)\n"); + m_fileSelector = i18n("*.layout|Board Layout File (*.layout)\n"); setCaption(i18n("Change Board Layout")); - m_selectedFile = tqlayout; - extension = "*.tqlayout"; + m_selectedFile = layout; + extension = "*.layout"; break; case theme: @@ -167,7 +167,7 @@ void Preview::load() { } } -// Top level preview drawing method. Background, tileset and tqlayout +// Top level preview drawing method. Background, tileset and layout // are initialised from the preferences. Depending on the type // of preview dialog we pick up the selected file for one of these // chaps. @@ -176,7 +176,7 @@ void Preview::drawPreview() { TQString tile = Prefs::tileSet(); TQString back = Prefs::background(); - TQString tqlayout = Prefs::layout(); + TQString layout = Prefs::layout(); switch (m_previewType) { @@ -189,12 +189,12 @@ void Preview::drawPreview() break; case board: - tqlayout = m_selectedFile; + layout = m_selectedFile; break; case theme: // a theme is quite a bit of work. We load the - // specified bits in (tqlayout, background and tileset + // specified bits in (layout, background and tileset if (!m_selectedFile.isEmpty()) { TQString backRaw, layoutRaw, tilesetRaw, magic; @@ -233,17 +233,17 @@ void Preview::drawPreview() back = locate("appdata", back); } - tqlayout = layoutRaw; - tqlayout.replace(":", "/kmahjongg/pics/"); - if (!TQFile::exists(tqlayout)) + layout = layoutRaw; + layout.replace(":", "/kmahjongg/pics/"); + if (!TQFile::exists(layout)) { - tqlayout = layoutRaw; - tqlayout = "pics/" + tqlayout.right(tqlayout.length() - tqlayout.find(":") - 1); - tqlayout = locate("appdata", tqlayout); + layout = layoutRaw; + layout = "pics/" + layout.right(layout.length() - layout.find(":") - 1); + layout = locate("appdata", layout); } m_themeBack=back; - m_themeLayout=tqlayout; + m_themeLayout=layout; m_themeTileset=tile; } } @@ -251,7 +251,7 @@ void Preview::drawPreview() } renderBackground(back); - renderTiles(tile, tqlayout); + renderTiles(tile, layout); } void Preview::paintEvent( TQPaintEvent* ){ @@ -260,7 +260,7 @@ void Preview::paintEvent( TQPaintEvent* ){ // the user selected ok, or apply. This method passes the changes // across to the game widget and if necessary forces a board redraw -// (unnecessary on tqlayout changes since it only effects the next game) +// (unnecessary on layout changes since it only effects the next game) void Preview::applyChange() { switch (m_previewType) @@ -287,7 +287,7 @@ void Preview::applyChange() break; } - // don't redraw for a tqlayout change + // don't redraw for a layout change if (m_previewType == board || m_previewType == theme) layoutChange(); else boardRedraw(true); @@ -310,9 +310,9 @@ void Preview::renderBackground(const TQString &bg) { // This method draws a mini-tiled board with no tiles missing. -void Preview::renderTiles(const TQString &file, const TQString &tqlayout) { +void Preview::renderTiles(const TQString &file, const TQString &layout) { m_tiles.loadTileset(file, true); - m_boardLayout.loadBoardLayout(tqlayout); + m_boardLayout.loadBoardLayout(layout); TQPixmap *dest = m_drawFrame->getPreviewPixmap(); int xOffset = m_tiles.width()/2; @@ -366,7 +366,7 @@ void Preview::renderTiles(const TQString &file, const TQString &tqlayout) { void Preview::saveTheme() { TQString tile = Prefs::tileSet(); TQString back = Prefs::background(); - TQString tqlayout = Prefs::layout(); + TQString layout = Prefs::layout(); TQString with = ":"; // we want to replace any path in the default store @@ -375,7 +375,7 @@ void Preview::saveTheme() { back.replace(p,with); tile.replace(p,with); - tqlayout.replace(p,with); + layout.replace(p,with); // Get the name of the file to save @@ -417,7 +417,7 @@ void Preview::saveTheme() { themeMagicV1_0, tile.utf8().data(), back.utf8().data(), - tqlayout.utf8().data()); + layout.utf8().data()); fclose(outFile); } diff --git a/kmahjongg/Preview.h b/kmahjongg/Preview.h index 2b0adb54..f77aaf09 100644 --- a/kmahjongg/Preview.h +++ b/kmahjongg/Preview.h @@ -63,7 +63,7 @@ protected: virtual void drawPreview(); void applyChange() ; void renderBackground(const TQString &bg); - void renderTiles(const TQString &file, const TQString &tqlayout); + void renderTiles(const TQString &file, const TQString &layout); void paintEvent( TQPaintEvent* pa ); signals: diff --git a/kmahjongg/boardwidget.cpp b/kmahjongg/boardwidget.cpp index 7b4d8270..23d183ab 100644 --- a/kmahjongg/boardwidget.cpp +++ b/kmahjongg/boardwidget.cpp @@ -60,11 +60,11 @@ BoardWidget::BoardWidget( TQWidget* parent, const char *name ) kapp->quit(); } - getFileOrDefault(Prefs::layout(), "tqlayout", tFile); + getFileOrDefault(Prefs::layout(), "layout", tFile); if( ! loadBoardLayout(tFile) ) { KMessageBox::error(this, - i18n("An error occurred when loading the board tqlayout %1\n" + i18n("An error occurred when loading the board layout %1\n" "KMahjongg will now terminate.").arg(tFile)); kapp->quit(); } @@ -92,7 +92,7 @@ void BoardWidget::saveSettings(){ //config->writePathEntry("Tileset_file", tileFile); //config->writePathEntry("Background_file", backgroundFile); - //config->writePathEntry("Layout_file", tqlayout); + //config->writePathEntry("Layout_file", layout); } void BoardWidget::getFileOrDefault(TQString filename, TQString type, TQString &res) @@ -766,7 +766,7 @@ void BoardWidget::calculateNewGame( int gNumber) } // --------------------------------------------------------- -// Generate the position data for the tqlayout from contents of Game.Map. +// Generate the position data for the layout from contents of Game.Map. void BoardWidget::generateTilePositions() { numTiles = 0; @@ -788,7 +788,7 @@ void BoardWidget::generateTilePositions() { } // --------------------------------------------------------- -// Generate the dependency data for the tqlayout from the position data. +// Generate the dependency data for the layout from the position data. // Note that the coordinates of each tile in tilePositions are those of // the upper left quarter of the tile. void BoardWidget::generatePositionDepends() { @@ -1393,7 +1393,7 @@ bool BoardWidget::findMove( POSITION& posA, POSITION& posB ) iPosCount = 0; // Hier Anzahl der gefunden Paare merken - // The new tile tqlayout with non-contiguos horizantle spans + // The new tile layout with non-contiguos horizantle spans // can lead to huge numbers of matching pairs being exposed. // we alter the loop to bail out when BoardLayout::maxTiles/2 pairs are found // (or less); diff --git a/kmahjongg/kmahjongg.cpp b/kmahjongg/kmahjongg.cpp index 536fa99b..e065b848 100644 --- a/kmahjongg/kmahjongg.cpp +++ b/kmahjongg/kmahjongg.cpp @@ -151,7 +151,7 @@ void KMahjongg::setupKAction() pauseAction = KStdGameAction::pause(TQT_TQOBJECT(this), TQT_SLOT(pause()), actionCollection()); // TODO: store the background ; open on startup - // TODO: same about tqlayout + // TODO: same about layout // TODO: same about theme // move diff --git a/kmahjongg/pics/cross.layout b/kmahjongg/pics/cross.layout index de71a115..39c58f1e 100644 --- a/kmahjongg/pics/cross.layout +++ b/kmahjongg/pics/cross.layout @@ -1,4 +1,4 @@ -kmahjongg-tqlayout-v1.0 +kmahjongg-layout-v1.0 12....12121212121212121212....12 4312..43434343434343434343..1243 124312........1212........124312 diff --git a/kmahjongg/pics/default.layout b/kmahjongg/pics/default.layout index 005254ed..f72ed794 100644 --- a/kmahjongg/pics/default.layout +++ b/kmahjongg/pics/default.layout @@ -1,4 +1,4 @@ -kmahjongg-tqlayout-v1.0 +kmahjongg-layout-v1.0 # Level 0 ------------------------- ...121212121212121212121212..... ...434343434343434343434343..... diff --git a/kmahjongg/pics/default.theme b/kmahjongg/pics/default.theme index 49502e04..9ba994bc 100644 --- a/kmahjongg/pics/default.theme +++ b/kmahjongg/pics/default.theme @@ -1,4 +1,4 @@ kmahjongg-theme-v1.0 :default.tileset :default.bgnd -:default.tqlayout +:default.layout diff --git a/kmahjongg/pics/pirates.layout b/kmahjongg/pics/pirates.layout index 3cce44e3..c5bb895c 100644 --- a/kmahjongg/pics/pirates.layout +++ b/kmahjongg/pics/pirates.layout @@ -1,4 +1,4 @@ -kmahjongg-tqlayout-v1.0 +kmahjongg-layout-v1.0 .............121212.......12..12 .............434343.......43..43 .............12.............12.. diff --git a/kmahjongg/pics/pirates.theme b/kmahjongg/pics/pirates.theme index 51b6ec88..748b3ffa 100644 --- a/kmahjongg/pics/pirates.theme +++ b/kmahjongg/pics/pirates.theme @@ -1,5 +1,5 @@ kmahjongg-theme-v1.0 :pirates.tileset :pirates.bgnd -:pirates.tqlayout +:pirates.layout diff --git a/kmahjongg/pics/pyramid.layout b/kmahjongg/pics/pyramid.layout index 0239212b..edd634dc 100644 --- a/kmahjongg/pics/pyramid.layout +++ b/kmahjongg/pics/pyramid.layout @@ -1,4 +1,4 @@ -kmahjongg-tqlayout-v1.0 +kmahjongg-layout-v1.0 # Level 0 ------------------------- ....121212121212121212121212.... ....434343434343434343434343.... diff --git a/kmahjongg/pics/stax.layout b/kmahjongg/pics/stax.layout index abc7e969..f5595dca 100644 --- a/kmahjongg/pics/stax.layout +++ b/kmahjongg/pics/stax.layout @@ -1,4 +1,4 @@ -kmahjongg-tqlayout-v1.0 +kmahjongg-layout-v1.0 ................................ 12121212..121212121212..12121212 43434343..434343434343..43434343 diff --git a/kmahjongg/pics/test.layout b/kmahjongg/pics/test.layout index 2c76ddec..d46a4e21 100644 --- a/kmahjongg/pics/test.layout +++ b/kmahjongg/pics/test.layout @@ -1,4 +1,4 @@ -kmahjongg-tqlayout-v1.0 +kmahjongg-layout-v1.0 .1212121212121212121212121212... .4343434343434343434343434343... .1212121212121212121212121212... diff --git a/kmahjongg/pics/test2.layout b/kmahjongg/pics/test2.layout index 9ab29fdf..aedc6290 100644 --- a/kmahjongg/pics/test2.layout +++ b/kmahjongg/pics/test2.layout @@ -1,4 +1,4 @@ -kmahjongg-tqlayout-v1.0 +kmahjongg-layout-v1.0 ................................ ................................ .121212121212121212............. diff --git a/kmahjongg/pics/tower.layout b/kmahjongg/pics/tower.layout index 3ca7bfc6..76fe96a0 100644 --- a/kmahjongg/pics/tower.layout +++ b/kmahjongg/pics/tower.layout @@ -1,4 +1,4 @@ -kmahjongg-tqlayout-v1.0 +kmahjongg-layout-v1.0 # Level 0 ------------------------- ....121212121212121212121212.... ....434343434343434343434343.... diff --git a/kmahjongg/pics/triangle.layout b/kmahjongg/pics/triangle.layout index e04c405a..e1dd4891 100644 --- a/kmahjongg/pics/triangle.layout +++ b/kmahjongg/pics/triangle.layout @@ -1,4 +1,4 @@ -kmahjongg-tqlayout-v1.0 +kmahjongg-layout-v1.0 # Level 0 ------------------------- .121212121212121212121212121212. .434343434343434343434343434343. diff --git a/kmines/frame.cpp b/kmines/frame.cpp index 2b348694..91cca53e 100644 --- a/kmines/frame.cpp +++ b/kmines/frame.cpp @@ -128,8 +128,8 @@ void FieldFrame::drawBox(TQPainter &painter, const TQPoint &p, &colorGroup().brush(TQColorGroup::Background)); if (hasFocus) { painter.translate(p.x(), p.y()); - TQRect fbr = tqstyle().subRect(TQStyle::SR_PushButtonFocusRect, &_button); - tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, fbr, + TQRect fbr = style().subRect(TQStyle::SR_PushButtonFocusRect, &_button); + style().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, fbr, colorGroup(), TQStyle::Style_Enabled); painter.resetXForm(); } @@ -137,9 +137,9 @@ void FieldFrame::drawBox(TQPainter &painter, const TQPoint &p, TQRect r(p, _button.size()); const TQPixmap *pixmap = (type==NoPixmap ? 0 : &_pixmaps[type]); TQColor color = (nbMines==0 ? black : Settings::mineColor(nbMines-1)); - tqstyle().drawItem(&painter, r, AlignCenter, colorGroup(), true, pixmap, + style().drawItem(&painter, r, AlignCenter, colorGroup(), true, pixmap, text, -1, &color); if ( advised!=-1 ) - tqstyle().drawItem(&painter, r, AlignCenter, colorGroup(), true, + style().drawItem(&painter, r, AlignCenter, colorGroup(), true, &_advised[advised], TQString()); } diff --git a/kmines/status.cpp b/kmines/status.cpp index 7940a388..15301115 100644 --- a/kmines/status.cpp +++ b/kmines/status.cpp @@ -54,7 +54,7 @@ Status::Status(TQWidget *parent) _solver = new Solver(TQT_TQOBJECT(this)); connect(_solver, TQT_SIGNAL(solvingDone(bool)), TQT_SLOT(solvingDone(bool))); -// top tqlayout +// top layout TQGridLayout *top = new TQGridLayout(this, 2, 5, 10, 10); top->setColStretch(1, 1); top->setColStretch(3, 1); diff --git a/kolf/config.cpp b/kolf/config.cpp index 0d9aafae..7c333755 100644 --- a/kolf/config.cpp +++ b/kolf/config.cpp @@ -36,8 +36,8 @@ void Config::changed() MessageConfig::MessageConfig(TQString text, TQWidget *parent, const char *name) : Config(parent, name) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); - tqlayout->addWidget(new TQLabel(text, this)); + TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint()); + layout->addWidget(new TQLabel(text, this)); } DefaultConfig::DefaultConfig(TQWidget *parent, const char *name) diff --git a/kolf/editor.cpp b/kolf/editor.cpp index ab8b1d0c..ae9cde32 100644 --- a/kolf/editor.cpp +++ b/kolf/editor.cpp @@ -15,13 +15,13 @@ Editor::Editor(ObjectList *list, TQWidget *parent, const char *name) this->list = list; config = 0; - htqlayout = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + hlayout = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - TQVBoxLayout *vtqlayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint()); - vtqlayout->addWidget(new TQLabel(i18n("Add object:"), this)); + TQVBoxLayout *vlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint()); + vlayout->addWidget(new TQLabel(i18n("Add object:"), this)); listbox = new KListBox(this, "Listbox"); - vtqlayout->addWidget(listbox); - htqlayout->setStretchFactor(vtqlayout, 2); + vlayout->addWidget(listbox); + hlayout->setStretchFactor(vlayout, 2); TQStringList items; Object *obj = 0; @@ -49,8 +49,8 @@ void Editor::setItem(CanvasItem *item) if (!config) return; config->ctorDone(); - htqlayout->addWidget(config); - htqlayout->setStretchFactor(config, 2); + hlayout->addWidget(config); + hlayout->setStretchFactor(config, 2); config->setFrameStyle(TQFrame::Box | TQFrame::Raised); config->setLineWidth(1); config->show(); diff --git a/kolf/editor.h b/kolf/editor.h index 8ee1b93a..e61e73cf 100644 --- a/kolf/editor.h +++ b/kolf/editor.h @@ -30,7 +30,7 @@ private slots: private: ObjectList *list; - TQHBoxLayout *htqlayout; + TQHBoxLayout *hlayout; KListBox *listbox; Config *config; }; diff --git a/kolf/floater.cpp b/kolf/floater.cpp index fe6e6344..ff42398a 100644 --- a/kolf/floater.cpp +++ b/kolf/floater.cpp @@ -257,14 +257,14 @@ FloaterConfig::FloaterConfig(Floater *floater, TQWidget *parent) : BridgeConfig(floater, parent) { this->floater = floater; - m_vtqlayout->addStretch(); + m_vlayout->addStretch(); - m_vtqlayout->addWidget(new TQLabel(i18n("Moving speed"), this)); - TQHBoxLayout *htqlayout = new TQHBoxLayout(m_vtqlayout, spacingHint()); - htqlayout->addWidget(new TQLabel(i18n("Slow"), this)); + m_vlayout->addWidget(new TQLabel(i18n("Moving speed"), this)); + TQHBoxLayout *hlayout = new TQHBoxLayout(m_vlayout, spacingHint()); + hlayout->addWidget(new TQLabel(i18n("Slow"), this)); TQSlider *slider = new TQSlider(0, 20, 2, floater->curSpeed(), Qt::Horizontal, this); - htqlayout->addWidget(slider); - htqlayout->addWidget(new TQLabel(i18n("Fast"), this)); + hlayout->addWidget(slider); + hlayout->addWidget(new TQLabel(i18n("Fast"), this)); connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(speedChanged(int))); } diff --git a/kolf/game.cpp b/kolf/game.cpp index a9a33f03..80ede233 100644 --- a/kolf/game.cpp +++ b/kolf/game.cpp @@ -197,23 +197,23 @@ BridgeConfig::BridgeConfig(Bridge *bridge, TQWidget *parent) { this->bridge = bridge; - m_vtqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); - TQGridLayout *tqlayout = new TQGridLayout(m_vtqlayout, 2, 3, spacingHint()); - tqlayout->addWidget(new TQLabel(i18n("Walls on:"), this), 0, 0); + m_vlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); + TQGridLayout *layout = new TQGridLayout(m_vlayout, 2, 3, spacingHint()); + layout->addWidget(new TQLabel(i18n("Walls on:"), this), 0, 0); top = new TQCheckBox(i18n("&Top"), this); - tqlayout->addWidget(top, 0, 1); + layout->addWidget(top, 0, 1); connect(top, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(topWallChanged(bool))); top->setChecked(bridge->topWallVisible()); bot = new TQCheckBox(i18n("&Bottom"), this); - tqlayout->addWidget(bot, 1, 1); + layout->addWidget(bot, 1, 1); connect(bot, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(botWallChanged(bool))); bot->setChecked(bridge->botWallVisible()); left = new TQCheckBox(i18n("&Left"), this); - tqlayout->addWidget(left, 1, 0); + layout->addWidget(left, 1, 0); connect(left, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(leftWallChanged(bool))); left->setChecked(bridge->leftWallVisible()); right = new TQCheckBox(i18n("&Right"), this); - tqlayout->addWidget(right, 1, 2); + layout->addWidget(right, 1, 2); connect(right, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(rightWallChanged(bool))); right->setChecked(bridge->rightWallVisible()); } @@ -405,18 +405,18 @@ WindmillConfig::WindmillConfig(Windmill *windmill, TQWidget *parent) : BridgeConfig(windmill, parent) { this->windmill = windmill; - m_vtqlayout->addStretch(); + m_vlayout->addStretch(); TQCheckBox *check = new TQCheckBox(i18n("Windmill on bottom"), this); check->setChecked(windmill->bottom()); connect(check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(endChanged(bool))); - m_vtqlayout->addWidget(check); + m_vlayout->addWidget(check); - TQHBoxLayout *htqlayout = new TQHBoxLayout(m_vtqlayout, spacingHint()); - htqlayout->addWidget(new TQLabel(i18n("Slow"), this)); + TQHBoxLayout *hlayout = new TQHBoxLayout(m_vlayout, spacingHint()); + hlayout->addWidget(new TQLabel(i18n("Slow"), this)); TQSlider *slider = new TQSlider(1, 10, 1, windmill->curSpeed(), Qt::Horizontal, this); - htqlayout->addWidget(slider); - htqlayout->addWidget(new TQLabel(i18n("Fast"), this)); + hlayout->addWidget(slider); + hlayout->addWidget(new TQLabel(i18n("Fast"), this)); connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(speedChanged(int))); endChanged(check->isChecked()); @@ -643,10 +643,10 @@ SignConfig::SignConfig(Sign *sign, TQWidget *parent) : BridgeConfig(sign, parent) { this->sign = sign; - m_vtqlayout->addStretch(); - m_vtqlayout->addWidget(new TQLabel(i18n("Sign HTML:"), this)); + m_vlayout->addStretch(); + m_vlayout->addWidget(new TQLabel(i18n("Sign HTML:"), this)); KLineEdit *name = new KLineEdit(sign->text(), this); - m_vtqlayout->addWidget(name); + m_vlayout->addWidget(name); connect(name, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(textChanged(const TQString &))); } @@ -663,20 +663,20 @@ EllipseConfig::EllipseConfig(Ellipse *ellipse, TQWidget *parent) { this->ellipse = ellipse; - m_vtqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); + m_vlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); TQCheckBox *check = new TQCheckBox(i18n("Enable show/hide"), this); - m_vtqlayout->addWidget(check); + m_vlayout->addWidget(check); connect(check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(check1Changed(bool))); check->setChecked(ellipse->changeEnabled()); - TQHBoxLayout *htqlayout = new TQHBoxLayout(m_vtqlayout, spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(m_vlayout, spacingHint()); slow1 = new TQLabel(i18n("Slow"), this); - htqlayout->addWidget(slow1); + hlayout->addWidget(slow1); slider1 = new TQSlider(1, 100, 5, 100 - ellipse->changeEvery(), Qt::Horizontal, this); - htqlayout->addWidget(slider1); + hlayout->addWidget(slider1); fast1 = new TQLabel(i18n("Fast"), this); - htqlayout->addWidget(fast1); + hlayout->addWidget(fast1); connect(slider1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(value1Changed(int))); @@ -684,7 +684,7 @@ EllipseConfig::EllipseConfig(Ellipse *ellipse, TQWidget *parent) // TODO add slider2 and friends and make it possible for ellipses to grow and contract - m_vtqlayout->addStretch(); + m_vlayout->addStretch(); } void EllipseConfig::value1Changed(int news) @@ -1503,30 +1503,30 @@ BlackHoleConfig::BlackHoleConfig(BlackHole *blackHole, TQWidget *parent) : Config(parent) { this->blackHole = blackHole; - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); - tqlayout->addWidget(new TQLabel(i18n("Exiting ball angle:"), this)); + TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint()); + layout->addWidget(new TQLabel(i18n("Exiting ball angle:"), this)); TQSpinBox *deg = new TQSpinBox(0, 359, 10, this); deg->setSuffix(TQString(" ") + i18n("degrees")); deg->setValue(blackHole->curExitDeg()); deg->setWrapping(true); - tqlayout->addWidget(deg); + layout->addWidget(deg); connect(deg, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(degChanged(int))); - tqlayout->addStretch(); + layout->addStretch(); - TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, spacingHint()); - htqlayout->addWidget(new TQLabel(i18n("Minimum exit speed:"), this)); + TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint()); + hlayout->addWidget(new TQLabel(i18n("Minimum exit speed:"), this)); KDoubleNumInput *min = new KDoubleNumInput(this); min->setRange(0, 8, 1, true); - htqlayout->addWidget(min); + hlayout->addWidget(min); connect(min, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(minChanged(double))); min->setValue(blackHole->minSpeed()); - htqlayout = new TQHBoxLayout(tqlayout, spacingHint()); - htqlayout->addWidget(new TQLabel(i18n("Maximum:"), this)); + hlayout = new TQHBoxLayout(layout, spacingHint()); + hlayout->addWidget(new TQLabel(i18n("Maximum:"), this)); KDoubleNumInput *max = new KDoubleNumInput(this); max->setRange(1, 10, 1, true); - htqlayout->addWidget(max); + hlayout->addWidget(max); connect(max, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(maxChanged(double))); max->setValue(blackHole->maxSpeed()); } @@ -1959,42 +1959,42 @@ HoleConfig::HoleConfig(HoleInfo *holeInfo, TQWidget *parent) { this->holeInfo = holeInfo; - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint()); - TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, spacingHint()); - htqlayout->addWidget(new TQLabel(i18n("Course name: "), this)); + TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint()); + hlayout->addWidget(new TQLabel(i18n("Course name: "), this)); KLineEdit *nameEdit = new KLineEdit(holeInfo->untranslatedName(), this); - htqlayout->addWidget(nameEdit); + hlayout->addWidget(nameEdit); connect(nameEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(nameChanged(const TQString &))); - htqlayout = new TQHBoxLayout(tqlayout, spacingHint()); - htqlayout->addWidget(new TQLabel(i18n("Course author: "), this)); + hlayout = new TQHBoxLayout(layout, spacingHint()); + hlayout->addWidget(new TQLabel(i18n("Course author: "), this)); KLineEdit *authorEdit = new KLineEdit(holeInfo->author(), this); - htqlayout->addWidget(authorEdit); + hlayout->addWidget(authorEdit); connect(authorEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(authorChanged(const TQString &))); - tqlayout->addStretch(); + layout->addStretch(); - htqlayout = new TQHBoxLayout(tqlayout, spacingHint()); - htqlayout->addWidget(new TQLabel(i18n("Par:"), this)); + hlayout = new TQHBoxLayout(layout, spacingHint()); + hlayout->addWidget(new TQLabel(i18n("Par:"), this)); TQSpinBox *par = new TQSpinBox(1, 15, 1, this); par->setValue(holeInfo->par()); - htqlayout->addWidget(par); + hlayout->addWidget(par); connect(par, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(parChanged(int))); - htqlayout->addStretch(); + hlayout->addStretch(); - htqlayout->addWidget(new TQLabel(i18n("Maximum:"), this)); + hlayout->addWidget(new TQLabel(i18n("Maximum:"), this)); TQSpinBox *maxstrokes = new TQSpinBox(holeInfo->lowestMaxStrokes(), 30, 1, this); TQWhatsThis::add(maxstrokes, i18n("Maximum number of strokes player can take on this hole.")); TQToolTip::add(maxstrokes, i18n("Maximum number of strokes")); maxstrokes->setSpecialValueText(i18n("Unlimited")); maxstrokes->setValue(holeInfo->maxStrokes()); - htqlayout->addWidget(maxstrokes); + hlayout->addWidget(maxstrokes); connect(maxstrokes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(maxStrokesChanged(int))); TQCheckBox *check = new TQCheckBox(i18n("Show border walls"), this); check->setChecked(holeInfo->borderWalls()); - tqlayout->addWidget(check); + layout->addWidget(check); connect(check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(borderWallsChanged(bool))); } diff --git a/kolf/game.h b/kolf/game.h index e1766802..136ac1d7 100644 --- a/kolf/game.h +++ b/kolf/game.h @@ -207,7 +207,7 @@ private slots: void check2Changed(bool on); protected: - TQVBoxLayout *m_vtqlayout; + TQVBoxLayout *m_vlayout; private: TQLabel *slow1; @@ -557,7 +557,7 @@ protected slots: void rightWallChanged(bool); protected: - TQVBoxLayout *m_vtqlayout; + TQVBoxLayout *m_vlayout; TQCheckBox *top; TQCheckBox *bot; TQCheckBox *left; diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp index fba028cb..246403b9 100644 --- a/kolf/kolf.cpp +++ b/kolf/kolf.cpp @@ -65,7 +65,7 @@ Kolf::Kolf() filename = TQString(); dummy = new TQWidget(this); setCentralWidget(dummy); - tqlayout = new TQGridLayout(dummy, 3, 1); + layout = new TQGridLayout(dummy, 3, 1); resize(420, 480); } @@ -176,7 +176,7 @@ void Kolf::startNewGame() players.clear(); delete scoreboard; scoreboard = new ScoreBoard(dummy, "Score Board"); - tqlayout->addWidget(scoreboard, 1, 0); + layout->addWidget(scoreboard, 1, 0); scoreboard->show(); if (loadedGame.isNull()) @@ -264,7 +264,7 @@ void Kolf::startNewGame() game->setShowGuideLine(showGuideLineAction->isChecked()); game->setSound(soundAction->isChecked()); - tqlayout->addWidget(game, 0, 0, AlignCenter); + layout->addWidget(game, 0, 0, AlignCenter); game->show(); game->setFocus(); @@ -372,7 +372,7 @@ void Kolf::createSpacer() spacer = new KolfGame(obj, &spacerPlayers, KGlobal::dirs()->findResource("appdata", "intro"), dummy); spacer->setSound(false); spacer->startFirstHole(1); - tqlayout->addWidget(spacer, 0, 0, AlignCenter); + layout->addWidget(spacer, 0, 0, AlignCenter); spacer->hidePutter(); spacer->ignoreEvents(true); @@ -601,7 +601,7 @@ void Kolf::editingStarted() scoreboard->hide(); - tqlayout->addWidget(editor, 1, 0); + layout->addWidget(editor, 1, 0); editor->show(); clearHoleAction->setEnabled(true); diff --git a/kolf/kolf.h b/kolf/kolf.h index 62892ea7..ea0f3c29 100644 --- a/kolf/kolf.h +++ b/kolf/kolf.h @@ -88,7 +88,7 @@ private: TQString filename; PlayerList players; PlayerList spacerPlayers; - TQGridLayout *tqlayout; + TQGridLayout *layout; ScoreBoard *scoreboard; KToggleAction *editingAction; KAction *newHoleAction; diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp index 7251fa0c..493b00fd 100644 --- a/kolf/newgame.cpp +++ b/kolf/newgame.cpp @@ -56,14 +56,14 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_ scroller = new TQScrollView(playerPage); bigLayout->addWidget(scroller); - tqlayout = new TQVBox(scroller->viewport()); + layout = new TQVBox(scroller->viewport()); if (!TQPixmapCache::find("grass", grass)) { grass.load(locate("appdata", "pics/grass.png")); TQPixmapCache::insert("grass", grass); } scroller->viewport()->setBackgroundPixmap(grass); - scroller->addChild(tqlayout); + scroller->addChild(layout); TQMap entries = config->entryMap("New Game Dialog"); unsigned int i = 0; @@ -95,7 +95,7 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_ connect(coursesLink, TQT_SIGNAL(leftClickedURL(const TQString &)), kapp, TQT_SLOT(invokeBrowser(const TQString &))); coursePageLayout->addWidget(coursesLink); - TQHBoxLayout *htqlayout = new TQHBoxLayout(coursePageLayout, spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(coursePageLayout, spacingHint()); // following use this group config->setGroup("New Game Dialog Mode"); @@ -128,13 +128,13 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_ nameList.append(newName); courseList = new KListBox(coursePage); - htqlayout->addWidget(courseList); + hlayout->addWidget(courseList); courseList->insertStringList(nameList); courseList->setCurrentItem(curItem); connect(courseList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(courseSelected(int))); connect(courseList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); - TQVBoxLayout *detailLayout = new TQVBoxLayout(htqlayout, spacingHint()); + TQVBoxLayout *detailLayout = new TQVBoxLayout(hlayout, spacingHint()); name = new TQLabel(coursePage); detailLayout->addWidget(name); author = new TQLabel(coursePage); @@ -170,15 +170,15 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_ // options page optionsPage = addPage(i18n("Options"), i18n("Game Options")); - TQVBoxLayout *vtqlayout = new TQVBoxLayout(optionsPage, marginHint(), spacingHint()); + TQVBoxLayout *vlayout = new TQVBoxLayout(optionsPage, marginHint(), spacingHint()); mode = new TQCheckBox(i18n("&Strict mode"), optionsPage); - vtqlayout->addWidget(mode); + vlayout->addWidget(mode); mode->setChecked(config->readBoolEntry("competition", false)); TQLabel *desc = new TQLabel(i18n("In strict mode, undo, editing, and switching holes is not allowed. This is generally for competition. Only in strict mode are highscores kept."), optionsPage); desc->setTextFormat(RichText); - vtqlayout->addWidget(desc); + vlayout->addWidget(desc); } void NewGameDialog::slotOk() @@ -287,7 +287,7 @@ void NewGameDialog::addPlayer() if (editors.count() >= startColors.count()) return; - editors.append(new PlayerEditor(i18n("Player %1").arg(editors.count() + 1), *startColors.at(editors.count()), tqlayout)); + editors.append(new PlayerEditor(i18n("Player %1").arg(editors.count() + 1), *startColors.at(editors.count()), layout)); editors.last()->show(); connect(editors.last(), TQT_SIGNAL(deleteEditor(PlayerEditor *)), this, TQT_SLOT(deleteEditor(PlayerEditor *))); @@ -314,7 +314,7 @@ void NewGameDialog::enableButtons() PlayerEditor::PlayerEditor(TQString startName, TQColor startColor, TQWidget *parent, const char *_name) : TQWidget(parent, _name) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this, KDialogBase::spacingHint()); + TQHBoxLayout *layout = new TQHBoxLayout(this, KDialogBase::spacingHint()); if (!TQPixmapCache::find("grass", grass)) { @@ -324,17 +324,17 @@ PlayerEditor::PlayerEditor(TQString startName, TQColor startColor, TQWidget *par setBackgroundPixmap(grass); editor = new KLineEdit(this); - tqlayout->addWidget(editor); + layout->addWidget(editor); editor->setFrame(false); editor->setText(startName); - tqlayout->addStretch(); - tqlayout->addWidget(colorButton = new KColorButton(startColor, this)); + layout->addStretch(); + layout->addWidget(colorButton = new KColorButton(startColor, this)); colorButton->setAutoMask(true); colorButton->setBackgroundPixmap(grass); KPushButton *remove = new KPushButton(i18n("Remove"), this); remove->setAutoMask(true); - tqlayout->addWidget(remove); + layout->addWidget(remove); remove->setBackgroundPixmap(grass); connect(remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeMe())); } diff --git a/kolf/newgame.h b/kolf/newgame.h index 4d0d1af5..9a8a7493 100644 --- a/kolf/newgame.h +++ b/kolf/newgame.h @@ -74,7 +74,7 @@ private slots: void showHighscores(); private: - TQVBox *tqlayout; + TQVBox *layout; KPushButton *addButton; TQFrame *playerPage; TQScrollView *scroller; diff --git a/kolf/objects/poolball/poolball.cpp b/kolf/objects/poolball/poolball.cpp index 10a26b9c..c2fe0718 100644 --- a/kolf/objects/poolball/poolball.cpp +++ b/kolf/objects/poolball/poolball.cpp @@ -57,17 +57,17 @@ void PoolBall::draw(TQPainter &p) PoolBallConfig::PoolBallConfig(PoolBall *poolBall, TQWidget *parent) : Config(parent), m_poolBall(poolBall) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint()); - tqlayout->addStretch(); + layout->addStretch(); TQLabel *num = new TQLabel(i18n("Number:"), this); - tqlayout->addWidget(num); + layout->addWidget(num); KIntNumInput *slider = new KIntNumInput(m_poolBall->number(), this); slider->setRange(1, 15); - tqlayout->addWidget(slider); + layout->addWidget(slider); - tqlayout->addStretch(); + layout->addStretch(); connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(numberChanged(int))); } diff --git a/kolf/objects/test/test.cpp b/kolf/objects/test/test.cpp index 9a959694..eabc2e7e 100644 --- a/kolf/objects/test/test.cpp +++ b/kolf/objects/test/test.cpp @@ -68,21 +68,21 @@ void Test::load(KConfig *cfg) TestConfig::TestConfig(Test *test, TQWidget *parent) : Config(parent), m_test(test) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint()); - tqlayout->addStretch(); + layout->addStretch(); - tqlayout->addWidget(new TQLabel(i18n("Flash speed"), this)); + layout->addWidget(new TQLabel(i18n("Flash speed"), this)); - TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint()); TQLabel *slow = new TQLabel(i18n("Slow"), this); - htqlayout->addWidget(slow); + hlayout->addWidget(slow); TQSlider *slider = new TQSlider(1, 100, 5, 101 - m_test->switchEvery(), Qt::Horizontal, this); - htqlayout->addWidget(slider); + hlayout->addWidget(slider); TQLabel *fast = new TQLabel(i18n("Fast"), this); - htqlayout->addWidget(fast); + hlayout->addWidget(fast); - tqlayout->addStretch(); + layout->addStretch(); connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(switchEveryChanged(int))); } diff --git a/kolf/printdialogpage.cpp b/kolf/printdialogpage.cpp index e60de7ea..e8733c81 100644 --- a/kolf/printdialogpage.cpp +++ b/kolf/printdialogpage.cpp @@ -13,11 +13,11 @@ PrintDialogPage::PrintDialogPage(TQWidget *parent, const char *name) { setTitle(i18n("Kolf Options")); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); titleCheck = new TQCheckBox(i18n("Draw title text"), this); titleCheck->setChecked(true); - tqlayout->addWidget(titleCheck); + layout->addWidget(titleCheck); } void PrintDialogPage::getOptions(TQMap &opts, bool /*incldef*/) diff --git a/kolf/slope.cpp b/kolf/slope.cpp index 9a2198f6..a6a1abf1 100644 --- a/kolf/slope.cpp +++ b/kolf/slope.cpp @@ -521,7 +521,7 @@ SlopeConfig::SlopeConfig(Slope *slope, TQWidget *parent) : Config(parent) { this->slope = slope; - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint()); KComboBox *gradient = new KComboBox(this); TQStringList items; TQString curText; @@ -533,28 +533,28 @@ SlopeConfig::SlopeConfig(Slope *slope, TQWidget *parent) } gradient->insertStringList(items); gradient->setCurrentText(curText); - tqlayout->addWidget(gradient); + layout->addWidget(gradient); connect(gradient, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(setGradient(const TQString &))); - tqlayout->addStretch(); + layout->addStretch(); TQCheckBox *reversed = new TQCheckBox(i18n("Reverse direction"), this); reversed->setChecked(slope->isReversed()); - tqlayout->addWidget(reversed); + layout->addWidget(reversed); connect(reversed, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setReversed(bool))); - TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, spacingHint()); - htqlayout->addWidget(new TQLabel(i18n("Grade:"), this)); + TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint()); + hlayout->addWidget(new TQLabel(i18n("Grade:"), this)); KDoubleNumInput *grade = new KDoubleNumInput(this); grade->setRange(0, 8, 1, true); grade->setValue(slope->curGrade()); - htqlayout->addWidget(grade); + hlayout->addWidget(grade); connect(grade, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(gradeChanged(double))); TQCheckBox *stuck = new TQCheckBox(i18n("Unmovable"), this); TQWhatsThis::add(stuck, i18n("Whether or not this slope can be moved by other objects, like floaters.")); stuck->setChecked(slope->isStuckOnGround()); - tqlayout->addWidget(stuck); + layout->addWidget(stuck); connect(stuck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setStuckOnGround(bool))); } diff --git a/konquest/fleetdlg.cc b/konquest/fleetdlg.cc index 2e18d0bc..e933e895 100644 --- a/konquest/fleetdlg.cc +++ b/konquest/fleetdlg.cc @@ -52,15 +52,15 @@ FleetDlg::FleetDlg( TQWidget *parent, AttackFleetList *fleets ) okButton->setMinimumSize( okButton->sizeHint() ); okButton->setDefault(true); - TQVBoxLayout *tqlayout1 = new TQVBoxLayout( this ); - TQHBoxLayout *tqlayout2 = new TQHBoxLayout; + TQVBoxLayout *layout1 = new TQVBoxLayout( this ); + TQHBoxLayout *layout2 = new TQHBoxLayout; - tqlayout1->addWidget( fleetTable, 1 ); - tqlayout1->addLayout( tqlayout2 ); + layout1->addWidget( fleetTable, 1 ); + layout1->addLayout( layout2 ); - tqlayout2->addStretch( 2 ); - tqlayout2->addWidget( okButton ); - tqlayout2->addStretch( 2 ); + layout2->addStretch( 2 ); + layout2->addWidget( okButton ); + layout2->addStretch( 2 ); connect( okButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); diff --git a/konquest/gameboard.cc b/konquest/gameboard.cc index 9f44f872..455ea03c 100644 --- a/konquest/gameboard.cc +++ b/konquest/gameboard.cc @@ -88,33 +88,33 @@ GameBoard::GameBoard( TQWidget *parent ) //******************************************************************** // Layout the main window //******************************************************************** - TQHBoxLayout *tqlayout1 = new TQHBoxLayout( this ); - TQVBoxLayout *tqlayout2 = new TQVBoxLayout; - TQHBoxLayout *tqlayout3 = new TQHBoxLayout; - TQVBoxLayout *tqlayout4 = new TQVBoxLayout; + TQHBoxLayout *layout1 = new TQHBoxLayout( this ); + TQVBoxLayout *layout2 = new TQVBoxLayout; + TQHBoxLayout *layout3 = new TQHBoxLayout; + TQVBoxLayout *layout4 = new TQVBoxLayout; - tqlayout1->addLayout( tqlayout2 ); - tqlayout2->addLayout( tqlayout3 ); + layout1->addLayout( layout2 ); + layout2->addLayout( layout3 ); - tqlayout3->addSpacing( 5 ); - tqlayout3->addWidget( gameMessage, 10 ); - tqlayout3->addWidget( shipCountEdit, 1 ); - tqlayout3->addWidget( endTurn, 1 ); + layout3->addSpacing( 5 ); + layout3->addWidget( gameMessage, 10 ); + layout3->addWidget( shipCountEdit, 1 ); + layout3->addWidget( endTurn, 1 ); - tqlayout2->addSpacing( 5 ); - tqlayout2->addWidget( mapWidget, 0, AlignTop ); - tqlayout2->addWidget( msgWidget ); - tqlayout2->addStretch( 1 ); + layout2->addSpacing( 5 ); + layout2->addWidget( mapWidget, 0, AlignTop ); + layout2->addWidget( msgWidget ); + layout2->addStretch( 1 ); - tqlayout1->addSpacing( 5 ); - tqlayout1->addLayout( tqlayout4, 10 ); + layout1->addSpacing( 5 ); + layout1->addLayout( layout4, 10 ); - tqlayout4->addWidget( planetInfo, 1 ); - tqlayout4->addSpacing( 10 ); - tqlayout4->addWidget( turnCounter, 1 ); - tqlayout4->addStretch( 1 ); + layout4->addWidget( planetInfo, 1 ); + layout4->addSpacing( 10 ); + layout4->addWidget( turnCounter, 1 ); + layout4->addStretch( 1 ); - tqlayout1->addStretch( 1 ); + layout1->addStretch( 1 ); //********************************************************************** // Set up signal/slot connections diff --git a/konquest/newGameDlg_ui.ui b/konquest/newGameDlg_ui.ui index 6c50c8d0..55a8a2b9 100644 --- a/konquest/newGameDlg_ui.ui +++ b/konquest/newGameDlg_ui.ui @@ -18,7 +18,7 @@ - tqlayout9 + layout9 @@ -26,7 +26,7 @@ - tqlayout4 + layout4 @@ -97,7 +97,7 @@ - tqlayout3 + layout3 @@ -131,7 +131,7 @@ - tqlayout2 + layout2 @@ -202,7 +202,7 @@ - tqlayout8 + layout8 @@ -246,7 +246,7 @@ - tqlayout7 + layout7 @@ -312,7 +312,7 @@ - tqlayout5 + layout5 diff --git a/konquest/planet_info.cc b/konquest/planet_info.cc index 0d4df824..1d178493 100644 --- a/konquest/planet_info.cc +++ b/konquest/planet_info.cc @@ -27,14 +27,14 @@ PlanetInfo::PlanetInfo( TQWidget *parent, TQPalette palette ) clearDisplay(); - TQVBoxLayout *tqlayout1 = new TQVBoxLayout( this ); - - tqlayout1->addWidget( name ); - tqlayout1->addWidget( owner ); - tqlayout1->addWidget( ships ); - tqlayout1->addWidget( production ); - tqlayout1->addWidget( kill_percent ); - tqlayout1->addStretch(1); + TQVBoxLayout *layout1 = new TQVBoxLayout( this ); + + layout1->addWidget( name ); + layout1->addWidget( owner ); + layout1->addWidget( ships ); + layout1->addWidget( production ); + layout1->addWidget( kill_percent ); + layout1->addStretch(1); setMouseTracking( true ); diff --git a/konquest/scoredlg.cc b/konquest/scoredlg.cc index 116f88c6..fee4a404 100644 --- a/konquest/scoredlg.cc +++ b/konquest/scoredlg.cc @@ -45,15 +45,15 @@ ScoreDlg::ScoreDlg( TQWidget *parent, const TQString& title, PlayerList *players okButton->setMinimumSize( okButton->sizeHint() ); okButton->setDefault(true); - TQVBoxLayout *tqlayout1 = new TQVBoxLayout( this ); - TQHBoxLayout *tqlayout2 = new TQHBoxLayout; + TQVBoxLayout *layout1 = new TQVBoxLayout( this ); + TQHBoxLayout *layout2 = new TQHBoxLayout; - tqlayout1->addWidget( scoreTable, 1 ); - tqlayout1->addLayout( tqlayout2 ); + layout1->addWidget( scoreTable, 1 ); + layout1->addLayout( layout2 ); - tqlayout2->addStretch( 2 ); - tqlayout2->addWidget( okButton ); - tqlayout2->addStretch( 2 ); + layout2->addStretch( 2 ); + layout2->addWidget( okButton ); + layout2->addStretch( 2 ); connect( okButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); diff --git a/kpat/gamestats.ui b/kpat/gamestats.ui index 9ad673ea..3efbdaa9 100644 --- a/kpat/gamestats.ui +++ b/kpat/gamestats.ui @@ -24,7 +24,7 @@ - tqlayout3 + layout3 @@ -63,7 +63,7 @@ - tqlayout5 + layout5 @@ -71,7 +71,7 @@ - tqlayout2 + layout2 diff --git a/kpoker/defines.h b/kpoker/defines.h index d4b827de..3da071f6 100644 --- a/kpoker/defines.h +++ b/kpoker/defines.h @@ -21,7 +21,7 @@ // ---------------------------------------------------------------- -// Graphical tqlayout +// Graphical layout #define cardHeight 96 diff --git a/kpoker/kpaint.cpp b/kpoker/kpaint.cpp index 86406dea..1669820c 100644 --- a/kpoker/kpaint.cpp +++ b/kpoker/kpaint.cpp @@ -173,7 +173,7 @@ void CardWidget::repaintDeck() setPixmap(*m_pm); setFixedSize(cardImages->getWidth(), cardImages->getHeight()); - ((TQWidget*) parent())->tqlayout()->invalidate(); + ((TQWidget*) parent())->layout()->invalidate(); ((TQWidget*) parent())->setFixedSize( ((TQWidget*) parent())->sizeHint()); } diff --git a/kpoker/kpoker.h b/kpoker/kpoker.h index 7eec697a..732a2af5 100644 --- a/kpoker/kpoker.h +++ b/kpoker/kpoker.h @@ -325,7 +325,7 @@ class kpok : public TQWidget int drawDelay; - // Graphical tqlayout. + // Graphical layout. TQVBoxLayout *topLayout; TQHBoxLayout *inputLayout; TQLabel *potLabel; diff --git a/kreversi/qreversigameview.cpp b/kreversi/qreversigameview.cpp index 7581ddf0..ce1e3f5f 100644 --- a/kreversi/qreversigameview.cpp +++ b/kreversi/qreversigameview.cpp @@ -156,30 +156,30 @@ QReversiGameView::~QReversiGameView() void QReversiGameView::createView() { - TQGridLayout *tqlayout = new TQGridLayout(this, 4, 2); + TQGridLayout *layout = new TQGridLayout(this, 4, 2); // The board m_boardView = new QReversiBoardView(this, m_game); m_boardView->loadSettings(); // Load the pixmaps used in the status widgets. - tqlayout->addMultiCellWidget(m_boardView, 0, 3, 0, 0); + layout->addMultiCellWidget(m_boardView, 0, 3, 0, 0); // The status widgets m_blackStatus = new StatusWidget(TQString(), this); m_blackStatus->setPixmap(m_boardView->chipPixmap(Black, 20)); - tqlayout->addWidget(m_blackStatus, 0, 1); + layout->addWidget(m_blackStatus, 0, 1); m_whiteStatus = new StatusWidget(TQString(), this); m_whiteStatus->setPixmap(m_boardView->chipPixmap(White, 20)); - tqlayout->addWidget(m_whiteStatus, 1, 1); + layout->addWidget(m_whiteStatus, 1, 1); // The "Moves" label TQLabel *movesLabel = new TQLabel( i18n("Moves"), this); movesLabel->setAlignment(AlignCenter); - tqlayout->addWidget(movesLabel, 2, 1); + layout->addWidget(movesLabel, 2, 1); // The list of moves. m_movesView = new TQListBox(this, "moves"); m_movesView->setMinimumWidth(150); - tqlayout->addWidget(m_movesView, 3, 1); + layout->addWidget(m_movesView, 3, 1); } diff --git a/kshisen/app.cpp b/kshisen/app.cpp index 98a40dde..e6ed257c 100644 --- a/kshisen/app.cpp +++ b/kshisen/app.cpp @@ -375,7 +375,7 @@ TQString App::getPlayerName() connect(b, TQT_SIGNAL(released()), dlg, TQT_SLOT(accept())); connect(e, TQT_SIGNAL(returnPressed()), dlg, TQT_SLOT(accept())); - // create tqlayout + // create layout TQVBoxLayout *tl = new TQVBoxLayout(dlg, 10); TQHBoxLayout *tl1 = new TQHBoxLayout(); tl->addWidget(l1); @@ -608,7 +608,7 @@ void App::showHighscore(int focusitem) l->setAlignment(AlignCenter); tl->addWidget(l); - // insert highscores in a gridtqlayout + // insert highscores in a gridlayout TQGridLayout *table = new TQGridLayout(12, 5, 5); tl->addLayout(table, 1); @@ -727,7 +727,7 @@ void App::showHighscore(int focusitem) b->setDefault(true); b->setFocus(); - // make tqlayout + // make layout tl->addSpacing(10); tl->addWidget(b); tl->activate(); diff --git a/ksnake/startroom.cpp b/ksnake/startroom.cpp index 9792ee4b..24874ee9 100644 --- a/ksnake/startroom.cpp +++ b/ksnake/startroom.cpp @@ -40,16 +40,16 @@ StartRoom::StartRoom( TQWidget *parent, const char *name) TQSpacerItem* spacer = new TQSpacerItem( 20, 61, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); Form1Layout->addItem( spacer, 2, 1 ); - TQHBoxLayout *tqlayout1 = new TQHBoxLayout( 0, 0, 6, "tqlayout1"); + TQHBoxLayout *layout1 = new TQHBoxLayout( 0, 0, 6, "layout1"); TQSpacerItem* spacer_2 = new TQSpacerItem( 91, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - tqlayout1->addItem( spacer_2 ); + layout1->addItem( spacer_2 ); picture = new TQLabel( this, "picture" ); - tqlayout1->addWidget( picture ); + layout1->addWidget( picture ); TQSpacerItem* spacer_3 = new TQSpacerItem( 41, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - tqlayout1->addItem( spacer_3 ); + layout1->addItem( spacer_3 ); - Form1Layout->addMultiCellLayout( tqlayout1, 0, 0, 0, 1 ); + Form1Layout->addMultiCellLayout( layout1, 0, 0, 0, 1 ); roomRange = new TQSpinBox( this, "kcfg_StartingRoom" ); roomRange->setMaxValue( 25 ); diff --git a/kspaceduel/dialogs.cpp b/kspaceduel/dialogs.cpp index 34194ad0..f7570ef9 100644 --- a/kspaceduel/dialogs.cpp +++ b/kspaceduel/dialogs.cpp @@ -130,7 +130,7 @@ ConfigSetup::ConfigSetup(SConfig *custom,TQWidget *parent,const char *name) //box=new TQGroupBox(i18n("Config"),this); //setMainWidget( box ); - TQVBoxLayout *boxtqlayout = new TQVBoxLayout( this, 6 ); + TQVBoxLayout *boxlayout = new TQVBoxLayout( this, 6 ); tabs=new TQTabWidget(this); for(i=0;iinsertItem(i18n(predefinedConfigName[i])); configCombo->insertItem(i18n("Custom")); - boxtqlayout->addSpacing( 2 * 6 ); - boxtqlayout->addWidget(configCombo); - boxtqlayout->addWidget(tabs); + boxlayout->addSpacing( 2 * 6 ); + boxlayout->addWidget(configCombo); + boxlayout->addWidget(tabs); for(i=0;iaddWidget(playerinfo[0]); - toptqlayout->addWidget(playfield); - toptqlayout->addWidget(playerinfo[1]); - toptqlayout->activate(); + TQBoxLayout *toplayout=new TQHBoxLayout(w); + toplayout->addWidget(playerinfo[0]); + toplayout->addWidget(playfield); + toplayout->addWidget(playerinfo[1]); + toplayout->activate(); playfield->setFocusPolicy(TQ_StrongFocus); playfield->setFocus(); diff --git a/ktron/general.ui b/ktron/general.ui index 2db1b4ae..c2f1cf4b 100644 --- a/ktron/general.ui +++ b/ktron/general.ui @@ -154,7 +154,7 @@ - tqlayout1 + layout1 diff --git a/ktuberling/pics/layout.i18n b/ktuberling/pics/layout.i18n index 85c63ed9..373203cb 100644 --- a/ktuberling/pics/layout.i18n +++ b/ktuberling/pics/layout.i18n @@ -1,6 +1,6 @@ /* ------------------------------------------------------------- KDE Tuberling - List of strings in tqlayout.xml that are translatable + List of strings in layout.xml that are translatable mailto:e.bischoff@noos.fr ------------------------------------------------------------- */ diff --git a/ktuberling/pics/layout.xml b/ktuberling/pics/layout.xml index e96beb07..c5b02fb8 100644 --- a/ktuberling/pics/layout.xml +++ b/ktuberling/pics/layout.xml @@ -5,7 +5,7 @@ Modify this file if you want to add new playgrounds, new sounds, or modify existing ones. If you do that, don't forget to update: - - tqlayout.i18n (strings that might be translated) + - layout.i18n (strings that might be translated) - ktuberlingui.rc (actions associated with menu items). --> diff --git a/ktuberling/toplevel.cpp b/ktuberling/toplevel.cpp index ab7eb9dd..8f480dc3 100644 --- a/ktuberling/toplevel.cpp +++ b/ktuberling/toplevel.cpp @@ -189,7 +189,7 @@ void TopLevel::changeLanguage(uint newLanguage) // Load the layouts file bool TopLevel::loadLayout(TQDomDocument &layoutDocument) { - TQFile layoutFile(TQFile::encodeName(locate("data", "ktuberling/pics/tqlayout.xml"))); + TQFile layoutFile(TQFile::encodeName(locate("data", "ktuberling/pics/layout.xml"))); if (!layoutFile.open(IO_ReadOnly)) return false; @@ -422,7 +422,7 @@ void TopLevel::filePrint() // Copy modified area to clipboard void TopLevel::editCopy() { - TQClipboard *clipboard = TQApplication::tqclipboard(); + TQClipboard *clipboard = TQApplication::clipboard(); TQPixmap picture(playGround->getPicture()); clipboard->setPixmap(picture); diff --git a/libksirtet/lib/meeting.cpp b/libksirtet/lib/meeting.cpp index 58acf205..e35a6cbc 100644 --- a/libksirtet/lib/meeting.cpp +++ b/libksirtet/lib/meeting.cpp @@ -23,7 +23,7 @@ NetMeeting::NetMeeting(const cId &_id, Socket *socket, sm.append(socket, SocketManager::ReadWrite); sm[0]->notifier()->setEnabled(TRUE); -/* top tqlayout */ +/* top layout */ TQVBoxLayout *top = new TQVBoxLayout(plainPage(), spacingHint()); top->setResizeMode(TQLayout::Fixed); diff --git a/libksirtet/lib/mp_option.h b/libksirtet/lib/mp_option.h index bca42bfa..f0e0f6cc 100644 --- a/libksirtet/lib/mp_option.h +++ b/libksirtet/lib/mp_option.h @@ -28,7 +28,7 @@ * changed. In addition you'll need to implement the method @ref #saveData * to save the configuration in the config file ; so that it will be available * for the initialisation of @ref LocalBoard. - * It seems a good idea that the widget have the same tqlayout + * It seems a good idea that the widget have the same layout * on both (server and client) sides but with the inner widgets all disabled * on the client side. */ diff --git a/libksirtet/lib/pline.cpp b/libksirtet/lib/pline.cpp index 28c0363f..86fde398 100644 --- a/libksirtet/lib/pline.cpp +++ b/libksirtet/lib/pline.cpp @@ -14,7 +14,7 @@ MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine, { setFrameStyle(Panel | (serverLine ? Raised : Plain)); - // Top tqlayout + // Top layout hbl = new TQHBoxLayout(this, THIN_BORDER + frameWidth()); /* TriCheckBox */ @@ -89,7 +89,7 @@ PlayerLine::PlayerLine(PlayerComboBox::Type type, const TQString &txt, { setFrameStyle(Panel | Raised); - // Top tqlayout + // Top layout TQHBoxLayout *hbl; hbl = new TQHBoxLayout(this, THIN_BORDER + frameWidth()); diff --git a/libtdegames/highscore/kexthighscore_tab.cpp b/libtdegames/highscore/kexthighscore_tab.cpp index b3fdecd1..cbb30e0a 100644 --- a/libtdegames/highscore/kexthighscore_tab.cpp +++ b/libtdegames/highscore/kexthighscore_tab.cpp @@ -120,7 +120,7 @@ StatisticsTab::StatisticsTab(TQWidget *parent) : AdditionalTab(parent, "statistics_tab") { // construct GUI - TQVBoxLayout *top = static_cast(tqlayout()); + TQVBoxLayout *top = static_cast(layout()); TQHBoxLayout *hbox = new TQHBoxLayout(top); TQVBoxLayout *vbox = new TQVBoxLayout(hbox); @@ -209,7 +209,7 @@ HistogramTab::HistogramTab(TQWidget *parent) : AdditionalTab(parent, "histogram_tab") { // construct GUI - TQVBoxLayout *top = static_cast(tqlayout()); + TQVBoxLayout *top = static_cast(layout()); _list = new KListView(this); _list->setSelectionMode(TQListView::NoSelection); diff --git a/libtdegames/highscore/kscoredialog.cpp b/libtdegames/highscore/kscoredialog.cpp index 03170939..a1ed1988 100644 --- a/libtdegames/highscore/kscoredialog.cpp +++ b/libtdegames/highscore/kscoredialog.cpp @@ -44,7 +44,7 @@ class KScoreDialog::KScoreDialogPrivate public: TQPtrList scores; TQWidget *page; - TQGridLayout *tqlayout; + TQGridLayout *layout; TQLineEdit *edit; TQPtrVector stack; TQPtrVector labels; @@ -126,36 +126,36 @@ void KScoreDialog::setupDialog() d->col[field] = d->nrCols++; } - d->tqlayout = new TQGridLayout(d->page, 15, d->nrCols, marginHint() + 20, spacingHint()); - d->tqlayout->addRowSpacing(4, 15); + d->layout = new TQGridLayout(d->page, 15, d->nrCols, marginHint() + 20, spacingHint()); + d->layout->addRowSpacing(4, 15); d->commentLabel = new TQLabel(d->page); d->commentLabel->setAlignment(AlignVCenter | AlignHCenter); - d->tqlayout->addMultiCellWidget(d->commentLabel, 1, 1, 0, d->nrCols-1); + d->layout->addMultiCellWidget(d->commentLabel, 1, 1, 0, d->nrCols-1); TQFont bold = font(); bold.setBold(true); TQLabel *label; - d->tqlayout->addColSpacing(0, 50); + d->layout->addColSpacing(0, 50); label = new TQLabel(i18n("Rank"), d->page); - d->tqlayout->addWidget(label, 3, 0); + d->layout->addWidget(label, 3, 0); label->setFont(bold); for(int field = 1; field < d->fields; field = field * 2) { if (d->fields & field) { - d->tqlayout->addColSpacing(d->col[field], 50); + d->layout->addColSpacing(d->col[field], 50); label = new TQLabel(d->header[field], d->page); - d->tqlayout->addWidget(label, 3, d->col[field], field <= Name ? AlignLeft : AlignRight); + d->layout->addWidget(label, 3, d->col[field], field <= Name ? AlignLeft : AlignRight); label->setFont(bold); } } KSeparator *sep = new KSeparator(Qt::Horizontal, d->page); - d->tqlayout->addMultiCellWidget(sep, 4, 4, 0, d->nrCols-1); + d->layout->addMultiCellWidget(sep, 4, 4, 0, d->nrCols-1); d->labels.resize(d->nrCols * 10); d->stack.resize(10); @@ -166,12 +166,12 @@ void KScoreDialog::setupDialog() num.setNum(i); label = new TQLabel(i18n("#%1").arg(num), d->page); d->labels.insert((i-1)*d->nrCols + 0, label); - d->tqlayout->addWidget(label, i+4, 0); + d->layout->addWidget(label, i+4, 0); if (d->fields & Name) { TQWidgetStack *stack = new TQWidgetStack(d->page); d->stack.insert(i-1, stack); - d->tqlayout->addWidget(stack, i+4, d->col[Name]); + d->layout->addWidget(stack, i+4, d->col[Name]); label = new TQLabel(d->page); d->labels.insert((i-1)*d->nrCols + d->col[Name], label); stack->addWidget(label); @@ -183,7 +183,7 @@ void KScoreDialog::setupDialog() { label = new TQLabel(d->page); d->labels.insert((i-1)*d->nrCols + d->col[field], label); - d->tqlayout->addWidget(label, i+4, d->col[field], AlignRight); + d->layout->addWidget(label, i+4, d->col[field], AlignRight); } } } @@ -202,15 +202,15 @@ void KScoreDialog::aboutToShow() { d->commentLabel->setMinimumSize(TQSize(1,1)); d->commentLabel->hide(); - d->tqlayout->addRowSpacing(0, -15); - d->tqlayout->addRowSpacing(2, -15); + d->layout->addRowSpacing(0, -15); + d->layout->addRowSpacing(2, -15); } else { d->commentLabel->setMinimumSize(d->commentLabel->sizeHint()); d->commentLabel->show(); - d->tqlayout->addRowSpacing(0, -10); - d->tqlayout->addRowSpacing(2, 10); + d->layout->addRowSpacing(0, -10); + d->layout->addRowSpacing(2, 10); } d->comment = TQString(); diff --git a/libtdegames/kcarddialog.cpp b/libtdegames/kcarddialog.cpp index c79a8d78..d6b42986 100644 --- a/libtdegames/kcarddialog.cpp +++ b/libtdegames/kcarddialog.cpp @@ -271,11 +271,11 @@ void KCardDialog::setupDialog(bool showResizeBox) if (! (flags() & NoDeck)) { - TQHBoxLayout* tqlayout = new TQHBoxLayout(cardLayout); + TQHBoxLayout* layout = new TQHBoxLayout(cardLayout); // Deck iconview TQGroupBox* grp1 = new TQGroupBox(1,Qt::Horizontal, i18n("Choose Backside"), plainPage()); - tqlayout->addWidget(grp1); + layout->addWidget(grp1); d->deckIconView = new KIconView(grp1,"decks"); d->deckIconView->setSpacing(8); @@ -293,7 +293,7 @@ void KCardDialog::setupDialog(bool showResizeBox) d->deckIconView->showToolTips(); // deck select - TQVBoxLayout* l = new TQVBoxLayout(tqlayout); + TQVBoxLayout* l = new TQVBoxLayout(layout); TQGroupBox* grp3 = new TQGroupBox(i18n("Backside"), plainPage()); grp3->setFixedSize(100, 130); l->addWidget(grp3, 0, AlignTop|AlignHCenter); @@ -325,9 +325,9 @@ void KCardDialog::setupDialog(bool showResizeBox) if (! (flags() & NoCards)) { // Cards iconview - TQHBoxLayout* tqlayout = new TQHBoxLayout(cardLayout); + TQHBoxLayout* layout = new TQHBoxLayout(cardLayout); TQGroupBox* grp2 = new TQGroupBox(1,Qt::Horizontal, i18n("Choose Frontside"), plainPage()); - tqlayout->addWidget(grp2); + layout->addWidget(grp2); d->cardIconView =new KIconView(grp2,"cards"); /* @@ -343,7 +343,7 @@ void KCardDialog::setupDialog(bool showResizeBox) d->cardIconView->showToolTips(); // Card select - TQVBoxLayout* l = new TQVBoxLayout(tqlayout); + TQVBoxLayout* l = new TQVBoxLayout(layout); TQGroupBox* grp4 = new TQGroupBox(i18n("Frontside"), plainPage()); grp4->setFixedSize(100, 130); l->addWidget(grp4, 0, AlignTop|AlignHCenter); @@ -422,10 +422,10 @@ void KCardDialog::setupDialog(bool showResizeBox) // large. This is desired behaviour as i don't want to make the box even // larger but i want the complete pixmap to be displayed. the dialog is not // resized if you make the pixmap smaller again. - TQVBoxLayout* tqlayout = new TQVBoxLayout(topLayout); + TQVBoxLayout* layout = new TQVBoxLayout(topLayout); TQGroupBox* grp = new TQGroupBox(1,Qt::Horizontal, i18n("Resize Cards"), plainPage()); - tqlayout->setResizeMode(TQLayout::Fixed); - tqlayout->addWidget(grp); + layout->setResizeMode(TQLayout::Fixed); + layout->addWidget(grp); TQWidget* box = new TQWidget(grp); TQHBoxLayout* hbox = new TQHBoxLayout(box, 0, spacingHint()); TQVBoxLayout* boxLayout = new TQVBoxLayout(hbox); diff --git a/libtdegames/kchatdialog.cpp b/libtdegames/kchatdialog.cpp index 7e0df7e8..9cfbefff 100644 --- a/libtdegames/kchatdialog.cpp +++ b/libtdegames/kchatdialog.cpp @@ -80,42 +80,42 @@ void KChatDialog::init() d = new KChatDialogPrivate; // d->mTextPage = addPage(i18n("&Messages"));// not a good name - game Messages? d->mTextPage = plainPage(); - TQGridLayout* tqlayout = new TQGridLayout(d->mTextPage, 7, 2, KDialog::marginHint(), KDialog::spacingHint()); + TQGridLayout* layout = new TQGridLayout(d->mTextPage, 7, 2, KDialog::marginHint(), KDialog::spacingHint()); // General fonts TQPushButton* nameFont = new TQPushButton(i18n("Name Font..."), d->mTextPage); connect(nameFont, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotGetNameFont())); - tqlayout->addWidget(nameFont, 0, 0); + layout->addWidget(nameFont, 0, 0); TQPushButton* textFont = new TQPushButton(i18n("Text Font..."), d->mTextPage); connect(textFont, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotGetTextFont())); - tqlayout->addWidget(textFont, 0, 1); + layout->addWidget(textFont, 0, 1); TQFrame* messagePreview = new TQFrame(d->mTextPage); messagePreview->setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); TQHBoxLayout* messageLayout = new TQHBoxLayout(messagePreview); - tqlayout->addMultiCellWidget(messagePreview, 1, 1, 0, 1); + layout->addMultiCellWidget(messagePreview, 1, 1, 0, 1); d->mNamePreview = new TQLabel(i18n("Player: "), messagePreview); messageLayout->addWidget(d->mNamePreview, 0); d->mTextPreview = new TQLabel(i18n("This is a player message"), messagePreview); messageLayout->addWidget(d->mTextPreview, 1); - tqlayout->addRowSpacing(2, 10); + layout->addRowSpacing(2, 10); // System Message fonts TQLabel* systemMessages = new TQLabel(i18n("System Messages - Messages directly sent from the game"), d->mTextPage); - tqlayout->addMultiCellWidget(systemMessages, 3, 3, 0, 1); + layout->addMultiCellWidget(systemMessages, 3, 3, 0, 1); TQPushButton* systemNameFont = new TQPushButton(i18n("Name Font..."), d->mTextPage); connect(systemNameFont, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotGetSystemNameFont())); - tqlayout->addWidget(systemNameFont, 4, 0); + layout->addWidget(systemNameFont, 4, 0); TQPushButton* systemTextFont = new TQPushButton(i18n("Text Font..."), d->mTextPage); connect(systemTextFont, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotGetSystemTextFont())); - tqlayout->addWidget(systemTextFont, 4, 1); + layout->addWidget(systemTextFont, 4, 1); TQFrame* systemMessagePreview = new TQFrame(d->mTextPage); systemMessagePreview->setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); TQHBoxLayout* systemMessageLayout = new TQHBoxLayout(systemMessagePreview); - tqlayout->addMultiCellWidget(systemMessagePreview, 5, 5, 0, 1); + layout->addMultiCellWidget(systemMessagePreview, 5, 5, 0, 1); d->mSystemNamePreview = new TQLabel(i18n("--- Game: "), systemMessagePreview); systemMessageLayout->addWidget(d->mSystemNamePreview, 0); @@ -124,10 +124,10 @@ void KChatDialog::init() // message count TQLabel* maxMessages = new TQLabel(i18n("Maximal number of messages (-1 = unlimited):"), d->mTextPage); - tqlayout->addWidget(maxMessages, 6, 0); + layout->addWidget(maxMessages, 6, 0); d->mMaxMessages = new TQLineEdit(d->mTextPage); d->mMaxMessages->setText(TQString::number(-1)); - tqlayout->addWidget(d->mMaxMessages, 6, 1); + layout->addWidget(d->mMaxMessages, 6, 1); } void KChatDialog::slotGetNameFont() diff --git a/libtdegames/kgame/COMPAT b/libtdegames/kgame/COMPAT index 4551c679..b85ec9b6 100644 --- a/libtdegames/kgame/COMPAT +++ b/libtdegames/kgame/COMPAT @@ -38,7 +38,7 @@ too! The API stays the same. 11.10.2001 KGameDialogGeneralConfig now doesn't provide setMin/maxPlayers() - anymore. The game should manage this internally. tqlayout() is + anymore. The game should manage this internally. layout() is obsolete as well 18.10.2001 KPlayer::signalNetworkData contained QDataStream& instead of const QByteArray& parameter (oops!). This is fixed now. All apps which diff --git a/libtdegames/kgame/dialogs/kgamedebugdialog.cpp b/libtdegames/kgame/dialogs/kgamedebugdialog.cpp index 6b56432c..9775edc4 100644 --- a/libtdegames/kgame/dialogs/kgamedebugdialog.cpp +++ b/libtdegames/kgame/dialogs/kgamedebugdialog.cpp @@ -142,18 +142,18 @@ void KGameDebugDialog::initGamePage() { d->mGamePage = addPage(i18n("Debug &KGame")); TQVBoxLayout* topLayout = new TQVBoxLayout(d->mGamePage, marginHint(), spacingHint()); - TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout); + TQHBoxLayout* layout = new TQHBoxLayout(topLayout); KListView* v = new KListView(d->mGamePage); v->addColumn(i18n("Data")); v->addColumn(i18n("Value")); - tqlayout->addWidget(v); + layout->addWidget(v); d->mGameProperties = new KListView(d->mGamePage); d->mGameProperties->addColumn(i18n("Property")); d->mGameProperties->addColumn(i18n("Value")); d->mGameProperties->addColumn(i18n("Policy")); - tqlayout->addWidget(d->mGameProperties); + layout->addWidget(d->mGameProperties); TQPushButton* b = new TQPushButton(i18n("Update"), d->mGamePage); connect(b, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotUpdateGameData())); @@ -177,10 +177,10 @@ void KGameDebugDialog::initPlayerPage() { d->mPlayerPage = addPage(i18n("Debug &Players")); TQVBoxLayout* topLayout = new TQVBoxLayout(d->mPlayerPage, marginHint(), spacingHint()); - TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout); + TQHBoxLayout* layout = new TQHBoxLayout(topLayout); //TODO: connect to the KGame signals for joined/removed players!!! - TQVBoxLayout* listLayout = new TQVBoxLayout(tqlayout); + TQVBoxLayout* listLayout = new TQVBoxLayout(layout); TQLabel* listLabel = new TQLabel(i18n("Available Players"), d->mPlayerPage); listLayout->addWidget(listLabel); d->mPlayerList = new KListBox(d->mPlayerPage); @@ -189,7 +189,7 @@ void KGameDebugDialog::initPlayerPage() d->mPlayerList->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding)); KListView* v = new KListView(d->mPlayerPage); - tqlayout->addWidget(v); + layout->addWidget(v); v->addColumn(i18n("Data")); v->addColumn(i18n("Value")); @@ -197,7 +197,7 @@ void KGameDebugDialog::initPlayerPage() d->mPlayerProperties->addColumn(i18n("Property")); d->mPlayerProperties->addColumn(i18n("Value")); d->mPlayerProperties->addColumn(i18n("Policy")); - tqlayout->addWidget(d->mPlayerProperties); + layout->addWidget(d->mPlayerProperties); TQPushButton* b = new TQPushButton(i18n("Update"), d->mPlayerPage); connect(b, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotUpdatePlayerList())); @@ -220,9 +220,9 @@ void KGameDebugDialog::initPlayerPage() void KGameDebugDialog::initMessagePage() { d->mMessagePage = addPage(i18n("Debug &Messages")); - TQGridLayout* tqlayout = new TQGridLayout(d->mMessagePage, 11, 7, marginHint(), spacingHint()); + TQGridLayout* layout = new TQGridLayout(d->mMessagePage, 11, 7, marginHint(), spacingHint()); d->mMessageList = new KListView(d->mMessagePage); - tqlayout->addMultiCellWidget(d->mMessageList, 0, 9, 0, 3); + layout->addMultiCellWidget(d->mMessageList, 0, 9, 0, 3); d->mMessageList->addColumn(i18n("Time")); d->mMessageList->addColumn(i18n("ID")); d->mMessageList->addColumn(i18n("Receiver")); @@ -231,20 +231,20 @@ void KGameDebugDialog::initMessagePage() TQPushButton* hide = new TQPushButton(i18n("&>>"), d->mMessagePage); connect(hide, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotHideId())); - tqlayout->addWidget(hide, 4, 4); + layout->addWidget(hide, 4, 4); TQPushButton* show = new TQPushButton(i18n("&<<"), d->mMessagePage); connect(show, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotShowId())); - tqlayout->addWidget(show, 6, 4); + layout->addWidget(show, 6, 4); TQLabel* l = new TQLabel(i18n("Do not show IDs:"), d->mMessagePage); - tqlayout->addMultiCellWidget(l, 0, 0, 5, 6); + layout->addMultiCellWidget(l, 0, 0, 5, 6); d->mHideIdList = new KListBox(d->mMessagePage); - tqlayout->addMultiCellWidget(d->mHideIdList, 1, 8, 5, 6); + layout->addMultiCellWidget(d->mHideIdList, 1, 8, 5, 6); TQPushButton* clear = new KPushButton(KStdGuiItem::clear(), d->mMessagePage); connect(clear, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotClearMessages())); - tqlayout->addMultiCellWidget(clear, 10, 10, 0, 6); + layout->addMultiCellWidget(clear, 10, 10, 0, 6); //TODO: "show all but..." and "show nothing but..." } diff --git a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp index a3f11835..dacbde82 100644 --- a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp +++ b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp @@ -122,7 +122,7 @@ KGameDialogNetworkConfig::KGameDialogNetworkConfig(TQWidget* parent) // kdDebug(11001) << k_funcinfo << ": this=" << this << endl; d = new KGameDialogNetworkConfigPrivate(); - TQVBoxLayout* topLayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint(), "toptqlayout"); + TQVBoxLayout* topLayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint(), "toplayout"); TQHBoxLayout *hb = new TQHBoxLayout(topLayout, KDialog::spacingHint()); diff --git a/libtdegames/kgame/dialogs/kgamedialogconfig.h b/libtdegames/kgame/dialogs/kgamedialogconfig.h index c2c36e2a..b91f05d0 100644 --- a/libtdegames/kgame/dialogs/kgamedialogconfig.h +++ b/libtdegames/kgame/dialogs/kgamedialogconfig.h @@ -157,7 +157,7 @@ public: * * @param parent Parent widget for this dialog. * @param initializeGUI If you really don't want to use the - * predefined widget and/or tqlayout use FALSE here. Note that then none + * predefined widget and/or layout use FALSE here. Note that then none * of the predefined widgets (currently only the name of the player) * will exist anymore. * diff --git a/libtdegames/kgamelcd.cpp b/libtdegames/kgamelcd.cpp index fc814f18..c99a3401 100644 --- a/libtdegames/kgamelcd.cpp +++ b/libtdegames/kgamelcd.cpp @@ -232,11 +232,11 @@ void KGameLCDList::append(const TQString &leading, TQLCDNumber *lcd) TQLabel *label = 0; if ( !leading.isEmpty() ) { label = new TQLabel(leading, this); - static_cast(tqlayout())->addWidget(label, i+1, 0); + static_cast(layout())->addWidget(label, i+1, 0); } d->_leadings.push_back(label); _lcds.push_back(lcd); - static_cast(tqlayout())->addWidget(lcd, i+1, 1); + static_cast(layout())->addWidget(lcd, i+1, 1); } void KGameLCDList::clear() diff --git a/libtdegames/kgamelcd.h b/libtdegames/kgamelcd.h index 6b84f012..f7bc69e6 100644 --- a/libtdegames/kgamelcd.h +++ b/libtdegames/kgamelcd.h @@ -184,7 +184,7 @@ private: //----------------------------------------------------------------------------- /** - * This widget holds a list of @ref TQLCDNumber arranged in a vertical tqlayout. + * This widget holds a list of @ref TQLCDNumber arranged in a vertical layout. * It also shows a label at the top of the list. * * @since 3.2 diff --git a/libtdegames/kgameprogress.cpp b/libtdegames/kgameprogress.cpp index de32cd14..451d9e40 100644 --- a/libtdegames/kgameprogress.cpp +++ b/libtdegames/kgameprogress.cpp @@ -213,7 +213,7 @@ void KGameProgress::styleChange(TQStyle&) void KGameProgress::adjustStyle() { - switch (tqstyle().styleHint(TQStyle::SH_GUIStyle)) { + switch (style().styleHint(TQStyle::SH_GUIStyle)) { case WindowsStyle: setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); break; diff --git a/lskat/lskat/KEMessage.cpp b/lskat/lskat/KEMessage.cpp index b11a70a5..38cd2e8d 100644 --- a/lskat/lskat/KEMessage.cpp +++ b/lskat/lskat/KEMessage.cpp @@ -202,7 +202,7 @@ TQString KEMessage::StringToEntry(TQString str,KMessageEntry *entry) cnt=size.toInt(); entry->SetType((KGM_TYPE)type.toInt()); - // I hope this works with tqunicode strings as well + // I hope this works with unicode strings as well p=data.latin1(); q=(char *)calloc(data.length()/2,sizeof(char)); if (!q) return TQString(); diff --git a/lskat/lskat/namedlg.cpp b/lskat/lskat/namedlg.cpp index 6067619c..262631cd 100644 --- a/lskat/lskat/namedlg.cpp +++ b/lskat/lskat/namedlg.cpp @@ -45,9 +45,9 @@ NameDlg::NameDlg( TQWidget *parent, const char *name,bool /* modal */, WFlags /* player_names = new TQGroupBox( page, "player_names" ); player_names->setTitle(i18n("Player Names") ); player_names->setColumnLayout(0, Qt::Vertical ); - player_names->tqlayout()->setSpacing( 0 ); - player_names->tqlayout()->setMargin( 0 ); - vbox_2 = new TQVBoxLayout( player_names->tqlayout() ); + player_names->layout()->setSpacing( 0 ); + player_names->layout()->setMargin( 0 ); + vbox_2 = new TQVBoxLayout( player_names->layout() ); vbox_2->setAlignment( TQt::AlignTop ); vbox_2->setSpacing( 6 ); vbox_2->setMargin( 11 ); diff --git a/lskat/lskat/networkdlgbase.ui b/lskat/lskat/networkdlgbase.ui index dce143d9..d064c13b 100644 --- a/lskat/lskat/networkdlgbase.ui +++ b/lskat/lskat/networkdlgbase.ui @@ -144,7 +144,7 @@ - tqlayout9 + layout9 @@ -220,7 +220,7 @@ - tqlayout11 + layout11 diff --git a/lskat/lskatproc/KEMessage.cpp b/lskat/lskatproc/KEMessage.cpp index aa88298a..ce8985f3 100644 --- a/lskat/lskatproc/KEMessage.cpp +++ b/lskat/lskatproc/KEMessage.cpp @@ -202,7 +202,7 @@ TQString KEMessage::StringToEntry(TQString str,KMessageEntry *entry) cnt=size.toInt(); entry->SetType((KGM_TYPE)type.toInt()); - // I hope this works with tqunicode strings as well + // I hope this works with unicode strings as well p=data.latin1(); q=(char *)calloc(data.length()/2,sizeof(char)); if (!q) return TQString(); diff --git a/twin4/twin4/statistics.ui b/twin4/twin4/statistics.ui index 1744158a..06385444 100644 --- a/twin4/twin4/statistics.ui +++ b/twin4/twin4/statistics.ui @@ -135,7 +135,7 @@ - tqlayout1 + layout1 diff --git a/twin4/twin4/twin4.cpp b/twin4/twin4/twin4.cpp index dd8b3359..194c64fa 100644 --- a/twin4/twin4/twin4.cpp +++ b/twin4/twin4/twin4.cpp @@ -539,7 +539,7 @@ void Kwin4App::slotInitNetwork() dlg.networkConfig()->setDiscoveryInfo("_twin4._tcp",Prefs::gamename()); TQVBox *box=dlg.configPage(KGameDialog::NetworkConfig); - TQVBoxLayout *l=(TQVBoxLayout *)(box->tqlayout()); + TQVBoxLayout *l=(TQVBoxLayout *)(box->layout()); mColorGroup=new TQVButtonGroup(box); connect(mColorGroup, TQT_SIGNAL(clicked(int)), TQT_TQOBJECT(this), TQT_SLOT(slotRemoteChanged(int))); -- cgit v1.2.3