Rename obsolete tq methods to standard names

9 files changed, 39 insertions, 39 deletions

diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp
index 6a9e7a8..28ae6c3 100644
--- a/noatun-plugins/alarm/wakeup.cpp
+++ b/noatun-plugins/alarm/wakeup.cpp
@@ -168,8 +168,8 @@ void Wakeup::slotVolumeChange()
 WakeupPrefs::WakeupPrefs( TQObject *parent ) :
 	CModule( i18n("Wakeup"), i18n("Alarm Configuration"), "date", parent )
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-	TQGridLayout *grid = new TQGridLayout (tqlayout,8,4);
+	TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+	TQGridLayout *grid = new TQGridLayout (layout,8,4);
 	
 	monday=new TQCheckBox(i18n("Monday"),this);
 	tuesday=new TQCheckBox(i18n("Tuesday"),this);
@@ -248,9 +248,9 @@ WakeupPrefs::WakeupPrefs( TQObject *parent ) :
 	TQLabel *volEndLabel = new TQLabel (i18n("Volume increases to:"), volFrame);
 	volEndValue = new KPercentSpinBox (1 ,volFrame,"volendvalue");
 
-	tqlayout->addWidget(modeGroup);
-	tqlayout->addWidget(volFrame);
-	tqlayout->addStretch();
+	layout->addWidget(modeGroup);
+	layout->addWidget(volFrame);
+	layout->addStretch();
 
 	TQHBoxLayout *volLayout = new TQHBoxLayout(volFrame, KDialog::marginHint(), KDialog::spacingHint()); 
 	volLayout->addWidget(volEndLabel);
diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp
index 0c98af7..6fd02f8 100644
--- a/noatun-plugins/alsaplayer/configmodule.cpp
+++ b/noatun-plugins/alsaplayer/configmodule.cpp
@@ -41,11 +41,11 @@ AlsaPlayerConfigModule::AlsaPlayerConfigModule(TQObject * parent)
 {
   scroll_ = new TQCheckBox(i18n("Scroll song title"), this);
 
-  TQVBoxLayout * tqlayout = new TQVBoxLayout(this);
+  TQVBoxLayout * layout = new TQVBoxLayout(this);
 
-  tqlayout->addWidget(scroll_);
+  layout->addWidget(scroll_);
 
-	tqlayout->addStretch(100);
+	layout->addStretch(100);
 
   reopen();
 }
diff --git a/noatun-plugins/charlatan/configmodule.cpp b/noatun-plugins/charlatan/configmodule.cpp
index 0af4ddb..3624e0b 100644
--- a/noatun-plugins/charlatan/configmodule.cpp
+++ b/noatun-plugins/charlatan/configmodule.cpp
@@ -41,11 +41,11 @@ CharlatanConfigModule::CharlatanConfigModule(TQObject * parent)
 {
   scroll_ = new TQCheckBox(i18n("Scroll song title"), this);
 
-  TQVBoxLayout * tqlayout = new TQVBoxLayout(this);
+  TQVBoxLayout * layout = new TQVBoxLayout(this);
 
-  tqlayout->addWidget(scroll_);
+  layout->addWidget(scroll_);
 
-	tqlayout->addStretch(100);
+	layout->addStretch(100);
 
   reopen();
 }
