Rename a number of classes to enhance compatibility with KDE4

12 files changed, 115 insertions, 115 deletions

diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp
index 9f5a49040..262aaac69 100644
--- a/kcontrol/keys/commandShortcuts.cpp
+++ b/kcontrol/keys/commandShortcuts.cpp
@@ -121,8 +121,8 @@ void CommandShortcutsModule::initGUI()
                          "to the currently selected command."));
     buttonLayout->addSpacing(KDialog::spacingHint() * 2);
     buttonLayout->addWidget(m_shortcutButton);
-    connect(m_shortcutButton, TQT_SIGNAL(capturedShortcut(const KShortcut&)),
-            this, TQT_SLOT(shortcutChanged(const KShortcut&)));
+    connect(m_shortcutButton, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)),
+            this, TQT_SLOT(shortcutChanged(const TDEShortcut&)));
     connect(m_customRadio, TQT_SIGNAL(toggled(bool)), m_shortcutButton, TQT_SLOT(setEnabled(bool)));
     connect(m_noneRadio, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(shortcutRadioToggled(bool)));
     buttonLayout->addStretch(1);
@@ -170,7 +170,7 @@ void CommandShortcutsModule::shortcutRadioToggled(bool remove)
     }
 }
 
-void CommandShortcutsModule::shortcutChanged(const KShortcut& shortcut)
+void CommandShortcutsModule::shortcutChanged(const TDEShortcut& shortcut)
 {
     AppTreeItem *item = static_cast<AppTreeItem*>(m_tree->currentItem());
     if (!item || item->isDirectory())
diff --git a/kcontrol/keys/commandShortcuts.h b/kcontrol/keys/commandShortcuts.h
index 3650b4e8c..2e0f0a76e 100644
--- a/kcontrol/keys/commandShortcuts.h
+++ b/kcontrol/keys/commandShortcuts.h
@@ -55,7 +55,7 @@ class CommandShortcutsModule : public TQWidget
 
     protected slots:
         void commandSelected(const TQString&, const TQString &, bool);
-        void shortcutChanged(const KShortcut& shortcut);
+        void shortcutChanged(const TDEShortcut& shortcut);
         void shortcutRadioToggled(bool remove);
         void commandDoubleClicked(TQListViewItem *item, const TQPoint &, int);
         void launchMenuEditor();
diff --git a/kcontrol/keys/kaccelaction.h b/kcontrol/keys/kaccelaction.h
index a50d7a41d..248ff2278 100644
--- a/kcontrol/keys/kaccelaction.h
+++ b/kcontrol/keys/kaccelaction.h
@@ -30,30 +30,30 @@
 
 #include <kshortcut.h>
 
-class KAccelBase;
+class TDEAccelBase;
 
 class TQObject;
 class TDEConfig;
 class TDEConfigBase;
 
 /*
-	KAccelAction holds information an a given action, such as "Run Command"
+	TDEAccelAction holds information an a given action, such as "Run Command"
 
-	1) KAccelAction = "Run Command"
+	1) TDEAccelAction = "Run Command"
 		Default3 = "Alt+F2"
 		Default4 = "Meta+Enter;Alt+F2"
-		1) KShortcut = "Meta+Enter"
+		1) TDEShortcut = "Meta+Enter"
 			1) KKeySequence = "Meta+Enter"
 				1) KKey = "Meta+Enter"
 					1) Meta+Enter
 					2) Meta+Keypad_Enter
-		2) KShortcut = "Alt+F2"
+		2) TDEShortcut = "Alt+F2"
 			1) KKeySequence = "Alt+F2"
 				1) Alt+F2
-	2) KAccelAction = "Something"
+	2) TDEAccelAction = "Something"
 		Default3 = ""
 		Default4 = ""
-		1) KShortcut = "Meta+X,Asterisk"
+		1) TDEShortcut = "Meta+X,Asterisk"
 			1) KKeySequence = "Meta+X,Asterisk"
 				1) KKey = "Meta+X"
 					1) Meta+X
@@ -63,35 +63,35 @@ class TDEConfigBase;
 */
 
 //---------------------------------------------------------------------
-// KAccelAction
+// TDEAccelAction
 //---------------------------------------------------------------------
 
-class KAccelAction
+class TDEAccelAction
 {
  public:
-	KAccelAction();
-	KAccelAction( const KAccelAction& );
-	KAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
-			const KShortcut& cutDef3, const KShortcut& cutDef4,
+	TDEAccelAction();
+	TDEAccelAction( const TDEAccelAction& );
+	TDEAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
+			const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
 			const TQObject* pObjSlot, const char* psMethodSlot,
 			bool bConfigurable, bool bEnabled );
-	~KAccelAction();
+	~TDEAccelAction();
 
 	void clear();
 	bool init( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
-			const KShortcut& cutDef3, const KShortcut& cutDef4,
+			const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
 			const TQObject* pObjSlot, const char* psMethodSlot,
 			bool bConfigurable, bool bEnabled );
 
-	KAccelAction& operator=( const KAccelAction& );
+	TDEAccelAction& operator=( const TDEAccelAction& );
 
 	const TQString& name() const                { return m_sName; }
 	const TQString& label() const               { return m_sLabel; }
 	const TQString& whatsThis() const           { return m_sWhatsThis; }
-	const KShortcut& shortcut() const          { return m_cut; }
-	const KShortcut& shortcutDefault() const;
-	const KShortcut& shortcutDefault3() const  { return m_cutDefault3; }
-	const KShortcut& shortcutDefault4() const  { return m_cutDefault4; }
+	const TDEShortcut& shortcut() const          { return m_cut; }
+	const TDEShortcut& shortcutDefault() const;
+	const TDEShortcut& shortcutDefault3() const  { return m_cutDefault3; }
+	const TDEShortcut& shortcutDefault4() const  { return m_cutDefault4; }
 	const TQObject* objSlotPtr() const          { return m_pObjSlot; }
 	const char* methodSlotPtr() const          { return m_psMethodSlot; }
 	bool isConfigurable() const                { return m_bConfigurable; }
@@ -100,7 +100,7 @@ class KAccelAction
 	void setName( const TQString& );
 	void setLabel( const TQString& );
 	void setWhatsThis( const TQString& );
-	bool setShortcut( const KShortcut& rgCuts );
+	bool setShortcut( const TDEShortcut& rgCuts );
 	void setSlot( const TQObject* pObjSlot, const char* psMethodSlot );
 	void setConfigurable( bool );
 	void setEnabled( bool );
@@ -123,8 +123,8 @@ class KAccelAction
 	TQString m_sName,
 	        m_sLabel,
 	        m_sWhatsThis;
-	KShortcut m_cut;
-	KShortcut m_cutDefault3, m_cutDefault4;
+	TDEShortcut m_cut;
+	TDEShortcut m_cutDefault3, m_cutDefault4;
 	const TQObject* m_pObjSlot;
 	const char* m_psMethodSlot;
 	bool m_bConfigurable,
@@ -137,43 +137,43 @@ class KAccelAction
 
  private:
 	static int g_bUseFourModifierKeys;
-	class KAccelActionPrivate* d;
+	class TDEAccelActionPrivate* d;
 
-	friend class KAccelActions;
-	friend class KAccelBase;
+	friend class TDEAccelActions;
+	friend class TDEAccelBase;
 };
 
 //---------------------------------------------------------------------
