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

3 files changed, 16 insertions, 16 deletions

diff --git a/kcontrol/smartcard/nosmartcardbase.ui b/kcontrol/smartcard/nosmartcardbase.ui
index 44fdf064a..fe8c4fa06 100644
--- a/kcontrol/smartcard/nosmartcardbase.ui
+++ b/kcontrol/smartcard/nosmartcardbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>NoSmartcardBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -23,7 +23,7 @@
             <property name="text">
                 <string>&lt;b&gt;Unable to contact the KDE smartcard service.&lt;/b&gt;</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -48,7 +48,7 @@
 
 2) You don't appear to have smartcard support in the KDE libraries. You will need to recompile the kdelibs package with libpcsclite installed.</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -64,7 +64,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -76,6 +76,6 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp
index ce2a8027d..0a1ea39ef 100644
--- a/kcontrol/smartcard/smartcard.cpp
+++ b/kcontrol/smartcard/smartcard.cpp
@@ -47,7 +47,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
   : KCModule(parent, name),DCOPObject(name)
 {
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+  TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
   config = new KConfig("ksmartcardrc", false, false);
 
   DCOPClient *dc = KApplication::kApplication()->dcopClient();
@@ -67,7 +67,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
 
 
      base = new SmartcardBase(this);
-     tqlayout->add(base);
+     layout->add(base);
 
      _popUpKardChooser = new KPopupMenu(this,"KpopupKardChooser");
      _popUpKardChooser->insertItem(i18n("Change Module..."),
@@ -107,7 +107,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
      _cardDB= new KCardDB();
      load();
   } else {
-     tqlayout->add(new NoSmartcardBase(this));
+     layout->add(new NoSmartcardBase(this));
   }
 }
 
diff --git a/kcontrol/smartcard/smartcardbase.ui b/kcontrol/smartcard/smartcardbase.ui
index c1fe3f0ed..b5dda006b 100644
--- a/kcontrol/smartcard/smartcardbase.ui
+++ b/kcontrol/smartcard/smartcardbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SmartcardBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -74,7 +74,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>15</width>
                                         <height>20</height>
@@ -118,7 +118,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -231,7 +231,7 @@
                                     <property name="name">
                                         <cstring>TextLabel2</cstring>
                                     </property>
-                                    <property name="tqgeometry">
+                                    <property name="geometry">
                                         <rect>
                                             <x>10</x>
                                             <y>20</y>
@@ -250,7 +250,7 @@
                                     <property name="text">
                                         <string>To add new readers you have to modify /etc/readers.conf file and re-start pcscd</string>
                                     </property>
-                                    <property name="tqalignment">
+                                    <property name="alignment">
                                         <set>WordBreak|AlignVCenter</set>
                                     </property>
                                 </widget>
@@ -305,6 +305,6 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>