diff options
Diffstat (limited to 'tdecore')
37 files changed, 146 insertions, 146 deletions
diff --git a/tdecore/kapplication_win.cpp b/tdecore/kapplication_win.cpp index 475dc070f..2e9a8a0ba 100644 --- a/tdecore/kapplication_win.cpp +++ b/tdecore/kapplication_win.cpp @@ -46,12 +46,12 @@ void TDEApplication_init_windows(bool /*GUIenabled*/) + "/LC_MESSAGES/qt_" + TDEGlobal::locale()->language() + ".qm" ); QTranslator *qt_transl = new QTranslator(); if (qt_transl->load( qt_transl_file, "")) - kapp->installTranslator( qt_transl ); + tdeApp->installTranslator( qt_transl ); else delete qt_transl; } -//unsafe; create kapplication_p.h instead! +//unsafe; create tdeapplication_p.h instead! typedef void* IceIOErrorHandler; class TDEApplicationPrivate diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp index 3aa6b9fa7..369f88c3d 100644 --- a/tdecore/kclipboard.cpp +++ b/tdecore/kclipboard.cpp @@ -97,7 +97,7 @@ bool TDEClipboardSynchronizer::s_blocked = false; TDEClipboardSynchronizer * TDEClipboardSynchronizer::self() { if ( !s_self ) - s_self = new TDEClipboardSynchronizer( kapp, "KDE Clipboard" ); + s_self = new TDEClipboardSynchronizer( tdeApp, "KDE Clipboard" ); return s_self; } diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp index 22843da4e..368aaef5d 100644 --- a/tdecore/kdebug.cpp +++ b/tdecore/kdebug.cpp @@ -289,7 +289,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char // If the application doesn't have a TQApplication object it can't use // a messagebox, as well as in case of GUI is disabled. - if ( nOutput == 1 && ( !kapp || !kapp->guiEnabled()) ) { + if ( nOutput == 1 && ( !tdeApp || !tdeApp->guiEnabled()) ) { nOutput = 2; } else if ( nOutput == 4 && nLevel != KDEBUG_FATAL ) { return; diff --git a/tdecore/kdesktopfile.cpp b/tdecore/kdesktopfile.cpp index fa1626701..3e262be3a 100644 --- a/tdecore/kdesktopfile.cpp +++ b/tdecore/kdesktopfile.cpp @@ -124,7 +124,7 @@ bool KDesktopFile::isDesktopFile(const TQString& path) bool KDesktopFile::isAuthorizedDesktopFile(const TQString& path) { - if (!kapp || kapp->authorize("run_desktop_files")) + if (!tdeApp || tdeApp->authorize("run_desktop_files")) return true; if (path.isEmpty()) @@ -300,13 +300,13 @@ bool KDesktopFile::tryExec() const } } TQStringList list = readListEntry("X-TDE-AuthorizeAction"); - if (kapp && !list.isEmpty()) + if (tdeApp && !list.isEmpty()) { for(TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { - if (!kapp->authorize((*it).stripWhiteSpace())) + if (!tdeApp->authorize((*it).stripWhiteSpace())) return false; } } @@ -320,7 +320,7 @@ bool KDesktopFile::tryExec() const user = ::getenv("ADMIN_ACCOUNT"); if (user.isEmpty()) user = "root"; - if (!kapp->authorize("user/"+user)) + if (!tdeApp->authorize("user/"+user)) return false; } else { @@ -333,7 +333,7 @@ bool KDesktopFile::tryExec() const user = ::getenv("ADMIN_ACCOUNT"); if (user.isEmpty()) user = "root"; - if (!kapp->authorize("user/"+user)) + if (!tdeApp->authorize("user/"+user)) return false; } } diff --git a/tdecore/kglobalaccel_win.cpp b/tdecore/kglobalaccel_win.cpp index 7b49ecfe4..a222d0242 100644 --- a/tdecore/kglobalaccel_win.cpp +++ b/tdecore/kglobalaccel_win.cpp @@ -48,7 +48,7 @@ TDEGlobalAccelPrivate::TDEGlobalAccelPrivate() all_accels = new TQValueList< TDEGlobalAccelPrivate* >; all_accels->append( this ); m_sConfigGroup = "Global Shortcuts"; -// kapp->installX11EventFilter( this ); +// tdeApp->installX11EventFilter( this ); } TDEGlobalAccelPrivate::~TDEGlobalAccelPrivate() diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/kglobalaccel_x11.cpp index 91cc94b74..a518c58c8 100644 --- a/tdecore/kglobalaccel_x11.cpp +++ b/tdecore/kglobalaccel_x11.cpp @@ -89,8 +89,8 @@ TDEGlobalAccelPrivate::TDEGlobalAccelPrivate() all_accels = new TQValueList< TDEGlobalAccelPrivate* >; all_accels->append( this ); m_sConfigGroup = "Global Shortcuts"; - kapp->installX11EventFilter( this ); - connect(kapp, TQ_SIGNAL(coreFakeKeyPress(unsigned int)), this, TQ_SLOT(fakeKeyPressed(unsigned int))); + tdeApp->installX11EventFilter( this ); + connect(tdeApp, TQ_SIGNAL(coreFakeKeyPress(unsigned int)), this, TQ_SLOT(fakeKeyPressed(unsigned int))); } TDEGlobalAccelPrivate::~TDEGlobalAccelPrivate() diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp index f6e267a86..db98fbffd 100644 --- a/tdecore/kiconloader.cpp +++ b/tdecore/kiconloader.cpp @@ -155,9 +155,9 @@ TDEIconLoader::TDEIconLoader(const TQString& _appname, TDEStandardDirs *_dirs) d->imgDict.setAutoDelete(true); d->links.setAutoDelete(true); - if (kapp) { - kapp->addKipcEventMask(KIPC::IconChanged); - TQObject::connect(kapp, TQ_SIGNAL(updateIconLoaders()), d, TQ_SLOT(reconfigure())); + if (tdeApp) { + tdeApp->addKipcEventMask(KIPC::IconChanged); + TQObject::connect(tdeApp, TQ_SIGNAL(updateIconLoaders()), d, TQ_SLOT(reconfigure())); } init( _appname, _dirs ); diff --git a/tdecore/klibloader.cpp b/tdecore/klibloader.cpp index 68dc72668..2d33aa80b 100644 --- a/tdecore/klibloader.cpp +++ b/tdecore/klibloader.cpp @@ -551,17 +551,17 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap) We need to make sure to clear the clipboard before unloading a DSO because the DSO could have defined an object derived from QMimeSource and placed that on the clipboard. */ - /*kapp->clipboard()->clear();*/ + /*tdeApp->clipboard()->clear();*/ /* Well.. let's do something more subtle... convert the clipboard context to text. That should be safe as it only uses objects defined by Qt. */ - if( kapp->clipboard()->ownsSelection()) { - kapp->clipboard()->setText( - kapp->clipboard()->text( TQClipboard::Selection ), TQClipboard::Selection ); + if( tdeApp->clipboard()->ownsSelection()) { + tdeApp->clipboard()->setText( + tdeApp->clipboard()->text( TQClipboard::Selection ), TQClipboard::Selection ); } - if( kapp->clipboard()->ownsClipboard()) { - kapp->clipboard()->setText( - kapp->clipboard()->text( TQClipboard::Clipboard ), TQClipboard::Clipboard ); + if( tdeApp->clipboard()->ownsClipboard()) { + tdeApp->clipboard()->setText( + tdeApp->clipboard()->text( TQClipboard::Clipboard ), TQClipboard::Clipboard ); } } diff --git a/tdecore/kmanagerselection.cpp b/tdecore/kmanagerselection.cpp index bfae6406a..8dc2f3f48 100644 --- a/tdecore/kmanagerselection.cpp +++ b/tdecore/kmanagerselection.cpp @@ -65,7 +65,7 @@ class TDESelectionOwnerPrivate TDESelectionOwnerPrivate::TDESelectionOwnerPrivate( TDESelectionOwner* owner_P ) : owner( owner_P ) { - kapp->installX11EventFilter( this ); + tdeApp->installX11EventFilter( this ); } bool TDESelectionOwnerPrivate::x11Event( XEvent* ev_P ) @@ -380,7 +380,7 @@ class TDESelectionWatcherPrivate TDESelectionWatcherPrivate::TDESelectionWatcherPrivate( TDESelectionWatcher* watcher_P ) : watcher( watcher_P ) { - kapp->installX11EventFilter( this ); + tdeApp->installX11EventFilter( this ); } bool TDESelectionWatcherPrivate::x11Event( XEvent* ev_P ) diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp index 1eb4b42fb..eaac81754 100644 --- a/tdecore/knotifyclient.cpp +++ b/tdecore/knotifyclient.cpp @@ -74,14 +74,14 @@ static int sendNotifyEvent(const TQString &message, const TQString &text, int present, int level, const TQString &sound, const TQString &file, int winId ) { - if (!kapp) return 0; + if (!tdeApp) return 0; // ensure tray icon is shown and positioned before sending event to notification daemon #ifdef TQ_WS_X11 XFlush(tqt_xdisplay()); #endif - DCOPClient *client=kapp->dcopClient(); + DCOPClient *client=tdeApp->dcopClient(); if (!client->isAttached()) { client->attach(); @@ -94,7 +94,7 @@ static int sendNotifyEvent(const TQString &message, const TQString &text, if( canAvoidStartupEvent( message, appname, present )) return -1; // done "successfully" - there will be no event presentation - int uniqueId = kMax( 1, kapp->random() ); // must not be 0 -- means failure! + int uniqueId = kMax( 1, tdeApp->random() ); // must not be 0 -- means failure! // knotify daemon needs toplevel window TQWidget* widget = TQWidget::find( (WId)winId ); @@ -238,7 +238,7 @@ TQString KNotifyClient::getDefaultFile(const TQString &eventname, int present) bool KNotifyClient::startDaemon() { static bool firstTry = true; - if (!kapp->dcopClient()->isApplicationRegistered(daemonName)) { + if (!tdeApp->dcopClient()->isApplicationRegistered(daemonName)) { if( firstTry ) { firstTry = false; return TDEApplication::startServiceByDesktopName(daemonName) == 0; @@ -251,12 +251,12 @@ bool KNotifyClient::startDaemon() void KNotifyClient::beep(const TQString& reason) { - if ( !kapp || KNotifyClient::Instance::currentInstance()->useSystemBell() ) { + if ( !tdeApp || KNotifyClient::Instance::currentInstance()->useSystemBell() ) { TQApplication::beep(); return; } - DCOPClient *client=kapp->dcopClient(); + DCOPClient *client=tdeApp->dcopClient(); if (!client->isAttached()) { client->attach(); @@ -307,7 +307,7 @@ public: { if (m_instances.isEmpty()) { - m_defaultInstance = new Instance(kapp); + m_defaultInstance = new Instance(tdeApp); } return m_instances.top(); } @@ -360,7 +360,7 @@ bool KNotifyClient::Instance::useSystemBell() const // static methods // We always return a valid KNotifyClient::Instance here. If no special one -// is available, we have a default-instance with kapp as TDEInstance. +// is available, we have a default-instance with tdeApp as TDEInstance. // We make sure to always have that default-instance in the stack, because // the stack might have gotten cleared in the destructor. // We can't use QPtrStack::setAutoDelete( true ), because no instance besides diff --git a/tdecore/knotifyclient.h b/tdecore/knotifyclient.h index 723c4bb45..d9afbf8f4 100644 --- a/tdecore/knotifyclient.h +++ b/tdecore/knotifyclient.h @@ -217,7 +217,7 @@ namespace KNotifyClient * placed appropriately. * * Call it by KNotifyClient::event(widget->winId(), "EventName"); - * It will use TDEApplication::kApplication->dcopClient() to communicate to + * It will use TDEApplication::tdeApplication->dcopClient() to communicate to * the server * @param winId The winId() of the widget where the event originates * @param message The name of the event diff --git a/tdecore/krandomsequence.h b/tdecore/krandomsequence.h index 256d03f17..50c413c47 100644 --- a/tdecore/krandomsequence.h +++ b/tdecore/krandomsequence.h @@ -46,7 +46,7 @@ public: * reproduced by starting the sequence with the same seed. * * If you need a single value which needs to be unpredictable, - * you need to use kapp->random() instead. + * you need to use tdeApp->random() instead. * * @param lngSeed Seed to initialize the sequence with. * If lngSeed is 0, the sequence is initialized with a value from diff --git a/tdecore/ksocks.cpp b/tdecore/ksocks.cpp index 6fac3179e..835cfd618 100644 --- a/tdecore/ksocks.cpp +++ b/tdecore/ksocks.cpp @@ -212,8 +212,8 @@ void KSocks::disable() KSocks *KSocks::self() { // Note that we don't use a static deleter here. It makes no sense and tends to cause crashes. if (!_me) { - if (kapp) { - TDEConfigGroup cfg(kapp->config(), "Socks"); + if (tdeApp) { + TDEConfigGroup cfg(tdeApp->config(), "Socks"); _me = new KSocks(&cfg); } else { _disabled = true; diff --git a/tdecore/kxmessages.cpp b/tdecore/kxmessages.cpp index b5f18ab04..37c15bcf9 100644 --- a/tdecore/kxmessages.cpp +++ b/tdecore/kxmessages.cpp @@ -42,8 +42,8 @@ KXMessages::KXMessages( const char* accept_broadcast_P, TQWidget* parent_P ) { if( accept_broadcast_P != NULL ) { - ( void ) kapp->desktop(); //trigger desktop widget creation to select root window events - kapp->installX11EventFilter( this ); // i.e. PropertyChangeMask + ( void ) tdeApp->desktop(); //trigger desktop widget creation to select root window events + tdeApp->installX11EventFilter( this ); // i.e. PropertyChangeMask accept_atom1 = XInternAtom( tqt_xdisplay(), accept_broadcast_P, false ); accept_atom2 = accept_atom1; } @@ -59,8 +59,8 @@ KXMessages::KXMessages( const char* accept_broadcast_P, TQWidget* parent_P, bool { if( accept_broadcast_P != NULL ) { - ( void ) kapp->desktop(); //trigger desktop widget creation to select root window events - kapp->installX11EventFilter( this ); // i.e. PropertyChangeMask + ( void ) tdeApp->desktop(); //trigger desktop widget creation to select root window events + tdeApp->installX11EventFilter( this ); // i.e. PropertyChangeMask accept_atom2 = XInternAtom( tqt_xdisplay(), accept_broadcast_P, false ); accept_atom1 = obsolete_P ? accept_atom2 : XInternAtom( tqt_xdisplay(), TQCString( accept_broadcast_P ) + "_BEGIN", false ); diff --git a/tdecore/network/ksockssocketdevice.cpp b/tdecore/network/ksockssocketdevice.cpp index c4ac6b4dc..f4388251f 100644 --- a/tdecore/network/ksockssocketdevice.cpp +++ b/tdecore/network/ksockssocketdevice.cpp @@ -467,7 +467,7 @@ void KSocksSocketDevice::initSocks() if (init) return; - if (kapp == 0L) + if (tdeApp == 0L) return; // no TDEApplication, so don't initialise // this should, however, test for TDEInstance diff --git a/tdecore/tdeaccel.cpp b/tdecore/tdeaccel.cpp index 5d098e4d4..5796bf060 100644 --- a/tdecore/tdeaccel.cpp +++ b/tdecore/tdeaccel.cpp @@ -110,8 +110,8 @@ TDEAccelEventHandler::TDEAccelEventHandler() : TQWidget( 0, "TDEAccelEventHandler" ) { # ifdef TQ_WS_X11 - if ( kapp ) - kapp->installX11EventFilter( this ); + if ( tdeApp ) + tdeApp->installX11EventFilter( this ); # endif } @@ -120,10 +120,10 @@ bool tqt_try_modal( TQWidget *, XEvent * ); bool TDEAccelEventHandler::x11Event( XEvent* pEvent ) { - if( TQWidget::keyboardGrabber() || !kapp->focusWidget() ) + if( TQWidget::keyboardGrabber() || !tdeApp->focusWidget() ) return false; - if ( !tqt_try_modal(kapp->focusWidget(), pEvent) ) + if ( !tqt_try_modal(tdeApp->focusWidget(), pEvent) ) return false; if( pEvent->type == XKeyPress ) { @@ -144,7 +144,7 @@ bool TDEAccelEventHandler::x11Event( XEvent* pEvent ) ke.ignore(); g_bAccelActivated = false; - kapp->sendEvent( kapp->focusWidget(), &ke ); + tdeApp->sendEvent( tdeApp->focusWidget(), &ke ); // If the Override event was accepted from a non-TDEAccel widget, // then kill the next AccelOverride in TDEApplication::notify. 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 (kalle@kde.org) 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 ) diff --git a/tdecore/tdeapplication.h b/tdecore/tdeapplication.h index 1922fa462..0383e757e 100644 --- a/tdecore/tdeapplication.h +++ b/tdecore/tdeapplication.h @@ -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 (kalle@kde.org) Copyright (c) 1998, 1999 KDE Team @@ -46,7 +46,7 @@ class KSessionManaged; class TDEStyle; class KURL; -#define kapp TDEApplication::kApplication() +#define tdeApp TDEApplication::tdeApplication() class TDEApplicationPrivate; @@ -54,7 +54,7 @@ class TDEApplicationPrivate; * Controls and provides information to all KDE applications. * * Only one object of this class can be instantiated in a single app. -* This instance is always accessible via the 'kapp' global variable. +* This instance is always accessible via the 'tdeApp' global variable. * See cut() for an example. * * This class provides the following services to all KDE applications. @@ -296,7 +296,7 @@ public: * to every function that may require it. * @return the current application object */ - static TDEApplication* kApplication() { return KApp; } + static TDEApplication* tdeApplication() { return TDEApp; } /** * Returns the application session config object. @@ -619,7 +619,7 @@ public slots: * If the widget with focus provides a cut() slot, call that slot. Thus for a * simple application cut can be implemented as: * \code - * KStdAction::cut( kapp, TQ_SLOT( cut() ), actionCollection() ); + * KStdAction::cut( tdeApp, TQ_SLOT( cut() ), actionCollection() ); * \endcode */ void cut(); @@ -628,7 +628,7 @@ public slots: * If the widget with focus provides a copy() slot, call that slot. Thus for a * simple application copy can be implemented as: * \code - * KStdAction::copy( kapp, TQ_SLOT( copy() ), actionCollection() ); + * KStdAction::copy( tdeApp, TQ_SLOT( copy() ), actionCollection() ); * \endcode */ void copy(); @@ -637,7 +637,7 @@ public slots: * If the widget with focus provides a paste() slot, call that slot. Thus for a * simple application copy can be implemented as: * \code - * KStdAction::paste( kapp, TQ_SLOT( paste() ), actionCollection() ); + * KStdAction::paste( tdeApp, TQ_SLOT( paste() ), actionCollection() ); * \endcode */ void paste(); @@ -646,7 +646,7 @@ public slots: * If the widget with focus provides a clear() slot, call that slot. Thus for a * simple application clear() can be implemented as: * \code - * new TDEAction( i18n( "Clear" ), "edit-clear", 0, kapp, TQ_SLOT( clear() ), actionCollection(), "clear" ); + * new TDEAction( i18n( "Clear" ), "edit-clear", 0, tdeApp, TQ_SLOT( clear() ), actionCollection(), "clear" ); * \endcode * * Note that for some widgets, this may not provide the intended bahavior. For @@ -673,7 +673,7 @@ public slots: * If the widget with focus provides a selectAll() slot, call that slot. Thus for a * simple application select all can be implemented as: * \code - * KStdAction::selectAll( kapp, TQ_SLOT( selectAll() ), actionCollection() ); + * KStdAction::selectAll( tdeApp, TQ_SLOT( selectAll() ), actionCollection() ); * \endcode */ void selectAll(); @@ -898,7 +898,7 @@ public: * userCaption using a standard layout. * * To make a compliant caption - * for your window, simply do: @p setCaption(kapp->makeStdCaption(yourCaption)); + * for your window, simply do: @p setCaption(tdeApp->makeStdCaption(yourCaption)); * * @param userCaption The caption string you want to display in the * window caption area. Do not include the application name! @@ -1278,7 +1278,7 @@ protected: int kipcEventMask; /// Current application object. - static TDEApplication *KApp; + static TDEApplication *TDEApp; int pArgc; /** @@ -1301,7 +1301,7 @@ protected: * focused widget if it provides this slot. You can combine this with TDEAction with: * * \code - * KStdAction::deselect( static_cast<MyApplication *>( kapp ), TQ_SLOT( cut() ), actionCollection() ); + * KStdAction::deselect( static_cast<MyApplication *>( tdeApp ), TQ_SLOT( cut() ), actionCollection() ); * \endcode * * @see cut() diff --git a/tdecore/tdeconfigbackend.cpp b/tdecore/tdeconfigbackend.cpp index 4f83e7716..43dc6eb0a 100644 --- a/tdecore/tdeconfigbackend.cpp +++ b/tdecore/tdeconfigbackend.cpp @@ -1178,7 +1178,7 @@ bool TDEConfigBackEnd::checkConfigFilesWritable(bool warnUser) // Note: We don't ask the user if we should not ask this question again because we can't save the answer. errorMsg += i18n("Please contact your system administrator."); TQString cmdToExec = TDEStandardDirs::findExe(TQString("kdialog")); - TDEApplication *app = kapp; + TDEApplication *app = tdeApp; if (!cmdToExec.isEmpty() && app) { TDEProcess lprocess; diff --git a/tdecore/tdeconfigbase.h b/tdecore/tdeconfigbase.h index 79e53dcc6..43a8e281e 100644 --- a/tdecore/tdeconfigbase.h +++ b/tdecore/tdeconfigbase.h @@ -1885,7 +1885,7 @@ public: * If an application computes a default value at runtime for * a certain entry, e.g. like: * \code - * TQColor computedDefault = kapp->palette().color(TQPalette::Active, TQColorGroup::Text) + * TQColor computedDefault = tdeApp->palette().color(TQPalette::Active, TQColorGroup::Text) * TQColor color = config->readEntry(key, computedDefault); * \encode * diff --git a/tdecore/tdeconfigdialogmanager.cpp b/tdecore/tdeconfigdialogmanager.cpp index 7b23f43b8..3864dcdd6 100644 --- a/tdecore/tdeconfigdialogmanager.cpp +++ b/tdecore/tdeconfigdialogmanager.cpp @@ -53,7 +53,7 @@ TDEConfigDialogManager::TDEConfigDialogManager(TQWidget *parent, TDEConfigSkelet { d = new Private(); - kapp->installKDEPropertyMap(); + tdeApp->installKDEPropertyMap(); propertyMap = TQSqlPropertyMap::defaultMap(); init(true); diff --git a/tdecore/tdeconfigdialogmanager.h b/tdecore/tdeconfigdialogmanager.h index d3d9644a6..8f142f1f9 100644 --- a/tdecore/tdeconfigdialogmanager.h +++ b/tdecore/tdeconfigdialogmanager.h @@ -63,7 +63,7 @@ class TQSqlPropertyMap; * To add KColorButton the following code would be inserted in the main. * * \code - * kapp->installKDEPropertyMap(); + * tdeApp->installKDEPropertyMap(); * TQSqlPropertyMap *map = TQSqlPropertyMap::defaultMap(); * map->insert("KColorButton", "color"); * \endcode diff --git a/tdecore/tdeconfigskeleton.h b/tdecore/tdeconfigskeleton.h index 825c74400..d1c2f5a33 100644 --- a/tdecore/tdeconfigskeleton.h +++ b/tdecore/tdeconfigskeleton.h @@ -791,7 +791,7 @@ public: * Constructor. * * @param configname name of config file. If no name is given, the default - * config file as returned by kapp()->config() is used. + * config file as returned by tdeApp()->config() is used. */ TDEConfigSkeleton(const TQString & configname = TQString::null); diff --git a/tdecore/tdecrash.cpp b/tdecore/tdecrash.cpp index eceece166..e1ff0ab57 100644 --- a/tdecore/tdecrash.cpp +++ b/tdecore/tdecrash.cpp @@ -215,9 +215,9 @@ TDECrash::defaultCrashHandler (int sig) } } - if ( kapp && !kapp->startupId().isNull()) { + if ( tdeApp && !tdeApp->startupId().isNull()) { argv[i++] = "--startupid"; - argv[i++] = kapp->startupId().data(); + argv[i++] = tdeApp->startupId().data(); } if ( safer ) diff --git a/tdecore/tdeglobalsettings.cpp b/tdecore/tdeglobalsettings.cpp index 97ef4394c..8540a4435 100644 --- a/tdecore/tdeglobalsettings.cpp +++ b/tdecore/tdeglobalsettings.cpp @@ -724,8 +724,8 @@ void TDEGlobalSettings::initPaths() } // Make sure this app gets the notifications about those paths - if (kapp) - kapp->addKipcEventMask(KIPC::SettingsChanged); + if (tdeApp) + tdeApp->addKipcEventMask(KIPC::SettingsChanged); } void TDEGlobalSettings::initColors() @@ -803,7 +803,7 @@ TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings() // Keep in sync ! s.handed = KMouseSettings::RightHanded; unsigned char map[20]; - int num_buttons = XGetPointerMapping(kapp->getDisplay(), map, 20); + int num_buttons = XGetPointerMapping(tdeApp->getDisplay(), map, 20); if( num_buttons == 2 ) { if ( (int)map[0] == 1 && (int)map[1] == 2 ) diff --git a/tdecore/tdehw/tderootsystemdevice.cpp b/tdecore/tdehw/tderootsystemdevice.cpp index 4fe075831..cb9016062 100644 --- a/tdecore/tdehw/tderootsystemdevice.cpp +++ b/tdecore/tdehw/tderootsystemdevice.cpp @@ -851,7 +851,7 @@ bool TDERootSystemDevice::setPowerState(TDESystemPowerState::TDESystemPowerState TQByteArray data; TQDataStream arg(data, IO_WriteOnly); arg << (int)0 << (int)2 << (int)2; - if ( kapp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data) ) { + if ( tdeApp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data) ) { return true; } return false; @@ -902,7 +902,7 @@ bool TDERootSystemDevice::setPowerState(TDESystemPowerState::TDESystemPowerState TQByteArray data; TQDataStream arg(data, IO_WriteOnly); arg << (int)0 << (int)1 << (int)2; - if ( kapp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data) ) { + if ( tdeApp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data) ) { return true; } return false; diff --git a/tdecore/tdestartupinfo.cpp b/tdecore/tdestartupinfo.cpp index 22f2b0bc6..e34964c25 100644 --- a/tdecore/tdestartupinfo.cpp +++ b/tdecore/tdestartupinfo.cpp @@ -124,9 +124,9 @@ TDEStartupInfo::TDEStartupInfo( bool clean_on_cantdetect_P, TQObject* parent_P, void TDEStartupInfo::init( int flags_P ) { // d == NULL means "disabled" - if( !TDEApplication::kApplication()) + if( !tdeApp) return; - if( !TDEApplication::kApplication()->getDisplay()) + if( !tdeApp->getDisplay()) return; d = new TDEStartupInfoPrivate( flags_P ); @@ -183,7 +183,7 @@ class DelayedWindowEvent void TDEStartupInfo::slot_window_added( WId w_P ) { - kapp->postEvent( this, new DelayedWindowEvent( w_P )); + tdeApp->postEvent( this, new DelayedWindowEvent( w_P )); } void TDEStartupInfo::customEvent( TQCustomEvent* e_P ) @@ -489,8 +489,8 @@ bool TDEStartupInfo::sendFinishX( Display* disp_P, const TDEStartupInfoId& id_P, void TDEStartupInfo::appStarted() { - if( kapp != NULL ) // TDEApplication constructor unsets the env. variable - appStarted( kapp->startupId()); + if( tdeApp != NULL ) // TDEApplication constructor unsets the env. variable + appStarted( tdeApp->startupId()); else appStarted( TDEStartupInfo::currentStartupIdEnv().id()); } @@ -501,7 +501,7 @@ void TDEStartupInfo::appStarted( const TQCString& startup_id ) id.initId( startup_id ); if( id.none()) return; - if( kapp != NULL ) + if( tdeApp != NULL ) TDEStartupInfo::sendFinish( id ); else if( getenv( "DISPLAY" ) != NULL ) // don't rely on tqt_xdisplay() { @@ -524,7 +524,7 @@ void TDEStartupInfo::disableAutoAppStartedSending( bool disable ) void TDEStartupInfo::silenceStartup( bool silence ) { TDEStartupInfoId id; - id.initId( kapp->startupId()); + id.initId( tdeApp->startupId()); if( id.none()) return; TDEStartupInfoData data; @@ -541,7 +541,7 @@ void TDEStartupInfo::handleAutoAppStartedSending() void TDEStartupInfo::setNewStartupId( TQWidget* window, const TQCString& startup_id ) { bool activate = true; - kapp->setStartupId( startup_id ); + tdeApp->setStartupId( startup_id ); if( window != NULL ) { if( !startup_id.isEmpty() && startup_id != "0" ) diff --git a/tdecore/tdesycoca.cpp b/tdecore/tdesycoca.cpp index b1b150df7..fff419532 100644 --- a/tdecore/tdesycoca.cpp +++ b/tdecore/tdesycoca.cpp @@ -92,9 +92,9 @@ KSycoca::KSycoca() { d = new KSycocaPrivate; // Register app as able to receive DCOP messages - if (kapp && !kapp->dcopClient()->isAttached()) + if (tdeApp && !tdeApp->dcopClient()->isAttached()) { - kapp->dcopClient()->attach(); + tdeApp->dcopClient()->attach(); } // We register with DCOP _before_ we try to open the database. // This way we can be relative sure that the KDE framework is diff --git a/tdecore/tdeuniqueapplication.cpp b/tdecore/tdeuniqueapplication.cpp index 7db9f528e..1614ac3d7 100644 --- a/tdecore/tdeuniqueapplication.cpp +++ b/tdecore/tdeuniqueapplication.cpp @@ -187,8 +187,8 @@ TDEUniqueApplication::start() #ifdef TQ_WS_X11 // say we're up and running ( probably no new window will appear ) TDEStartupInfoId id; - if( kapp != NULL ) // TDEApplication constructor unsets the env. variable - id.initId( kapp->startupId()); + if( tdeApp != NULL ) // TDEApplication constructor unsets the env. variable + id.initId( tdeApp->startupId()); else id = TDEStartupInfo::currentStartupIdEnv(); if( !id.none()) @@ -211,8 +211,8 @@ TDEUniqueApplication::start() { #ifdef TQ_WS_X11 TDEStartupInfoId id; - if( kapp != NULL ) // TDEApplication constructor unsets the env. variable - id.initId( kapp->startupId()); + if( tdeApp != NULL ) // TDEApplication constructor unsets the env. variable + id.initId( tdeApp->startupId()); else id = TDEStartupInfo::currentStartupIdEnv(); if( !id.none()) @@ -274,8 +274,8 @@ TDEUniqueApplication::start() TQCString new_asn_id; #if defined TQ_WS_X11 TDEStartupInfoId id; - if( kapp != NULL ) // TDEApplication constructor unsets the env. variable - id.initId( kapp->startupId()); + if( tdeApp != NULL ) // TDEApplication constructor unsets the env. variable + id.initId( tdeApp->startupId()); else id = TDEStartupInfo::currentStartupIdEnv(); if( !id.none()) @@ -486,7 +486,7 @@ int TDEUniqueApplication::newInstance() // and what's important, it does it properly. If you reimplement newInstance(), // and don't call the inherited one, use this (but NOT when newInstance() // is called for the first time, like here). - TDEStartupInfo::setNewStartupId( mainWidget(), kapp->startupId()); + TDEStartupInfo::setNewStartupId( mainWidget(), tdeApp->startupId()); #endif } } diff --git a/tdecore/tests/KIDLTestClient.cpp b/tdecore/tests/KIDLTestClient.cpp index 4614ed51e..3fadee13e 100644 --- a/tdecore/tests/KIDLTestClient.cpp +++ b/tdecore/tests/KIDLTestClient.cpp @@ -7,8 +7,8 @@ int main( int argc, char** argv ) { TDEApplication app( argc, argv, "KIDLTestClient", false /* No GUI */ ); - kapp->dcopClient()->attach(); - // kapp->dcopClient()->registerAs( "kidlclienttest" ); + tdeApp->dcopClient()->attach(); + // tdeApp->dcopClient()->registerAs( "kidlclienttest" ); KIDLTest_stub* t = new KIDLTest_stub( "kidlservertest", "Hello" ); diff --git a/tdecore/tests/dcopkonqtest.cpp b/tdecore/tests/dcopkonqtest.cpp index b8bb055d6..531d8dfd7 100644 --- a/tdecore/tests/dcopkonqtest.cpp +++ b/tdecore/tests/dcopkonqtest.cpp @@ -6,8 +6,8 @@ int main( int argc, char** argv ) { TDEApplication app( argc, argv, "KIDLTestClient", false ); - kapp->dcopClient()->attach(); - // kapp->dcopClient()->registerAs( "kidlclienttest" ); + tdeApp->dcopClient()->attach(); + // tdeApp->dcopClient()->registerAs( "kidlclienttest" ); TQByteArray data; @@ -15,20 +15,20 @@ int main( int argc, char** argv ) TQByteArray snd; TQByteArray rcv; TQCString _type_; - kapp->dcopClient()->call( "konqueror", "KonquerorIface", "reparseConfiguration()", snd, _type_, rcv ); + tdeApp->dcopClient()->call( "konqueror", "KonquerorIface", "reparseConfiguration()", snd, _type_, rcv ); kdDebug() << _type_ << endl; if( _type_ != "void" ) kdDebug() << "void expected, " << _type_.data() << " returned" << endl; /* debug("sending configure to object KonquerorIface in konqueror"); - if (kapp->dcopClient()->send( "konqueror", "KonquerorIface", "configure()", data )) + if (tdeApp->dcopClient()->send( "konqueror", "KonquerorIface", "configure()", data )) debug("ok"); else debug("ko"); /// BROADCAST debug("sending databaseChanged to object tdesycoca in all apps"); - if (kapp->dcopClient()->send( "*", "tdesycoca", "databaseChanged()", data )) + if (tdeApp->dcopClient()->send( "*", "tdesycoca", "databaseChanged()", data )) debug("ok"); else debug("ko"); diff --git a/tdecore/tests/kipctest.cpp b/tdecore/tests/kipctest.cpp index 72101d8b1..9692710e2 100644 --- a/tdecore/tests/kipctest.cpp +++ b/tdecore/tests/kipctest.cpp @@ -8,12 +8,12 @@ MyObject::MyObject() : TQObject(0L, "testobj") { - connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(slotPaletteChanged())); - connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), TQ_SLOT(slotFontChanged())); - connect(kapp, TQ_SIGNAL(tdedisplayStyleChanged()), TQ_SLOT(slotStyleChanged())); - connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int))); - connect(kapp, TQ_SIGNAL(appearanceChanged()), TQ_SLOT(slotAppearanceChanged())); - connect(kapp, TQ_SIGNAL(kipcMessage(int,int)), TQ_SLOT(slotMessage(int,int))); + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(slotPaletteChanged())); + connect(tdeApp, TQ_SIGNAL(tdedisplayFontChanged()), TQ_SLOT(slotFontChanged())); + connect(tdeApp, TQ_SIGNAL(tdedisplayStyleChanged()), TQ_SLOT(slotStyleChanged())); + connect(tdeApp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int))); + connect(tdeApp, TQ_SIGNAL(appearanceChanged()), TQ_SLOT(slotAppearanceChanged())); + connect(tdeApp, TQ_SIGNAL(kipcMessage(int,int)), TQ_SLOT(slotMessage(int,int))); } int main(int argc, char **argv) diff --git a/tdecore/tests/krandomsequencetest.cpp b/tdecore/tests/krandomsequencetest.cpp index 44f1ce15a..f83d2a80f 100644 --- a/tdecore/tests/krandomsequencetest.cpp +++ b/tdecore/tests/krandomsequencetest.cpp @@ -54,7 +54,7 @@ main(int argc, char *argv[]) for(int i = 0; i < 20; i++) printf("%3ld ", seq.getLong(100)); - seq.setSeed(kapp->random()); + seq.setSeed(tdeApp->random()); TQPtrList<TQString> list; list.append(new TQString("A")); diff --git a/tdecore/tests/tdeuniqueapptest.cpp b/tdecore/tests/tdeuniqueapptest.cpp index 9a002c6d8..7ea5b6308 100644 --- a/tdecore/tests/tdeuniqueapptest.cpp +++ b/tdecore/tests/tdeuniqueapptest.cpp @@ -54,6 +54,6 @@ main(int argc, char *argv[]) TestApp a; printf("Running.\n"); - kapp->exec(); + tdeApp->exec(); printf("Terminating.\n"); } diff --git a/tdecore/tests/testqtargs.cpp b/tdecore/tests/testqtargs.cpp index d69b3f6f4..cb67ab02a 100644 --- a/tdecore/tests/testqtargs.cpp +++ b/tdecore/tests/testqtargs.cpp @@ -29,7 +29,7 @@ -background, you get the same thing. in tdecore/tdeapplication.cpp, TDECmdLineOption qt_options is defined and used - by the static method Kapplication::addCmdLineOptions to add the Qt options + by the static method TDEApplication::addCmdLineOptions to add the Qt options but its' entries look like this: { "background <color>", I18N_NOOP("sets the default background color and an\n diff --git a/tdecore/twin.cpp b/tdecore/twin.cpp index 3871f3513..6e96b3b66 100644 --- a/tdecore/twin.cpp +++ b/tdecore/twin.cpp @@ -167,7 +167,7 @@ ContextWidget::ContextWidget() : TQWidget(0,0) { twin_net_create_atoms(); - kapp->installX11EventFilter( this ); + tdeApp->installX11EventFilter( this ); TQWhatsThis::enterWhatsThisMode(); TQCursor c = *TQApplication::overrideCursor(); TQWhatsThis::leaveWhatsThisMode(); @@ -241,7 +241,7 @@ void KWin::activateWindow( WId win, long time ) if( time == 0 ) time = get_tqt_x_user_time(); info.setActiveWindow( win, NET::FromApplication, time, - kapp->activeWindow() ? kapp->activeWindow()->winId() : 0 ); + tdeApp->activeWindow() ? tdeApp->activeWindow()->winId() : 0 ); #endif // TQ_WS_X11 ... TDEUniqueApplication::setHandleAutoStarted(); } @@ -312,9 +312,9 @@ void KWin::setMainWindow( TQWidget* subwindow, WId mainwindow ) */ if( tqt_cast< TQDialog* >( subwindow ) != NULL && subwindow->parentWidget() == NULL - && kapp->mainWidget() != NULL ) + && tdeApp->mainWidget() != NULL ) { - kdWarning() << "KWin::setMainWindow(): There either mustn't be kapp->mainWidget()," + kdWarning() << "KWin::setMainWindow(): There either mustn't be tdeApp->mainWidget()," " or the dialog must have a non-NULL parent, otherwise Qt will reset the change. Bummer." << endl; } XSetTransientForHint( tqt_xdisplay(), subwindow->winId(), mainwindow ); diff --git a/tdecore/twinmodule.cpp b/tdecore/twinmodule.cpp index fc1a37574..e34a012fd 100644 --- a/tdecore/twinmodule.cpp +++ b/tdecore/twinmodule.cpp @@ -71,8 +71,8 @@ public: strutSignalConnected( false ), what( _what ) { - kapp->installX11EventFilter( this ); - (void ) kapp->desktop(); //trigger desktop widget creation to select root window events + tdeApp->installX11EventFilter( this ); + (void ) tdeApp->desktop(); //trigger desktop widget creation to select root window events activate(); updateStackingOrder(); } @@ -468,13 +468,13 @@ void KWinModule::setDesktopName( int desktop, const TQString& name ) void KWinModule::doNotManage( const TQString& title ) { - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); TQByteArray data, replyData; TQCString replyType; TQDataStream arg(data, IO_WriteOnly); arg << title; - kapp->dcopClient()->call("twin", "", "doNotManage(TQString)", + tdeApp->dcopClient()->call("twin", "", "doNotManage(TQString)", data, replyType, replyData); } |