Rename old tq methods that no longer need a unique name

5 files changed, 30 insertions, 30 deletions

diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp
index ae65419a9..cb0f6f93a 100644
--- a/kcontrol/arts/arts.cpp
+++ b/kcontrol/arts/arts.cpp
@@ -499,7 +499,7 @@ void KArtsModule::updateWidgets()
 	if (item >= 0)
 	{
 		audioIO = audioIOList.tqat(item)->name;
-		bool jack = (audioIO == TQString::tqfromLatin1("jack"));
+		bool jack = (audioIO == TQString::fromLatin1("jack"));
 		if(jack)
 		{
 			customRate->setChecked(false);
@@ -620,39 +620,39 @@ TQString KArtsModule::createArgs(bool netTrans,
 	TQString args;
 
 	if(fragmentCount)
-		args += TQString::tqfromLatin1(" -F %1").arg(fragmentCount);
+		args += TQString::fromLatin1(" -F %1").arg(fragmentCount);
 
 	if(fragmentSize)
-		args += TQString::tqfromLatin1(" -S %1").arg(fragmentSize);
+		args += TQString::fromLatin1(" -S %1").arg(fragmentSize);
 
 	if (!audioIO.isEmpty())
-		args += TQString::tqfromLatin1(" -a %1").arg(audioIO);
+		args += TQString::fromLatin1(" -a %1").arg(audioIO);
 
 	if (duplex)
-		args += TQString::tqfromLatin1(" -d");
+		args += TQString::fromLatin1(" -d");
 
 	if (netTrans)
-		args += TQString::tqfromLatin1(" -n");
+		args += TQString::fromLatin1(" -n");
 
 	if (!deviceName.isEmpty())
-		args += TQString::tqfromLatin1(" -D ") + deviceName;
+		args += TQString::fromLatin1(" -D ") + deviceName;
 
 	if (rate)
-		args += TQString::tqfromLatin1(" -r %1").arg(rate);
+		args += TQString::fromLatin1(" -r %1").arg(rate);
 
 	if (bits)
-		args += TQString::tqfromLatin1(" -b %1").arg(bits);
+		args += TQString::fromLatin1(" -b %1").arg(bits);
 
 	if (autoSuspend && suspendTime)
-		args += TQString::tqfromLatin1(" -s %1").arg(suspendTime);
+		args += TQString::fromLatin1(" -s %1").arg(suspendTime);
 
 	if (!addOptions.isEmpty())
 		args += TQChar(' ') + addOptions;
 
-	args += TQString::tqfromLatin1(" -m artsmessage");
-	args += TQString::tqfromLatin1(" -c drkonqi");
-	args += TQString::tqfromLatin1(" -l 3");
-	args += TQString::tqfromLatin1(" -f");
+	args += TQString::fromLatin1(" -m artsmessage");
+	args += TQString::fromLatin1(" -c drkonqi");
+	args += TQString::fromLatin1(" -l 3");
+	args += TQString::fromLatin1(" -f");
 
 	return args;
 }
diff --git a/kcontrol/arts/generaltab.ui b/kcontrol/arts/generaltab.ui
index f0d42dd8a..06ccd7b92 100644
--- a/kcontrol/arts/generaltab.ui
+++ b/kcontrol/arts/generaltab.ui
@@ -12,7 +12,7 @@
             <height>613</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>450</height>
@@ -227,7 +227,7 @@ Recommended if you want sound.</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>173</width>
                                     <height>20</height>
@@ -256,7 +256,7 @@ Recommended if you want sound.</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -289,7 +289,7 @@ Recommended if you want sound.</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -308,7 +308,7 @@ Recommended if you want sound.</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
diff --git a/kcontrol/arts/hardwaretab.ui b/kcontrol/arts/hardwaretab.ui
index 68ed5916f..ac20fdfe2 100644
--- a/kcontrol/arts/hardwaretab.ui
+++ b/kcontrol/arts/hardwaretab.ui
@@ -133,7 +133,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -189,7 +189,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>0</width>
                                     <height>20</height>
@@ -252,7 +252,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>0</width>
                                     <height>20</height>
@@ -345,7 +345,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>60</height>
diff --git a/kcontrol/arts/krichtextlabel.cpp b/kcontrol/arts/krichtextlabel.cpp
index d15d344a7..0a188a475 100644
--- a/kcontrol/arts/krichtextlabel.cpp
+++ b/kcontrol/arts/krichtextlabel.cpp
@@ -41,14 +41,14 @@ static TQString qrichtextify( const TQString& text )
 KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
   m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
-  tqsetAlignment( TQt::WordBreak );
+  setAlignment( TQt::WordBreak );
   setText(text);
 }
 
 KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
   m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
-  tqsetAlignment( TQt::WordBreak );
+  setAlignment( TQt::WordBreak );
 }
 
 void KRichTextLabel::setDefaultWidth(int defaultWidth)
@@ -62,7 +62,7 @@ TQSizePolicy KRichTextLabel::sizePolicy() const
   return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false);
 }
 
-TQSize KRichTextLabel::tqminimumSizeHint() const
+TQSize KRichTextLabel::minimumSizeHint() const
 {
   TQString qt_text = qrichtextify( text() );
   int pref_width = 0;
@@ -97,9 +97,9 @@ TQSize KRichTextLabel::tqminimumSizeHint() const
   return TQSize(pref_width, rt.height());
 }
 
-TQSize KRichTextLabel::tqsizeHint() const
+TQSize KRichTextLabel::sizeHint() const
 {
-  return tqminimumSizeHint();
+  return minimumSizeHint();
 }
 
 void KRichTextLabel::setText( const TQString &text ) {
diff --git a/kcontrol/arts/krichtextlabel.h b/kcontrol/arts/krichtextlabel.h
index 43bf0afce..18cba5a32 100644
--- a/kcontrol/arts/krichtextlabel.h
+++ b/kcontrol/arts/krichtextlabel.h
@@ -45,8 +45,8 @@ public:
   int defaultWidth() const { return m_defaultWidth; }
   void setDefaultWidth(int defaultWidth);
 
-  virtual TQSize tqminimumSizeHint() const;
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize minimumSizeHint() const;
+  virtual TQSize sizeHint() const;
   TQSizePolicy sizePolicy() const;
 
 public slots: