From 650b58e8e66f8e3e1cf78ee3e0037f4c9e00699a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:55:47 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit ef5831dd5c8811c94c9b1bc1377a90174d17c82c. --- src/k3binteractiondialog.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'src/k3binteractiondialog.cpp') diff --git a/src/k3binteractiondialog.cpp b/src/k3binteractiondialog.cpp index e7cf633..738661c 100644 --- a/src/k3binteractiondialog.cpp +++ b/src/k3binteractiondialog.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include @@ -82,7 +82,7 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent, // settings buttons // --------------------------------------------------------------------------------------------------- if( !m_configGroup.isEmpty() ) { - TQHBoxLayout* layout2 = new TQHBoxLayout( 0, 0, spacingHint(), "layout2"); + TQHBoxLayout* tqlayout2 = new TQHBoxLayout( 0, 0, spacingHint(), "tqlayout2"); m_buttonLoadSettings = new K3bToolButton( /*i18n("User Defaults"), */this ); ((K3bToolButton*)m_buttonLoadSettings)->setIconSet( SmallIconSet( "revert" ) ); TQPopupMenu* userDefaultsPopup = new TQPopupMenu( m_buttonLoadSettings ); @@ -91,13 +91,13 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent, userDefaultsPopup->insertItem( i18n("Load last used settings"), this, TQT_SLOT(slotLoadLastSettings()) ); ((TQToolButton*)m_buttonLoadSettings)->setPopup( userDefaultsPopup ); ((K3bToolButton*)m_buttonLoadSettings)->setInstantMenu( true ); - layout2->addWidget( m_buttonLoadSettings ); + tqlayout2->addWidget( m_buttonLoadSettings ); m_buttonSaveSettings = new TQToolButton( /*i18n("Save User Defaults"), */this, "m_buttonSaveSettings" ); ((TQToolButton*)m_buttonSaveSettings)->setIconSet( SmallIconSet( "filesave" ) ); - layout2->addWidget( m_buttonSaveSettings ); + tqlayout2->addWidget( m_buttonSaveSettings ); - mainGrid->addLayout( layout2, 2, 0 ); + mainGrid->addLayout( tqlayout2, 2, 0 ); } TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); @@ -106,7 +106,7 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent, // action buttons // --------------------------------------------------------------------------------------------------- - TQHBoxLayout* layout5 = new TQHBoxLayout( 0, 0, spacingHint(), "layout5"); + TQHBoxLayout* tqlayout5 = new TQHBoxLayout( 0, 0, spacingHint(), "tqlayout5"); if( buttonMask & START_BUTTON ) { KGuiItem startItem = KStdGuiItem::ok(); @@ -149,33 +149,33 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent, case 0: // KDE default default: if ( m_buttonStart ) - layout5->addWidget( m_buttonStart ); + tqlayout5->addWidget( m_buttonStart ); if ( m_buttonSave ) - layout5->addWidget( m_buttonSave ); + tqlayout5->addWidget( m_buttonSave ); if ( m_buttonCancel ) - layout5->addWidget( m_buttonCancel ); + tqlayout5->addWidget( m_buttonCancel ); break; case 1: // something different if ( m_buttonCancel ) - layout5->addWidget( m_buttonCancel ); + tqlayout5->addWidget( m_buttonCancel ); if ( m_buttonSave ) - layout5->addWidget( m_buttonSave ); + tqlayout5->addWidget( m_buttonSave ); if ( m_buttonStart ) - layout5->addWidget( m_buttonStart ); + tqlayout5->addWidget( m_buttonStart ); break; case 2: // GTK-Style if ( m_buttonSave ) - layout5->addWidget( m_buttonSave ); + tqlayout5->addWidget( m_buttonSave ); if ( m_buttonCancel ) - layout5->addWidget( m_buttonCancel ); + tqlayout5->addWidget( m_buttonCancel ); if ( m_buttonStart ) - layout5->addWidget( m_buttonStart ); + tqlayout5->addWidget( m_buttonStart ); break; } - mainGrid->addLayout( layout5, 2, 2 ); + mainGrid->addLayout( tqlayout5, 2, 2 ); mainGrid->setRowStretch( 1, 1 ); @@ -200,9 +200,9 @@ void K3bInteractionDialog::show() } -TQSize K3bInteractionDialog::sizeHint() const +TQSize K3bInteractionDialog::tqsizeHint() const { - TQSize s = KDialog::sizeHint(); + TQSize s = KDialog::tqsizeHint(); // I want the dialogs to look good. // That means their height should never outgrow their width if( s.height() > s.width() ) -- cgit v1.2.3