-// KAccelActions
+// TDEAccelActions
 //---------------------------------------------------------------------
 
-class KAccelActions
+class TDEAccelActions
 {
  public:
-	KAccelActions();
-	KAccelActions( const KAccelActions& );
-	virtual ~KAccelActions();
+	TDEAccelActions();
+	TDEAccelActions( const TDEAccelActions& );
+	virtual ~TDEAccelActions();
 
 	void clear();
-	bool init( const KAccelActions& );
+	bool init( const TDEAccelActions& );
 	bool init( TDEConfigBase& config, const TQString& sGroup );
 
-	void updateShortcuts( KAccelActions& );
+	void updateShortcuts( TDEAccelActions& );
 
 	int actionIndex( const TQString& sAction ) const;
-	KAccelAction* actionPtr( uint );
-	const KAccelAction* actionPtr( uint ) const;
-	KAccelAction* actionPtr( const TQString& sAction );
-	const KAccelAction* actionPtr( const TQString& sAction ) const;
-	KAccelAction* actionPtr( KKeySequence cut );
-	KAccelAction& operator []( uint );
-	const KAccelAction& operator []( uint ) const;
-
-	KAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
-			const KShortcut& rgCutDefaults3, const KShortcut& rgCutDefaults4,
+	TDEAccelAction* actionPtr( uint );
+	const TDEAccelAction* actionPtr( uint ) const;
+	TDEAccelAction* actionPtr( const TQString& sAction );
+	const TDEAccelAction* actionPtr( const TQString& sAction ) const;
+	TDEAccelAction* actionPtr( KKeySequence cut );
+	TDEAccelAction& operator []( uint );
+	const TDEAccelAction& operator []( uint ) const;
+
+	TDEAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
+			const TDEShortcut& rgCutDefaults3, const TDEShortcut& rgCutDefaults4,
 			const TQObject* pObjSlot = 0, const char* psMethodSlot = 0,
 			bool bConfigurable = true, bool bEnabled = true );
