From a659b8d7f9dab069ef8549c22a86c0a0748980eb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:08:31 -0600 Subject: [PATCH] Rename old tq methods that no longer need a unique name (cherry picked from commit c74c9068a8df1cf50ccda88a20dbfad1f9f30545) --- src/app/mainWindow.cpp | 2 +- src/part/dialog.ui | 16 ++++++++-------- src/part/progressBox.cpp | 6 +++--- src/part/radialMap/builder.cpp | 2 +- src/part/summaryWidget.cpp | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp index 6dbc353..daa2dda 100644 --- a/src/app/mainWindow.cpp +++ b/src/app/mainWindow.cpp @@ -79,7 +79,7 @@ MainWindow::setupActions() //singleton function m_combo = new KHistoryCombo( this, "history_combo" ); m_combo->setCompletionObject( new KURLCompletion( KURLCompletion::DirCompletion ) ); m_combo->setAutoDeleteCompletionObject( true ); - m_combo->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); + m_combo->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); m_combo->setDuplicatesEnabled( false ); KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT(slotScanDirectory()), ac, "scan_directory" ); diff --git a/src/part/dialog.ui b/src/part/dialog.ui index 4cadbf8..871338d 100644 --- a/src/part/dialog.ui +++ b/src/part/dialog.ui @@ -88,7 +88,7 @@ Expanding - + 180 21 @@ -129,7 +129,7 @@ line1 - + 0 15 @@ -169,7 +169,7 @@ Fixed - + 16 50 @@ -183,13 +183,13 @@ false - + 0 0 - + 32767 32767 @@ -372,7 +372,7 @@ Fixed - + 20 20 @@ -414,7 +414,7 @@ 0 - + 80 0 @@ -480,7 +480,7 @@ Expanding - + 120 30 diff --git a/src/part/progressBox.cpp b/src/part/progressBox.cpp index 68c3349..6f1d5b1 100644 --- a/src/part/progressBox.cpp +++ b/src/part/progressBox.cpp @@ -15,12 +15,12 @@ ProgressBox::ProgressBox( TQWidget *parent, TQObject *part ) { hide(); - tqsetAlignment( TQt::AlignCenter ); + setAlignment( TQt::AlignCenter ); setFont( KGlobalSettings::fixedFont() ); - tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); + setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); setText( 999999 ); - setMinimumWidth( tqsizeHint().width() ); + setMinimumWidth( sizeHint().width() ); connect( &m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(report()) ); connect( part, TQT_SIGNAL(started( KIO::Job* )), TQT_SLOT(start()) ); diff --git a/src/part/radialMap/builder.cpp b/src/part/radialMap/builder.cpp index bae6626..74b9288 100644 --- a/src/part/radialMap/builder.cpp +++ b/src/part/radialMap/builder.cpp @@ -40,7 +40,7 @@ RadialMap::Builder::Builder( RadialMap::Map *m, const Directory* const d, bool f void RadialMap::Builder::findVisibleDepth( const Directory* const dir, const unsigned int depth ) { - //**** because I don't use the same tqminimumSize criteria as in the visual function + //**** because I don't use the same minimumSize criteria as in the visual function // this can lead to incorrect visual representation //**** BUT, you can't set those limits until you know m_depth! diff --git a/src/part/summaryWidget.cpp b/src/part/summaryWidget.cpp index 5f6deee..cddb3c3 100644 --- a/src/part/summaryWidget.cpp +++ b/src/part/summaryWidget.cpp @@ -123,8 +123,8 @@ SummaryWidget::createDiskMaps() << "(" << disk.device << ")"; TQLabel *label = new TQLabel( text, box ); - label->tqsetAlignment( TQt::AlignCenter ); - label->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Maximum ); + label->setAlignment( TQt::AlignCenter ); + label->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Maximum ); box->show(); // will show its tqchildren too