diff --git a/noatun-plugins/dub/dub/dubprefs.ui b/noatun-plugins/dub/dub/dubprefs.ui
index 437dfa9..aa2725d 100644
--- a/noatun-plugins/dub/dub/dubprefs.ui
+++ b/noatun-plugins/dub/dub/dubprefs.ui
@@ -29,7 +29,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/noatun-plugins/dub/dub/fileselectorwidget.cpp b/noatun-plugins/dub/dub/fileselectorwidget.cpp
index ae5c5d3..ac1892e 100644
--- a/noatun-plugins/dub/dub/fileselectorwidget.cpp
+++ b/noatun-plugins/dub/dub/fileselectorwidget.cpp
@@ -40,7 +40,7 @@ FileSelectorWidget::FileSelectorWidget(TQWidget *parent)
     : TQWidget(parent, "file selector widget")
 {
 
-	// widgets and tqlayout
+	// widgets and layout
 
 	TQVBoxLayout* lo = new TQVBoxLayout(this);
 
diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp
index 5bdad61..9e73104 100644
--- a/noatun-plugins/ffrs/ffrs.cpp
+++ b/noatun-plugins/ffrs/ffrs.cpp
@@ -187,49 +187,49 @@ void FFRS::changed()
 FFRSPrefs::FFRSPrefs( TQObject *parent )
 	: CModule(i18n("Foreign Region"), i18n("French Foreign Region"),"",parent)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *layout = new TQVBoxLayout(this);
 
 	TQHBox *box = new TQHBox(this);
-	tqlayout->addWidget(box);
+	layout->addWidget(box);
 	new TQLabel(i18n("Width:"), box);
 	mWidth = new KIntNumInput(width(), box);
 	mWidth->setMinValue(0);
 
 	box = new TQHBox(this);
-	tqlayout->addWidget(box);
+	layout->addWidget(box);
 	new TQLabel(i18n("Height:"), box);
 	mHeight = new KIntNumInput(height(), box);
 	mHeight->setMinValue(0);
 
 	box = new TQHBox(this);
-	tqlayout->addWidget(box);
+	layout->addWidget(box);
 	new TQLabel(i18n("Visible block size:"), box);
 	mFgblock = new KIntNumInput(fgblock(), box);
 	mFgblock->setMinValue(0);
 
 	box = new TQHBox(this);
-	tqlayout->addWidget(box);
+	layout->addWidget(box);
 	new TQLabel(i18n("Transparent block size:"), box);
 	mBgblock = new KIntNumInput(bgblock(), box);
 	mBgblock->setMinValue(0);
 
 	box = new TQHBox(this);
-	tqlayout->addWidget(box);
+	layout->addWidget(box);
 	new TQLabel(i18n("Update interval:"), box);
 	mRate = new KIntNumInput(rate(), box);
 	mRate->setMinValue(0);
 
 	box = new TQHBox(this);
-	tqlayout->addWidget(box);
+	layout->addWidget(box);
 	new TQLabel(i18n("Foreground color:"), box);
 	mFgcolor = new KColorButton(fgcolor(), box);
 
 	box = new TQHBox(this);
-	tqlayout->addWidget(box);
+	layout->addWidget(box);
 	new TQLabel(i18n("Background color:"), box);
 	mBgcolor = new KColorButton(bgcolor(), box);
 
-	tqlayout->addStretch();
+	layout->addStretch();
 }
 
 void FFRSPrefs::save()
diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp
index 1d444c4..e83d8fc 100644
--- a/noatun-plugins/lyrics/cmodule.cpp
+++ b/noatun-plugins/lyrics/cmodule.cpp
@@ -47,23 +47,23 @@ const char *const DEFAULT_TQUERY =
 LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("Configure Lyrics Plugin"), "document", _parent) {
   /* Thanks to the kde-usability guys for the help designing this dialog!
    * help to simon edwards of KGuardGod, for a big help designing it */
-  TQVBoxLayout *vtqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-  TQHBoxLayout *htqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint());
-  vtqlayout->setStretchFactor( htqlayout, 1 );
+  TQVBoxLayout *vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+  TQHBoxLayout *hlayout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
+  vlayout->setStretchFactor( hlayout, 1 );
 
   // Search box
-  TQVBoxLayout *boxtqlayout = new TQVBoxLayout( htqlayout, KDialog::spacingHint() );
-  boxtqlayout->addWidget( new TQLabel( i18n("Search providers:" ), this ) );
+  TQVBoxLayout *boxlayout = new TQVBoxLayout( hlayout, KDialog::spacingHint() );
+  boxlayout->addWidget( new TQLabel( i18n("Search providers:" ), this ) );
   providersBox = new KListBox( this, "providersBox" );
