summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-31 21:51:57 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-31 21:51:57 -0600
commit339bb51ad3721e188a57c529828a55400213ff70 (patch)
treeb727ad5ad27441f498bc5e04d5f47d88af0e4537
parentf2225fc1f936c1d9e6a5570a63ffe12c366176bf (diff)
downloadtdepim-339bb51ad3721e188a57c529828a55400213ff70.tar.gz
tdepim-339bb51ad3721e188a57c529828a55400213ff70.zip
Rename KStartup for enhanced compatibility with KDE4
-rw-r--r--kaddressbook/main.cpp4
-rw-r--r--kalarm/kalarmd/admain.cpp2
-rw-r--r--kmail/kmkernel.cpp8
-rw-r--r--kontact/interfaces/uniqueapphandler.cpp2
-rw-r--r--kontact/plugins/korganizer/korg_uniqueapp.cpp2
-rw-r--r--korganizer/koapp.cpp2
6 files changed, 10 insertions, 10 deletions
diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp
index 805a20cc8..16c5156ec 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 bd5c8bf1a..f030dd1aa 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 4ca2440c5..423c04a70 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 04e5a9e23..1cddbf1aa 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 9a1f3fc49..1a90a8aad 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 49e2ec3aa..8f9412ba3 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
}