Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit ca82971624269719d487c6f7980d7237f9420036.

3 files changed, 13 insertions, 13 deletions

diff --git a/noatun-plugins/alsaplayer/AlsaPlayer.ui b/noatun-plugins/alsaplayer/AlsaPlayer.ui
index 3280242..73c4249 100644
--- a/noatun-plugins/alsaplayer/AlsaPlayer.ui
+++ b/noatun-plugins/alsaplayer/AlsaPlayer.ui
@@ -574,7 +574,7 @@
                     <property name="text">
                         <string>Speed:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -1924,7 +1924,7 @@
                     <property name="text">
                         <string>Volume:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -2205,7 +2205,7 @@
             <property name="name">
                 <cstring>seeker</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>32</width>
                     <height>16</height>
@@ -2254,7 +2254,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -2394,7 +2394,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp
index 664b1cb..0c98af7 100644
--- a/noatun-plugins/alsaplayer/configmodule.cpp
+++ b/noatun-plugins/alsaplayer/configmodule.cpp
@@ -25,7 +25,7 @@
 #include <kconfig.h>
 
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "configmodule.h"
 
@@ -41,11 +41,11 @@ AlsaPlayerConfigModule::AlsaPlayerConfigModule(TQObject * parent)
 {
   scroll_ = new TQCheckBox(i18n("Scroll song title"), this);
 
-  TQVBoxLayout * layout = new TQVBoxLayout(this);
+  TQVBoxLayout * tqlayout = new TQVBoxLayout(this);
 
-  layout->addWidget(scroll_);
+  tqlayout->addWidget(scroll_);
 
-	layout->addStretch(100);
+	tqlayout->addStretch(100);
 
   reopen();
 }
diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp
index 55a63fe..cc53b06 100644
--- a/noatun-plugins/alsaplayer/userinterface.cpp
+++ b/noatun-plugins/alsaplayer/userinterface.cpp
@@ -30,7 +30,7 @@
 
 #include <tqtoolbutton.h>
 #include <tqdragobject.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqframe.h>
 
@@ -155,7 +155,7 @@ AlsaPlayer::AlsaPlayer()
 
 	loadConfig();
 
-	resize(sizeHint().width(), minimumSizeHint().height());
+	resize(tqsizeHint().width(), tqminimumSizeHint().height());
 
 	show();
 }
@@ -273,7 +273,7 @@ void AlsaPlayer::slotConfigChanged()
 void AlsaPlayer::slotVolumeChanged(int i)
 {
 	TQString text("%1%");
-	volumeLabel->setText(text.arg(i));
+	volumeLabel->setText(text.tqarg(i));
 	volumeSlider->setValue(i);
 }
 
@@ -312,7 +312,7 @@ void AlsaPlayer::slotSetSpeed(int newSpeed)
 	speed_ = newSpeed;
 
 	pauseButton->setEnabled(0 != speed_);
-	speedLabel->setText(TQString("%1%").arg(speed_));
+	speedLabel->setText(TQString("%1%").tqarg(speed_));
 
 	Arts::PlayObject playobject(napp->player()->engine()->playObject());
 	Arts::PitchablePlayObject pitchable = Arts::DynamicCast(playobject);