Rename a number of classes to enhance compatibility with KDE4

4 files changed, 11 insertions, 11 deletions

diff --git a/twin/kcmtwin/twinrules/ruleslistbase.ui b/twin/kcmtwin/twinrules/ruleslistbase.ui
index 8ab21412b..078d1ef2c 100644
--- a/twin/kcmtwin/twinrules/ruleslistbase.ui
+++ b/twin/kcmtwin/twinrules/ruleslistbase.ui
@@ -19,7 +19,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="KListBox" row="0" column="0" rowspan="6" colspan="1">
+        <widget class="TDEListBox" row="0" column="0" rowspan="6" colspan="1">
             <property name="name">
                 <cstring>rules_listbox</cstring>
             </property>
diff --git a/twin/kcmtwin/twinrules/ruleswidget.cpp b/twin/kcmtwin/twinrules/ruleswidget.cpp
index 8680018d7..dcf7cd358 100644
--- a/twin/kcmtwin/twinrules/ruleswidget.cpp
+++ b/twin/kcmtwin/twinrules/ruleswidget.cpp
@@ -735,7 +735,7 @@ EditShortcut::EditShortcut( TQWidget* parent, const char* name )
 
 void EditShortcut::editShortcut()
     {
-    ShortcutDialog dlg( KShortcut( shortcut->text()), topLevelWidget());
+    ShortcutDialog dlg( TDEShortcut( shortcut->text()), topLevelWidget());
     if( dlg.exec() == TQDialog::Accepted )
         shortcut->setText( dlg.shortcut().toString());
     }
@@ -762,8 +762,8 @@ TQString EditShortcutDialog::shortcut() const
     return widget->shortcut->text();
     }
 
-ShortcutDialog::ShortcutDialog( const KShortcut& cut, TQWidget* parent, const char* name )
-    : KShortcutDialog( cut, false /*TODO???*/, parent, name )
+ShortcutDialog::ShortcutDialog( const TDEShortcut& cut, TQWidget* parent, const char* name )
+    : TDEShortcutDialog( cut, false /*TODO???*/, parent, name )
     {
     }
 
@@ -783,19 +783,19 @@ void ShortcutDialog::accept()
             }
         if( seq.key( 0 ) == Key_Space )
             { // clear
-            setShortcut( KShortcut());
-            KShortcutDialog::accept();
+            setShortcut( TDEShortcut());
+            TDEShortcutDialog::accept();
             return;
             }
         if( seq.key( 0 ).modFlags() == 0 )
             { // no shortcuts without modifiers
-            KShortcut cut = shortcut();
+            TDEShortcut cut = shortcut();
             cut.setSeq( i, KKeySequence());
             setShortcut( cut );
             return;
             }
         }
-    KShortcutDialog::accept();
+    TDEShortcutDialog::accept();
     }
 
 } // namespace
diff --git a/twin/kcmtwin/twinrules/ruleswidget.h b/twin/kcmtwin/twinrules/ruleswidget.h
index 2a9b0d036..f3f6f9881 100644
--- a/twin/kcmtwin/twinrules/ruleswidget.h
+++ b/twin/kcmtwin/twinrules/ruleswidget.h
@@ -135,11 +135,11 @@ class EditShortcutDialog
 
 // slightly duped from utils.cpp
 class ShortcutDialog
-    : public KShortcutDialog
+    : public TDEShortcutDialog
     {
     Q_OBJECT
     public:
-        ShortcutDialog( const KShortcut& cut, TQWidget* parent = NULL, const char* name = NULL );
+        ShortcutDialog( const TDEShortcut& cut, TQWidget* parent = NULL, const char* name = NULL );
         virtual void accept();
     };
 
diff --git a/twin/kcmtwin/twinrules/ruleswidgetbase.ui b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
index c83bbef92..d99b475b2 100644
--- a/twin/kcmtwin/twinrules/ruleswidgetbase.ui
+++ b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
@@ -329,7 +329,7 @@
                             <cstring>types</cstring>
                         </property>
                     </widget>
-                    <widget class="KListBox" row="1" column="0" rowspan="1" colspan="4">
+                    <widget class="TDEListBox" row="1" column="0" rowspan="1" colspan="4">
                         <item>
                             <property name="text">
                                 <string>Normal Window</string>