diff options
| -rw-r--r-- | dcoprss/main.cpp | 8 | ||||
| -rw-r--r-- | kdict/application.cpp | 4 | ||||
| -rw-r--r-- | kdict/application.h | 4 | ||||
| -rw-r--r-- | kdict/main.cpp | 2 | ||||
| -rw-r--r-- | kget/main.cpp | 6 | ||||
| -rw-r--r-- | kopete/kopete/kopeteapplication.cpp | 10 | ||||
| -rw-r--r-- | kopete/kopete/kopeteapplication.h | 4 | ||||
| -rw-r--r-- | kopete/kopete/main.cpp | 2 | ||||
| -rw-r--r-- | ksirc/ksirc.cpp | 8 |
9 files changed, 24 insertions, 24 deletions
diff --git a/dcoprss/main.cpp b/dcoprss/main.cpp index 88807acd..64a22bde 100644 --- a/dcoprss/main.cpp +++ b/dcoprss/main.cpp @@ -1,6 +1,6 @@ /* $Id$ */ -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kdebug.h> @@ -20,15 +20,15 @@ int main (int argc, char *argv[]) TDECmdLineArgs::init( argc, argv, &aboutdata ); // TDECmdLineArgs::addCmdLineOptions( options ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); - if (!KUniqueApplication::start()) + if (!TDEUniqueApplication::start()) { kdDebug() << "rssservice is already running!" << endl; return (0); } - KUniqueApplication app; + TDEUniqueApplication app; kdDebug() << "starting rssservice " << endl; // This app is started automatically, no need for session management app.disableSessionManagement(); diff --git a/kdict/application.cpp b/kdict/application.cpp index de0c294e..46a708e7 100644 --- a/kdict/application.cpp +++ b/kdict/application.cpp @@ -18,7 +18,7 @@ Application::Application() - : KUniqueApplication() + : TDEUniqueApplication() { m_mainWindow = new TopLevel( 0, "mainWindow" ); } @@ -33,7 +33,7 @@ Application::~Application() int Application::newInstance() { kdDebug(5004) << "Application::newInstance()" << endl; - KUniqueApplication::newInstance(); + TDEUniqueApplication::newInstance(); // process parameters... TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/kdict/application.h b/kdict/application.h index dc59e260..fc34ef02 100644 --- a/kdict/application.h +++ b/kdict/application.h @@ -12,14 +12,14 @@ #ifndef APPLICATION_H #define APPLICATION_H -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <tqguardedptr.h> #define KDICT_VERSION "0.6" class TopLevel; -class Application : public KUniqueApplication +class Application : public TDEUniqueApplication { TQ_OBJECT diff --git a/kdict/main.cpp b/kdict/main.cpp index db7a6a18..c45507b4 100644 --- a/kdict/main.cpp +++ b/kdict/main.cpp @@ -45,7 +45,7 @@ extern "C" TDE_EXPORT int kdemain(int argc, char* argv[]) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( knoptions ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); if (!Application::start()) return 0; diff --git a/kget/main.cpp b/kget/main.cpp index 00d3e4db..7b59407f 100644 --- a/kget/main.cpp +++ b/kget/main.cpp @@ -29,7 +29,7 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kurl.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <tdestartupinfo.h> #include <signal.h> @@ -97,13 +97,13 @@ static void cleanup(void) } -class KGetApp : public KUniqueApplication +class KGetApp : public TDEUniqueApplication { private: TDEMainWidget *tdemainwidget; public: - KGetApp() : KUniqueApplication() + KGetApp() : TDEUniqueApplication() { #ifdef _DEBUG sDebugIn << endl; diff --git a/kopete/kopete/kopeteapplication.cpp b/kopete/kopete/kopeteapplication.cpp index 263ed973..342b03f5 100644 --- a/kopete/kopete/kopeteapplication.cpp +++ b/kopete/kopete/kopeteapplication.cpp @@ -52,7 +52,7 @@ #endif KopeteApplication::KopeteApplication() -: KUniqueApplication( true, true, true ) +: TDEUniqueApplication( true, true, true ) { m_isShuttingDown = false; m_mainWindow = new KopeteWindow( 0, "mainWindow" ); @@ -274,18 +274,18 @@ int KopeteApplication::newInstance() * The following three lines work around a problem that * Kopete has since it has multiple main windows so * qapp->mainWidget() returns 0, which breaks the normal - * KUniqueApplication::newInstance() behavior that raises + * TDEUniqueApplication::newInstance() behavior that raises * the window when we run a new instance. * * 1. Set the main widget to the contact list window - * 2. Call KUniqueApplication::newInstance() + * 2. Call TDEUniqueApplication::newInstance() * 3. Set the main widget back to 0 * * This little workaround fixes the problem. -Matt */ setMainWidget( m_mainWindow ); - int kUnitqAppReturnCode = KUniqueApplication::newInstance(); + int kUnitqAppReturnCode = TDEUniqueApplication::newInstance(); setMainWidget( 0L ); return kUnitqAppReturnCode; @@ -331,7 +331,7 @@ void KopeteApplication::quitKopete() void KopeteApplication::commitData( TQSessionManager &sm ) { m_isShuttingDown = true; - KUniqueApplication::commitData( sm ); + TDEUniqueApplication::commitData( sm ); } #include "kopeteapplication.moc" diff --git a/kopete/kopete/kopeteapplication.h b/kopete/kopete/kopeteapplication.h index 8490684e..ed363ed9 100644 --- a/kopete/kopete/kopeteapplication.h +++ b/kopete/kopete/kopeteapplication.h @@ -26,7 +26,7 @@ #include <tqguardedptr.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> class KopeteWindow; class TQSessionManager; @@ -40,7 +40,7 @@ namespace Kopete /** * @author Duncan Mac-Vicar P. <duncan@kde.org> */ -class KopeteApplication : public KUniqueApplication +class KopeteApplication : public TDEUniqueApplication { TQ_OBJECT diff --git a/kopete/kopete/main.cpp b/kopete/kopete/main.cpp index 04656f8f..68218d78 100644 --- a/kopete/kopete/main.cpp +++ b/kopete/kopete/main.cpp @@ -98,7 +98,7 @@ int main( int argc, char *argv[] ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); KopeteApplication kopete; new KIMIfaceImpl(); diff --git a/ksirc/ksirc.cpp b/ksirc/ksirc.cpp index fb82e61a..a8b604a9 100644 --- a/ksirc/ksirc.cpp +++ b/ksirc/ksirc.cpp @@ -17,7 +17,7 @@ #include <tqsessionmanager.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <tdelocale.h> @@ -80,14 +80,14 @@ extern "C" TDE_EXPORT int kdemain( int argc, char ** argv ) aboutData.addAuthor("Alyssa Mejawohld", I18N_NOOP("Icons Author"), "amejawohld@bellsouth.net"); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); - if (!KUniqueApplication::start()) { + if (!TDEUniqueApplication::start()) { exit(0); } // Start the KDE application - KUniqueApplication app; + TDEUniqueApplication app; KSircSessionManaged sm; |