Rename KStartup for enhanced compatibility with KDE4

22 files changed, 91 insertions, 91 deletions

diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp
index c22d20814..9730d7183 100644
--- a/drkonqi/krashconf.cpp
+++ b/drkonqi/krashconf.cpp
@@ -83,9 +83,9 @@ void KrashConfig :: readConfig()
   TQCString startup_id( args->getOption( "startupid" ));
   if (!startup_id.isEmpty())
   { // stop startup notification
-    KStartupInfoId id;
+    TDEStartupInfoId id;
     id.initId( startup_id );
-    KStartupInfo::sendFinish( id );
+    TDEStartupInfo::sendFinish( id );
   }
 
   TDEConfig *config = TDEGlobal::config();
diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp
index 931845b16..317906e95 100644
--- a/kappfinder/toplevel.cpp
+++ b/kappfinder/toplevel.cpp
@@ -102,7 +102,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
   mDestDir = destDir;
   mDestDir = mDestDir.replace( TQRegExp( "^~/" ), TQDir::homeDirPath() + "/" );
 	
-  KStartupInfo::appStarted();
+  TDEStartupInfo::appStarted();
 
   TQAccel *accel = new TQAccel( this );
   accel->connectItem( accel->insertItem( Key_Q + CTRL ), kapp, TQT_SLOT( quit() ) );
diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index d170f6c76..62d070e41 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -162,7 +162,7 @@ void KateApp::restoreKate ()
     newMainWindow ();
 
   // Do not notify about start there: this makes kicker crazy and kate go to a wrong desktop.
-  // KStartupInfo::setNewStartupId( activeMainWindow(), startupId());
+  // TDEStartupInfo::setNewStartupId( activeMainWindow(), startupId());
 }
 
 bool KateApp::startupKate ()
@@ -178,7 +178,7 @@ bool KateApp::startupKate ()
     if (!sessionManager()->chooseSession ())
     {
       // we will exit kate now, notify the rest of the world we are done
-      KStartupInfo::appStarted (startupId());
+      TDEStartupInfo::appStarted (startupId());
       return false;
     }
   }
@@ -188,7 +188,7 @@ bool KateApp::startupKate ()
     newMainWindow ();
 
   // notify about start
-  KStartupInfo::setNewStartupId( activeMainWindow(), startupId());
+  TDEStartupInfo::setNewStartupId( activeMainWindow(), startupId());
 
   TQTextCodec *codec = m_args->isSet("encoding") ? TQTextCodec::codecForName(m_args->getOption("encoding")) : 0;
 
diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp
index e53c07910..fb389131d 100644
--- a/kate/app/katemain.cpp
+++ b/kate/app/katemain.cpp
@@ -251,7 +251,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
       wRef.call( "show" );
 
       // stop startup notification
-      KStartupInfo::appStarted(  );
+      TDEStartupInfo::appStarted(  );
 
       return 0;
     }
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index ce6d20e34..a793102f8 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -422,12 +422,12 @@ int Minicli::runCommand()
   TQCString asn;
   if( tqApp->desktop()->isVirtualDesktop())
   {
-    asn = KStartupInfo::createNewStartupId();
-    KStartupInfoId id;
+    asn = TDEStartupInfo::createNewStartupId();
+    TDEStartupInfoId id;
     id.initId( asn );
-    KStartupInfoData data;
+    TDEStartupInfoData data;
     data.setXinerama( tqApp->desktop()->screenNumber( this ));
-    KStartupInfo::sendChange( id, data );
+    TDEStartupInfo::sendChange( id, data );
   }
 
   // Determine whether the application should be run through
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp
index 6603e7b7b..2cedadcdf 100644
--- a/kdesktop/startupid.cpp
+++ b/kdesktop/startupid.cpp
@@ -42,7 +42,7 @@ static Atom kde_splash_progress;
 
 StartupId::StartupId( TQWidget* parent, const char* name )
     :   TQWidget( parent, name ),
-	startup_info( KStartupInfo::CleanOnCantDetect ),
+	startup_info( TDEStartupInfo::CleanOnCantDetect ),
 	startup_widget( NULL ),
 	blinking( true ),
 	bouncing( false )
