Rename KUniqueApplication to TDEUniqueApplication

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
master
Michele Calgaro 2 weeks ago
parent 75436bb8cf
commit 4b808f07f0
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -1,6 +1,6 @@
/* $Id$ */ /* $Id$ */
#include <kuniqueapplication.h> #include <tdeuniqueapplication.h>
#include <tdeaboutdata.h> #include <tdeaboutdata.h>
#include <tdecmdlineargs.h> #include <tdecmdlineargs.h>
#include <kdebug.h> #include <kdebug.h>
@ -20,15 +20,15 @@ int main (int argc, char *argv[])
TDECmdLineArgs::init( argc, argv, &aboutdata ); TDECmdLineArgs::init( argc, argv, &aboutdata );
// TDECmdLineArgs::addCmdLineOptions( options ); // TDECmdLineArgs::addCmdLineOptions( options );
KUniqueApplication::addCmdLineOptions(); TDEUniqueApplication::addCmdLineOptions();
if (!KUniqueApplication::start()) if (!TDEUniqueApplication::start())
{ {
kdDebug() << "rssservice is already running!" << endl; kdDebug() << "rssservice is already running!" << endl;
return (0); return (0);
} }
KUniqueApplication app; TDEUniqueApplication app;
kdDebug() << "starting rssservice " << endl; kdDebug() << "starting rssservice " << endl;
// This app is started automatically, no need for session management // This app is started automatically, no need for session management
app.disableSessionManagement(); app.disableSessionManagement();

@ -18,7 +18,7 @@
Application::Application() Application::Application()
: KUniqueApplication() : TDEUniqueApplication()
{ {
m_mainWindow = new TopLevel( 0, "mainWindow" ); m_mainWindow = new TopLevel( 0, "mainWindow" );
} }
@ -33,7 +33,7 @@ Application::~Application()
int Application::newInstance() int Application::newInstance()
{ {
kdDebug(5004) << "Application::newInstance()" << endl; kdDebug(5004) << "Application::newInstance()" << endl;
KUniqueApplication::newInstance(); TDEUniqueApplication::newInstance();
// process parameters... // process parameters...
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

@ -12,14 +12,14 @@
#ifndef APPLICATION_H #ifndef APPLICATION_H
#define APPLICATION_H #define APPLICATION_H
#include <kuniqueapplication.h> #include <tdeuniqueapplication.h>
#include <tqguardedptr.h> #include <tqguardedptr.h>
#define KDICT_VERSION "0.6" #define KDICT_VERSION "0.6"
class TopLevel; class TopLevel;
class Application : public KUniqueApplication class Application : public TDEUniqueApplication
{ {
TQ_OBJECT TQ_OBJECT

@ -45,7 +45,7 @@ extern "C" TDE_EXPORT int kdemain(int argc, char* argv[])
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( knoptions ); TDECmdLineArgs::addCmdLineOptions( knoptions );
KUniqueApplication::addCmdLineOptions(); TDEUniqueApplication::addCmdLineOptions();
if (!Application::start()) if (!Application::start())
return 0; return 0;

@ -29,7 +29,7 @@
#include <tdeaboutdata.h> #include <tdeaboutdata.h>
#include <tdecmdlineargs.h> #include <tdecmdlineargs.h>
#include <kurl.h> #include <kurl.h>
#include <kuniqueapplication.h> #include <tdeuniqueapplication.h>
#include <tdestartupinfo.h> #include <tdestartupinfo.h>
#include <signal.h> #include <signal.h>
@ -97,13 +97,13 @@ static void cleanup(void)
} }
class KGetApp : public KUniqueApplication class KGetApp : public TDEUniqueApplication
{ {
private: private:
TDEMainWidget *tdemainwidget; TDEMainWidget *tdemainwidget;
public: public:
KGetApp() : KUniqueApplication() KGetApp() : TDEUniqueApplication()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;

@ -52,7 +52,7 @@
#endif #endif
KopeteApplication::KopeteApplication() KopeteApplication::KopeteApplication()
: KUniqueApplication( true, true, true ) : TDEUniqueApplication( true, true, true )
{ {
m_isShuttingDown = false; m_isShuttingDown = false;
m_mainWindow = new KopeteWindow( 0, "mainWindow" ); m_mainWindow = new KopeteWindow( 0, "mainWindow" );
@ -274,18 +274,18 @@ int KopeteApplication::newInstance()
* The following three lines work around a problem that * The following three lines work around a problem that
* Kopete has since it has multiple main windows so * Kopete has since it has multiple main windows so
* qapp->mainWidget() returns 0, which breaks the normal * 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. * the window when we run a new instance.
* *
* 1. Set the main widget to the contact list window * 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 * 3. Set the main widget back to 0
* *
* This little workaround fixes the problem. -Matt * This little workaround fixes the problem. -Matt
*/ */
setMainWidget( m_mainWindow ); setMainWidget( m_mainWindow );
int kUnitqAppReturnCode = KUniqueApplication::newInstance(); int kUnitqAppReturnCode = TDEUniqueApplication::newInstance();
setMainWidget( 0L ); setMainWidget( 0L );
return kUnitqAppReturnCode; return kUnitqAppReturnCode;
@ -331,7 +331,7 @@ void KopeteApplication::quitKopete()
void KopeteApplication::commitData( TQSessionManager &sm ) void KopeteApplication::commitData( TQSessionManager &sm )
{ {
m_isShuttingDown = true; m_isShuttingDown = true;
KUniqueApplication::commitData( sm ); TDEUniqueApplication::commitData( sm );
} }
#include "kopeteapplication.moc" #include "kopeteapplication.moc"

@ -26,7 +26,7 @@
#include <tqguardedptr.h> #include <tqguardedptr.h>
#include <kuniqueapplication.h> #include <tdeuniqueapplication.h>
class KopeteWindow; class KopeteWindow;
class TQSessionManager; class TQSessionManager;
@ -40,7 +40,7 @@ namespace Kopete
/** /**
* @author Duncan Mac-Vicar P. <duncan@kde.org> * @author Duncan Mac-Vicar P. <duncan@kde.org>
*/ */
class KopeteApplication : public KUniqueApplication class KopeteApplication : public TDEUniqueApplication
{ {
TQ_OBJECT TQ_OBJECT

@ -98,7 +98,7 @@ int main( int argc, char *argv[] )
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KUniqueApplication::addCmdLineOptions(); TDEUniqueApplication::addCmdLineOptions();
KopeteApplication kopete; KopeteApplication kopete;
new KIMIfaceImpl(); new KIMIfaceImpl();

@ -17,7 +17,7 @@
#include <tqsessionmanager.h> #include <tqsessionmanager.h>
#include <kuniqueapplication.h> #include <tdeuniqueapplication.h>
#include <tdeaboutdata.h> #include <tdeaboutdata.h>
#include <tdecmdlineargs.h> #include <tdecmdlineargs.h>
#include <tdelocale.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"); aboutData.addAuthor("Alyssa Mejawohld", I18N_NOOP("Icons Author"), "amejawohld@bellsouth.net");
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KUniqueApplication::addCmdLineOptions(); TDEUniqueApplication::addCmdLineOptions();
if (!KUniqueApplication::start()) { if (!TDEUniqueApplication::start()) {
exit(0); exit(0);
} }
// Start the KDE application // Start the KDE application
KUniqueApplication app; TDEUniqueApplication app;
KSircSessionManaged sm; KSircSessionManaged sm;

Loading…
Cancel
Save