-  boxtqlayout->addWidget(providersBox);
+  boxlayout->addWidget(providersBox);
 
   boxButtons = new KButtonBox( this,Qt::Vertical );
   boxButtons->addButton( i18n( "New Search Provider" ), TQT_TQOBJECT(this), TQT_SLOT( newSearch() ) );
   boxButtons->addButton( i18n( "Delete Search Provider" ), TQT_TQOBJECT(this), TQT_SLOT( delSearch() ) );
   boxButtons->addButton( i18n( "Move Up" ), TQT_TQOBJECT(this), TQT_SLOT( moveUpSearch() ) );
   boxButtons->addButton( i18n( "Move Down" ), TQT_TQOBJECT(this), TQT_SLOT( moveDownSearch() ) );
-  boxButtons->tqlayout();
-  boxtqlayout->addWidget( boxButtons );
+  boxButtons->layout();
+  boxlayout->addWidget( boxButtons );
 
   // Edit box
   TQGroupBox *propBox = new TQVGroupBox( i18n("Search Provider Properties" ), this );
@@ -77,7 +77,7 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("
    * The property names can't be translated. This means that $(author) must be kept as $(author), $(title) as $(title), etc, or it won't work.*/
   TQLabel *textLabel = new TQLabel(i18n("For your query, you can use any property of your multimedia item, just enclosing it with a $(property).\n\nSome common properties used are $(title), $(author) and $(album). For example, to search in Google for the author, title and track, just use:\nhttp://www.google.com/search?q=$(author)+$(title)+$(track)"), propBox, "textLabel");
   textLabel->setAlignment(TQt::WordBreak);
-  htqlayout->addWidget( propBox, 1 );
+  hlayout->addWidget( propBox, 1 );
 
   /* Signal/slots */
   nameEdit->setEnabled( false );
@@ -88,7 +88,7 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("
 
 
 
-  vtqlayout->addStretch();
+  vlayout->addStretch();
   reopen();
   save();
 }
diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp
index 8267865..48dbca2 100644
--- a/noatun-plugins/oblique/cmodule.cpp
+++ b/noatun-plugins/oblique/cmodule.cpp
@@ -36,9 +36,9 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique)
 	mRegexpEditor=0;
 
 	{
-		TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 11, 7);
-		tqlayout->setAutoAdd(true);
-		tqlayout->setSpacing(7);
+		TQVBoxLayout *layout = new TQVBoxLayout(this, 11, 7);
+		layout->setAutoAdd(true);
+		layout->setSpacing(7);
 	}
 
 
diff --git a/noatun-plugins/synaescope/cmodule.cpp b/noatun-plugins/synaescope/cmodule.cpp
index e6c2930..5b881fd 100644
--- a/noatun-plugins/synaescope/cmodule.cpp
+++ b/noatun-plugins/synaescope/cmodule.cpp
@@ -37,7 +37,7 @@ SynaePrefs::SynaePrefs(TQObject *parent)
 	xRes = new TQSpinBox(320, 1024, 16, this);
 	yRes = new TQSpinBox(240, 768, 12, this);
 
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	TQHBoxLayout *xResLayout = new TQHBoxLayout(0, 0, KDialog::spacingHint());
 	TQHBoxLayout *yResLayout = new TQHBoxLayout(0, 0, KDialog::spacingHint());
 
@@ -47,9 +47,9 @@ SynaePrefs::SynaePrefs(TQObject *parent)
 	yResLayout->addWidget(new TQLabel(i18n("Display height:"), this));
 	yResLayout->addWidget(yRes);
 
-	tqlayout->addLayout(xResLayout);
-	tqlayout->addLayout(yResLayout);
-	tqlayout->addStretch();
+	layout->addLayout(xResLayout);
+	layout->addLayout(yResLayout);
+	layout->addStretch();
 
 	changed=false;
 	connect(xRes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanges()));