Rename KStartup for enhanced compatibility with KDE4

5 files changed, 18 insertions, 18 deletions

diff --git a/twin/activation.cpp b/twin/activation.cpp
index c2c910818..eab4a2c87 100644
--- a/twin/activation.cpp
+++ b/twin/activation.cpp
@@ -748,7 +748,7 @@ KWIN_COMPARE_PREDICATE( SameApplicationActiveHackPredicate, const Client*,
     !cl->isSplash() && !cl->isToolbar() && !cl->isTopMenu() && !cl->isUtility() && !cl->isMenu()
     && Client::belongToSameApplication( cl, value, true ) && cl != value);
 
-Time Client::readUserTimeMapTimestamp( const KStartupInfoId* asn_id, const KStartupInfoData* asn_data,
+Time Client::readUserTimeMapTimestamp( const TDEStartupInfoId* asn_id, const TDEStartupInfoData* asn_data,
     bool session ) const
     {
     Time time = info->userTime();
@@ -928,8 +928,8 @@ void Client::setActive( bool act, bool updateOpacity_)
 
 void Client::startupIdChanged()
     {
-    KStartupInfoId asn_id;
-    KStartupInfoData asn_data;
+    TDEStartupInfoId asn_id;
+    TDEStartupInfoData asn_data;
     bool asn_valid = workspace()->checkStartupNotification( window(), asn_id, asn_data );
     if( !asn_valid )
         return;
@@ -975,8 +975,8 @@ void Client::shortcutActivated()
     
 void Group::startupIdChanged()
     {
-    KStartupInfoId asn_id;
-    KStartupInfoData asn_data;
+    TDEStartupInfoId asn_id;
+    TDEStartupInfoData asn_data;
     bool asn_valid = workspace()->checkStartupNotification( leader_wid, asn_id, asn_data );
     if( !asn_valid )
         return;
diff --git a/twin/client.h b/twin/client.h
index 98efe8f8e..fa63e2b3a 100644
--- a/twin/client.h
+++ b/twin/client.h
@@ -32,7 +32,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 class TQTimer;
 class TDEProcess;
-class KStartupInfoData;
+class TDEStartupInfoData;
 
 namespace KWinInternal
 {
@@ -457,7 +457,7 @@ class Client : public TQObject, public KDecorationDefines
         void rawShow(); // just shows it
         void rawHide(); // just hides it
 
-        Time readUserTimeMapTimestamp( const KStartupInfoId* asn_id, const KStartupInfoData* asn_data,
+        Time readUserTimeMapTimestamp( const TDEStartupInfoId* asn_id, const TDEStartupInfoData* asn_data,
             bool session ) const;
         Time readUserCreationTime() const;
         static bool sameAppWindowRoleMatch( const Client* c1, const Client* c2, bool active_hack );
diff --git a/twin/manage.cpp b/twin/manage.cpp
index d6127e4e0..064145218 100644
--- a/twin/manage.cpp
+++ b/twin/manage.cpp
@@ -118,8 +118,8 @@ bool Client::manage( Window w, bool isMapped )
     original_skip_taskbar = skip_taskbar = ( info->state() & NET::SkipTaskbar) != 0;
     skip_pager = ( info->state() & NET::SkipPager) != 0;
 
-    KStartupInfoId asn_id;
-    KStartupInfoData asn_data;
+    TDEStartupInfoId asn_id;
+    TDEStartupInfoData asn_data;
     bool asn_valid = workspace()->checkStartupNotification( window(), asn_id, asn_data );
 
     workspace()->updateClientLayer( this );
diff --git a/twin/workspace.cpp b/twin/workspace.cpp
index 85308f66d..d7ce0d884 100644
--- a/twin/workspace.cpp
+++ b/twin/workspace.cpp
@@ -173,8 +173,8 @@ Workspace::Workspace( bool restore )
 
     kapp->setGlobalMouseTracking( true ); // so that this doesn't mess eventmask on root window later
     // call this before XSelectInput() on the root window
-    startup = new KStartupInfo(
-        KStartupInfo::DisableKWinModule | KStartupInfo::AnnounceSilenceChanges, this );
+    startup = new TDEStartupInfo(
+        TDEStartupInfo::DisableKWinModule | TDEStartupInfo::AnnounceSilenceChanges, this );
 
     // select windowmanager privileges
     XSelectInput(tqt_xdisplay(), root,
@@ -2716,9 +2716,9 @@ TQString Workspace::desktopName( int desk ) const
     return TQString::fromUtf8( rootInfo->desktopName( desk ) );
     }
 
-bool Workspace::checkStartupNotification( Window w, KStartupInfoId& id, KStartupInfoData& data )
+bool Workspace::checkStartupNotification( Window w, TDEStartupInfoId& id, TDEStartupInfoData& data )
     {
-    return startup->checkStartup( w, id, data ) == KStartupInfo::Match;
+    return startup->checkStartup( w, id, data ) == TDEStartupInfo::Match;
     }
 
 /*!
diff --git a/twin/workspace.h b/twin/workspace.h
index 8abb669f8..e1db8bfbd 100644
--- a/twin/workspace.h
+++ b/twin/workspace.h
@@ -30,9 +30,9 @@ class TQPopupMenu;
 class TDEConfig;
 class TDEGlobalAccel;
 class KShortcutDialog;
-class KStartupInfo;
-class KStartupInfoId;
-class KStartupInfoData;
+class TDEStartupInfo;
+class TDEStartupInfoId;
+class TDEStartupInfoData;
 class TQSlider;
 class TQPushButton;
 class TDEProcess;
@@ -268,7 +268,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         void removeGroup( Group* group, allowed_t );
         Group* findClientLeaderGroup( const Client* c ) const;
 
-        bool checkStartupNotification( Window w, KStartupInfoId& id, KStartupInfoData& data );
+        bool checkStartupNotification( Window w, TDEStartupInfoId& id, TDEStartupInfoData& data );
 
         void focusToNull(); // SELI public?
         enum FocusChainChange { FocusChainMakeFirst, FocusChainMakeLast, FocusChainUpdate };
@@ -615,7 +615,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
 
         bool workspaceInit;
 
-        KStartupInfo* startup;
+        TDEStartupInfo* startup;
 
         bool electric_have_borders;
         int electric_current_border;