diff options
Diffstat (limited to 'kontact')
-rw-r--r-- | kontact/interfaces/uniqueapphandler.cpp | 8 | ||||
-rw-r--r-- | kontact/plugins/korganizer/korg_uniqueapp.cpp | 2 | ||||
-rw-r--r-- | kontact/src/main.cpp | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp index 2ad0f6381..904089cad 100644 --- a/kontact/interfaces/uniqueapphandler.cpp +++ b/kontact/interfaces/uniqueapphandler.cpp @@ -28,7 +28,7 @@ #include <dcopclient.h> #include <kdebug.h> #include <tdelocale.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> /* Test plan for the various cases of interaction between standalone apps and kontact: @@ -78,7 +78,7 @@ using namespace Kontact; int UniqueAppHandler::newInstance() { - // This bit is duplicated from KUniqueApplication::newInstance() + // This bit is duplicated from TDEUniqueApplication::newInstance() if ( kapp->mainWidget() ) { kapp->mainWidget()->show(); KWin::forceActiveWindow( kapp->mainWidget()->winId() ); @@ -99,7 +99,7 @@ bool UniqueAppHandler::process( const TQCString &fun, const TQByteArray &data, TDECmdLineArgs::reset(); // forget options defined by other "applications" loadCommandLineOptions(); // implemented by plugin - // This bit is duplicated from KUniqueApplication::processDelayed() + // This bit is duplicated from TDEUniqueApplication::processDelayed() TQDataStream ds( data, IO_ReadOnly ); TDECmdLineArgs::loadAppArgs( ds ); if ( !ds.atEnd() ) { // backwards compatibility @@ -196,7 +196,7 @@ static TDECmdLineOptions options[] = void Kontact::UniqueAppHandler::loadKontactCommandLineOptions() { TDECmdLineArgs::addCmdLineOptions( options ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); TDEApplication::addCmdLineOptions(); } diff --git a/kontact/plugins/korganizer/korg_uniqueapp.cpp b/kontact/plugins/korganizer/korg_uniqueapp.cpp index c83605833..a3229cd8a 100644 --- a/kontact/plugins/korganizer/korg_uniqueapp.cpp +++ b/kontact/plugins/korganizer/korg_uniqueapp.cpp @@ -41,7 +41,7 @@ int KOrganizerUniqueAppHandler::newInstance() korganizer.send( "handleCommandLine" ); // Bring korganizer's plugin to front - // This bit is duplicated from KUniqueApplication::newInstance() + // This bit is duplicated from TDEUniqueApplication::newInstance() if ( kapp->mainWidget() ) { kapp->mainWidget()->show(); KWin::forceActiveWindow( kapp->mainWidget()->winId() ); diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index 576eb48c0..2ec3aa8bd 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -28,7 +28,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdestartupinfo.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <twin.h> #include <kstandarddirs.h> #include <ktrader.h> @@ -49,7 +49,7 @@ static const char description[] = static const char version[] = "1.2.9"; -class KontactApp : public KUniqueApplication { +class KontactApp : public TDEUniqueApplication { public: KontactApp() : mMainWindow( 0 ), mSessionRestored( false ) { @@ -139,7 +139,7 @@ int KontactApp::newInstance() // Handle startup notification and window activation // (The first time it will do nothing except note that it was called) - return KUniqueApplication::newInstance(); + return TDEUniqueApplication::newInstance(); } int main( int argc, char **argv ) |