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, 32 insertions, 32 deletions

diff --git a/kioslave/media/propsdlgplugin/propertiespage.cpp b/kioslave/media/propsdlgplugin/propertiespage.cpp
index 70eab1b83..14ac2b33f 100644
--- a/kioslave/media/propsdlgplugin/propertiespage.cpp
+++ b/kioslave/media/propsdlgplugin/propertiespage.cpp
@@ -60,49 +60,49 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id)
 	options[key] = value;
       }
 
-    if (!options.tqcontains("ro"))
+    if (!options.contains("ro"))
       option_ro->hide();
     else
       option_ro->setChecked(options["ro"] == "true");
     connect( option_ro, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
 
-    if (!options.tqcontains("quiet"))
+    if (!options.contains("quiet"))
       option_quiet->hide();
     else
       option_quiet->setChecked(options["quiet"] == "true");
     connect( option_quiet, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
 
-    if (!options.tqcontains("sync"))
+    if (!options.contains("sync"))
       option_sync->hide();
     else
       option_sync->setChecked(options["sync"] == "true");
     connect( option_sync, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
 
-    if (!options.tqcontains("atime"))
+    if (!options.contains("atime"))
       option_atime->hide();
     else
       option_atime->setChecked(options["atime"] == "true");
     connect( option_atime, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
 
-    if (!options.tqcontains("flush"))
+    if (!options.contains("flush"))
       option_flush->hide();
     else
       option_flush->setChecked(options["flush"] == "true");
     connect( option_flush, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
 
-    if (!options.tqcontains("utf8"))
+    if (!options.contains("utf8"))
       option_utf8->hide();
     else
       option_utf8->setChecked(options["utf8"] == "true");
     connect( option_utf8, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
 
-    if (!options.tqcontains("uid"))
+    if (!options.contains("uid"))
       option_uid->hide();
     else
       option_uid->setChecked(options["uid"] == "true");
     connect( option_uid, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
 
-    if (!options.tqcontains("shortname"))
+    if (!options.contains("shortname"))
       {
 	option_shortname->hide();
 	text_shortname->hide();
@@ -118,7 +118,7 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id)
 	connect( option_shortname, TQT_SIGNAL( activated(int) ), TQT_SIGNAL( changed() ) );
       }
 
-    if (!options.tqcontains("journaling"))
+    if (!options.contains("journaling"))
       {
 	text_journaling->hide();
 	option_journaling->hide();
@@ -140,11 +140,11 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id)
     option_automount->setChecked(options["automount"] == "true");
     connect( option_automount, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
 
-    if (!options.tqcontains("journaling") &&
-	!options.tqcontains("shortname") &&
-	!options.tqcontains("uid") &&
-	!options.tqcontains("utf8") &&
-	!options.tqcontains("flush"))
+    if (!options.contains("journaling") &&
+	!options.contains("shortname") &&
+	!options.contains("uid") &&
+	!options.contains("utf8") &&
+	!options.contains("flush"))
       groupbox_specific->hide();
 
   } else {
@@ -163,31 +163,31 @@ bool PropertiesPage::save()
 {
   TQStringList result;
 
-  if (options.tqcontains("ro"))
+  if (options.contains("ro"))
     result << TQString("ro=%1").arg(option_ro->isChecked() ? "true" : "false");
 
-  if (options.tqcontains("quiet"))
+  if (options.contains("quiet"))
     result << TQString("quiet=%1").arg(option_quiet->isChecked() ? "true" : "false");
 
-  if (options.tqcontains("sync"))
+  if (options.contains("sync"))
     result << TQString("sync=%1").arg(option_sync->isChecked() ? "true" : "false");
 
-  if (options.tqcontains("atime"))
+  if (options.contains("atime"))
     result << TQString("atime=%1").arg(option_atime->isChecked() ? "true" : "false");
 
-  if (options.tqcontains("flush"))
+  if (options.contains("flush"))
     result << TQString("flush=%1").arg(option_flush->isChecked() ? "true" : "false");
 
-  if (options.tqcontains("utf8"))
+  if (options.contains("utf8"))
     result << TQString("utf8=%1").arg(option_utf8->isChecked() ? "true" : "false");
 
-  if (options.tqcontains("uid"))
+  if (options.contains("uid"))
     result << TQString("uid=%1").arg(option_uid->isChecked() ? "true" : "false");
 
-  if (options.tqcontains("shortname"))
+  if (options.contains("shortname"))
     result << TQString("shortname=%1").arg(short_names[option_shortname->currentItem()]);
 
-  if (options.tqcontains("journaling"))
+  if (options.contains("journaling"))
     result << TQString("journaling=%1").arg(journales[option_journaling->currentItem()]);
 
   TQString mp = option_mountpoint->text();
diff --git a/kioslave/media/propsdlgplugin/propertiespagegui.ui b/kioslave/media/propsdlgplugin/propertiespagegui.ui
index 7c91db351..c4de4c059 100644
--- a/kioslave/media/propsdlgplugin/propertiespagegui.ui
+++ b/kioslave/media/propsdlgplugin/propertiespagegui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>PropertiesPageGUI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -21,7 +21,7 @@
         </property>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout17</cstring>
+                <cstring>layout17</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -40,7 +40,7 @@
                         </property>
                         <widget class="QLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout15</cstring>
+                                <cstring>layout15</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -92,7 +92,7 @@
                                 </widget>
                                 <widget class="QLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout14</cstring>
+                                        <cstring>layout14</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -150,7 +150,7 @@
                         </property>
                         <widget class="QLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout11</cstring>
+                                <cstring>layout11</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -191,7 +191,7 @@
                                 </widget>
                                 <widget class="QLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout7</cstring>
+                                        <cstring>layout7</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -256,7 +256,7 @@
                                 </widget>
                                 <widget class="QLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout14</cstring>
+                                        <cstring>layout14</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -352,7 +352,7 @@ Display the short name as is; store a long name when the short name is not all u
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -383,5 +383,5 @@ Display the short name as is; store a long name when the short name is not all u
 <functions>
     <function returnType="bool">hasChanged()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>