Rename a number of classes to enhance compatibility with KDE4

19 files changed, 74 insertions, 74 deletions

diff --git a/twin/activation.cpp b/twin/activation.cpp
index eab4a2c87..ba95cde04 100644
--- a/twin/activation.cpp
+++ b/twin/activation.cpp
@@ -713,7 +713,7 @@ void Client::demandAttention( bool set )
         // e.g. the passive popup next to it. So wait up to 1 second for the icon geometry
         // to be set.
         // Delayed call to KNotify also solves the problem of having X server grab in manage(),
-        // which may deadlock when KNotify (or KLauncher when launching KNotify) need to access X.
+        // which may deadlock when KNotify (or TDELauncher when launching KNotify) need to access X.
         Notify::Event e = isOnCurrentDesktop() ? Notify::DemandAttentionCurrent : Notify::DemandAttentionOther;
         // Setting the demands attention state needs to be done directly in KWin, because
         // KNotify would try to set it, resulting in a call to KNotify again, etc.
diff --git a/twin/client.h b/twin/client.h
index fa63e2b3a..ffa328592 100644
--- a/twin/client.h
+++ b/twin/client.h
@@ -239,7 +239,7 @@ class Client : public TQObject, public KDecorationDefines
         void shrinkVertical();
 
         bool providesContextHelp() const;
-        KShortcut shortcut() const;
+        TDEShortcut shortcut() const;
         void setShortcut( const TQString& cut );
 
         bool performMouseCommand( Options::MouseCommand, TQPoint globalPos, bool handled = false );
@@ -419,7 +419,7 @@ class Client : public TQObject, public KDecorationDefines
         void setCaption( const TQString& s, bool force = false );
         bool hasTransientInternal( const Client* c, bool indirect, ConstClientList& set ) const;
         void finishWindowRules();
-        void setShortcutInternal( const KShortcut& cut );
+        void setShortcutInternal( const TDEShortcut& cut );
 
         void updateWorkareaDiffs();
         void checkDirection( int new_diff, int old_diff, TQRect& rect, const TQRect& area );
@@ -584,7 +584,7 @@ class Client : public TQObject, public KDecorationDefines
 
         TQRegion _mask;
         static bool check_active_modal; // see Client::checkActiveModal()
-        KShortcut _shortcut;
+        TDEShortcut _shortcut;
         friend struct FetchNameInternalPredicate;
         friend struct CheckIgnoreFocusStealingProcedure;
         friend struct ResetupRulesProcedure;
@@ -964,7 +964,7 @@ inline Window Client::moveResizeGrabWindow() const
     return move_resize_grab_window;
     }
 
-inline KShortcut Client::shortcut() const
+inline TDEShortcut Client::shortcut() const
     {
     return _shortcut;
     }
diff --git a/twin/group.cpp b/twin/group.cpp
index 50fce46f0..fb625b3e4 100644
--- a/twin/group.cpp
+++ b/twin/group.cpp
@@ -479,8 +479,8 @@ bool Client::belongToSameApplication( const Client* c1, const Client* c2, bool a
 
 // Non-transient windows with window role containing '#' are always
 // considered belonging to different applications (unless
-// the window role is exactly the same). KMainWindow sets
-// window role this way by default, and different KMainWindow
+// the window role is exactly the same). TDEMainWindow sets
+// window role this way by default, and different TDEMainWindow
 // usually "are" different application from user's point of view.
 // This help with no-focus-stealing for e.g. konqy reusing.
 // On the other hand, if one of the windows is active, they are
diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp
index fc00dea9d..55b5beb56 100644
--- a/twin/kcmtwin/twindecoration/buttons.cpp
+++ b/twin/kcmtwin/twindecoration/buttons.cpp
@@ -121,7 +121,7 @@ TQPixmap bitmapPixmap(const TQBitmap& bm, const TQColor& color)
 
 
 ButtonSource::ButtonSource(TQWidget *parent, const char* name)
-	: KListView(parent, name)
+	: TDEListView(parent, name)
 {
 	setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 
diff --git a/twin/kcmtwin/twindecoration/buttons.h b/twin/kcmtwin/twindecoration/buttons.h
index e1dbbc812..d3a794569 100644
--- a/twin/kcmtwin/twindecoration/buttons.h
+++ b/twin/kcmtwin/twindecoration/buttons.h
@@ -109,7 +109,7 @@ class ButtonSourceItem : public TQListViewItem
 /**
  * Implements the button drag source list view
  */
-class ButtonSource : public KListView
+class ButtonSource : public TDEListView
 {
 	Q_OBJECT
 
diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp
index aac2436d1..5e79c6365 100644
--- a/twin/kcmtwin/twinoptions/main.cpp
+++ b/twin/kcmtwin/twinoptions/main.cpp
@@ -48,7 +48,7 @@ extern "C"
 	{
 		//CT there's need for decision: kwm or twin?
 		TDEGlobal::locale()->insertCatalogue("kcmkwm");
-		return new KActionsOptions( parent, name);
+		return new TDEActionsOptions( parent, name);
 	}
 
 	KDE_EXPORT TDECModule *create_twinmoving(TQWidget *parent, const char *name)
@@ -201,7 +201,7 @@ void KWinOptions::moduleChanged(bool state)
 }
 
 
-KActionsOptions::KActionsOptions(TQWidget *parent, const char *name)
+TDEActionsOptions::TDEActionsOptions(TQWidget *parent, const char *name)
   : TDECModule(parent, name)
 {
   mConfig = new TDEConfig("twinrc", false, true);
@@ -221,12 +221,12 @@ KActionsOptions::KActionsOptions(TQWidget *parent, const char *name)
   connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
 }
 
-KActionsOptions::~KActionsOptions()
+TDEActionsOptions::~TDEActionsOptions()
 {
   delete mConfig;
 }
 
-void KActionsOptions::load()
+void TDEActionsOptions::load()
 {
   mTitleBarActions->load();
   mWindowActions->load();
@@ -234,7 +234,7 @@ void KActionsOptions::load()
 }
 
 
-void KActionsOptions::save()
+void TDEActionsOptions::save()
 {
   mTitleBarActions->save();
   mWindowActions->save();
@@ -248,13 +248,13 @@ void KActionsOptions::save()
 }
 
 
-void KActionsOptions::defaults()
+void TDEActionsOptions::defaults()
 {
   mTitleBarActions->defaults();
   mWindowActions->defaults();
 }
 
-void KActionsOptions::moduleChanged(bool state)
+void TDEActionsOptions::moduleChanged(bool state)
 {
   emit TDECModule::changed(state);
 }
diff --git a/twin/kcmtwin/twinoptions/main.h b/twin/kcmtwin/twinoptions/main.h
index c1146fa92..cb80f7e8d 100644
--- a/twin/kcmtwin/twinoptions/main.h
+++ b/twin/kcmtwin/twinoptions/main.h
@@ -69,14 +69,14 @@ private:
   TDEConfig *mConfig;
 };
 
-class KActionsOptions : public TDECModule
+class TDEActionsOptions : public TDECModule
 {
   Q_OBJECT
 
 public:
 
-  KActionsOptions(TQWidget *parent, const char *name);
-  virtual ~KActionsOptions();
+  TDEActionsOptions(TQWidget *parent, const char *name);
+  virtual ~TDEActionsOptions();
 
   void load();
   void save();
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>
diff --git a/twin/notifications.cpp b/twin/notifications.cpp
index 288cbd029..5a83e9bce 100644
--- a/twin/notifications.cpp
+++ b/twin/notifications.cpp
@@ -105,9 +105,9 @@ bool Notify::raise( Event e, const TQString& message, Client* c )
         return false;
 
 // There may be a deadlock if KNotify event is sent while KWin has X grabbed.
-// If KNotify is not running, KLauncher may do X requests (startup notification, whatever)
+// If KNotify is not running, TDELauncher may do X requests (startup notification, whatever)
 // that will block it. And KNotifyClient waits for the launch to succeed, which means
-// KLauncher waits for X and KWin waits for KLauncher. So postpone events in such case.
+// TDELauncher waits for X and KWin waits for TDELauncher. So postpone events in such case.
     if( grabbedXServer())
         {
         EventData data;
diff --git a/twin/sm.cpp b/twin/sm.cpp
index 0ce286fdd..3a07d7b80 100644
--- a/twin/sm.cpp
+++ b/twin/sm.cpp
@@ -251,7 +251,7 @@ bool Workspace::sessionInfoWindowTypeMatch( Client* c, SessionInfo* info )
 
 // maybe needed later
 #if 0
-// KMainWindow's without name() given have WM_WINDOW_ROLE in the form
+// TDEMainWindow's without name() given have WM_WINDOW_ROLE in the form
 // of <appname>-mainwindow#<number>
 // when comparing them for fake session info, it's probably better to check
 // them without the trailing number
diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp
index 85da5a7be..7d343962f 100644
--- a/twin/tabbox.cpp
+++ b/twin/tabbox.cpp
@@ -847,7 +847,7 @@ static bool areModKeysDepressed( const KKeySequence& seq )
     return areKeySymXsDepressed( false, rgKeySyms, nKeySyms );
     }
 
-static bool areModKeysDepressed( const KShortcut& cut )
+static bool areModKeysDepressed( const TDEShortcut& cut )
     {
     for( unsigned int i = 0;
 	 i < cut.count();
diff --git a/twin/useractions.cpp b/twin/useractions.cpp
index 1b5769f8d..f3bf3ed18 100644
--- a/twin/useractions.cpp
+++ b/twin/useractions.cpp
@@ -320,7 +320,7 @@ void Workspace::setupWindowShortcutDone( bool ok )
     client_keys->suspend( false );
     if( ok )
         {
-        client_keys_client->setShortcut( KShortcut( client_keys_dialog->shortcut()).toString());
+        client_keys_client->setShortcut( TDEShortcut( client_keys_dialog->shortcut()).toString());
         }
     closeActivePopup();
     delete client_keys_dialog;
@@ -1053,7 +1053,7 @@ void Workspace::slotWindowOperations()
 
 void Workspace::showWindowMenu( const TQRect &pos, Client* cl )
     {
-    if (!kapp->authorizeKAction("twin_rmb"))
+    if (!kapp->authorizeTDEAction("twin_rmb"))
         return;
     if( !cl )
         return;
@@ -1120,19 +1120,19 @@ void Client::setShortcut( const TQString& _cut )
     {
     TQString cut = rules()->checkShortcut( _cut );
     if( cut.isEmpty())
-        return setShortcutInternal( KShortcut());
+        return setShortcutInternal( TDEShortcut());
 // Format:
 // base+(abcdef)<space>base+(abcdef)
 // E.g. Alt+Ctrl+(ABCDEF) Win+X,Win+(ABCDEF)
     if( !cut.contains( '(' ) && !cut.contains( ')' ) && !cut.contains( ' ' ))
         {
-        if( workspace()->shortcutAvailable( KShortcut( cut ), this ))
-            setShortcutInternal( KShortcut( cut ));
+        if( workspace()->shortcutAvailable( TDEShortcut( cut ), this ))
+            setShortcutInternal( TDEShortcut( cut ));
         else
-            setShortcutInternal( KShortcut());
+            setShortcutInternal( TDEShortcut());
         return;
         }
-    TQValueList< KShortcut > keys;
+    TQValueList< TDEShortcut > keys;
     TQStringList groups = TQStringList::split( ' ', cut );
     for( TQStringList::ConstIterator it = groups.begin();
          it != groups.end();
@@ -1147,20 +1147,20 @@ void Client::setShortcut( const TQString& _cut )
                  i < list.length();
                  ++i )
                 {
-                KShortcut c( base + list[ i ] );
+                TDEShortcut c( base + list[ i ] );
                 if( !c.isNull())
                     keys.append( c );
                 }
             }
         }
-    for( TQValueList< KShortcut >::ConstIterator it = keys.begin();
+    for( TQValueList< TDEShortcut >::ConstIterator it = keys.begin();
          it != keys.end();
          ++it )
         {
         if( _shortcut == *it ) // current one is in the list
             return;
         }
-    for( TQValueList< KShortcut >::ConstIterator it = keys.begin();
+    for( TQValueList< TDEShortcut >::ConstIterator it = keys.begin();
          it != keys.end();
          ++it )
         {
@@ -1170,10 +1170,10 @@ void Client::setShortcut( const TQString& _cut )
             return;
             }
         }
-    setShortcutInternal( KShortcut());
+    setShortcutInternal( TDEShortcut());
     }
 
-void Client::setShortcutInternal( const KShortcut& cut )
+void Client::setShortcutInternal( const TDEShortcut& cut )
     {
     if( _shortcut == cut )
         return;
@@ -1182,7 +1182,7 @@ void Client::setShortcutInternal( const KShortcut& cut )
     workspace()->clientShortcutUpdated( this );
     }
 
-bool Workspace::shortcutAvailable( const KShortcut& cut, Client* ignore ) const
+bool Workspace::shortcutAvailable( const TDEShortcut& cut, Client* ignore ) const
     {
     // TODO check global shortcuts etc.
     for( ClientList::ConstIterator it = clients.begin();
diff --git a/twin/utils.cpp b/twin/utils.cpp
index 1159deb30..47c09b0e5 100644
--- a/twin/utils.cpp
+++ b/twin/utils.cpp
@@ -137,7 +137,7 @@ void Motif::readFlags( WId w, bool& noborder, bool& resize, bool& move,
 //************************************
 
 KWinSelectionOwner::KWinSelectionOwner( int screen_P )
-    : KSelectionOwner( make_selection_atom( screen_P ), screen_P )
+    : TDESelectionOwner( make_selection_atom( screen_P ), screen_P )
     {
     }
 
@@ -152,7 +152,7 @@ Atom KWinSelectionOwner::make_selection_atom( int screen_P )
 
 void KWinSelectionOwner::getAtoms()
     {
-    KSelectionOwner::getAtoms();
+    TDESelectionOwner::getAtoms();
     if( xa_version == None )
         {
         Atom atoms[ 1 ];
@@ -165,7 +165,7 @@ void KWinSelectionOwner::getAtoms()
 
 void KWinSelectionOwner::replyTargets( Atom property_P, Window requestor_P )
     {
-    KSelectionOwner::replyTargets( property_P, requestor_P );
+    TDESelectionOwner::replyTargets( property_P, requestor_P );
     Atom atoms[ 1 ] = { xa_version };
     // PropModeAppend !
     XChangeProperty( tqt_xdisplay(), requestor_P, property_P, XA_ATOM, 32, PropModeAppend,
@@ -181,7 +181,7 @@ bool KWinSelectionOwner::genericReply( Atom target_P, Atom property_P, Window re
             PropModeReplace, reinterpret_cast< unsigned char* >( &version ), 2 );
         }
     else
-        return KSelectionOwner::genericReply( target_P, property_P, requestor_P );
+        return TDESelectionOwner::genericReply( target_P, property_P, requestor_P );
     return true;    
     }
 
@@ -351,8 +351,8 @@ bool isLocalMachine( const TQCString& host )
     }
 
 #ifndef KCMRULES
-ShortcutDialog::ShortcutDialog( const KShortcut& cut )
-    : KShortcutDialog( cut, false /*TODO???*/ )
+ShortcutDialog::ShortcutDialog( const TDEShortcut& cut )
+    : TDEShortcutDialog( cut, false /*TODO???*/ )
     {
     // make it a popup, so that it has the grab
     XSetWindowAttributes attrs;
@@ -377,19 +377,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();
     }
 
 // Workaround for Qt bug causing #119142 - wheel event causes only calling
@@ -399,7 +399,7 @@ void ShortcutDialog::accept()
 void ShortcutDialog::hide()
     {
     close();
-    return KShortcutDialog::hide();
+    return TDEShortcutDialog::hide();
     }
 
 #endif
diff --git a/twin/utils.h b/twin/utils.h
index 538a7c6b5..94edb8b4d 100644
--- a/twin/utils.h
+++ b/twin/utils.h
@@ -153,7 +153,7 @@ class Motif
     };
 
 class KWinSelectionOwner
-    : public KSelectionOwner
+    : public TDESelectionOwner
     {
     Q_OBJECT
     public:
@@ -254,17 +254,17 @@ void checkNonExistentClients();
 #ifndef KCMRULES
 // Qt dialogs emit no signal when closed :(
 class ShortcutDialog
-    : public KShortcutDialog
+    : public TDEShortcutDialog
     {
     Q_OBJECT
     public:
-        ShortcutDialog( const KShortcut& cut );
+        ShortcutDialog( const TDEShortcut& cut );
         virtual void accept();
         virtual void hide();
     signals:
         void dialogDone( bool ok );
     protected:
-        virtual void done( int r ) { KShortcutDialog::done( r ); emit dialogDone( r == Accepted ); }
+        virtual void done( int r ) { TDEShortcutDialog::done( r ); emit dialogDone( r == Accepted ); }
     };
 #endif
 
diff --git a/twin/workspace.cpp b/twin/workspace.cpp
index d7ce0d884..21598fbd2 100644
--- a/twin/workspace.cpp
+++ b/twin/workspace.cpp
@@ -56,7 +56,7 @@ extern int screen_number;
 Workspace *Workspace::_self = 0;
 
 TDEProcess* kompmgr = 0;
-KSelectionOwner* kompmgr_selection;
+TDESelectionOwner* kompmgr_selection;
 
 bool allowKompmgrRestart = TRUE;
 
@@ -416,8 +416,8 @@ void Workspace::init()
     char nm[ 100 ];
     sprintf( nm, "_KDE_TOPMENU_OWNER_S%d", DefaultScreen( tqt_xdisplay()));
     Atom topmenu_atom = XInternAtom( tqt_xdisplay(), nm, False );
-    topmenu_selection = new KSelectionOwner( topmenu_atom );
-    topmenu_watcher = new KSelectionWatcher( topmenu_atom );
+    topmenu_selection = new TDESelectionOwner( topmenu_atom );
+    topmenu_watcher = new TDESelectionWatcher( topmenu_atom );
 // TODO grabXServer(); - where exactly put this? topmenu selection claiming down belong must be before
 
         { // begin updates blocker block
@@ -2814,7 +2814,7 @@ void Workspace::startKompmgr()
         delete kompmgr_selection;
         char selection_name[ 100 ];
         sprintf( selection_name, "_NET_WM_CM_S%d", DefaultScreen( tqt_xdisplay()));
-        kompmgr_selection = new KSelectionOwner( selection_name );
+        kompmgr_selection = new TDESelectionOwner( selection_name );
         connect( kompmgr_selection, TQT_SIGNAL( lostOwnership()), TQT_SLOT( stopKompmgr()));
         kompmgr_selection->claim( true );
         connect(kompmgr, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(restartKompmgr(TDEProcess*)));
diff --git a/twin/workspace.h b/twin/workspace.h
index e1db8bfbd..74f898668 100644
--- a/twin/workspace.h
+++ b/twin/workspace.h
@@ -29,7 +29,7 @@ License. See the file "COPYING" for the exact licensing terms.
 class TQPopupMenu;
 class TDEConfig;
 class TDEGlobalAccel;
-class KShortcutDialog;
+class TDEShortcutDialog;
 class TDEStartupInfo;
 class TDEStartupInfoId;
 class TDEStartupInfoData;
@@ -276,7 +276,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         
         bool forcedGlobalMouseGrab() const;
         void clientShortcutUpdated( Client* c );
-        bool shortcutAvailable( const KShortcut& cut, Client* ignore = NULL ) const;
+        bool shortcutAvailable( const TDEShortcut& cut, Client* ignore = NULL ) const;
         bool globalShortcutsDisabled() const;
         void disableGlobalShortcuts( bool disable );
         void disableGlobalShortcutsForClient( bool disable );
@@ -567,10 +567,10 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
     //KKeyNative walkThroughDesktopsKeycode, walkBackThroughDesktopsKeycode;
     //KKeyNative walkThroughDesktopListKeycode, walkBackThroughDesktopListKeycode;
     //KKeyNative walkThroughWindowsKeycode, walkBackThroughWindowsKeycode;
-        KShortcut cutWalkThroughDesktops, cutWalkThroughDesktopsReverse;
-        KShortcut cutWalkThroughDesktopList, cutWalkThroughDesktopListReverse;
-        KShortcut cutWalkThroughWindows, cutWalkThroughWindowsReverse;
-        KShortcut cutWalkThroughApps, cutWalkThroughAppsReverse;
+        TDEShortcut cutWalkThroughDesktops, cutWalkThroughDesktopsReverse;
+        TDEShortcut cutWalkThroughDesktopList, cutWalkThroughDesktopListReverse;
+        TDEShortcut cutWalkThroughWindows, cutWalkThroughWindowsReverse;
+        TDEShortcut cutWalkThroughApps, cutWalkThroughAppsReverse;
         bool mouse_emulation;
         unsigned int mouse_emulation_state;
         WId mouse_emulation_window;
@@ -641,8 +641,8 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         TQRect** screenarea; // array of workareas per xinerama screen for all virtual desktops
 
         bool managing_topmenus;
-        KSelectionOwner* topmenu_selection;
-        KSelectionWatcher* topmenu_watcher;
+        TDESelectionOwner* topmenu_selection;
+        TDESelectionWatcher* topmenu_watcher;
         ClientList topmenus; // doesn't own them
         mutable int topmenu_height;
         TQWidget* topmenu_space;