Rename KUniqueApplication to TDEUniqueApplication

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
master
Michele Calgaro 2 weeks ago
parent 79908b3926
commit 74926683f1
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -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("<qt>%1 already seems to be running on another display on "
"this machine. <b>Running %2 more than once is not supported "

@ -28,7 +28,7 @@
#include <tdecmdlineargs.h>
#include <tdelocale.h>
#include <knotifyclient.h>
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#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;

@ -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 ) );

@ -37,7 +37,7 @@
#include "aboutdata.h"
#include "kwatchgnupgmainwin.h"
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#include <tdecmdlineargs.h>
#include <tdemessagebox.h>
#include <tdelocale.h>
@ -45,7 +45,7 @@
#include <kiconloader.h>
#include <kdebug.h>
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 )

@ -33,14 +33,14 @@
#include <kdebug.h>
#include <tdelocale.h>
#include <tdestartupinfo.h>
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#include <twin.h>
#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;

@ -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())

@ -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)
{

@ -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
}

@ -27,7 +27,7 @@
class TQTimer;
class TQDateTime;
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#include <kurl.h>
class TDEProcess;
namespace KCal { class Event; }
@ -45,7 +45,7 @@ class TrayWindow;
class ShellProcess;
class KAlarmApp : public KUniqueApplication
class KAlarmApp : public TDEUniqueApplication
{
TQ_OBJECT

@ -30,7 +30,7 @@
AlarmDaemonApp::AlarmDaemonApp()
: KUniqueApplication(false, false),
: TDEUniqueApplication(false, false),
mAd(0)
{
disableSessionManagement();

@ -23,12 +23,12 @@
#ifndef ADAPP_H
#define ADAPP_H
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
class AlarmDaemon;
class AlarmDaemonApp : public KUniqueApplication
class AlarmDaemonApp : public TDEUniqueApplication
{
TQ_OBJECT

@ -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())

@ -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())
{

@ -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 "

@ -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;

@ -19,7 +19,7 @@
*/
#include <config.h>
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#include <tdeglobal.h>
#include <knotifyclient.h>
#include <dcopclient.h>
@ -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".

@ -18,7 +18,7 @@
*/
#include "kmobile.h"
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#include <dcopclient.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
@ -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);

@ -75,7 +75,7 @@ int KNApplication::newInstance()
}
// Handle window activation and startup notification
KUniqueApplication::newInstance();
TDEUniqueApplication::newInstance();
// process URLs...
KNMainWidget *w = static_cast<KNMainWindow*>(mainWidget())->mainWidget();

@ -17,14 +17,14 @@
#ifndef KNAPPLICATION_H
#define KNAPPLICATION_H
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
class KNApplication : public KUniqueApplication
class KNApplication : public TDEUniqueApplication
{
TQ_OBJECT
public:
KNApplication(): KUniqueApplication() { };
KNApplication(): TDEUniqueApplication() { };
/** Create new instance of KNode. Make the existing

@ -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;

@ -18,7 +18,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*******************************************************************/
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
#include <tdelocale.h>
@ -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() ) );

@ -21,12 +21,12 @@
#ifndef MAIN_H
#define MAIN_H
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
class KNotesApp;
class Application : public KUniqueApplication
class Application : public TDEUniqueApplication
{
public:
Application();

@ -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();
}

@ -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() );

@ -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 )

@ -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 ) );

@ -25,9 +25,9 @@
#ifndef KORGANIZERAPP_H
#define KORGANIZERAPP_H
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
class KOrganizerApp : public KUniqueApplication
class KOrganizerApp : public TDEUniqueApplication
{
TQ_OBJECT

@ -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(

@ -29,11 +29,11 @@
#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#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 );

@ -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;

@ -5,7 +5,7 @@
#ifndef SSK_KORNAPP_H
#define SSK_KORNAPP_H
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
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

@ -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;
}

@ -25,7 +25,7 @@
#include <tdecmdlineargs.h>
#include <kiconloader.h>
#include <tdelocale.h>
#include <kuniqueapplication.h>
#include <tdeuniqueapplication.h>
#include <tqlabel.h>
@ -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() )

@ -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
}

Loading…
Cancel
Save