-	KAccelAction* insert( const TQString& sName, const TQString& sLabel );
+	TDEAccelAction* insert( const TQString& sName, const TQString& sLabel );
 	bool remove( const TQString& sAction );
 
 	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
@@ -185,21 +185,21 @@ class KAccelActions
 	uint count() const;
 
  protected:
-	KAccelBase* m_pKAccelBase;
-	KAccelAction** m_prgActions;
+	TDEAccelBase* m_pTDEAccelBase;
+	TDEAccelAction** m_prgActions;
 	uint m_nSizeAllocated, m_nSize;
 
 	void resize( uint );
-	void insertPtr( KAccelAction* );
+	void insertPtr( TDEAccelAction* );
 
  private:
-	class KAccelActionsPrivate* d;
+	class TDEAccelActionsPrivate* d;
 
-	KAccelActions( KAccelBase* );
-	void initPrivate( KAccelBase* );
-	KAccelActions& operator =( KAccelActions& );
+	TDEAccelActions( TDEAccelBase* );
+	void initPrivate( TDEAccelBase* );
+	TDEAccelActions& operator =( TDEAccelActions& );
 
-	friend class KAccelBase;
+	friend class TDEAccelBase;
 };
 
 #endif // _KACCELACTION_H
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index 88f3aabe0..1696abf59 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -57,17 +57,17 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
 
   kdDebug(125) << "KKeyModule::init() - Get default key bindings." << endl;
   if ( KeyType == "global" ) {
-    KAccelActions* keys = &actions;
+    TDEAccelActions* keys = &actions;
 // see also KKeyModule::init() below !!!
 #define NOSLOTS
-#define KShortcuts KAccelShortcuts
+#define TDEShortcuts TDEAccelShortcuts
 #include "../../twin/twinbindings.cpp"
 #include "../../kicker/kicker/core/kickerbindings.cpp"
 #include "../../kicker/taskbar/taskbarbindings.cpp"
 #include "../../kdesktop/kdesktopbindings.cpp"
 #include "../../klipper/klipperbindings.cpp"
 #include "../../kxkb/kxkbbindings.cpp"
-#undef KShortcuts
+#undef TDEShortcuts
     KeyScheme = "Global Key Scheme";
     KeySet    = "Global Keys";
     // Sorting Hack: I'll re-write the module once feature-adding begins again.
@@ -92,12 +92,12 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
   }
 
   if ( KeyType == "standard" ) {
-    for(uint i=0; i<KStdAccel::NB_STD_ACCELS; i++) {
-      KStdAccel::StdAccel id = (KStdAccel::StdAccel)i;
-      actions.insertAction( KStdAccel::action(id),
-                          KStdAccel::description(id),
-                          KStdAccel::defaultKey3(id),
-                          KStdAccel::defaultKey4(id) );
+    for(uint i=0; i<TDEStdAccel::NB_STD_ACCELS; i++) {
+      TDEStdAccel::StdAccel id = (TDEStdAccel::StdAccel)i;
+      actions.insertAction( TDEStdAccel::action(id),
+                          TDEStdAccel::description(id),
+                          TDEStdAccel::defaultKey3(id),
+                          TDEStdAccel::defaultKey4(id) );
     }
 
     KeyScheme = "Standard Key Scheme";
@@ -459,7 +459,7 @@ void KKeyModule::readScheme( int index )
   }
 }*/
 
