Rename obsolete tq methods to standard names

8 files changed, 38 insertions, 38 deletions

diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp
index 2924e1bc..27f4fa99 100644
--- a/noatun/library/cmodule.cpp
+++ b/noatun/library/cmodule.cpp
@@ -88,24 +88,24 @@ General::General(TQObject *parent)
 		b->toggle();
 	}
 
-	TQGridLayout *tqlayout = new TQGridLayout(this, 0, KDialog::spacingHint());
-	tqlayout->setSpacing(KDialog::spacingHint());
+	TQGridLayout *layout = new TQGridLayout(this, 0, KDialog::spacingHint());
+	layout->setSpacing(KDialog::spacingHint());
 
-	tqlayout->addMultiCellWidget(mLoopList, 0, 0, 0, 1);
-	tqlayout->addMultiCellWidget(mOneInstance, 2, 2, 0, 1);
-	tqlayout->addMultiCellWidget(mClearOnOpen, 4, 4, 0, 1);
-	tqlayout->addMultiCellWidget(mFastVolume, 5, 5, 0, 1);
-	tqlayout->addMultiCellWidget(mRemaining, 6, 6, 0, 1);
+	layout->addMultiCellWidget(mLoopList, 0, 0, 0, 1);
+	layout->addMultiCellWidget(mOneInstance, 2, 2, 0, 1);
+	layout->addMultiCellWidget(mClearOnOpen, 4, 4, 0, 1);
+	layout->addMultiCellWidget(mFastVolume, 5, 5, 0, 1);
+	layout->addMultiCellWidget(mRemaining, 6, 6, 0, 1);
 
-	tqlayout->addWidget(titleLabel, 7, 0);
-	tqlayout->addWidget(mTitleFormat, 7, 1);
+	layout->addWidget(titleLabel, 7, 0);
+	layout->addWidget(mTitleFormat, 7, 1);
 
-	tqlayout->addWidget(dlsaver, 8, 0);
-	tqlayout->addWidget(mDlSaver, 8, 1);
+	layout->addWidget(dlsaver, 8, 0);
+	layout->addWidget(mDlSaver, 8, 1);
 
-	tqlayout->addMultiCellWidget(mPlayOnStartup, 9, 9, 0, 1);
+	layout->addMultiCellWidget(mPlayOnStartup, 9, 9, 0, 1);
 
-	tqlayout->setRowStretch(10, 1);
+	layout->setRowStretch(10, 1);
 }
 
 
diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp
index 2a476861..c243a349 100644
--- a/noatun/library/equalizerview.cpp
+++ b/noatun/library/equalizerview.cpp
@@ -64,17 +64,17 @@ void PresetList::rename(TQListViewItem *item, int c)
 EqualizerLevel::EqualizerLevel(TQWidget *parent, VBand band)
 	: TQWidget(parent), mBand(band)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this,
-		0, 0, "EqualizerLevel::tqlayout");
+	TQVBoxLayout *layout = new TQVBoxLayout(this,
+		0, 0, "EqualizerLevel::layout");
 
 	mSlider = new TQSlider(-200, 200, 25, 0, Qt::Vertical, this, "EqualizerLevel::mSlider");
 	mSlider->setTickmarks(TQSlider::Left);
 	mSlider->setTickInterval(25);
-	tqlayout->addWidget(mSlider);
+	layout->addWidget(mSlider);
 	connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed(int)));
 	mLabel = new TQLabel("", this, "EqualizerLevel::mLabel");
 	mLabel->setAlignment(AlignHCenter | AlignVCenter);
-	tqlayout->addWidget(mLabel);
+	layout->addWidget(mLabel);
 
 	setMinimumHeight(200);
 //	setMinimumWidth(kapp->fontMetrics().width("158kHz"));