@@ -58,14 +58,14 @@ StartupId::StartupId( TQWidget* parent, const char* name )
         }
     connect( &update_timer, TQT_SIGNAL( timeout()), TQT_SLOT( update_startupid()));
     connect( &startup_info,
-        TQT_SIGNAL( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& )),
-        TQT_SLOT( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& )));
+        TQT_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQT_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )));
     connect( &startup_info,
-        TQT_SIGNAL( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& )),
-        TQT_SLOT( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& )));
+        TQT_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQT_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )));
     connect( &startup_info,
-        TQT_SIGNAL( gotRemoveStartup( const KStartupInfoId&, const KStartupInfoData& )),
-        TQT_SLOT( gotRemoveStartup( const KStartupInfoId& )));
+        TQT_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQT_SLOT( gotRemoveStartup( const TDEStartupInfoId& )));
     }
 
 StartupId::~StartupId()
@@ -80,7 +80,7 @@ void StartupId::configure()
     bouncing = KLaunchSettings::bouncing();
     }
 
-void StartupId::gotNewStartup( const KStartupInfoId& id_P, const KStartupInfoData& data_P )
+void StartupId::gotNewStartup( const TDEStartupInfoId& id_P, const TDEStartupInfoData& data_P )
     {
     TQString icon = data_P.findIcon();
     current_startup = id_P;
@@ -88,7 +88,7 @@ void StartupId::gotNewStartup( const KStartupInfoId& id_P, const KStartupInfoDat
     start_startupid( icon );
     }
 
-void StartupId::gotStartupChange( const KStartupInfoId& id_P, const KStartupInfoData& data_P )
+void StartupId::gotStartupChange( const TDEStartupInfoId& id_P, const TDEStartupInfoData& data_P )
     {
     if( current_startup == id_P )
         {
@@ -101,12 +101,12 @@ void StartupId::gotStartupChange( const KStartupInfoId& id_P, const KStartupInfo
         }
     }
 
-void StartupId::gotRemoveStartup( const KStartupInfoId& id_P )
+void StartupId::gotRemoveStartup( const TDEStartupInfoId& id_P )
     {
     startups.remove( id_P );
     if( startups.count() == 0 )
         {
-        current_startup = KStartupInfoId(); // null
+        current_startup = TDEStartupInfoId(); // null
         if( kde_startup_status == StartupIn )
             start_startupid( KDE_STARTUP_ICON );
         else
diff --git a/kdesktop/startupid.h b/kdesktop/startupid.h
index 62e7031db..4c0027bfa 100644
--- a/kdesktop/startupid.h
+++ b/kdesktop/startupid.h
@@ -45,16 +45,16 @@ class StartupId
         void stop_startupid();
     protected slots:
         void update_startupid();
-        void gotNewStartup( const KStartupInfoId& id, const KStartupInfoData& data );
-        void gotStartupChange( const KStartupInfoId& id, const KStartupInfoData& data );
-        void gotRemoveStartup( const KStartupInfoId& id );
+        void gotNewStartup( const TDEStartupInfoId& id, const TDEStartupInfoData& data );
+        void gotStartupChange( const TDEStartupInfoId& id, const TDEStartupInfoData& data );
+        void gotRemoveStartup( const TDEStartupInfoId& id );
         void finishKDEStartup();
     protected:
-        KStartupInfo startup_info;
+        TDEStartupInfo startup_info;
         TQWidget* startup_widget;
         TQTimer update_timer;
-        TQMap< KStartupInfoId, TQString > startups; // TQString == pixmap
-        KStartupInfoId current_startup;
+        TQMap< TDEStartupInfoId, TQString > startups; // TQString == pixmap
+        TDEStartupInfoId current_startup;
         bool blinking;
         bool bouncing;
         unsigned int color_index;
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index a3093fabf..836307460 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -359,7 +359,7 @@ void MainWindow::openUrl( const TQString &url )
 
 void MainWindow::openUrl( const TQString &url, const TQCString& startup_id )
 {
-    KStartupInfo::setNewStartupId( this, startup_id );
+    TDEStartupInfo::setNewStartupId( this, startup_id );
     openUrl( KURL( url ) );
 }
 
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index a1d68e98a..18f04452f 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -97,16 +97,16 @@ void TaskManager::configure_startup()
     c.setGroup("FeedbackStyle");
     if (!c.readBoolEntry("TaskbarButton", false))
         return;
-    _startup_info = new KStartupInfo( KStartupInfo::CleanOnCantDetect, this );
+    _startup_info = new TDEStartupInfo( TDEStartupInfo::CleanOnCantDetect, this );
     connect( _startup_info,
-        TQT_SIGNAL( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& )),
-        TQT_SLOT( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& )));
+        TQT_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQT_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )));
     connect( _startup_info,
-        TQT_SIGNAL( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& )),
-        TQT_SLOT( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& )));
+        TQT_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQT_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )));
     connect( _startup_info,
-        TQT_SIGNAL( gotRemoveStartup( const KStartupInfoId&, const KStartupInfoData& )),
-        TQT_SLOT( killStartup( const KStartupInfoId& )));
+        TQT_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQT_SLOT( killStartup( const TDEStartupInfoId& )));
     c.setGroup( "TaskbarButtonSettings" );
     _startup_info->setTimeout( c.readUnsignedNumEntry( "Timeout", 30 ));
 }
