Rename KStartup for enhanced compatibility with KDE4

kaddressbook/main.cpp

@@ -72,7 +72,7 @@ int KAddressBookApp::newInstance()
           mMainWin->hide();
         }
         // otherwise, leave the window like it is (hidden or shown)
-        KStartupInfo::appStarted();
+        TDEStartupInfo::appStarted();
     } else {
       TQString file;
       if ( args->isSet( "document" ) ) {
@@ -101,7 +101,7 @@ int KAddressBookApp::newInstance()
   static bool firstInstance = true;
 
   if ( !firstInstance )
-    KStartupInfo::setNewStartupId( mMainWin, kapp->startupId() );
+    TDEStartupInfo::setNewStartupId( mMainWin, kapp->startupId() );
 
   firstInstance = false;
 #endif

kalarm/kalarmd/admain.cpp

@@ -50,7 +50,7 @@ int main(int argc, char** argv)
 	TDECmdLineArgs::init(argc, argv, &aboutData);
 	TDECmdLineArgs::addCmdLineOptions(options);
 	KUniqueApplication::addCmdLineOptions();
-	KStartupInfo::disableAutoAppStartedSending();
+	TDEStartupInfo::disableAutoAppStartedSending();
 
 	if (!AlarmDaemonApp::start())
 		exit(0);

kmail/kmkernel.cpp

@@ -376,7 +376,7 @@ void KMKernel::openReader( bool onlyCheck )
     // Activate window - doing this instead of KWin::activateWindow(mWin->winId());
     // so that it also works when called from KMailApplication::newInstance()
 #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
-    KStartupInfo::setNewStartupId( mWin, kapp->startupId() );
+    TDEStartupInfo::setNewStartupId( mWin, kapp->startupId() );
 #endif
   }
 }
@@ -446,7 +446,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
     // Activate window - doing this instead of KWin::activateWindow(cWin->winId());
     // so that it also works when called from KMailApplication::newInstance()
 #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
-    KStartupInfo::setNewStartupId( cWin, kapp->startupId() );
+    TDEStartupInfo::setNewStartupId( cWin, kapp->startupId() );
 #endif
   }
   return 1;
@@ -593,7 +593,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
     // Activate window - doing this instead of KWin::activateWindow(cWin->winId());
     // so that it also works when called from KMailApplication::newInstance()
 #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
-    KStartupInfo::setNewStartupId( cWin, kapp->startupId() );
+    TDEStartupInfo::setNewStartupId( cWin, kapp->startupId() );
 #endif
   } else {
     cWin->setAutoDeleteWindow( true );
@@ -639,7 +639,7 @@ DCOPRef KMKernel::openComposer(const TQString &to, const TQString &cc,
     // Activate window - doing this instead of KWin::activateWindow(cWin->winId());
     // so that it also works when called from KMailApplication::newInstance()
 #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
-    KStartupInfo::setNewStartupId( cWin, kapp->startupId() );
+    TDEStartupInfo::setNewStartupId( cWin, kapp->startupId() );
 #endif
   }
 

kontact/interfaces/uniqueapphandler.cpp

@@ -82,7 +82,7 @@ int UniqueAppHandler::newInstance()
   if ( kapp->mainWidget() ) {
     kapp->mainWidget()->show();
     KWin::forceActiveWindow( kapp->mainWidget()->winId() );
-    KStartupInfo::appStarted();
+    TDEStartupInfo::appStarted();
   }
 
   // Then ensure the part appears in kontact

kontact/plugins/korganizer/korg_uniqueapp.cpp

@@ -45,7 +45,7 @@ int KOrganizerUniqueAppHandler::newInstance()
   if ( kapp->mainWidget() ) {
     kapp->mainWidget()->show();
     KWin::forceActiveWindow( kapp->mainWidget()->winId() );
-    KStartupInfo::appStarted();
+    TDEStartupInfo::appStarted();
   }
 
   // Then ensure the part appears in kontact.

korganizer/koapp.cpp

@@ -150,7 +150,7 @@ void KOrganizerApp::processCalendar( const KURL &url )
 
   // Handle window activation
 #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
-  KStartupInfo::setNewStartupId( korg->topLevelWidget(), startupId() );
+  TDEStartupInfo::setNewStartupId( korg->topLevelWidget(), startupId() );
 #endif
 }