-/*void KKeyModule::updateKeys( const KAccelActions* map_P )
+/*void KKeyModule::updateKeys( const TDEAccelActions* map_P )
     {
     kc->updateKeys( map_P );
     }*/
@@ -473,24 +473,24 @@ void KKeyModule::init()
 
   /*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
   TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
-  TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
-  KAccel::useFourModifierKeys( fourMods == "true" );
-  bool bUseFourModifierKeys = KAccel::useFourModifierKeys();
+  TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", TDEAccel::keyboardHasMetaKey() ? "true" : "false" );
+  TDEAccel::useFourModifierKeys( fourMods == "true" );
+  bool bUseFourModifierKeys = TDEAccel::useFourModifierKeys();
   TDEGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true );
   */
-  KAccelActions* keys = new KAccelActions();
+  TDEAccelActions* keys = new TDEAccelActions();
 
   kdDebug(125) << "KKeyModule::init() - Load Included Bindings\n";
 // this should match the included files above
 #define NOSLOTS
-#define KShortcuts KAccelShortcuts
+#define TDEShortcuts TDEAccelShortcuts
 #include "../../klipper/klipperbindings.cpp"
 #include "../../twin/twinbindings.cpp"
 #include "../../kicker/kicker/core/kickerbindings.cpp"
 #include "../../kicker/taskbar/taskbarbindings.cpp"
 #include "../../kdesktop/kdesktopbindings.cpp"
 #include "../../kxkb/kxkbbindings.cpp"
-#undef KShortcuts
+#undef TDEShortcuts
 
   kdDebug(125) << "KKeyModule::init() - Read Config Bindings\n";
   keys->readActions( "Global Keys" );
@@ -508,19 +508,19 @@ void KKeyModule::init()
 // KeyChooserSpec
 //-----------------------------------------------------------------
 
-KeyChooserSpec::KeyChooserSpec( KAccelActions& actions, TQWidget* parent, bool bGlobal )
+KeyChooserSpec::KeyChooserSpec( TDEAccelActions& actions, TQWidget* parent, bool bGlobal )
     : KKeyChooser( actions, parent, bGlobal, false, true ), m_bGlobal( bGlobal )
     {
     //if( global )
     //    globalDict()->clear(); // don't check against global keys twice
     }
 