@@ -479,7 +479,7 @@ void TaskManager::currentDesktopChanged(int desktop)
     emit desktopChanged(desktop);
 }
 
-void TaskManager::gotNewStartup( const KStartupInfoId& id, const KStartupInfoData& data )
+void TaskManager::gotNewStartup( const TDEStartupInfoId& id, const TDEStartupInfoData& data )
 {
     Startup::Ptr s = new Startup( id, data, this );
     _startups.append(s);
@@ -487,7 +487,7 @@ void TaskManager::gotNewStartup( const KStartupInfoId& id, const KStartupInfoDat
     emit startupAdded(s);
 }
 
-void TaskManager::gotStartupChange( const KStartupInfoId& id, const KStartupInfoData& data )
+void TaskManager::gotStartupChange( const TDEStartupInfoId& id, const TDEStartupInfoData& data )
 {
     Startup::List::iterator itEnd = _startups.end();
     for (Startup::List::iterator sIt = _startups.begin(); sIt != itEnd; ++sIt)
@@ -500,7 +500,7 @@ void TaskManager::gotStartupChange( const KStartupInfoId& id, const KStartupInfo
     }
 }
 
-void TaskManager::killStartup( const KStartupInfoId& id )
+void TaskManager::killStartup( const TDEStartupInfoId& id )
 {
     Startup::List::iterator sIt = _startups.begin();
     Startup::List::iterator itEnd = _startups.end();
@@ -1452,7 +1452,7 @@ void Task::updateWindowPixmap()
 #endif // THUMBNAILING_POSSIBLE
 }
 
-Startup::Startup(const KStartupInfoId& id, const KStartupInfoData& data,
+Startup::Startup(const TDEStartupInfoId& id, const TDEStartupInfoData& data,
                  TQObject * parent, const char *name)
     : TQObject(parent, name), _id(id), _data(data)
 {
@@ -1462,7 +1462,7 @@ Startup::~Startup()
 {
 }
 
-void Startup::update(const KStartupInfoData& data)
+void Startup::update(const TDEStartupInfoData& data)
 {
     _data.update(data);
     emit changed();
diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h
index 148c77da2..6b9dab397 100644
--- a/kicker/taskmanager/taskmanager.h
+++ b/kicker/taskmanager/taskmanager.h
@@ -522,7 +522,7 @@ public:
     typedef TDESharedPtr<Startup> Ptr;
     typedef TQValueVector<Startup::Ptr> List;
 
-    Startup( const KStartupInfoId& id, const KStartupInfoData& data, TQObject * parent,
+    Startup( const TDEStartupInfoId& id, const TDEStartupInfoData& data, TQObject * parent,
         const char *name = 0);
     virtual ~Startup();
 
@@ -540,8 +540,8 @@ public:
      * The name of the icon to be used for the starting task.
      */
     TQString icon() const { return _data.findIcon(); }
-    void update( const KStartupInfoData& data );
-    const KStartupInfoId& id() const { return _id; }
+    void update( const TDEStartupInfoData& data );
+    const TDEStartupInfoId& id() const { return _id; }
 
 signals:
     /**
@@ -550,8 +550,8 @@ signals:
     void changed();
 
 private:
-    KStartupInfoId _id;
-    KStartupInfoData _data;
+    TDEStartupInfoId _id;
+    TDEStartupInfoData _data;
     class StartupPrivate *d;
 };
 
@@ -680,14 +680,14 @@ protected slots:
     //* @internal
     void currentDesktopChanged(int);
     //* @internal
-    void killStartup( const KStartupInfoId& );
+    void killStartup( const TDEStartupInfoId& );
     //* @internal
     void killStartup(Startup::Ptr);
 
     //* @internal
-    void gotNewStartup( const KStartupInfoId&, const KStartupInfoData& );
+    void gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& );
     //* @internal
-    void gotStartupChange( const KStartupInfoId&, const KStartupInfoData& );
+    void gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& );
 
 protected:
     void configure_startup();
@@ -700,7 +700,7 @@ private:
     Task::Dict m_tasksByWId;
     WindowList _skiptaskbar_windows;
     Startup::List _startups;
-    KStartupInfo* _startup_info;
+    TDEStartupInfo* _startup_info;
     KWinModule* m_winModule;
     bool m_trackGeometry;
 
diff --git a/konqueror/KonqMainWindowIface.cc b/konqueror/KonqMainWindowIface.cc
index 4f0598626..7fce12205 100644
--- a/konqueror/KonqMainWindowIface.cc
+++ b/konqueror/KonqMainWindowIface.cc
@@ -67,7 +67,7 @@ void KonqMainWindowIface::newTab( TQString url, bool tempFile )
 
 void KonqMainWindowIface::newTabASN( TQString url, const TQCString& startup_id, bool tempFile )
 {
-  KStartupInfo::setNewStartupId( m_pMainWindow, startup_id );
+  TDEStartupInfo::setNewStartupId( m_pMainWindow, startup_id );
   m_pMainWindow->openFilteredURL( url, true, tempFile );
 }
 
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc
index 6e8ccc2ac..899d27f84 100644
--- a/konqueror/client/kfmclient.cc
+++ b/konqueror/client/kfmclient.cc
@@ -281,16 +281,16 @@ static bool krun_has_error = false;
 
 void clientApp::sendASNChange()
 {
-    KStartupInfoId id;
+    TDEStartupInfoId id;
     id.initId( startup_id_str );
-    KStartupInfoData data;
+    TDEStartupInfoData data;
     data.addPid( 0 );   // say there's another process for this ASN with unknown PID
     data.setHostname(); // ( no need to bother to get this konqy's PID )
     Display* dpy = tqt_xdisplay();
     if( dpy == NULL ) // we may be running without TQApplication here
         dpy = XOpenDisplay( NULL );
     if( dpy != NULL )
-        KStartupInfo::sendChangeX( dpy, id, data );
+        TDEStartupInfo::sendChangeX( dpy, id, data );
     if( dpy != NULL && dpy != tqt_xdisplay())
         XCloseDisplay( dpy );
 }
@@ -320,7 +320,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
         if (!config.readEntry("BrowserApplication").isEmpty())
         {
             clientApp app;
-            KStartupInfo::appStarted();
+            TDEStartupInfo::appStarted();
 
             KRun * run = new KRun( url, 0, 0, false, false /* no progress window */ ); // TODO pass tempFile [needs support in the KRun ctor]
             TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() ));
@@ -367,7 +367,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
             kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl;
             */
             // pass kfmclient's startup id to konqueror using kshell
-            KStartupInfoId id;
+            TDEStartupInfoId id;
             id.initId( startup_id_str );
             id.setupStartupEnv();
             TDEProcess proc;
@@ -378,7 +378,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
                 proc << "-tempfile";
             proc << url.url();
             proc.start( TDEProcess::DontCare );
-            KStartupInfo::resetStartupEnv();
+            TDEStartupInfo::resetStartupEnv();
             kdDebug( 1202 ) << "clientApp::createNewWindow TDEProcess started" << endl;
         //}
     }
@@ -455,7 +455,7 @@ bool clientApp::doIt()
   TQCString command = args->arg(0);
 
   // read ASN env. variable for non-KApp cases
-  startup_id_str = KStartupInfo::currentStartupIdEnv().id();
+  startup_id_str = TDEStartupInfo::currentStartupIdEnv().id();
 
   if ( command == "openURL" || command == "newTab" )
   {
diff --git a/konqueror/konq_misc.cc b/konqueror/konq_misc.cc
index cee752015..3ccccd441 100644
--- a/konqueror/konq_misc.cc
+++ b/konqueror/konq_misc.cc
@@ -129,7 +129,7 @@ KonqMainWindow * KonqMisc::createBrowserWindowFromProfile( const TQString &path,
   else if( KonqMainWindow::isPreloaded() && KonqMainWindow::preloadedWindow() != NULL )
   {
       mainWindow = KonqMainWindow::preloadedWindow();
-      KStartupInfo::setWindowStartupId( mainWindow->winId(), kapp->startupId());
+      TDEStartupInfo::setWindowStartupId( mainWindow->winId(), kapp->startupId());
       KonqMainWindow::setPreloadedWindow( NULL );
       KonqMainWindow::setPreloadedFlag( false );
       mainWindow->resetWindow();
diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp
index 4adbd55bc..61961a390 100644
--- a/kstart/kstart.cpp
+++ b/kstart/kstart.cpp
@@ -60,21 +60,21 @@ KStart::KStart()
     	    twinmodule->doNotManage( windowtitle );
     }
     // propagate the app startup notification info to the started app
-    KStartupInfoId id;
+    TDEStartupInfoId id;
     id.initId( kapp->startupId());
     id.setupStartupEnv();
 
     //finally execute the comand
     if( proc.start(TDEProcess::DontCare) ) {
-        KStartupInfoData data;
+        TDEStartupInfoData data;
         data.addPid( proc.pid() );
         TQCString bin = proc.args().first();
         data.setName( bin );
         data.setBin( bin.mid( bin.findRev( '/' ) + 1 ));
-        KStartupInfo::sendChange( id, data );
+        TDEStartupInfo::sendChange( id, data );
     }
     else
-        KStartupInfo::sendFinish( id ); // failed to start
+        TDEStartupInfo::sendFinish( id ); // failed to start
 
   TQTimer::singleShot( useRule ? 0 : 120 * 1000, kapp, TQT_SLOT( quit()));
 }
diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
index 038a4de57..2e4761f82 100644
--- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
+++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
@@ -274,7 +274,7 @@ int main(int argc, char **argv)
 	if (TDECmdLineArgs::parsedArgs()->count()==0) TDECmdLineArgs::usage();
 	TDEApplication *app = new  MountHelper();
 
-	KStartupInfo::appStarted();
+	TDEStartupInfo::appStarted();
 	app->dcopClient()->attach();
 	return app->exec();
 }
diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp
index bd104c72f..d2b23bfc4 100644
--- a/tdeprint/kjobviewer/kjobviewer.cpp
+++ b/tdeprint/kjobviewer/kjobviewer.cpp
@@ -180,7 +180,7 @@ void KJobViewerApp::slotJobsShown(KMJobViewer *view, bool hasJobs)
 			m_tray->show();
 	}
 	else {
-		KStartupInfo::appStarted();
+		TDEStartupInfo::appStarted();
 		kapp->quit();
 	}
 }
diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp
index ab3abce5c..ec3da142d 100644
--- a/tdesu/tdesu/tdesu.cpp
+++ b/tdesu/tdesu/tdesu.cpp
@@ -120,7 +120,7 @@ int main(int argc, char *argv[])
     }
     
     {
-        KStartupInfoId id;
+        TDEStartupInfoId id;
         id.initId( kapp->startupId());
         id.setupStartupEnv(); // make DESKTOP_STARTUP_ID env. var. available again
     }
@@ -356,11 +356,11 @@ static int startApp()
     TQCString password;
     if (needpw)
     {
-        KStartupInfoId id;
+        TDEStartupInfoId id;
         id.initId( kapp->startupId());
-        KStartupInfoData data;
-        data.setSilent( KStartupInfoData::Yes );
-        KStartupInfo::sendChange( id, data );
+        TDEStartupInfoData data;
+        data.setSilent( TDEStartupInfoData::Yes );
+        TDEStartupInfo::sendChange( id, data );
         KDEsuDialog dlg(user, auth_user, keep && !terminal,icon, withIgnoreButton, timeout);
 	if (prompt)
 	    dlg.addLine(i18n("Command:"), command);
@@ -376,7 +376,7 @@ static int startApp()
         int ret = dlg.exec();
         if (ret == KDEsuDialog::Rejected)
         {
-            KStartupInfo::sendFinish( id );
+            TDEStartupInfo::sendFinish( id );
             exit(0);
         }
         if (ret == KDEsuDialog::AsUser)
@@ -384,8 +384,8 @@ static int startApp()
         password = dlg.password();
         keep = dlg.keep();
         TDEConfigGroup(config,"Passwords").writeEntry("Keep", keep);
-        data.setSilent( KStartupInfoData::No );
-        KStartupInfo::sendChange( id, data );
+        data.setSilent( TDEStartupInfoData::No );
+        TDEStartupInfo::sendChange( id, data );
     }
 
     // Some events may need to be handled (like a button animation)
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;