diff --git a/noatun/library/equalizerwidget.ui b/noatun/library/equalizerwidget.ui
index 4a0f6714..7ec3329f 100644
--- a/noatun/library/equalizerwidget.ui
+++ b/noatun/library/equalizerwidget.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -80,7 +80,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget" row="1" column="1">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -238,7 +238,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp
index 98150f40..4e3a0711 100644
--- a/noatun/modules/infrared/irprefs.cpp
+++ b/noatun/modules/infrared/irprefs.cpp
@@ -54,35 +54,35 @@ TQMap<TQString, IRPrefs::Command> IRPrefs::s_commands;
 IRPrefs::IRPrefs(TQObject *parent)
 	: CModule(i18n("Infrared Control"), i18n("Configure Infrared Commands"), "remote", parent)
 {
-	TQGridLayout *tqlayout = new TQGridLayout(this, 3, 5, KDialog::marginHint(), KDialog::spacingHint());
-	tqlayout->setColStretch(1, 1);
+	TQGridLayout *layout = new TQGridLayout(this, 3, 5, KDialog::marginHint(), KDialog::spacingHint());
+	layout->setColStretch(1, 1);
 
 	TQLabel *label = new TQLabel(i18n("Remote control &commands:"), this);
-	tqlayout->addMultiCellWidget(label, 0, 0, 0, 4);
+	layout->addMultiCellWidget(label, 0, 0, 0, 4);
 
 	label->setBuddy(m_commands = new KListView(this));
-	tqlayout->addMultiCellWidget(m_commands, 1, 1, 0, 4);
+	layout->addMultiCellWidget(m_commands, 1, 1, 0, 4);
 
 	label = new TQLabel(i18n("&Action:"), this);
-	tqlayout->addWidget(label, 2, 0);
+	layout->addWidget(label, 2, 0);
 
 	label->setBuddy(m_action = new KComboBox(this));
 	m_action->setEnabled(false);
-	tqlayout->addWidget(m_action, 2, 1);
+	layout->addWidget(m_action, 2, 1);
 
 	m_repeat = new TQCheckBox(i18n("&Repeat"), this);
 	m_repeat->setEnabled(false);
-	tqlayout->addWidget(m_repeat, 2, 2);
+	layout->addWidget(m_repeat, 2, 2);
 
 	label = new TQLabel(i18n("&Interval:"), this);
-	tqlayout->addWidget(label, 2, 3);
+	layout->addWidget(label, 2, 3);
 
 	label->setBuddy(m_interval = new KIntSpinBox(this));
 	m_interval->setMinValue(1);
 	m_interval->setMaxValue(0xff);
 	m_interval->setValue(10);
 	m_interval->setEnabled(false);
-	tqlayout->addWidget(m_interval, 2, 4);
+	layout->addWidget(m_interval, 2, 4);
 
 	connect(s_lirc, TQT_SIGNAL(remotesRead()), TQT_SLOT(reopen()));
 	connect(m_commands,
diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp
index e1f2286a..143be362 100644
--- a/noatun/modules/keyz/keyz.cpp
+++ b/noatun/modules/keyz/keyz.cpp
@@ -174,9 +174,9 @@ KeyzPrefs::KeyzPrefs( TQObject *parent ) :
     CModule( i18n("Keyz"), i18n("Shortcut Configuration"), "key_bindings",
              parent )
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+    TQVBoxLayout *layout = new TQVBoxLayout( this );
     m_chooser = new KKeyChooser( Keyz::accel(), this );
-    tqlayout->addWidget( m_chooser );
+    layout->addWidget( m_chooser );
 }
 
 void KeyzPrefs::save()
diff --git a/noatun/modules/splitplaylist/find.cpp b/noatun/modules/splitplaylist/find.cpp
index d167e02e..5d378a79 100644
--- a/noatun/modules/splitplaylist/find.cpp
+++ b/noatun/modules/splitplaylist/find.cpp
@@ -11,8 +11,8 @@ Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), C
 	mainWidget->setMinimumWidth(320);
 	setMainWidget(mainWidget);
 
-	TQGridLayout *tqlayout=new TQGridLayout(mainWidget);
-	tqlayout->setSpacing(KDialog::spacingHint());
+	TQGridLayout *layout=new TQGridLayout(mainWidget);
+	layout->setSpacing(KDialog::spacingHint());
 
 	mText=new KHistoryCombo(mainWidget);
 	mText->setMaxCount(10);
@@ -22,9 +22,9 @@ Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), C
 	mRegexp=new TQCheckBox(i18n("&Regular expression"), mainWidget);
 	mBackwards=new TQCheckBox(i18n("Find &backwards"), mainWidget);
 
-	tqlayout->addMultiCellWidget(mText, 0, 0, 0, 1);
-	tqlayout->addWidget(mRegexp, 1, 0);
-	tqlayout->addWidget(mBackwards, 1, 1);
+	layout->addMultiCellWidget(mText, 0, 0, 0, 1);
+	layout->addWidget(mRegexp, 1, 0);
+	layout->addWidget(mBackwards, 1, 1);
 
 	connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(clicked()));
 
diff --git a/noatun/modules/systray/yhconfigwidget.ui b/noatun/modules/systray/yhconfigwidget.ui
index 3c14d3df..02ea0a1c 100644
--- a/noatun/modules/systray/yhconfigwidget.ui
+++ b/noatun/modules/systray/yhconfigwidget.ui
@@ -231,7 +231,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout1</cstring>
+                                    <cstring>layout1</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp
index 43940bb7..70a22ea5 100644
--- a/noatun/modules/winskin/winSkinConfig.cpp
+++ b/noatun/modules/winskin/winSkinConfig.cpp
@@ -29,7 +29,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) :
 	        "style",
 	        TQT_TQOBJECT(parent))
 {
-    // Make a token horizontal tqlayout box
+    // Make a token horizontal layout box
     vbox = new TQVBoxLayout(this);
     vbox->setSpacing( 6 );
     vbox->setMargin( 0 );