-/*void KeyChooserSpec::updateKeys( const KAccelActions* map_P )
+/*void KeyChooserSpec::updateKeys( const TDEAccelActions* map_P )
     {
     if( global )
         {
         stdDict()->clear();
-        for( KAccelActions::ConstIterator gIt( map_P->begin());
+        for( TDEAccelActions::ConstIterator gIt( map_P->begin());
              gIt != map_P->end();
              ++gIt )
             {
@@ -532,7 +532,7 @@ KeyChooserSpec::KeyChooserSpec( KAccelActions& actions, TQWidget* parent, bool b
     else
         {
         globalDict()->clear();
-        for( KAccelActions::ConstIterator gIt( map_P->begin());
+        for( TDEAccelActions::ConstIterator gIt( map_P->begin());
              gIt != map_P->end();
              ++gIt )
             {
diff --git a/kcontrol/keys/keyconfig.h b/kcontrol/keys/keyconfig.h
index d1760728d..fb9136184 100644
--- a/kcontrol/keys/keyconfig.h
+++ b/kcontrol/keys/keyconfig.h
@@ -24,8 +24,8 @@ class KKeyModule : public TQWidget
 {
 	Q_OBJECT
 public:
-	KAccelActions actions;
-        //KAccelActions dict;
+	TDEAccelActions actions;
+        //TDEAccelActions dict;
         KeyChooserSpec *kc;
 
 	KKeyModule( TQWidget *parent, bool isGlobal, bool bSeriesOnly, bool bSeriesNone, const char *name = 0 );
@@ -51,12 +51,12 @@ public slots:
 	//void slotRemove();
 	void slotKeyChange();
 	void slotPreferMeta();
-        //void updateKeys( const KAccelActions* map_P );
+        //void updateKeys( const TDEAccelActions* map_P );
 	//void readSchemeNames();
 
 signals:
 	void keyChange();
-        //void keysChanged( const KAccelActions* map_P );
+        //void keysChanged( const TDEAccelActions* map_P );
 
 protected:
 	TQListBox *sList;
@@ -79,9 +79,9 @@ class KeyChooserSpec : public KKeyChooser
 {
         Q_OBJECT
 public:
-        KeyChooserSpec( KAccelActions& actions, TQWidget* parent,
+        KeyChooserSpec( TDEAccelActions& actions, TQWidget* parent,
                  bool bGlobal );
-        //void updateKeys( const KAccelActions* map_P );
+        //void updateKeys( const TDEAccelActions* map_P );
 protected:
         bool m_bGlobal;
 };
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp
index 0c6d13c4d..736a937bd 100644
--- a/kcontrol/keys/main.cpp
+++ b/kcontrol/keys/main.cpp
@@ -154,12 +154,12 @@ extern "C"
 
 	/*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
 	TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
-	TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
-	KAccel::useFourModifierKeys( fourMods == "true" );
-	bool bUseFourModifierKeys = KAccel::useFourModifierKeys();
+	TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", TDEAccel::keyboardHasMetaKey() ? "true" : "false" );
+	TDEAccel::useFourModifierKeys( fourMods == "true" );
+	bool bUseFourModifierKeys = TDEAccel::useFourModifierKeys();
 	TDEGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true );
 	*/
-	KAccelActions* keys = new KAccelActions();
+	TDEAccelActions* keys = new TDEAccelActions();
 
 	kdDebug(125) << "KeyModule::init() - Load Included Bindings\n";
 // this should match the included files above
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index 15cad733a..c014a8b54 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -229,20 +229,20 @@ void ModifiersModule::initGUI()
 	pGroup = new TQGroupBox( 1, Qt::Horizontal, i18n("X Modifier Mapping"), this );
 	pLayoutTop->addWidget( pGroup, 4, 0 );
 
-	m_plstXMods = new KListView( pGroup );
+	m_plstXMods = new TDEListView( pGroup );
 	m_plstXMods->setSorting( -1 );
 	m_plstXMods->setSelectionMode( TQListView::NoSelection );
 	m_plstXMods->setAllColumnsShowFocus( true );
 	m_plstXMods->addColumn( i18n("X11-Mod") );
 
-	new KListViewItem( m_plstXMods, "mod5" );
-	new KListViewItem( m_plstXMods, "mod4" );
-	new KListViewItem( m_plstXMods, "mod3" );
-	new KListViewItem( m_plstXMods, "mod2" );
-	new KListViewItem( m_plstXMods, "mod1" );
-	new KListViewItem( m_plstXMods, "control" );
-	new KListViewItem( m_plstXMods, "lock" );
-	new KListViewItem( m_plstXMods, "shift" );
+	new TDEListViewItem( m_plstXMods, "mod5" );
+	new TDEListViewItem( m_plstXMods, "mod4" );
+	new TDEListViewItem( m_plstXMods, "mod3" );
+	new TDEListViewItem( m_plstXMods, "mod2" );
+	new TDEListViewItem( m_plstXMods, "mod1" );
+	new TDEListViewItem( m_plstXMods, "control" );
+	new TDEListViewItem( m_plstXMods, "lock" );
+	new TDEListViewItem( m_plstXMods, "shift" );
 
 	//------------------
 	pLayoutTop->setRowStretch( 5, 1 );
