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

5 files changed, 12 insertions, 12 deletions

diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp
index 9baa6fdba..edfa28e48 100644
--- a/kcontrol/knotify/knotify.cpp
+++ b/kcontrol/knotify/knotify.cpp
@@ -64,19 +64,19 @@ KCMKNotify::KCMKNotify(TQWidget *parent, const char *name, const TQStringList &
                 "any additional visual or audible alert."
                 "</ul>"));
 
-    TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
+    TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
     TQLabel *label = new TQLabel( i18n( "Event source:" ), this );
     m_appCombo = new KComboBox( false, this, "app combo" );
 
-    TQHBoxLayout *hbox = new TQHBoxLayout( tqlayout );
+    TQHBoxLayout *hbox = new TQHBoxLayout( layout );
     hbox->addWidget( label );
     hbox->addWidget( m_appCombo, 10 );
 
     m_notifyWidget = new KNotifyWidget( this, "knotify widget", true );
     connect( m_notifyWidget, TQT_SIGNAL( changed( bool )), TQT_SIGNAL( changed(bool)));
 
-    tqlayout->addWidget( m_notifyWidget );
+    layout->addWidget( m_notifyWidget );
 
     connect( m_appCombo, TQT_SIGNAL( activated( const TQString& ) ),
              TQT_SLOT( slotAppActivated( const TQString& )) );
diff --git a/kcontrol/knotify/playersettings.ui b/kcontrol/knotify/playersettings.ui
index 81e0ff8a0..f990fc995 100644
--- a/kcontrol/knotify/playersettings.ui
+++ b/kcontrol/knotify/playersettings.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>PlayerSettingsUI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -84,7 +84,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -93,7 +93,7 @@
                 </spacer>
                 <widget class="QLayoutWidget" row="1" column="1" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -109,7 +109,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -118,7 +118,7 @@
                         </spacer>
                         <widget class="QLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -140,7 +140,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>233</width>
                                             <height>20</height>
@@ -205,7 +205,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -265,7 +265,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -321,7 +321,7 @@
     <tabstop>cbExternal</tabstop>
     <tabstop>cbNone</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg b/kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg
index 321b35b8d..daa451531 100644
--- a/kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg
+++ b/kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg
diff --git a/kcontrol/knotify/sounds/KDE_Startup_1.ogg b/kcontrol/knotify/sounds/KDE_Startup_1.ogg
index 251683347..2fca9715b 100644
--- a/kcontrol/knotify/sounds/KDE_Startup_1.ogg
+++ b/kcontrol/knotify/sounds/KDE_Startup_1.ogg
diff --git a/kcontrol/knotify/sounds/KDE_Window_Iconify.wav b/kcontrol/knotify/sounds/KDE_Window_Iconify.wav
index 52bc44bf1..55b4e4598 100644
--- a/kcontrol/knotify/sounds/KDE_Window_Iconify.wav
+++ b/kcontrol/knotify/sounds/KDE_Window_Iconify.wav