Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 files changed, 48 insertions, 48 deletions

diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp
index 68ca85932..792951aec 100644
--- a/kcontrol/arts/arts.cpp
+++ b/kcontrol/arts/arts.cpp
@@ -116,7 +116,7 @@ void KArtsModule::initAudioIOList()
 
 void KArtsModule::slotArtsdExited(KProcess* proc)
 {
-	latestProcesstqStatus = proc->exitStatus();
+	latestProcessStatus = proc->exitStatus();
 	delete proc;
 }
 
@@ -151,17 +151,17 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name)
 
 	initAudioIOList();
 
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	TQTabWidget *tab = new TQTabWidget(this);
-	tqlayout->addWidget(tab);
+	layout->addWidget(tab);
 
 	general = new generalTab(tab);
 	hardware = new hardwareTab(tab);
 	//mixer = KCModuleLoader::loadModule("kmixcfg", tab);
 	//midi = new KMidConfig(tab, "kmidconfig");
 
-	general->tqlayout()->setMargin( KDialog::marginHint() );
-	hardware->tqlayout()->setMargin( KDialog::marginHint() );
+	general->layout()->setMargin( KDialog::marginHint() );
+	hardware->layout()->setMargin( KDialog::marginHint() );
 	general->latencyLabel->setFixedHeight(general->latencyLabel->fontMetrics().lineSpacing());
 
 	tab->addTab(general, i18n("&General"));
@@ -499,7 +499,7 @@ void KArtsModule::updateWidgets()
 	if (item >= 0)
 	{
 		audioIO = audioIOList.at(item)->name;
-		bool jack = (audioIO == TQString::tqfromLatin1("jack"));
+		bool jack = (audioIO == TQString::fromLatin1("jack"));
 		if(jack)
 		{
 			customRate->setChecked(false);
@@ -549,7 +549,7 @@ bool KArtsModule::realtimeIsPossible()
 		delete checkProcess;
 		realtimePossible =  false;
 	}
-	else if (latestProcesstqStatus == 0)
+	else if (latestProcessStatus == 0)
 	{
 		realtimePossible =  true;
 	}
@@ -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/arts.h b/kcontrol/arts/arts.h
index 2e033286d..80df5bd8e 100644
--- a/kcontrol/arts/arts.h
+++ b/kcontrol/arts/arts.h
@@ -92,7 +92,7 @@ private:
   hardwareTab *hardware;
   KConfig *config;
   DeviceManager *deviceManager;
-  int latestProcesstqStatus;
+  int latestProcessStatus;
   int fragmentCount;
   int fragmentSize;
   bool configChanged;
diff --git a/kcontrol/arts/generaltab.ui b/kcontrol/arts/generaltab.ui
index 19aa6444a..5b7ba7f79 100644
--- a/kcontrol/arts/generaltab.ui
+++ b/kcontrol/arts/generaltab.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>generalTab</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -12,7 +12,7 @@
             <height>613</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>450</height>
@@ -186,7 +186,7 @@ Recommended if you want sound.</string>
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout7</cstring>
+                        <cstring>layout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -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>
@@ -240,7 +240,7 @@ Recommended if you want sound.</string>
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -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>
@@ -322,7 +322,7 @@ Recommended if you want sound.</string>
 <includes>
     <include location="local" impldecl="in implementation">krichtextlabel.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kcontrol/arts/hardwaretab.ui b/kcontrol/arts/hardwaretab.ui
index 977cb6440..c11f19962 100644
--- a/kcontrol/arts/hardwaretab.ui
+++ b/kcontrol/arts/hardwaretab.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>hardwareTab</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -35,7 +35,7 @@
                 </property>
                 <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout57</cstring>
+                        <cstring>layout57</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -77,7 +77,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout31</cstring>
+                        <cstring>layout31</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -117,7 +117,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -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>
@@ -208,7 +208,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="2" column="1">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -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>
@@ -354,5 +354,5 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kcontrol/arts/krichtextlabel.cpp b/kcontrol/arts/krichtextlabel.cpp
index 0d20965c7..5c7618a1b 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 = QMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
-  tqsetAlignment( Qt::WordBreak );
+  setAlignment( Qt::WordBreak );
   setText(text);
 }
 
 KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
   m_defaultWidth = QMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
-  tqsetAlignment( Qt::WordBreak );
+  setAlignment( Qt::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 178630bc2..40ead0375 100644
--- a/kcontrol/arts/krichtextlabel.h
+++ b/kcontrol/arts/krichtextlabel.h
@@ -24,7 +24,7 @@
 #include <kdelibs_export.h>
 
 /**
- * @short A tqreplacement for TQLabel that supports richtext and proper tqlayout management
+ * @short A replacement for TQLabel that supports richtext and proper layout management
  *
  * @author Waldo Bastian <[email protected]>
  */
@@ -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: