From 74926683f153c10d642dd7b330e90d1518ccd088 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 10 Nov 2024 17:12:56 +0900 Subject: [PATCH] Rename KUniqueApplication to TDEUniqueApplication Signed-off-by: Michele Calgaro --- akregator/src/akregator_part.cpp | 2 +- akregator/src/main.cpp | 8 ++++---- certmanager/certificatewizardimpl.cpp | 2 +- certmanager/kwatchgnupg/main.cpp | 8 ++++---- kaddressbook/main.cpp | 8 ++++---- kalarm/daemon.cpp | 2 +- kalarm/functions.cpp | 2 +- kalarm/kalarmapp.cpp | 6 +++--- kalarm/kalarmapp.h | 4 ++-- kalarm/kalarmd/adapp.cpp | 2 +- kalarm/kalarmd/adapp.h | 4 ++-- kalarm/kalarmd/admain.cpp | 2 +- kalarm/main.cpp | 2 +- kmail/kmstartup.cpp | 2 +- kmail/korghelper.cpp | 2 +- kmail/main.cpp | 8 ++++---- kmobile/main.cpp | 4 ++-- knode/knapplication.cpp | 2 +- knode/knapplication.h | 6 +++--- knode/main.cpp | 2 +- knotes/main.cpp | 8 ++++---- knotes/main.h | 4 ++-- kontact/interfaces/uniqueapphandler.cpp | 8 ++++---- kontact/plugins/korganizer/korg_uniqueapp.cpp | 2 +- kontact/src/main.cpp | 6 +++--- korganizer/koapp.cpp | 2 +- korganizer/koapp.h | 4 ++-- korganizer/korgac/alarmdialog.cpp | 2 +- korganizer/korgac/korgacmain.cpp | 6 +++--- korganizer/main.cpp | 2 +- korn/kornapp.h | 6 +++--- korn/main.cpp | 4 ++-- libtdepim/komposer/test/test.cpp | 4 ++-- plugins/kmail/bodypartformatter/text_calendar.cpp | 2 +- 34 files changed, 69 insertions(+), 69 deletions(-) diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index 016b6008..52b46a05 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -982,7 +982,7 @@ bool Part::tryToLock(const TQString& backendName) { // this can only happen if the user is running this application on // different displays on the same machine. All other cases will be - // taken care of by KUniqueApplication() + // taken care of by TDEUniqueApplication() if ( oldAppName == appName ) msg = i18n("%1 already seems to be running on another display on " "this machine. Running %2 more than once is not supported " diff --git a/akregator/src/main.cpp b/akregator/src/main.cpp index 4c4b31ec..9f6e466e 100644 --- a/akregator/src/main.cpp +++ b/akregator/src/main.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "aboutdata.h" #include "mainwindow.h" @@ -36,7 +36,7 @@ namespace Akregator { -class Application : public KUniqueApplication { +class Application : public TDEUniqueApplication { public: Application() : mMainWindow( ) {} ~Application() {} @@ -80,7 +80,7 @@ int Application::newInstance() args->clear(); } - return KUniqueApplication::newInstance(); + return TDEUniqueApplication::newInstance(); } } // namespace Akregator @@ -90,7 +90,7 @@ int main(int argc, char **argv) Akregator::AboutData about; TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( Akregator::akregator_options ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); Akregator::Application app; diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index f5dd08ad..ae14bf36 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -442,7 +442,7 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte // OK, so kmail (or kontact) is running. Now ensure the object we want is available. // [that's not the case when kontact was already running, but kmail not loaded into it... in theory.] if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) { - DCOPRef ref( dcopService, dcopService ); // talk to the KUniqueApplication or its kontact wrapper + DCOPRef ref( dcopService, dcopService ); // talk to the TDEUniqueApplication or its kontact wrapper DCOPReply reply = ref.call( "load()" ); if ( reply.isValid() && (bool)reply ) { Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ); diff --git a/certmanager/kwatchgnupg/main.cpp b/certmanager/kwatchgnupg/main.cpp index 975b45c7..b9f6237a 100644 --- a/certmanager/kwatchgnupg/main.cpp +++ b/certmanager/kwatchgnupg/main.cpp @@ -37,7 +37,7 @@ #include "aboutdata.h" #include "kwatchgnupgmainwin.h" -#include +#include #include #include #include @@ -45,7 +45,7 @@ #include #include -class KWatchGnuPGApplication : public KUniqueApplication { +class KWatchGnuPGApplication : public TDEUniqueApplication { public: KWatchGnuPGApplication(); ~KWatchGnuPGApplication(); @@ -55,7 +55,7 @@ private: }; KWatchGnuPGApplication::KWatchGnuPGApplication() - : KUniqueApplication(), mMainWin(0) + : TDEUniqueApplication(), mMainWin(0) { } @@ -71,7 +71,7 @@ int KWatchGnuPGApplication::newInstance() setMainWidget( mMainWin ); } mMainWin->show(); - return KUniqueApplication::newInstance(); + return TDEUniqueApplication::newInstance(); } int main( int argc, char** argv ) diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp index 2c88e89b..e272783e 100644 --- a/kaddressbook/main.cpp +++ b/kaddressbook/main.cpp @@ -33,14 +33,14 @@ #include #include #include -#include +#include #include #include "kaddressbookmain.h" #include "kaddressbook_options.h" #include "kabcore.h" -class KAddressBookApp : public KUniqueApplication { +class KAddressBookApp : public TDEUniqueApplication { public: KAddressBookApp() : mMainWin( 0 ), mDefaultIsOpen( false ) {} ~KAddressBookApp() {} @@ -95,7 +95,7 @@ int KAddressBookApp::newInstance() } // Handle startup notification and window activation - // We do it ourselves instead of calling KUniqueApplication::newInstance + // We do it ourselves instead of calling TDEUniqueApplication::newInstance // to avoid the show() call there. #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY static bool firstInstance = true; @@ -115,7 +115,7 @@ int main( int argc, char *argv[] ) TDECmdLineArgs::init( argc, argv, KABCore::createAboutData() ); TDECmdLineArgs::addCmdLineOptions( kaddressbook_options ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); if ( !KAddressBookApp::start() ) return 0; diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp index fd099632..06206cc9 100644 --- a/kalarm/daemon.cpp +++ b/kalarm/daemon.cpp @@ -132,7 +132,7 @@ bool Daemon::start() { if (mStartTimer) return true; // we're currently waiting for the daemon to start - // Start the alarm daemon. It is a KUniqueApplication, which means that + // Start the alarm daemon. It is a TDEUniqueApplication, which means that // there is automatically only one instance of the alarm daemon running. TQString execStr = locate("exe", TQString::fromLatin1(DAEMON_APP_NAME)); if (execStr.isEmpty()) diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index 455c27a2..d91d65ae 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -1044,7 +1044,7 @@ bool runKOrganizer() TQCString dummy; if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy)) { - DCOPRef ref(dcopService, dcopService); // talk to the KUniqueApplication or its Kontact wrapper + DCOPRef ref(dcopService, dcopService); // talk to the TDEUniqueApplication or its Kontact wrapper DCOPReply reply = ref.call("load()"); if (!reply.isValid() || !(bool)reply) { diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index d9adbf7c..71346738 100644 --- a/kalarm/kalarmapp.cpp +++ b/kalarm/kalarmapp.cpp @@ -94,7 +94,7 @@ TQString KAlarmApp::mFatalMessage; * Construct the application. */ KAlarmApp::KAlarmApp() - : KUniqueApplication(), + : TDEUniqueApplication(), mInitialised(false), mDcopHandler(new DcopHandler()), #ifdef OLD_DCOP @@ -244,7 +244,7 @@ bool KAlarmApp::restoreSession() } /****************************************************************************** -* Called for a KUniqueApplication when a new instance of the application is +* Called for a TDEUniqueApplication when a new instance of the application is * started. */ int KAlarmApp::newInstance() @@ -834,7 +834,7 @@ void KAlarmApp::doQuit(TQWidget* parent) void KAlarmApp::commitData(TQSessionManager& sm) { mSessionClosingDown = true; - KUniqueApplication::commitData(sm); + TDEUniqueApplication::commitData(sm); mSessionClosingDown = false; // reset in case shutdown is cancelled } diff --git a/kalarm/kalarmapp.h b/kalarm/kalarmapp.h index 17f707ea..52359ef0 100644 --- a/kalarm/kalarmapp.h +++ b/kalarm/kalarmapp.h @@ -27,7 +27,7 @@ class TQTimer; class TQDateTime; -#include +#include #include class TDEProcess; namespace KCal { class Event; } @@ -45,7 +45,7 @@ class TrayWindow; class ShellProcess; -class KAlarmApp : public KUniqueApplication +class KAlarmApp : public TDEUniqueApplication { TQ_OBJECT diff --git a/kalarm/kalarmd/adapp.cpp b/kalarm/kalarmd/adapp.cpp index 2c9e09dc..3d5f2298 100644 --- a/kalarm/kalarmd/adapp.cpp +++ b/kalarm/kalarmd/adapp.cpp @@ -30,7 +30,7 @@ AlarmDaemonApp::AlarmDaemonApp() - : KUniqueApplication(false, false), + : TDEUniqueApplication(false, false), mAd(0) { disableSessionManagement(); diff --git a/kalarm/kalarmd/adapp.h b/kalarm/kalarmd/adapp.h index 62992094..c4a4188d 100644 --- a/kalarm/kalarmd/adapp.h +++ b/kalarm/kalarmd/adapp.h @@ -23,12 +23,12 @@ #ifndef ADAPP_H #define ADAPP_H -#include +#include class AlarmDaemon; -class AlarmDaemonApp : public KUniqueApplication +class AlarmDaemonApp : public TDEUniqueApplication { TQ_OBJECT diff --git a/kalarm/kalarmd/admain.cpp b/kalarm/kalarmd/admain.cpp index a5d9fd16..b1533e4a 100644 --- a/kalarm/kalarmd/admain.cpp +++ b/kalarm/kalarmd/admain.cpp @@ -49,7 +49,7 @@ int main(int argc, char** argv) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); TDEStartupInfo::disableAutoAppStartedSending(); if (!AlarmDaemonApp::start()) diff --git a/kalarm/main.cpp b/kalarm/main.cpp index f29ec673..62904a17 100644 --- a/kalarm/main.cpp +++ b/kalarm/main.cpp @@ -115,7 +115,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); if (!KAlarmApp::start()) { diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp index c1eb6ccb..888e4e19 100644 --- a/kmail/kmstartup.cpp +++ b/kmail/kmstartup.cpp @@ -193,7 +193,7 @@ void lockOrDie() { if ( oldHostName == hostName ) { // this can only happen if the user is running this application on // different displays on the same machine. All other cases will be - // taken care of by KUniqueApplication() + // taken care of by TDEUniqueApplication() if ( oldAppName == appName ) msg = i18n("%1 already seems to be running on another display on " "this machine. Running %2 more than once " diff --git a/kmail/korghelper.cpp b/kmail/korghelper.cpp index 17097126..cace2a10 100644 --- a/kmail/korghelper.cpp +++ b/kmail/korghelper.cpp @@ -36,7 +36,7 @@ void KMail::KorgHelper::ensureRunning() static const char* const dcopObjectId = "KOrganizerIface"; TQCString dummy; if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) { - DCOPRef ref( dcopService, dcopService ); // talk to the KUniqueApplication or its kontact wrapper + DCOPRef ref( dcopService, dcopService ); // talk to the TDEUniqueApplication or its kontact wrapper DCOPReply reply = ref.call( "load()" ); if ( reply.isValid() && (bool)reply ) { kdDebug() << "Loaded " << dcopService << " successfully" << endl; diff --git a/kmail/main.cpp b/kmail/main.cpp index 8b40e555..fe5dee0a 100644 --- a/kmail/main.cpp +++ b/kmail/main.cpp @@ -19,7 +19,7 @@ */ #include -#include +#include #include #include #include @@ -36,10 +36,10 @@ //----------------------------------------------------------------------------- -class KMailApplication : public KUniqueApplication +class KMailApplication : public TDEUniqueApplication { public: - KMailApplication() : KUniqueApplication() { }; + KMailApplication() : TDEUniqueApplication() { }; virtual int newInstance(); void commitData(TQSessionManager& sm); @@ -66,7 +66,7 @@ int KMailApplication::newInstance() int main(int argc, char *argv[]) { - // WABA: KMail is a KUniqueApplication. Unfortunately this makes debugging + // WABA: KMail is a TDEUniqueApplication. Unfortunately this makes debugging // a bit harder: You should pass --nofork as commandline argument when using // a debugger. In gdb you can do this by typing "set args --nofork" before // typing "run". diff --git a/kmobile/main.cpp b/kmobile/main.cpp index 6fe97df3..c1e9cae9 100644 --- a/kmobile/main.cpp +++ b/kmobile/main.cpp @@ -18,7 +18,7 @@ */ #include "kmobile.h" -#include +#include #include #include #include @@ -42,7 +42,7 @@ int main(int argc, char **argv) about.addAuthor( "Helge Deller", 0, "deller@kde.org" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); - KUniqueApplication app; + TDEUniqueApplication app; // register ourselves as a dcop client app.dcopClient()->registerAs(app.name(), false); diff --git a/knode/knapplication.cpp b/knode/knapplication.cpp index b74f41cf..c64ada84 100644 --- a/knode/knapplication.cpp +++ b/knode/knapplication.cpp @@ -75,7 +75,7 @@ int KNApplication::newInstance() } // Handle window activation and startup notification - KUniqueApplication::newInstance(); + TDEUniqueApplication::newInstance(); // process URLs... KNMainWidget *w = static_cast(mainWidget())->mainWidget(); diff --git a/knode/knapplication.h b/knode/knapplication.h index c65c010d..13a12357 100644 --- a/knode/knapplication.h +++ b/knode/knapplication.h @@ -17,14 +17,14 @@ #ifndef KNAPPLICATION_H #define KNAPPLICATION_H -#include +#include -class KNApplication : public KUniqueApplication +class KNApplication : public TDEUniqueApplication { TQ_OBJECT public: - KNApplication(): KUniqueApplication() { }; + KNApplication(): TDEUniqueApplication() { }; /** Create new instance of KNode. Make the existing diff --git a/knode/main.cpp b/knode/main.cpp index ab833dd7..6a7fc259 100644 --- a/knode/main.cpp +++ b/knode/main.cpp @@ -31,7 +31,7 @@ int main(int argc, char* argv[]) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( knode_options ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); if (!KNApplication::start()) return 0; diff --git a/knotes/main.cpp b/knotes/main.cpp index 8b85abe3..833e5695 100644 --- a/knotes/main.cpp +++ b/knotes/main.cpp @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *******************************************************************/ -#include +#include #include #include #include @@ -64,7 +64,7 @@ void remove_sm_from_client_leader() Application::Application() - : KUniqueApplication(), mMainWindow( 0 ) + : TDEUniqueApplication(), mMainWindow( 0 ) { } @@ -83,7 +83,7 @@ int Application::newInstance() else mMainWindow->newNote(); - return KUniqueApplication::newInstance(); + return TDEUniqueApplication::newInstance(); } int main( int argc, char* argv[] ) @@ -119,7 +119,7 @@ int main( int argc, char* argv[] ) TDECmdLineArgs::init( argc, argv, &aboutData ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); Application app; app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) ); diff --git a/knotes/main.h b/knotes/main.h index 7e7af105..7a1f4d1c 100644 --- a/knotes/main.h +++ b/knotes/main.h @@ -21,12 +21,12 @@ #ifndef MAIN_H #define MAIN_H -#include +#include class KNotesApp; -class Application : public KUniqueApplication +class Application : public TDEUniqueApplication { public: Application(); diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp index 2ad0f638..904089ca 100644 --- a/kontact/interfaces/uniqueapphandler.cpp +++ b/kontact/interfaces/uniqueapphandler.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include /* 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 c8360583..a3229cd8 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 576eb48c..2ec3aa8b 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -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 ) diff --git a/korganizer/koapp.cpp b/korganizer/koapp.cpp index 8d6b6f61..14847258 100644 --- a/korganizer/koapp.cpp +++ b/korganizer/koapp.cpp @@ -54,7 +54,7 @@ using namespace std; -KOrganizerApp::KOrganizerApp() : KUniqueApplication() +KOrganizerApp::KOrganizerApp() : TDEUniqueApplication() { TQString prodId = "-//K Desktop Environment//NONSGML KOrganizer %1//EN"; CalFormat::setApplication( "KOrganizer", prodId.arg( korgVersion ) ); diff --git a/korganizer/koapp.h b/korganizer/koapp.h index 59ead1a0..cb1cd22b 100644 --- a/korganizer/koapp.h +++ b/korganizer/koapp.h @@ -25,9 +25,9 @@ #ifndef KORGANIZERAPP_H #define KORGANIZERAPP_H -#include +#include -class KOrganizerApp : public KUniqueApplication +class KOrganizerApp : public TDEUniqueApplication { TQ_OBJECT diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index 80610483..d5cf0477 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -675,7 +675,7 @@ bool AlarmDialog::ensureKorganizerRunning() const TQCString dummy; if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) { - DCOPRef ref( dcopService, dcopService ); // talk to KUniqueApplication or its kontact wrapper + DCOPRef ref( dcopService, dcopService ); // talk to TDEUniqueApplication or its kontact wrapper DCOPReply reply = ref.call( "load()" ); if ( reply.isValid() && (bool)reply ) { Q_ASSERT( kapp->dcopClient()->findObject( diff --git a/korganizer/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp index d44ac4a2..c278f3c8 100644 --- a/korganizer/korgac/korgacmain.cpp +++ b/korganizer/korgac/korgacmain.cpp @@ -29,11 +29,11 @@ #include #include #include -#include +#include #include "koalarmclient.h" -class MyApp : public KUniqueApplication +class MyApp : public TDEUniqueApplication { public: MyApp() : mClient( 0 ) {} @@ -74,7 +74,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); if ( !MyApp::start() ) exit( 0 ); diff --git a/korganizer/main.cpp b/korganizer/main.cpp index 9090b949..8640c092 100644 --- a/korganizer/main.cpp +++ b/korganizer/main.cpp @@ -41,7 +41,7 @@ int main ( int argc, char **argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( korganizer_options ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); if ( !KOrganizerApp::start() ) return 0; diff --git a/korn/kornapp.h b/korn/kornapp.h index 9ef87f2f..03f7ae4b 100644 --- a/korn/kornapp.h +++ b/korn/kornapp.h @@ -5,7 +5,7 @@ #ifndef SSK_KORNAPP_H #define SSK_KORNAPP_H -#include +#include class KornShell; @@ -14,7 +14,7 @@ class KornShell; * @author Sirtaj Singh Kang (taj@kde.org) * @version $Id$ */ -class KornApp : public KUniqueApplication +class KornApp : public TDEUniqueApplication { TQ_OBJECT @@ -23,7 +23,7 @@ public: /** * KornApp Constructor */ - KornApp() : KUniqueApplication(), _shell( 0 ), _instanceCount( 0 ) {} + KornApp() : TDEUniqueApplication(), _shell( 0 ), _instanceCount( 0 ) {} /** * KornApp Destructor diff --git a/korn/main.cpp b/korn/main.cpp index f3e8cf9a..9efbc369 100644 --- a/korn/main.cpp +++ b/korn/main.cpp @@ -28,9 +28,9 @@ int main(int argc, char *argv[]) aboutData.addAuthor("Mart Kelder",0,"mart@kelder31.nl"); TDECmdLineArgs::init( argc, argv, &aboutData ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); - if( !KUniqueApplication::start() ) { + if( !TDEUniqueApplication::start() ) { // Already running. Should pop up the preferences dialog return 0; } diff --git a/libtdepim/komposer/test/test.cpp b/libtdepim/komposer/test/test.cpp index b5dfc63a..acbc9972 100644 --- a/libtdepim/komposer/test/test.cpp +++ b/libtdepim/komposer/test/test.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include @@ -41,7 +41,7 @@ int main(int argc, char **argv) about.addAuthor( "Zack Rusin", 0, "zack@kde.org" ); TDECmdLineArgs::init( argc, argv, &about ); - KUniqueApplication app; + TDEUniqueApplication app; // see if we are starting with session management if ( app.isRestored() ) diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp index 607c30b0..3e5bf945 100644 --- a/plugins/kmail/bodypartformatter/text_calendar.cpp +++ b/plugins/kmail/bodypartformatter/text_calendar.cpp @@ -382,7 +382,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler static const char* const dcopObjectId = "KOrganizerIface"; TQCString dummy; if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) { - DCOPRef ref( dcopService, dcopService ); // talk to the KUniqueApplication or its kontact wrapper + DCOPRef ref( dcopService, dcopService ); // talk to the TDEUniqueApplication or its kontact wrapper if ( switchTo ) { ref.call( "newInstance()" ); // activate korganizer window }