diff options
| author | Timothy Pearson <[email protected]> | 2011-12-18 18:15:09 -0600 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2012-08-02 00:18:38 +0200 |
| commit | 2cbad6e6852a313acbd5f4b3d63393fe5d58e6a2 (patch) | |
| tree | 8d69016fcc14b614ac535caf2e619245bca1fe20 | |
| parent | 19d1af3d8d8bba58e011c1d4625f2c1401b7a3ea (diff) | |
| download | tde-systemsettings-2cbad6e6852a313acbd5f4b3d63393fe5d58e6a2.tar.gz tde-systemsettings-2cbad6e6852a313acbd5f4b3d63393fe5d58e6a2.zip | |
Rename old tq methods that no longer need a unique name
(cherry picked from commit 3eb39830ef8d807ff1538a0aa66a9b3fd711903a)
| -rw-r--r-- | systemsettings/kcscrollview.cpp | 4 | ||||
| -rw-r--r-- | systemsettings/kcscrollview.h | 2 | ||||
| -rw-r--r-- | systemsettings/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | systemsettings/modulesview.cpp | 6 | ||||
| -rw-r--r-- | systemsettings/modulesview.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/systemsettings/kcscrollview.cpp b/systemsettings/kcscrollview.cpp index a543ac7..4566337 100644 --- a/systemsettings/kcscrollview.cpp +++ b/systemsettings/kcscrollview.cpp @@ -25,8 +25,8 @@ KCScrollView::KCScrollView( TQWidget * parent, const char * name, WFlags f) : TQ mainChild = 0; } -TQSize KCScrollView::tqsizeHint() const { - TQSize vphint = mainChild->tqsizeHint(); +TQSize KCScrollView::sizeHint() const { + TQSize vphint = mainChild->sizeHint(); vphint.setWidth(vphint.width()+2*frameWidth()); vphint.setHeight(vphint.height()+2*frameWidth()); return vphint; diff --git a/systemsettings/kcscrollview.h b/systemsettings/kcscrollview.h index dc9fbeb..e023899 100644 --- a/systemsettings/kcscrollview.h +++ b/systemsettings/kcscrollview.h @@ -26,7 +26,7 @@ class KCScrollView : public TQScrollView { public: KCScrollView ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual void addChild(TQWidget *child, int x=0, int y=0); private: TQWidget *mainChild; diff --git a/systemsettings/mainwindow.cpp b/systemsettings/mainwindow.cpp index 0c21736..cf2d1b5 100644 --- a/systemsettings/mainwindow.cpp +++ b/systemsettings/mainwindow.cpp @@ -289,7 +289,7 @@ void MainWindow::slotItemSelected( TQIconViewItem *item ){ void MainWindow::timerResize() { TQSize currentSize = size(); - TQSize newSize = currentSize.expandedTo(tqsizeHint()); + TQSize newSize = currentSize.expandedTo(sizeHint()); // Avoid resizing if possible. if(newSize!=currentSize) { resize(newSize); diff --git a/systemsettings/modulesview.cpp b/systemsettings/modulesview.cpp index ef920f1..ff0e0da 100644 --- a/systemsettings/modulesview.cpp +++ b/systemsettings/modulesview.cpp @@ -112,14 +112,14 @@ void ModulesView::createRow( const TQString &parentPath, TQBoxLayout *boxLayout // Heaer Icon TQLabel *icon = new TQLabel( this, "groupicon" ); icon->setPixmap( SmallIcon( group->icon() ) ); - icon->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, + icon->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)5, 0, 0, icon->sizePolicy().hasHeightForWidth() ) ); rowLayout->addWidget( icon ); // Header Name TQLabel *textLabel = new TQLabel( this, "groupcaption" ); textLabel->setText( group->caption() ); - textLabel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, + textLabel->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)5, 0, 0, textLabel->sizePolicy().hasHeightForWidth())); TQFont textLabel_font( textLabel->font() ); textLabel_font.setBold( true ); @@ -160,7 +160,7 @@ void ModulesView::createRow( const TQString &parentPath, TQBoxLayout *boxLayout } // Force the height for those items that have two words. - iconView->setMinimumHeight( iconView->tqminimumSizeHint().height() ); + iconView->setMinimumHeight( iconView->minimumSizeHint().height() ); } void ModulesView::clearSelection() { diff --git a/systemsettings/modulesview.h b/systemsettings/modulesview.h index a334d75..9eeb72a 100644 --- a/systemsettings/modulesview.h +++ b/systemsettings/modulesview.h @@ -34,7 +34,7 @@ public: : KIconView( parent, name ){ }; // Figure out the hight/width to have only one row - TQSize tqminimumSizeHint() const { + TQSize minimumSizeHint() const { int width = 0; /* for ( TQIconViewItem *item = firstItem(); item; item = item->nextItem() ) |