Rename a number of classes to enhance compatibility with KDE4

6 files changed, 18 insertions, 18 deletions

diff --git a/khotkeys/kcontrol/kcmkhotkeys.h b/khotkeys/kcontrol/kcmkhotkeys.h
index 92bf49efb..58751599d 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.h
+++ b/khotkeys/kcontrol/kcmkhotkeys.h
@@ -54,8 +54,8 @@ class Module
         void set_daemon_disabled( bool disable );
         bool daemon_disabled() const;
         void import();
-		KShortcut voice_shortcut() const;
-		void set_voice_shortcut( const KShortcut&) ;
+		TDEShortcut voice_shortcut() const;
+		void set_voice_shortcut( const TDEShortcut&) ;
     public slots:
         void changed();
     protected:
@@ -153,13 +153,13 @@ bool Module::daemon_disabled() const
 
 
 inline
-void Module::set_voice_shortcut( const KShortcut& cut)
+void Module::set_voice_shortcut( const TDEShortcut& cut)
    {
     settings.voice_shortcut=cut;
    }
 
 inline 
-KShortcut Module::voice_shortcut() const
+TDEShortcut Module::voice_shortcut() const
    {
 	return settings.voice_shortcut;
    }
diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp
index 990cd4ff5..97e372821 100644
--- a/khotkeys/kcontrol/menuedit.cpp
+++ b/khotkeys/kcontrol/menuedit.cpp
@@ -288,9 +288,9 @@ TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P,
         }
     TQString shortcut = "";
     // make sure the shortcut is valid
-    shortcut = (KShortcut( shortcut_P )).toStringInternal();
+    shortcut = (TDEShortcut( shortcut_P )).toStringInternal();
     if( !shortcut.isEmpty())
-        entry->set_trigger( new Shortcut_trigger( entry, KShortcut( shortcut )));
+        entry->set_trigger( new Shortcut_trigger( entry, TDEShortcut( shortcut )));
     if( shortcut.isEmpty())
         {
         delete entry;
diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp
index 31eb7be27..258c6cfd5 100644
--- a/khotkeys/kcontrol/triggers_tab.cpp
+++ b/khotkeys/kcontrol/triggers_tab.cpp
@@ -125,7 +125,7 @@ void Triggers_tab::new_selected( int type_P )
         {
         case TYPE_SHORTCUT_TRIGGER: // Shortcut_trigger
             dlg = new Shortcut_trigger_dialog(
-                new Shortcut_trigger( NULL, KShortcut())); // CHECKME NULL ?
+                new Shortcut_trigger( NULL, TDEShortcut())); // CHECKME NULL ?
           break;
         case TYPE_GESTURE_TRIGGER: // Gesture trigger
             dlg = new Gesture_trigger_dialog(
@@ -230,16 +230,16 @@ Shortcut_trigger_widget::Shortcut_trigger_widget( TQWidget* parent_P, const char
     lay->addWidget( bt, 0 , Qt::AlignHCenter );
     lay->addStretch();
     clear_data();
-    connect( bt, TQT_SIGNAL( capturedShortcut( const KShortcut& )),
-        this, TQT_SLOT( capturedShortcut( const KShortcut& )));
+    connect( bt, TQT_SIGNAL( capturedShortcut( const TDEShortcut& )),
+        this, TQT_SLOT( capturedShortcut( const TDEShortcut& )));
     }
 
 void Shortcut_trigger_widget::clear_data()
     {
-    bt->setShortcut( KShortcut(), false );
+    bt->setShortcut( TDEShortcut(), false );
     }
 
-void Shortcut_trigger_widget::capturedShortcut( const KShortcut& s_P )
+void Shortcut_trigger_widget::capturedShortcut( const TDEShortcut& s_P )
     {
     if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, topLevelWidget())
         || KKeyChooser::checkStandardShortcutsConflict( s_P, true, topLevelWidget()))
diff --git a/khotkeys/kcontrol/triggers_tab.h b/khotkeys/kcontrol/triggers_tab.h
index 89b674a7b..c4d6160fe 100644
--- a/khotkeys/kcontrol/triggers_tab.h
+++ b/khotkeys/kcontrol/triggers_tab.h
@@ -20,7 +20,7 @@
 #include <window_trigger_widget.h>
 
 class KKeyButton;
-class KShortcut;
+class TDEShortcut;
 
 namespace KHotKeys
 {
@@ -90,7 +90,7 @@ class Shortcut_trigger_widget
     public slots:
         void clear_data();
     private slots:
-        void capturedShortcut( const KShortcut& );
+        void capturedShortcut( const TDEShortcut& );
     private:
         KKeyButton* bt;
     };
diff --git a/khotkeys/kcontrol/voice_settings_tab.cpp b/khotkeys/kcontrol/voice_settings_tab.cpp
index 612498536..277e2f675 100644
--- a/khotkeys/kcontrol/voice_settings_tab.cpp
+++ b/khotkeys/kcontrol/voice_settings_tab.cpp
@@ -26,7 +26,7 @@ namespace KHotKeys
 Voice_settings_tab::Voice_settings_tab( TQWidget* parent_P, const char* name_P )
     : Voice_settings_tab_ui( parent_P, name_P )
     {
-		connect( keyButton , TQT_SIGNAL(capturedShortcut (const KShortcut &)) , this, TQT_SLOT(slotCapturedKey( const KShortcut& )));
+		connect( keyButton , TQT_SIGNAL(capturedShortcut (const TDEShortcut &)) , this, TQT_SLOT(slotCapturedKey( const TDEShortcut& )));
     }
 
 void Voice_settings_tab::read_data()
@@ -44,9 +44,9 @@ void Voice_settings_tab::clear_data()
     // "global" tab, not action specific, do nothing
     }
 	
-void Voice_settings_tab::slotCapturedKey( const KShortcut& cut)
+void Voice_settings_tab::slotCapturedKey( const TDEShortcut& cut)
    {
-	   /*for(uint seq=0; seq<KShortcut::MAX_SEQUENCES; seq++)
+	   /*for(uint seq=0; seq<TDEShortcut::MAX_SEQUENCES; seq++)
 	   {
 		   KKeySequance key=cut.seq(seq);
 		   if(key.isNull())
diff --git a/khotkeys/kcontrol/voice_settings_tab.h b/khotkeys/kcontrol/voice_settings_tab.h
index 68e37af3a..c59a911a2 100644
--- a/khotkeys/kcontrol/voice_settings_tab.h
+++ b/khotkeys/kcontrol/voice_settings_tab.h
@@ -13,7 +13,7 @@
 
 #include <voice_settings_tab_ui.h>
 
-class KShortcut;
+class TDEShortcut;
 
 namespace KHotKeys
 {
@@ -29,7 +29,7 @@ class Voice_settings_tab
     public slots:
         void clear_data();
     private slots:
-		void slotCapturedKey( const KShortcut& );
+		void slotCapturedKey( const TDEShortcut& );
     };
 
 //***************************************************************************