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

2 files changed, 17 insertions, 17 deletions

diff --git a/knetattach/knetattach.ui b/knetattach/knetattach.ui
index 13b7d0f9c..b93a7e62f 100644
--- a/knetattach/knetattach.ui
+++ b/knetattach/knetattach.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KNetAttach</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -96,7 +96,7 @@
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="tqminimumSize">
+                        <property name="minimumSize">
                             <size>
                                 <width>250</width>
                                 <height>0</height>
@@ -131,7 +131,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>31</width>
                         <height>16</height>
@@ -145,7 +145,7 @@
                 <property name="text">
                     <string>Select the type of network folder you wish to connect to and press the Next button.</string>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>WordBreak|AlignVCenter</set>
                 </property>
             </widget>
@@ -159,7 +159,7 @@
                 <property name="sizeType">
                     <enum>Fixed</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>20</width>
                         <height>21</height>
@@ -186,7 +186,7 @@
                 <property name="text">
                     <string>Enter a name for this &lt;i&gt;%1&lt;/i&gt; as well as the server address, port and folder path to use and press the Next button.</string>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>WordBreak|AlignVCenter</set>
                 </property>
             </widget>
@@ -200,7 +200,7 @@
                 <property name="sizeType">
                     <enum>Fixed</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>20</width>
                         <height>21</height>
@@ -327,7 +327,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>560</width>
                         <height>16</height>
@@ -367,19 +367,19 @@
         <sender>_user</sender>
         <signal>textChanged(const QString&amp;)</signal>
         <receiver>KNetAttach</receiver>
-        <slot>updateParametersPagetqStatus()</slot>
+        <slot>updateParametersPageStatus()</slot>
     </connection>
     <connection>
         <sender>_host</sender>
         <signal>textChanged(const QString&amp;)</signal>
         <receiver>KNetAttach</receiver>
-        <slot>updateParametersPagetqStatus()</slot>
+        <slot>updateParametersPageStatus()</slot>
     </connection>
     <connection>
         <sender>_path</sender>
         <signal>textChanged(const QString&amp;)</signal>
         <receiver>KNetAttach</receiver>
-        <slot>updateParametersPagetqStatus()</slot>
+        <slot>updateParametersPageStatus()</slot>
     </connection>
     <connection>
         <sender>_useEncryption</sender>
@@ -427,7 +427,7 @@
     <slot access="private">init()</slot>
     <slot>setInformationText( const QString &amp; type )</slot>
     <slot access="private">showPage( QWidget * page )</slot>
-    <slot access="private">updateParametersPagetqStatus()</slot>
+    <slot access="private">updateParametersPageStatus()</slot>
     <slot access="private">finished()</slot>
     <slot access="private">updatePort( bool encryption )</slot>
     <slot access="private">updateFinishButtonText( bool save )</slot>
@@ -436,5 +436,5 @@
     <function access="private" returnType="bool">doConnectionTest( const KURL &amp; url )</function>
     <function access="private" returnType="bool">updateForProtocol( const QString &amp; protocol )</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/knetattach/knetattach.ui.h b/knetattach/knetattach.ui.h
index 4de321bd3..f60dab03e 100644
--- a/knetattach/knetattach.ui.h
+++ b/knetattach/knetattach.ui.h
@@ -16,7 +16,7 @@ void KNetAttach::init()
     disconnect(finishButton(), TQT_SIGNAL(clicked()), (TQDialog*)this, TQT_SLOT(accept()));
     connect(finishButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(finished()));
     finishButton()->setText(i18n("Save && C&onnect"));
-    //setResizeMode(Fixed); FIXME: make the wizard fixed-tqgeometry
+    //setResizeMode(Fixed); FIXME: make the wizard fixed-geometry
     setFinishEnabled(_folderParameters, false);
     KConfig recent("krecentconnections", true, false);
     recent.setGroup("General");
@@ -109,14 +109,14 @@ void KNetAttach::showPage( TQWidget *page )
 	    _connectionName->setText(_recentConnectionName->currentText());
 	    _createIcon->setChecked(false);
 	}
-	updateParametersPagetqStatus();
+	updateParametersPageStatus();
     }
 
     TQWizard::showPage(page);
 }
 
 
-void KNetAttach::updateParametersPagetqStatus()
+void KNetAttach::updateParametersPageStatus()
 {
     setFinishEnabled(_folderParameters,
 		  !_host->text().stripWhiteSpace().isEmpty() &&
@@ -190,7 +190,7 @@ void KNetAttach::finished()
 	recent.setGroup("General");
 	TQStringList idx = recent.readListEntry("Index");
 	recent.deleteGroup(name); // erase anything stale
-	if (idx.tqcontains(name)) {
+	if (idx.contains(name)) {
 	    idx.remove(name);
 	    idx.prepend(name);
 	    recent.writeEntry("Index", idx);