diff --git a/kcontrol/keys/modifiers.h b/kcontrol/keys/modifiers.h
index 5cb57bfcb..b600bfafb 100644
--- a/kcontrol/keys/modifiers.h
+++ b/kcontrol/keys/modifiers.h
@@ -6,7 +6,7 @@
 class TQCheckBox;
 class TQLabel;
 class KComboBox;
-class KListView;
+class TDEListView;
 
 class ModifiersModule : public TQWidget
 {
@@ -30,7 +30,7 @@ class ModifiersModule : public TQWidget
 	TQLabel* m_plblCtrl, * m_plblAlt, * m_plblWin;
 	TQLabel* m_plblWinModX;
 	TQCheckBox* m_pchkMacKeyboard;
-	KListView* m_plstXMods;
+	TDEListView* m_plstXMods;
 	TQCheckBox* m_pchkMacSwap;
 
 	void initGUI();
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index 3dac9dcf7..e45953056 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -107,8 +107,8 @@ void ShortcutsModule::initGUI()
 	TQString kde_winkeys_env_dir = TDEGlobal::dirs()->localtdedir() + "/env/";
 
 	kdDebug(125) << "A-----------" << endl;
-	KAccelActions* keys = &m_actionsGeneral;
-// see also KShortcutsModule::init() below !!!
+	TDEAccelActions* keys = &m_actionsGeneral;
+// see also TDEShortcutsModule::init() below !!!
 #define NOSLOTS
 #define KICKER_ALL_BINDINGS
 #include "../../twin/twinbindings.cpp"
@@ -187,7 +187,7 @@ void ShortcutsModule::initGUI()
 		// Yes, it does, so Win is a key
 		m_bUseRmWinKeys = false;
 	}
-	m_pListGeneral = new KAccelShortcutList( m_actionsGeneral, true );
+	m_pListGeneral = new TDEAccelShortcutList( m_actionsGeneral, true );
 
 	m_pkcGeneral = new KKeyChooser( m_pListGeneral, this, KKeyChooser::Global, false );
 	m_pkcGeneral->resize (m_pkcGeneral->sizeHint() );
