From 73ac8fea20eed1a641aff6860d0756856c05cbd7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:05:54 -0600 Subject: [PATCH] Rename obsolete tq methods to standard names (cherry picked from commit 514b0c9f215ecb837a0192c7f84f5654d735c4df) --- .../alsa-sound/alsa-mixer-element-ui.ui | 8 ++--- .../alsa-sound/alsa-sound-configuration-ui.ui | 2 +- .../alsa-sound/alsa-sound-configuration.cpp | 2 +- .../docking-configuration.cpp | 16 +++++----- .../plugins/gui-quickbar/buttonflowlayout.cpp | 4 +-- .../plugins/gui-quickbar/buttonflowlayout.h | 2 +- kradio3/plugins/gui-quickbar/quickbar.cpp | 2 +- .../gui-standard-display/displaycfg.cpp | 6 ++-- .../plugins/radio/radio-configuration-ui.ui | 30 +++++++++---------- .../recording/recording-configuration-ui.ui | 16 +++++----- .../streaming/streaming-configuration-ui.ui | 6 ++-- .../timecontrol-configuration-ui.ui | 20 ++++++------- .../timeshifter-configuration-ui.ui | 2 +- .../v4lradio/v4lradio-configuration-ui.ui | 16 +++++----- kradio3/src/aboutwidget.cpp | 18 +++++------ kradio3/src/pluginmanager.cpp | 4 +-- kradio3/src/standardscandialog-ui.ui | 4 +-- kradio3/src/stationselector-ui.ui | 2 +- 18 files changed, 80 insertions(+), 80 deletions(-) diff --git a/kradio3/plugins/alsa-sound/alsa-mixer-element-ui.ui b/kradio3/plugins/alsa-sound/alsa-mixer-element-ui.ui index b0f8618..54467cc 100644 --- a/kradio3/plugins/alsa-sound/alsa-mixer-element-ui.ui +++ b/kradio3/plugins/alsa-sound/alsa-mixer-element-ui.ui @@ -21,7 +21,7 @@ - tqlayout16 + layout16 @@ -113,7 +113,7 @@ - tqlayout7 + layout7 @@ -168,7 +168,7 @@ - tqlayout5 + layout5 @@ -193,7 +193,7 @@ - tqlayout4 + layout4 diff --git a/kradio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui b/kradio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui index e487fb1..df64968 100644 --- a/kradio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui +++ b/kradio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui @@ -59,7 +59,7 @@ - tqlayout58 + layout58 diff --git a/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp b/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp index 8da578b..de67faf 100644 --- a/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp +++ b/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp @@ -57,7 +57,7 @@ AlsaSoundConfiguration::AlsaSoundConfiguration (TQWidget *parent, AlsaSoundDevic m_groupMixer->setColumnLayout(0, Qt::Horizontal ); - TQHBoxLayout *tmp_layout = new TQHBoxLayout( m_groupMixer->tqlayout() ); + TQHBoxLayout *tmp_layout = new TQHBoxLayout( m_groupMixer->layout() ); m_groupMixerScrollView = new TQScrollView (m_groupMixer); m_groupMixerScrollView->setFrameShape(TQFrame::NoFrame); diff --git a/kradio3/plugins/gui-docking-menu/docking-configuration.cpp b/kradio3/plugins/gui-docking-menu/docking-configuration.cpp index 489df58..daff887 100644 --- a/kradio3/plugins/gui-docking-menu/docking-configuration.cpp +++ b/kradio3/plugins/gui-docking-menu/docking-configuration.cpp @@ -31,26 +31,26 @@ DockingConfiguration::DockingConfiguration (RadioDocking *docking, TQWidget *par m_docking(docking), m_disableGUIUpdates(false) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(); - TQHBoxLayout *tqlayout2 = new TQHBoxLayout(); + TQHBoxLayout *layout = new TQHBoxLayout(); + TQHBoxLayout *layout2 = new TQHBoxLayout(); m_labelClickMode = new TQLabel(this); - tqlayout->addWidget(m_labelClickMode); + layout->addWidget(m_labelClickMode); m_comboClickMode = new TQComboBox(this); - tqlayout->addWidget(m_comboClickMode); + layout->addWidget(m_comboClickMode); TQSpacerItem *spacer = new TQSpacerItem( 20, 2, TQSizePolicy::Expanding, TQSizePolicy::Minimum); - tqlayout->addItem(spacer); + layout->addItem(spacer); TQFrame *line = new TQFrame(this); line->setFrameShape ( TQFrame::HLine ); line->setFrameShadow( TQFrame::Sunken ); - tqlayout2->addWidget(line); + layout2->addWidget(line); StationSelectorUILayout->expand(2,0); - StationSelectorUILayout->addMultiCellLayout(tqlayout2, 2, 2, 0, 2); - StationSelectorUILayout->addMultiCellLayout(tqlayout, 3, 3, 0, 2); + StationSelectorUILayout->addMultiCellLayout(layout2, 2, 2, 0, 2); + StationSelectorUILayout->addMultiCellLayout(layout, 3, 3, 0, 2); connect(m_comboClickMode, TQT_SIGNAL(activated( int )), this, TQT_SLOT(slotSetDirty())); diff --git a/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp b/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp index c13c0fa..5d4ec18 100644 --- a/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp +++ b/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** $Id: buttonflowtqlayout.cpp 272 2005-05-18 08:12:51Z emw $ ** -** Implementing your own tqlayout: flow example +** Implementing your own layout: flow example ** ** Copyright (C) 1996 by Trolltech AS. All rights reserved. ** @@ -133,7 +133,7 @@ void ButtonFlowLayout::setGeometry( const TQRect &r ) int ButtonFlowLayout::doLayout( const TQRect &r, bool testonly ) { -/* kdDebug() << "buttonflowtqlayout::doLayout (" +/* kdDebug() << "buttonflowlayout::doLayout (" << r.x() << "," << r.y() << "," << r.width() << "," << r.height() << ", " << testonly << ")\n"; */ diff --git a/kradio3/plugins/gui-quickbar/buttonflowlayout.h b/kradio3/plugins/gui-quickbar/buttonflowlayout.h index bca27f0..2cb8444 100644 --- a/kradio3/plugins/gui-quickbar/buttonflowlayout.h +++ b/kradio3/plugins/gui-quickbar/buttonflowlayout.h @@ -1,7 +1,7 @@ /**************************************************************************** ** $Id: buttonflowtqlayout.h 471 2006-11-11 17:04:51Z emw $ ** -** Definition of simple flow tqlayout for custom tqlayout example +** Definition of simple flow layout for custom layout example ** ** Created : 979899 ** diff --git a/kradio3/plugins/gui-quickbar/quickbar.cpp b/kradio3/plugins/gui-quickbar/quickbar.cpp index ec12c4d..735bb23 100644 --- a/kradio3/plugins/gui-quickbar/quickbar.cpp +++ b/kradio3/plugins/gui-quickbar/quickbar.cpp @@ -381,7 +381,7 @@ void QuickBar::setGeometry (const TQRect &r) void QuickBar::resizeEvent (TQResizeEvent *e) { - // minimumSize might change because of the flow tqlayout + // minimumSize might change because of the flow layout if (m_layout) { TQSize marginSize(m_layout->margin()*2, m_layout->margin()*2); setMinimumSize(m_layout->minimumSize(e->size() - marginSize) + marginSize); diff --git a/kradio3/plugins/gui-standard-display/displaycfg.cpp b/kradio3/plugins/gui-standard-display/displaycfg.cpp index 16ebad2..bae51ee 100644 --- a/kradio3/plugins/gui-standard-display/displaycfg.cpp +++ b/kradio3/plugins/gui-standard-display/displaycfg.cpp @@ -32,9 +32,9 @@ DisplayConfiguration::DisplayConfiguration(TQWidget *parent) { TQGroupBox *bg = new TQGroupBox(i18n("Display Colors"), this); bg->setColumnLayout(0, Qt::Vertical ); - bg->tqlayout()->setSpacing( 8 ); - bg->tqlayout()->setMargin( 12 ); - TQGridLayout *gl = new TQGridLayout (bg->tqlayout()); + bg->layout()->setSpacing( 8 ); + bg->layout()->setMargin( 12 ); + TQGridLayout *gl = new TQGridLayout (bg->layout()); m_btnActive = new KColorButton(queryDisplayActiveColor(), bg); m_btnInactive = new KColorButton(queryDisplayInactiveColor(), bg); diff --git a/kradio3/plugins/radio/radio-configuration-ui.ui b/kradio3/plugins/radio/radio-configuration-ui.ui index f92a0da..2ea4d33 100644 --- a/kradio3/plugins/radio/radio-configuration-ui.ui +++ b/kradio3/plugins/radio/radio-configuration-ui.ui @@ -36,7 +36,7 @@ - tqlayout32 + layout32 6 @@ -55,7 +55,7 @@ - tqlayout22 + layout22 @@ -63,7 +63,7 @@ - tqlayout9 + layout9 @@ -84,7 +84,7 @@ - tqlayout5 + layout5 @@ -157,7 +157,7 @@ - tqlayout21 + layout21 @@ -228,7 +228,7 @@ - tqlayout18 + layout18 @@ -249,7 +249,7 @@ - tqlayout7 + layout7 @@ -280,7 +280,7 @@ - tqlayout32 + layout32 @@ -311,7 +311,7 @@ - tqlayout6 + layout6 @@ -327,7 +327,7 @@ - tqlayout5 + layout5 @@ -377,7 +377,7 @@ - tqlayout19 + layout19 @@ -443,7 +443,7 @@ - tqlayout20 + layout20 @@ -494,7 +494,7 @@ - tqlayout25 + layout25 @@ -550,7 +550,7 @@ - tqlayout21 + layout21 @@ -579,7 +579,7 @@ - tqlayout19 + layout19 diff --git a/kradio3/plugins/recording/recording-configuration-ui.ui b/kradio3/plugins/recording/recording-configuration-ui.ui index 1c6ece2..2a90973 100644 --- a/kradio3/plugins/recording/recording-configuration-ui.ui +++ b/kradio3/plugins/recording/recording-configuration-ui.ui @@ -42,7 +42,7 @@ - tqlayout7 + layout7 @@ -50,7 +50,7 @@ - tqlayout3_2 + layout3_2 @@ -91,7 +91,7 @@ - tqlayout3 + layout3 @@ -247,7 +247,7 @@ - tqlayout69 + layout69 @@ -498,7 +498,7 @@ - tqlayout5 + layout5 @@ -588,7 +588,7 @@ - tqlayout68 + layout68 @@ -596,7 +596,7 @@ - tqlayout6 + layout6 @@ -634,7 +634,7 @@ - tqlayout7 + layout7 diff --git a/kradio3/plugins/streaming/streaming-configuration-ui.ui b/kradio3/plugins/streaming/streaming-configuration-ui.ui index 591bc87..e6b93af 100644 --- a/kradio3/plugins/streaming/streaming-configuration-ui.ui +++ b/kradio3/plugins/streaming/streaming-configuration-ui.ui @@ -21,7 +21,7 @@ - tqlayout48 + layout48 @@ -124,7 +124,7 @@ - tqlayout38_2 + layout38_2 @@ -275,7 +275,7 @@ - tqlayout38 + layout38 diff --git a/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui b/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui index c5b92b8..e592ea1 100644 --- a/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui +++ b/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui @@ -18,7 +18,7 @@ - tqlayout13 + layout13 @@ -87,7 +87,7 @@ - tqlayout15 + layout15 @@ -95,7 +95,7 @@ - tqlayout14 + layout14 @@ -150,7 +150,7 @@ - tqlayout17 + layout17 @@ -158,7 +158,7 @@ - tqlayout28 + layout28 @@ -166,7 +166,7 @@ - tqlayout27 + layout27 @@ -189,7 +189,7 @@ - tqlayout28 + layout28 @@ -212,7 +212,7 @@ - tqlayout29 + layout29 @@ -249,7 +249,7 @@ - tqlayout16 + layout16 @@ -348,7 +348,7 @@ - tqlayout20 + layout20 diff --git a/kradio3/plugins/timeshifter/timeshifter-configuration-ui.ui b/kradio3/plugins/timeshifter/timeshifter-configuration-ui.ui index c6b6109..135bac6 100644 --- a/kradio3/plugins/timeshifter/timeshifter-configuration-ui.ui +++ b/kradio3/plugins/timeshifter/timeshifter-configuration-ui.ui @@ -24,7 +24,7 @@ - tqlayout10 + layout10 diff --git a/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui b/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui index 9b7693a..130d440 100644 --- a/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui +++ b/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui @@ -374,7 +374,7 @@ - tqlayout37 + layout37 @@ -574,7 +574,7 @@ - tqlayout35 + layout35 @@ -599,7 +599,7 @@ - tqlayout34 + layout34 @@ -664,7 +664,7 @@ - tqlayout35_2 + layout35_2 @@ -689,7 +689,7 @@ - tqlayout34_2 + layout34_2 @@ -754,7 +754,7 @@ - tqlayout35_2_2 + layout35_2_2 @@ -779,7 +779,7 @@ - tqlayout34_2_3 + layout34_2_3 @@ -844,7 +844,7 @@ - tqlayout51 + layout51 diff --git a/kradio3/src/aboutwidget.cpp b/kradio3/src/aboutwidget.cpp index d21b8c3..f5c08d5 100644 --- a/kradio3/src/aboutwidget.cpp +++ b/kradio3/src/aboutwidget.cpp @@ -211,7 +211,7 @@ void KRadioAboutWidget::fontChange( const TQFont &/*oldFont*/ ) f.setBold( true ); mVersionLabel->setFont(f); mAuthorLabel->setFont(f); - mVersionLabel->parentWidget()->tqlayout()->activate(); + mVersionLabel->parentWidget()->layout()->activate(); } update(); @@ -279,7 +279,7 @@ KAboutContainer *KRadioAboutWidget::addContainerPage( const TQString &title, { if( mPageTab == 0 ) { - kdDebug(291) << "addPage: " << i18n("Invalid tqlayout") << endl; + kdDebug(291) << "addPage: " << i18n("Invalid layout") << endl; return 0; } @@ -309,7 +309,7 @@ KAboutContainer *KRadioAboutWidget::addScrolledContainerPage( { if( mPageTab == 0 ) { - kdDebug(291) << "addPage: " << "Invalid tqlayout" << endl; + kdDebug(291) << "addPage: " << "Invalid layout" << endl; return 0; } @@ -338,7 +338,7 @@ TQFrame *KRadioAboutWidget::addEmptyPage( const TQString &title ) { if( mPageTab == 0 ) { - kdDebug(291) << "addPage: " << "Invalid tqlayout" << endl; + kdDebug(291) << "addPage: " << "Invalid layout" << endl; return 0; } @@ -376,7 +376,7 @@ void KRadioAboutWidget::setTitle( const TQString &title ) { if( mTitleLabel == 0 ) { - kdDebug(291) << "setTitle: " << "Invalid tqlayout" << endl; + kdDebug(291) << "setTitle: " << "Invalid layout" << endl; return; } mTitleLabel->setText(title); @@ -387,7 +387,7 @@ void KRadioAboutWidget::setImage( const TQString &fileName ) { if( mImageLabel == 0 ) { - kdDebug(291) << "setImage: " << "Invalid tqlayout" << endl; + kdDebug(291) << "setImage: " << "Invalid layout" << endl; return; } if( fileName.isNull() ) @@ -402,7 +402,7 @@ void KRadioAboutWidget::setImage( const TQString &fileName ) pix = logo; mImageLabel->setPixmap( pix ); } - mImageFrame->tqlayout()->activate(); + mImageFrame->layout()->activate(); } @@ -441,7 +441,7 @@ void KRadioAboutWidget::setProduct( const TQString &appName, { if( mIconLabel == 0 ) { - kdDebug(291) << "setProduct: " << "Invalid tqlayout" << endl; + kdDebug(291) << "setProduct: " << "Invalid layout" << endl; return; } @@ -461,7 +461,7 @@ void KRadioAboutWidget::setProduct( const TQString &appName, mAuthorLabel->hide(); } - mIconLabel->parentWidget()->tqlayout()->activate(); + mIconLabel->parentWidget()->layout()->activate(); } diff --git a/kradio3/src/pluginmanager.cpp b/kradio3/src/pluginmanager.cpp index 8eef203..aac2c65 100644 --- a/kradio3/src/pluginmanager.cpp +++ b/kradio3/src/pluginmanager.cpp @@ -295,7 +295,7 @@ TQFrame *PluginManager::addConfigurationPage (const ConfigPageInfo &info) KGlobal::instance()->iconLoader()->loadIcon( info.iconName, KIcon::NoGroup, KIcon::SizeMedium ) ); - // fill config frame with tqlayout ... + // fill config frame with layout ... TQGridLayout *l = new TQGridLayout(f); l->setSpacing( 0 ); l->setMargin( 0 ); @@ -378,7 +378,7 @@ void PluginManager::addAboutPage (PluginBase *forWhom, m_aboutPageFrames.insert(forWhom, f); m_aboutPages.insert(forWhom, info.page); - // fill config frame with tqlayout ... + // fill config frame with layout ... TQGridLayout *l = new TQGridLayout(f); l->setSpacing( 0 ); l->setMargin( 0 ); diff --git a/kradio3/src/standardscandialog-ui.ui b/kradio3/src/standardscandialog-ui.ui index 60d48e2..394ccfc 100644 --- a/kradio3/src/standardscandialog-ui.ui +++ b/kradio3/src/standardscandialog-ui.ui @@ -38,7 +38,7 @@ - tqlayout2 + layout2 @@ -90,7 +90,7 @@ - tqlayout2 + layout2 diff --git a/kradio3/src/stationselector-ui.ui b/kradio3/src/stationselector-ui.ui index 586f970..2844baf 100644 --- a/kradio3/src/stationselector-ui.ui +++ b/kradio3/src/stationselector-ui.ui @@ -48,7 +48,7 @@ - tqlayout1 + layout1