summaryrefslogtreecommitdiffstats
path: root/tdecore/tdeapplication.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tdecore/tdeapplication.cpp')
-rw-r--r--tdecore/tdeapplication.cpp68
1 files changed, 34 insertions, 34 deletions
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index 7d18d3ba9..2cdc4b3a4 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -1,4 +1,4 @@
-/* This file is part of the KDE libraries
+/* This file is part of the TDE libraries
Copyright (C) 1997 Matthias Kalle Dalheimer ([email protected])
Copyright (C) 1998, 1999, 2000 KDE Team
@@ -192,9 +192,9 @@ TDE_EXPORT bool kde_have_kipc = true; // magic hook to disable kipc in tdm
bool kde_kiosk_exception = false; // flag to disable kiosk restrictions
bool kde_kiosk_admin = false;
-TDEApplication* TDEApplication::KApp = 0L;
+TDEApplication* TDEApplication::TDEApp = nullptr;
bool TDEApplication::loadedByKdeinit = false;
-DCOPClient *TDEApplication::s_DCOPClient = 0L;
+DCOPClient *TDEApplication::s_DCOPClient = nullptr;
bool TDEApplication::s_dcopClientNeedsPostInit = false;
#ifdef TQ_WS_X11
@@ -225,12 +225,12 @@ template class TQPtrList<KSessionManaged>;
extern "C" {
static int kde_xio_errhandler( Display * dpy )
{
- return kapp->xioErrhandler( dpy );
+ return tdeApp->xioErrhandler( dpy );
}
static int kde_x_errhandler( Display *dpy, XErrorEvent *err )
{
- return kapp->xErrhandler( dpy, err );
+ return tdeApp->xErrhandler( dpy, err );
}
}
@@ -238,8 +238,8 @@ static int kde_x_errhandler( Display *dpy, XErrorEvent *err )
extern "C" {
static void kde_ice_ioerrorhandler( IceConn conn )
{
- if(kapp)
- kapp->iceIOErrorHandler( conn );
+ if(tdeApp)
+ tdeApp->iceIOErrorHandler( conn );
// else ignore the error for now
}
}
@@ -925,7 +925,7 @@ TDEApplication::TDEApplication(Display *display, int& argc, char** argv, const T
int TDEApplication::xioErrhandler( Display* dpy )
{
- if(kapp)
+ if(tdeApp)
{
emit shutDown();
#ifdef TQ_WS_X11
@@ -942,7 +942,7 @@ int TDEApplication::xErrhandler( Display* dpy, void* err_ )
{ // no idea how to make forward decl. for XErrorEvent
#ifdef TQ_WS_X11
XErrorEvent* err = static_cast< XErrorEvent* >( err_ );
- if(kapp)
+ if(tdeApp)
{
// add KDE specific stuff here
d->oldXErrorHandler( dpy, err );
@@ -997,7 +997,7 @@ void TDEApplication::init(bool GUIenabled)
TQApplication::setDesktopSettingsAware( false );
- KApp = this;
+ TDEApp = this;
#ifdef TQ_WS_X11 //FIXME(E)
@@ -1195,11 +1195,11 @@ DCOPClient *TDEApplication::dcopClient()
{
s_DCOPClient->setServerAddress( args->getOption("dcopserver"));
}
- if( kapp ) {
+ if( tdeApp ) {
connect(s_DCOPClient, TQ_SIGNAL(attachFailed(const TQString &)),
- kapp, TQ_SLOT(dcopFailure(const TQString &)));
+ tdeApp, TQ_SLOT(dcopFailure(const TQString &)));
connect(s_DCOPClient, TQ_SIGNAL(blockUserInput(bool) ),
- kapp, TQ_SLOT(dcopBlockUserInput(bool)) );
+ tdeApp, TQ_SLOT(dcopBlockUserInput(bool)) );
}
else
s_dcopClientNeedsPostInit = true;
@@ -1583,10 +1583,10 @@ void TDEApplication::startKdeinit()
srv = TDEStandardDirs::findExe(TQString::fromLatin1("tdeinit"), TDEGlobal::dirs()->kfsstnd_defaultbindir());
if (srv.isEmpty())
return;
- if (kapp && (Tty != kapp->type()))
+ if (tdeApp && (Tty != tdeApp->type()))
setOverrideCursor( TQt::waitCursor );
my_system(TQFile::encodeName(srv)+" --suicide"+" --new-startup");
- if (kapp && (Tty != kapp->type()))
+ if (tdeApp && (Tty != tdeApp->type()))
restoreOverrideCursor();
#endif
}
@@ -1613,12 +1613,12 @@ void TDEApplication::dcopFailure(const TQString &msg)
msgStr += msg;
msgStr += i18n("\n\nPlease check that the \"dcopserver\" program is running!");
- if (Tty != kapp->type())
+ if (Tty != tdeApp->type())
{
TQMessageBox::critical
(
- kapp->mainWidget(),
- i18n("DCOP communications error (%1)").arg(kapp->caption()),
+ tdeApp->mainWidget(),
+ i18n("DCOP communications error (%1)").arg(tdeApp->caption()),
msgStr,
i18n("&OK")
);
@@ -1870,7 +1870,7 @@ TDEApplication::~TDEApplication()
// close down IPC
delete s_DCOPClient;
- s_DCOPClient = 0L;
+ s_DCOPClient = nullptr;
TDEProcessController::deref();
@@ -1884,7 +1884,7 @@ TDEApplication::~TDEApplication()
#endif
delete d;
- KApp = 0;
+ TDEApp = nullptr;
#ifdef TQ_WS_X11
mySmcConnection = 0;
@@ -2678,8 +2678,8 @@ void TDEApplication::invokeHelp( const TQString& anchor,
{
if (startServiceByDesktopName("khelpcenter", url, &error, 0, 0, startup_id, false))
{
- if (Tty != kapp->type())
- TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Help Center"),
+ if (Tty != tdeApp->type())
+ TQMessageBox::critical(tdeApp->mainWidget(), i18n("Could not Launch Help Center"),
i18n("Could not launch the TDE Help Center:\n\n%1").arg(error), i18n("&OK"));
else
kdWarning() << "Could not launch help:\n" << error << endl;
@@ -2713,8 +2713,8 @@ void TDEApplication::invokeHTMLHelp( const TQString& _filename, const TQString&
{
if (startServiceByDesktopName("khelpcenter", url, &error, 0, 0, "", false))
{
- if (Tty != kapp->type())
- TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Help Center"),
+ if (Tty != tdeApp->type())
+ TQMessageBox::critical(tdeApp->mainWidget(), i18n("Could not Launch Help Center"),
i18n("Could not launch the TDE Help Center:\n\n%1").arg(error), i18n("&OK"));
else
kdWarning() << "Could not launch help:\n" << error << endl;
@@ -2984,8 +2984,8 @@ void TDEApplication::invokeMailer(const TQString &_to, const TQString &_cc, cons
// TODO this should check if cmd has a .desktop file, and use data from it, together
// with sending more ASN data
if (tdeinitExec(cmd, cmdTokens, &error, NULL, startup_id )) {
- if (Tty != kapp->type()) {
- TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Mail Client"),
+ if (Tty != tdeApp->type()) {
+ TQMessageBox::critical(tdeApp->mainWidget(), i18n("Could not Launch Mail Client"),
i18n("Could not launch the mail client:\n\n%1").arg(error), i18n("&OK"));
}
else {
@@ -3009,8 +3009,8 @@ void TDEApplication::invokeBrowser( const TQString &url, const TQCString& startu
if (startServiceByDesktopName("kfmclient", url, &error, 0, 0, startup_id, false))
{
- if (Tty != kapp->type())
- TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Browser"),
+ if (Tty != tdeApp->type())
+ TQMessageBox::critical(tdeApp->mainWidget(), i18n("Could not Launch Browser"),
i18n("Could not launch the browser:\n\n%1").arg(error), i18n("&OK"));
else
kdWarning() << "Could not launch browser:\n" << error << endl;
@@ -3070,8 +3070,8 @@ startServiceInternal( const TQCString &function,
// Register app as able to send DCOP messages
DCOPClient *dcopClient;
- if (kapp)
- dcopClient = kapp->dcopClient();
+ if (tdeApp)
+ dcopClient = tdeApp->dcopClient();
else
dcopClient = new DCOPClient;
@@ -3081,7 +3081,7 @@ startServiceInternal( const TQCString &function,
{
if (error)
*error = i18n("Could not register with DCOP.\n");
- if (!kapp)
+ if (!tdeApp)
delete dcopClient;
return -1;
@@ -3116,11 +3116,11 @@ startServiceInternal( const TQCString &function,
{
if (error)
*error = i18n("TDELauncher could not be reached via DCOP.\n");
- if (!kapp)
+ if (!tdeApp)
delete dcopClient;
return -1;
}
- if (!kapp)
+ if (!tdeApp)
delete dcopClient;
if (noWait)
@@ -3720,7 +3720,7 @@ void TDEApplication::sigpipeHandler(int)
bool TDEApplication::guiEnabled()
{
- return kapp && kapp->d->guiEnabled;
+ return tdeApp && tdeApp->d->guiEnabled;
}
void TDEApplication::virtual_hook( int id, void* data )
generated by cgit v1.2.1 (git 2.18.0) at 2025-02-19 01:22:25 +0000