@@ -201,12 +201,12 @@ void ShortcutsModule::initGUI()
 	m_pTab->addTab( m_pkcGeneral, i18n("&Global Shortcuts") );
 	connect( m_pkcGeneral, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
 
-	m_pListSequence = new KAccelShortcutList( m_actionsSequence, true );
+	m_pListSequence = new TDEAccelShortcutList( m_actionsSequence, true );
 	m_pkcSequence = new KKeyChooser( m_pListSequence, this, KKeyChooser::Global, false );
 	m_pTab->addTab( m_pkcSequence, i18n("Shortcut Se&quences") );
 	connect( m_pkcSequence, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
 
-	m_pListApplication = new KStdAccel::ShortcutList;
+	m_pListApplication = new TDEStdAccel::ShortcutList;
 	m_pkcApplication = new KKeyChooser( m_pListApplication, this, KKeyChooser::Standard, false );
 	m_pTab->addTab( m_pkcApplication, i18n("App&lication Shortcuts") );
 	connect( m_pkcApplication, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
@@ -222,7 +222,7 @@ void ShortcutsModule::initGUI()
 
 void ShortcutsModule::createActionsGeneral()
 {
-	KAccelActions& actions = m_actionsGeneral;
+	TDEAccelActions& actions = m_actionsGeneral;
 
 	for( uint i = 0; i < actions.count(); i++ ) {
 		TQString sConfigKey = actions[i].name();
@@ -243,7 +243,7 @@ void ShortcutsModule::createActionsGeneral()
 
 void ShortcutsModule::createActionsSequence()
 {
-	KAccelActions& actions = m_actionsSequence;
+	TDEAccelActions& actions = m_actionsSequence;
 
 	for( uint i = 0; i < actions.count(); i++ ) {
 		TQString sConfigKey = actions[i].name();
@@ -410,7 +410,7 @@ void ShortcutsModule::slotSaveSchemeAs()
 
 	TQDir dir( kksPath );
 	if( !dir.exists() && !dir.mkdir( kksPath ) ) {
-		tqWarning("KShortcutsModule: Could not make directory to store user info.");
+		tqWarning("TDEShortcutsModule: Could not make directory to store user info.");
 		return;
 	}
 
diff --git a/kcontrol/keys/shortcuts.h b/kcontrol/keys/shortcuts.h
index 0fa8818a8..76c3890c6 100644
--- a/kcontrol/keys/shortcuts.h
+++ b/kcontrol/keys/shortcuts.h
@@ -71,8 +71,8 @@ class ShortcutsModule : public TQWidget
 	TQPushButton* m_pbtnSave, * m_pbtnRemove;
 	int m_nSysSchemes;
 	TQStringList m_rgsSchemeFiles;
-	KAccelActions m_actionsGeneral, m_actionsSequence;//, m_actionsApplication;
-	KShortcutList* m_pListGeneral, * m_pListSequence, * m_pListApplication;
+	TDEAccelActions m_actionsGeneral, m_actionsSequence;//, m_actionsApplication;
+	TDEShortcutList* m_pListGeneral, * m_pListSequence, * m_pListApplication;
 	KKeyChooser* m_pkcGeneral, * m_pkcSequence, * m_pkcApplication;
 	TQCheckBox* m_useRmWinKeys;
 	bool m_bUseRmWinKeys;
diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp
index 31b39974f..361c1cfb8 100644
--- a/kcontrol/keys/treeview.cpp
+++ b/kcontrol/keys/treeview.cpp
@@ -35,16 +35,16 @@
 #include "khotkeys.h"
 
 AppTreeItem::AppTreeItem(TQListViewItem *parent, const TQString& storageId)
-    : KListViewItem(parent), m_init(false), m_storageId(storageId) {}
+    : TDEListViewItem(parent), m_init(false), m_storageId(storageId) {}
 
 AppTreeItem::AppTreeItem(TQListViewItem *parent, TQListViewItem *after, const TQString& storageId)
-    : KListViewItem(parent, after), m_init(false), m_storageId(storageId) {}
+    : TDEListViewItem(parent, after), m_init(false), m_storageId(storageId) {}
 
 AppTreeItem::AppTreeItem(TQListView *parent, const TQString& storageId)
-    : KListViewItem(parent), m_init(false), m_storageId(storageId) {}
+    : TDEListViewItem(parent), m_init(false), m_storageId(storageId) {}
 
 AppTreeItem::AppTreeItem(TQListView *parent, TQListViewItem *after, const TQString& storageId)
-    : KListViewItem(parent, after), m_init(false), m_storageId(storageId) {}
+    : TDEListViewItem(parent, after), m_init(false), m_storageId(storageId) {}
 
 void AppTreeItem::setName(const TQString &name)
 {
@@ -94,7 +94,7 @@ static TQPixmap appIcon(const TQString &iconName)
 
 
 AppTreeView::AppTreeView( TQWidget *parent, const char *name )
-    : KListView(parent, name)
+    : TDEListView(parent, name)
 {
     setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
     setAllColumnsShowFocus(true);
diff --git a/kcontrol/keys/treeview.h b/kcontrol/keys/treeview.h
index d31ba2d00..36d8b91ca 100644
--- a/kcontrol/keys/treeview.h
+++ b/kcontrol/keys/treeview.h
@@ -25,10 +25,10 @@
 #include <klistview.h>
 
 class TQPopupMenu;
-class KActionCollection;
+class TDEActionCollection;
 class KDesktopFile;
 
-class AppTreeItem : public KListViewItem
+class AppTreeItem : public TDEListViewItem
 {
 
 public:
@@ -58,7 +58,7 @@ private:
     TQString m_accel;
 };
 
-class AppTreeView : public KListView
+class AppTreeView : public TDEListView
 {
     friend class AppTreeItem;
     Q_OBJECT