From aa335c4c9fabc6ac9b6e532ef047ec46579f8fa2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:04:21 -0600 Subject: [PATCH] Rename obsolete tq methods to standard names --- kdirstat/kdirstatsettings.cpp | 38 +++++++++++++++++------------------ kdirstat/kfeedback.cpp | 4 ++-- kdirstat/ktreemaptile.cpp | 2 +- kdirstat/ktreemaptile.h | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/kdirstat/kdirstatsettings.cpp b/kdirstat/kdirstatsettings.cpp index de9a3b7..21fb22f 100644 --- a/kdirstat/kdirstatsettings.cpp +++ b/kdirstat/kdirstatsettings.cpp @@ -51,14 +51,14 @@ KSettingsDialog::KSettingsDialog( KDirStatApp *mainWin ) * initial geometry management. Only then can some generic widget be added * into this - and I WANT my settings pages to be generic widgets. I want * them to be self-sufficient - no monolithic mess of widget creation in my - * code, intermixed with all kinds of tqlayout objects. + * code, intermixed with all kinds of layout objects. * * The ordinary KDialogBase::addPage() just creates a TQFrame which is too * dumb for any kind of geometry management - it cannot even handle one * single child right. So, let's have KDialogBase create something more * intelligent: A TQVBox (which is derived from TQFrame anyway). This TQVBox * gets only one child - the KSettingsPage. This KSettingsPage handles its - * own tqlayout. + * own layout. **/ TQWidget * page; @@ -166,14 +166,14 @@ KTreeColorsPage::KTreeColorsPage( KSettingsDialog * dialog, , _treeView( mainWin->treeView() ) , _maxButtons( KDirStatSettingsMaxColorButton ) { - // Outer tqlayout box + // Outer layout box TQHBoxLayout * outerBox = new TQHBoxLayout( this, 0, // border dialog->spacingHint() ); - // Inner tqlayout box with a column of color buttons + // Inner layout box with a column of color buttons TQGridLayout *grid = new TQGridLayout( _maxButtons, // rows _maxButtons + 1, // cols @@ -284,9 +284,9 @@ KCleanupPage::KCleanupPage( KSettingsDialog * dialog, _workCleanupCollection = *mainWin->cleanupCollection(); - // Create tqlayout and widgets. + // Create layout and widgets. - TQHBoxLayout * tqlayout = new TQHBoxLayout( this, + TQHBoxLayout * layout = new TQHBoxLayout( this, 0, // border dialog->spacingHint() ); // spacing _listBox = new KCleanupListBox( this ); @@ -308,11 +308,11 @@ KCleanupPage::KCleanupPage( KSettingsDialog * dialog, setup(); // Now that _listBox will (hopefully) have determined a reasonable - // default geometry, add the widgets to the tqlayout. + // default geometry, add the widgets to the layout. - tqlayout->addWidget( _listBox, 0 ); - tqlayout->addWidget( _props , 1 ); - tqlayout->activate(); + layout->addWidget( _listBox, 0 ); + layout->addWidget( _props , 1 ); + layout->activate(); } @@ -544,7 +544,7 @@ KCleanupPropertiesPage::KCleanupPropertiesPage( TQWidget * parent, TQVBoxLayout *fieldsBox = new TQVBoxLayout( _fields ); - // Grid tqlayout for the edit fields, their labels, some + // Grid layout for the edit fields, their labels, some // explanatory text and the "recurse?" check box. TQGridLayout *grid = new TQGridLayout( 7, // rows @@ -611,7 +611,7 @@ KCleanupPropertiesPage::KCleanupPropertiesPage( TQWidget * parent, _worksForProtocols->insertItem( i18n( "Network Transparent (ftp, smb, tar, ...)" ) ); - // Grid tqlayout for combo boxes at the bottom + // Grid layout for combo boxes at the bottom grid = new TQGridLayout( 1, // rows 2, // cols @@ -707,13 +707,13 @@ KGeneralSettingsPage::KGeneralSettingsPage( KSettingsDialog * dialog, , _treeView( mainWin->treeView() ) { - // Create tqlayout and widgets. + // Create layout and widgets. - TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 5, // border + TQVBoxLayout * layout = new TQVBoxLayout( this, 5, // border dialog->spacingHint() ); // spacing TQVGroupBox * gbox = new TQVGroupBox( i18n( "Directory Reading" ), this ); - tqlayout->addWidget( gbox ); + layout->addWidget( gbox ); _crossFileSystems = new TQCheckBox( i18n( "Cross &File System Boundaries" ), gbox ); _enableLocalDirReader = new TQCheckBox( i18n( "Use Optimized &Local Directory Read Methods" ), gbox ); @@ -721,10 +721,10 @@ KGeneralSettingsPage::KGeneralSettingsPage( KSettingsDialog * dialog, connect( _enableLocalDirReader, TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT ( checkEnabledState() ) ); - tqlayout->addSpacing( 10 ); + layout->addSpacing( 10 ); gbox = new TQVGroupBox( i18n( "Animation" ), this ); - tqlayout->addWidget( gbox ); + layout->addWidget( gbox ); _enableToolBarAnimation = new TQCheckBox( i18n( "P@cM@n Animation in Tool &Bar" ), gbox ); _enableTreeViewAnimation = new TQCheckBox( i18n( "P@cM@n Animation in Directory &Tree" ), gbox ); @@ -800,11 +800,11 @@ KTreemapPage::KTreemapPage( KSettingsDialog * dialog, { // kdDebug() << k_funcinfo << endl; - TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 0, 0 ); // parent, border, spacing + TQVBoxLayout * layout = new TQVBoxLayout( this, 0, 0 ); // parent, border, spacing TQVBox * vbox = new TQVBox( this ); vbox->setSpacing( dialog->spacingHint() ); - tqlayout->addWidget( vbox ); + layout->addWidget( vbox ); _squarify = new TQCheckBox( i18n( "S&quarify Treemap" ), vbox ); _doCushionShading = new TQCheckBox( i18n( "Use C&ushion Shading" ), vbox ); diff --git a/kdirstat/kfeedback.cpp b/kdirstat/kfeedback.cpp index bcc7005..9b2956e 100644 --- a/kdirstat/kfeedback.cpp +++ b/kdirstat/kfeedback.cpp @@ -34,7 +34,7 @@ KFeedbackDialog::KFeedbackDialog( const TQString & feedbackMailAddress, | ( helpTopic.isEmpty() ? 0 : (int) Help ), // buttonMask Apply ) // defaultButton { - TQVBoxLayout * tqlayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); + TQVBoxLayout * layout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); setButtonApply( KGuiItem( i18n( "&Mail this..." ) ) ); if ( ! helpTopic.isEmpty() ) @@ -43,7 +43,7 @@ KFeedbackDialog::KFeedbackDialog( const TQString & feedbackMailAddress, _form = new KFeedbackForm( feedbackMailAddress, plainPage() ); CHECK_PTR( _form ); - tqlayout->addWidget( _form ); + layout->addWidget( _form ); checkSendButton(); connect( this, TQT_SIGNAL( applyClicked() ), diff --git a/kdirstat/ktreemaptile.cpp b/kdirstat/ktreemaptile.cpp index 69b6170..6efed77 100644 --- a/kdirstat/ktreemaptile.cpp +++ b/kdirstat/ktreemaptile.cpp @@ -287,7 +287,7 @@ KTreemapTile::layoutRow( const TQRect & rect, return rect; - // Set up a cushion surface for this tqlayout row: + // Set up a cushion surface for this layout row: // Add another ridge perpendicular to the row's direction // that optically groups this row's tiles together. diff --git a/kdirstat/ktreemaptile.h b/kdirstat/ktreemaptile.h index fc2ea07..e36a08a 100644 --- a/kdirstat/ktreemaptile.h +++ b/kdirstat/ktreemaptile.h @@ -214,7 +214,7 @@ namespace KDirStat * * This algorithm is not quite so simple and involves more expensive * operations, e.g., sorting the children of each node by size first, - * try some variations of the tqlayout and maybe backtrack to the + * try some variations of the layout and maybe backtrack to the * previous attempt. But it results in tiles that are much more * square-like, i.e. have more reasonable width-to-height ratios. It is * very much less likely to get thin, elongated tiles that are hard to