From 339bb51ad3721e188a57c529828a55400213ff70 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 31 Jan 2013 21:51:57 -0600
Subject: Rename KStartup for enhanced compatibility with KDE4

---
 kaddressbook/main.cpp                         | 4 ++--
 kalarm/kalarmd/admain.cpp                     | 2 +-
 kmail/kmkernel.cpp                            | 8 ++++----
 kontact/interfaces/uniqueapphandler.cpp       | 2 +-
 kontact/plugins/korganizer/korg_uniqueapp.cpp | 2 +-
 korganizer/koapp.cpp                          | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp
index 805a20cc..16c5156e 100644
--- a/kaddressbook/main.cpp
+++ b/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
diff --git a/kalarm/kalarmd/admain.cpp b/kalarm/kalarmd/admain.cpp
index bd5c8bf1..f030dd1a 100644
--- a/kalarm/kalarmd/admain.cpp
+++ b/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);
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 4ca2440c..423c04a7 100644
--- a/kmail/kmkernel.cpp
+++ b/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
   }
 
diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp
index 04e5a9e2..1cddbf1a 100644
--- a/kontact/interfaces/uniqueapphandler.cpp
+++ b/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
diff --git a/kontact/plugins/korganizer/korg_uniqueapp.cpp b/kontact/plugins/korganizer/korg_uniqueapp.cpp
index 9a1f3fc4..1a90a8aa 100644
--- a/kontact/plugins/korganizer/korg_uniqueapp.cpp
+++ b/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.
diff --git a/korganizer/koapp.cpp b/korganizer/koapp.cpp
index 49e2ec3a..8f9412ba 100644
--- a/korganizer/koapp.cpp
+++ b/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
 }
 
-- 
cgit v1.2.3