diff options
Diffstat (limited to 'kicker')
58 files changed, 217 insertions, 217 deletions
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index c8432f7e8..dab00ba20 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -919,12 +919,12 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions, connect(m_layoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fixupLayout())); connect(_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotUpdate())); - connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(globalPaletteChange())); + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(globalPaletteChange())); reconfigure(); // initialize clock widget slotUpdate(); - if (kapp->authorizeTDEAction("kicker_rmb")) + if (tdeApp->authorizeTDEAction("kicker_rmb")) { menu = new TDEPopupMenu(); connect(menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShowContextMenu())); @@ -1485,7 +1485,7 @@ void ClockApplet::toggleCalendar() void ClockApplet::openContextMenu() { - if (!menu || !kapp->authorizeTDEAction("kicker_rmb")) + if (!menu || !tdeApp->authorizeTDEAction("kicker_rmb")) return; menu->exec( TQCursor::pos() ); @@ -1585,7 +1585,7 @@ void ClockApplet::aboutToShowContextMenu() menu->insertItem(i18n("&Type"), type_menu, 101, 1); menu->insertItem(i18n("Show Time&zone"), zoneMenu, 110, 2); - if (kapp->authorize("user/root")) + if (tdeApp->authorize("user/root")) { menu->insertItem(SmallIcon("date"), i18n("&Adjust Date && Time..."), 103, 4); } diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index 2b09dac34..5878c0acd 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -118,7 +118,7 @@ QuickURL::QuickURL(const TQString &u) } void QuickURL::run() const -{ kapp->propagateSessionManager(); // is this needed? +{ tdeApp->propagateSessionManager(); // is this needed? if (_service) KRun::run(*(_service), KURL::List()); else diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp index f0d6a7e85..770a8431f 100644 --- a/kicker/applets/lockout/lockout.cpp +++ b/kicker/applets/lockout/lockout.cpp @@ -88,19 +88,19 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name lockButton->installEventFilter( this ); logoutButton->installEventFilter( this ); - if (!kapp->authorize("lock_screen")) + if (!tdeApp->authorize("lock_screen")) lockButton->hide(); - if (!kapp->authorize("logout")) + if (!tdeApp->authorize("logout")) logoutButton->hide(); lockButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); logoutButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); - connect( kapp, TQ_SIGNAL( iconChanged(int) ), TQ_SLOT( slotIconChanged() )); + connect( tdeApp, TQ_SIGNAL( iconChanged(int) ), TQ_SLOT( slotIconChanged() )); } Lockout::~Lockout() @@ -146,12 +146,12 @@ void Lockout::lock() int kicker_screen_number = tqt_xscreen(); if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString("")); + tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString("")); } void Lockout::logout() { - kapp->requestShutDown(); + tdeApp->requestShutDown(); } void Lockout::mousePressEvent(TQMouseEvent* e) @@ -185,7 +185,7 @@ void Lockout::propagateMouseEvent(TQMouseEvent* e) bool Lockout::eventFilter( TQObject *o, TQEvent *e ) { - if (!kapp->authorizeTDEAction("kicker_rmb")) + if (!tdeApp->authorizeTDEAction("kicker_rmb")) return false; // Process event normally: if( e->type() == TQEvent::MouseButtonPress ) diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index 52e3da93b..d1aae0268 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -89,7 +89,7 @@ Applet::Applet( const TQString& configFile_P, TQWidget* parent_P ) setBackgroundOrigin(AncestorOrigin); dcopclient.registerAs( "menuapplet", false ); // toolbarAppearanceChanged(int) is sent when changing macstyle - connect( kapp, TQ_SIGNAL( toolbarAppearanceChanged( int )), + connect( tdeApp, TQ_SIGNAL( toolbarAppearanceChanged( int )), this, TQ_SLOT( readSettings())); claimSelection(); readSettings(); diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index 25e6e040d..fb805bef5 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -141,9 +141,9 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, connect( m_twin, TQ_SIGNAL( windowRemoved(WId) ), this, TQ_SLOT( slotWindowRemoved(WId) ) ); connect( m_twin, TQ_SIGNAL( windowChanged(WId,unsigned int) ), this, TQ_SLOT( slotWindowChanged(WId,unsigned int) ) ); connect( m_twin, TQ_SIGNAL( desktopNamesChanged() ), this, TQ_SLOT( slotDesktopNamesChanged() ) ); - connect( kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)) ); + connect( tdeApp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)) ); - if (kapp->authorizeTDEAction("kicker_rmb") && kapp->authorizeControlModule("tde-kcmtaskbar.desktop")) + if (tdeApp->authorizeTDEAction("kicker_rmb") && tdeApp->authorizeControlModule("tde-kcmtaskbar.desktop")) { m_contextMenu = new TQPopupMenu(); connect(m_contextMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShowContextMenu())); @@ -799,7 +799,7 @@ void KMiniPager::contextMenuActivated(int result) return; case ConfigureDesktops: - kapp->startServiceByDesktopName("desktop"); + tdeApp->startServiceByDesktopName("desktop"); return; case RenameDesktop: @@ -883,7 +883,7 @@ void KMiniPager::slotDesktopNamesChanged() void KMiniPager::showPager() { - DCOPClient *dcop=kapp->dcopClient(); + DCOPClient *dcop=tdeApp->dcopClient(); if (dcop->isApplicationRegistered("kpager")) { @@ -922,7 +922,7 @@ void KMiniPager::showKPager(bool toggleShow) pt=mapToGlobal( TQPoint(x(), y()) ); } - DCOPClient *dcop=kapp->dcopClient(); + DCOPClient *dcop=tdeApp->dcopClient(); TQByteArray data; TQDataStream arg(data, IO_WriteOnly); @@ -941,7 +941,7 @@ void KMiniPager::applicationRegistered( const TQCString & appName ) { if (appName == "kpager") { - disconnect( kapp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString &) ), + disconnect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString &) ), this, TQ_SLOT(applicationRegistered(const TQCString &)) ); showKPager(false); } diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp index 22f59956d..517f81cfe 100644 --- a/kicker/applets/minipager/pagerbutton.cpp +++ b/kicker/applets/minipager/pagerbutton.cpp @@ -213,7 +213,7 @@ void KMiniPagerButton::loadBgPixmap() if (m_pager->bgType() != PagerSettings::EnumBackgroundType::BgLive) return; // not needed - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (!client->isAttached()) { client->attach(); diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp index 3d1321140..104cd5efe 100644 --- a/kicker/applets/run/runapplet.cpp +++ b/kicker/applets/run/runapplet.cpp @@ -209,7 +209,7 @@ void RunApplet::run_command(const TQString& command) TQString exec; bool focusNeeded = false; - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); _filterData->setData( _input->currentText().stripWhiteSpace() ); TQStringList filters; @@ -230,7 +230,7 @@ void RunApplet::run_command(const TQString& command) } else if (cmd == "logout") { - bool shutdown = kapp->requestShutDown(); + bool shutdown = tdeApp->requestShutDown(); if( !shutdown ) { // This i18n string is in kdesktop/desktop.cpp as well. Maybe we should DCOP to kdesktop instead ? diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp index cd1e45795..a9eea202e 100644 --- a/kicker/applets/swallow/swallow.cpp +++ b/kicker/applets/swallow/swallow.cpp @@ -161,7 +161,7 @@ void SwallowApplet::createApps( SwallowCommandList* list ) TQ_SLOT( embedded(SwallowApp *))); appList->append( app ); ++it; - kapp->processEvents(); + tdeApp->processEvents(); } m_layout->activate(); @@ -287,7 +287,7 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent, // move window out of sight // *process << "-geometry"; - // *process << TQString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->desktop()->height()); + // *process << TQString("32x32+%1+%2").arg(tdeApp->desktop()->width()).arg(tdeApp->desktop()->height()); connect(process, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(processExited(TDEProcess*))); diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 50781f9cd..d243b318e 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -106,9 +106,9 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac twin_module = new KWinModule(this); - // kApplication notifies us of settings changes. added to support + // tdeApp notifies us of settings changes. added to support // disabling of frame effect on mouse hover - kapp->dcopClient()->setNotifications(true); + tdeApp->dcopClient()->setNotifications(true); connectDCOPSignal("kicker", "kicker", "configurationChanged()", "loadSettings()", false); TQTimer::singleShot(0, this, TQ_SLOT(initialize())); @@ -682,7 +682,7 @@ void SystemTrayApplet::refreshExpandButton() if (orientation() == TQt::Vertical) a = m_showHidden ? TQt::DownArrow : TQt::UpArrow; else - a = (m_showHidden ^ kapp->reverseLayout()) ? TQt::RightArrow : TQt::LeftArrow; + a = (m_showHidden ^ tdeApp->reverseLayout()) ? TQt::RightArrow : TQt::LeftArrow; m_expandButton->setArrowType(a); } diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp index 3c9bbead7..a34db8b73 100644 --- a/kicker/applets/taskbar/taskbarapplet.cpp +++ b/kicker/applets/taskbar/taskbarapplet.cpp @@ -43,7 +43,7 @@ extern "C" // FIXME: what about two taskbars? perhaps this should be inserted just once TDEGlobal::locale()->insertCatalogue( "ktaskbarapplet" ); int options = 0; - if (kapp->authorizeControlModule("tde-kcmtaskbar.desktop")) + if (tdeApp->authorizeControlModule("tde-kcmtaskbar.desktop")) options = KPanelApplet::Preferences; TaskbarApplet *taskbar = new TaskbarApplet( configFile, KPanelApplet::Stretch, options, parent, "ktaskbarapplet" ); diff --git a/kicker/extensions/kasbar/ChangeLog b/kicker/extensions/kasbar/ChangeLog index 71abc4321..811d029f3 100644 --- a/kicker/extensions/kasbar/ChangeLog +++ b/kicker/extensions/kasbar/ChangeLog @@ -634,7 +634,7 @@ 2002-05-14 Tuesday 10:31 gioele - * kapp.h -> tdeapplication.h + * tdeApp.h -> tdeapplication.h 2002-04-23 Tuesday 14:02 binner diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp index a9a5fd68a..bddeeacb2 100644 --- a/kicker/extensions/kasbar/kasbarapp.cpp +++ b/kicker/extensions/kasbar/kasbarapp.cpp @@ -116,7 +116,7 @@ int main( int argc, char **argv ) KWin::setOnAllDesktops( kasbar->winId(), true ); kdDebug() << "kasbar: Window id is " << kasbar->winId() << endl; - TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" ); + tdeApp->dcopClient()->registerAs( "kasbar" ); app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) ); diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index ff29d4dd3..ad047a887 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -92,7 +92,7 @@ KasBarExtension::KasBarExtension( const TQString& configFile, detached_( false ) { kdDebug(1345) << "KasBarExtension: Created '" << name << "', '" << configFile << "'" << endl; -// TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" ); +// tdeApp->dcopClient()->registerAs( "kasbar" ); // setBackgroundMode( NoBackground ); kasbar = new KasTasker( orientation(), this, name ); diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp index 382e42795..47d457d0d 100644 --- a/kicker/extensions/taskbar/taskbarextension.cpp +++ b/kicker/extensions/taskbar/taskbarextension.cpp @@ -66,11 +66,11 @@ TaskBarExtension::TaskBarExtension(const TQString& configFile, Type type, connect(m_container, TQ_SIGNAL(containerCountChanged()), TQ_SIGNAL(updateLayout())); - kapp->dcopClient()->setNotifications(true); + tdeApp->dcopClient()->setNotifications(true); connectDCOPSignal("kicker", "kicker", "configurationChanged()", "configure()", false); - connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(setBackgroundTheme())); TQTimer::singleShot(0, this, TQ_SLOT(setBackgroundTheme())); diff --git a/kicker/kicker/buttons/nontdeappbutton.cpp b/kicker/kicker/buttons/nontdeappbutton.cpp index 7e3b3e044..4b6af8ce1 100644 --- a/kicker/kicker/buttons/nontdeappbutton.cpp +++ b/kicker/kicker/buttons/nontdeappbutton.cpp @@ -216,7 +216,7 @@ void NonKDEAppButton::runCommand(const TQString& execStr) // since kicker doesn't listen to or use the session manager, we have // to make sure that our environment is set up correctly. this is // accomlplished by doing: - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); if (term) { diff --git a/kicker/kicker/buttons/servicebutton.cpp b/kicker/kicker/buttons/servicebutton.cpp index 9b368407e..6b3836d20 100644 --- a/kicker/kicker/buttons/servicebutton.cpp +++ b/kicker/kicker/buttons/servicebutton.cpp @@ -169,7 +169,7 @@ void ServiceButton::dropEvent( TQDropEvent* ev ) { KURL::List uriList; if( KURLDrag::decode( ev, uriList ) && _service ) { - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); KRun::run( *_service, uriList ); } PanelButton::dropEvent(ev); @@ -200,7 +200,7 @@ void ServiceButton::performExec() if (!_service) return; KURL::List uriList; - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); KRun::run( *_service, uriList ); } diff --git a/kicker/kicker/buttons/urlbutton.cpp b/kicker/kicker/buttons/urlbutton.cpp index d398b07b0..cc9bfb0c6 100644 --- a/kicker/kicker/buttons/urlbutton.cpp +++ b/kicker/kicker/buttons/urlbutton.cpp @@ -140,7 +140,7 @@ void URLButton::dragEnterEvent(TQDragEnterEvent *ev) void URLButton::dropEvent(TQDropEvent *ev) { - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); KURL::List execList; if(KURLDrag::decode(ev, execList)){ KURL url( fileItem->url() ); @@ -165,7 +165,7 @@ void URLButton::startDrag() void URLButton::slotExec() { - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); fileItem->run(); } diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp index c8f87b02e..6299a6650 100644 --- a/kicker/kicker/core/applethandle.cpp +++ b/kicker/kicker/core/applethandle.cpp @@ -58,7 +58,7 @@ AppletHandle::AppletHandle(AppletContainer* parent) m_dragBar->installEventFilter(this); m_layout->addWidget(m_dragBar); - if (kapp->authorizeTDEAction("kicker_rmb")) + if (tdeApp->authorizeTDEAction("kicker_rmb")) { m_menuButton = new AppletHandleButton( this ); m_menuButton->installEventFilter(this); @@ -252,7 +252,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) void AppletHandle::menuButtonPressed() { - if (!kapp->authorizeTDEAction("kicker_rmb")) + if (!tdeApp->authorizeTDEAction("kicker_rmb")) { return; } diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp index 2005935a3..63a0815da 100644 --- a/kicker/kicker/core/container_applet.cpp +++ b/kicker/kicker/core/container_applet.cpp @@ -139,7 +139,7 @@ void AppletContainer::configure() if (isImmutable() || KickerSettings::hideAppletHandles() || - !kapp->authorizeTDEAction("kicker_rmb")) + !tdeApp->authorizeTDEAction("kicker_rmb")) { if (_handle->isVisibleTo(this)) { @@ -216,7 +216,7 @@ void AppletContainer::signalToBeRemoved() void AppletContainer::showAppletMenu() { - if (!kapp->authorizeTDEAction("kicker_rmb")) + if (!tdeApp->authorizeTDEAction("kicker_rmb")) { return; } @@ -461,7 +461,7 @@ void AppletContainer::setImmutable(bool immutable) BaseContainer::setImmutable(immutable); if (isImmutable() || KickerSettings::hideAppletHandles() || - !kapp->authorizeTDEAction("kicker_rmb")) + !tdeApp->authorizeTDEAction("kicker_rmb")) { if (_handle->isVisibleTo(this)) { diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp index d3a550a07..c35f54606 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/kicker/kicker/core/container_button.cpp @@ -254,7 +254,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) case TQt::RightButton: { - if (!kapp->authorizeTDEAction("kicker_rmb") || + if (!tdeApp->authorizeTDEAction("kicker_rmb") || isImmutable()) { break; diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index afb786f7f..877f828d9 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -371,7 +371,7 @@ void ExtensionContainer::writeConfig() void ExtensionContainer::showPanelMenu( const TQPoint& globalPos ) { - if (!kapp->authorizeTDEAction("kicker_rmb")) + if (!tdeApp->authorizeTDEAction("kicker_rmb")) { return; } @@ -484,7 +484,7 @@ void ExtensionContainer::moveMe() if (screen < 0) { - screen = kapp->desktop()->screenNumber(this); + screen = tdeApp->desktop()->screenNumber(this); } if (screen < 0) @@ -1260,7 +1260,7 @@ int ExtensionContainer::arrangeHideButtons() _ltHB->setMaximumHeight(maxHeight); _ltHB->setMaximumWidth(14); _layout->remove(_ltHB); - if (kapp->reverseLayout()) + if (tdeApp->reverseLayout()) { _layout->addWidget(_ltHB, 1, 2, (TQt::AlignmentFlags)vertAlignment); } @@ -1275,7 +1275,7 @@ int ExtensionContainer::arrangeHideButtons() _rbHB->setMaximumHeight(maxHeight); _rbHB->setMaximumWidth(14); _layout->remove(_rbHB); - if (kapp->reverseLayout()) + if (tdeApp->reverseLayout()) { _layout->addWidget(_rbHB, 1, 0, (TQt::AlignmentFlags)(leftAlignment | vertAlignment)); } diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index 626973855..d62d5396c 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -104,7 +104,7 @@ ContainerArea::ContainerArea(TDEConfig* _c, setBackground(); connect(&_autoScrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(autoScroll())); - connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(setBackground())); + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(setBackground())); connect(Kicker::the(), TQ_SIGNAL(immutabilityChanged(bool)), TQ_SLOT(immutabilityChanged(bool))); connect(this, TQ_SIGNAL(contentsMoving(int, int)), TQ_SLOT(setBackground())); @@ -325,7 +325,7 @@ void ContainerArea::loadContainers(const TQStringList& containers) a = new DesktopButtonContainer(group, m_opMenu, m_contents); else if (appletType == "WindowListButton") a = new WindowListButtonContainer(group, m_opMenu, m_contents); - else if ((appletType == "BookmarksButton") && kapp->authorizeTDEAction("bookmarks")) + else if ((appletType == "BookmarksButton") && tdeApp->authorizeTDEAction("bookmarks")) a = new BookmarksButtonContainer(group, m_opMenu, m_contents); else if (appletType == "ServiceButton") a = new ServiceButtonContainer(group, m_opMenu, m_contents); @@ -438,7 +438,7 @@ const TQWidget* ContainerArea::addButton(const AppletInfo& info) if (buttonType == "BookmarksButton") { - if (kapp->authorizeTDEAction("bookmarks")) + if (tdeApp->authorizeTDEAction("bookmarks")) { return addBookmarksButton(); } @@ -979,7 +979,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) saveContainerConfig(true); PanelDrag *dd = new PanelDrag(_moveAC, this); - dd->setPixmap(kapp->iconLoader()->loadIcon(_moveAC->icon(), TDEIcon::Small)); + dd->setPixmap(tdeApp->iconLoader()->loadIcon(_moveAC->icon(), TDEIcon::Small)); grabKeyboard(); dd->drag(); releaseKeyboard(); @@ -1640,7 +1640,7 @@ void ContainerArea::moveDragIndicator(int pos) void ContainerArea::updateBackground( const TQPixmap& pm ) { TQBrush bgBrush(colorGroup().background(), pm); - TQPalette pal = kapp->palette(); + TQPalette pal = tdeApp->palette(); pal.setBrush(TQColorGroup::Background, bgBrush); setPalette(pal); diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index cb20c7a58..14cc96b29 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -111,7 +111,7 @@ void ExtensionManager::initialize() m_mainPanel = pm->createExtensionContainer( "childpanelextension.desktop", true, - TQString(kapp->aboutData()->appName()) + "rc", + TQString(tdeApp->aboutData()->appName()) + "rc", "Main Panel"); } @@ -129,7 +129,7 @@ void ExtensionManager::initialize() m_mainPanel->readConfig(); m_mainPanel->show(); - kapp->processEvents(); + tdeApp->processEvents(); // read extension list config->setGroup("General"); @@ -173,7 +173,7 @@ void ExtensionManager::initialize() addContainer(e); e->readConfig(); e->show(); - kapp->processEvents(); + tdeApp->processEvents(); } } m_loadingContainers = false; @@ -222,7 +222,7 @@ void ExtensionManager::configureMenubar(bool duringInit) updateMenubar(); m_menubarPanel->show(); - connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), TQ_SLOT(updateMenubar())); + connect(tdeApp, TQ_SIGNAL(tdedisplayFontChanged()), TQ_SLOT(updateMenubar())); } else if (m_menubarPanel) { @@ -692,7 +692,7 @@ TQRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer* } TQRect workArea; - if ((XineramaScreen == XineramaAllScreens) || (kapp->desktop()->numScreens() < 2)) + if ((XineramaScreen == XineramaAllScreens) || (tdeApp->desktop()->numScreens() < 2)) { /* special value for all screens */ workArea = Kicker::the()->twinModule()->workArea(list); diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index e99f9fed4..f58c6bfa5 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -59,7 +59,7 @@ #include "kicker.moc" -Kicker* Kicker::the() { return static_cast<Kicker*>(kapp); } +Kicker* Kicker::the() { return static_cast<Kicker*>(tdeApp); } Kicker::Kicker() : TDEUniqueApplication(), @@ -88,7 +88,7 @@ Kicker::Kicker() } // Make kicker immutable if configuration modules have been marked immutable - if (isKioskImmutable() && kapp->authorizeControlModules(Kicker::configModules(true)).isEmpty()) + if (isKioskImmutable() && tdeApp->authorizeControlModules(Kicker::configModules(true)).isEmpty()) { config()->setReadOnly(true); config()->reparseConfiguration(); @@ -413,7 +413,7 @@ void Kicker::configDialogFinished() if (m_reloadingConfigDialog) { TQByteArray data; m_reloadingConfigDialog = false; - kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data); + tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data); } } diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp index 94ee0acfb..4e4de2f56 100644 --- a/kicker/kicker/core/menumanager.cpp +++ b/kicker/kicker/core/menumanager.cpp @@ -70,8 +70,8 @@ MenuManager::MenuManager(TQObject *parent) else m_kmenu = new KMenuStub(new KMenu); - kapp->dcopClient()->setNotifications(true); - connect(kapp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)), + tdeApp->dcopClient()->setNotifications(true); + connect(tdeApp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)), this, TQ_SLOT(applicationRemoved(const TQCString&))); } @@ -210,7 +210,7 @@ TQCString MenuManager::createMenu(TQPixmap icon, TQString text) p->text = text; p->icon = icon; p->idInParentMenu = m_kmenu->insertClientMenu( p ); - p->createdBy = kapp->dcopClient()->senderId(); + p->createdBy = tdeApp->dcopClient()->senderId(); m_kmenu->adjustSize(); return name; } diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp index e55f65697..b3160aed5 100644 --- a/kicker/kicker/core/panelextension.cpp +++ b/kicker/kicker/core/panelextension.cpp @@ -162,7 +162,7 @@ bool PanelExtension::eventFilter(TQObject*, TQEvent * e) if ( e->type() == TQEvent::MouseButtonPress ) { TQMouseEvent* me = (TQMouseEvent*) e; - if ( me->button() == TQt::RightButton && kapp->authorize("action/kicker_rmb")) + if ( me->button() == TQt::RightButton && tdeApp->authorize("action/kicker_rmb")) { Kicker::the()->setInsertionPoint(me->globalPos()); opMenu()->exec(me->globalPos()); @@ -386,7 +386,7 @@ void PanelExtension::slotBuildOpMenu() this, TQ_SLOT(showProcessManager())); _opMnu->insertSeparator(); - if (kapp->authorize("action/help")) + if (tdeApp->authorize("action/help")) { KHelpMenu* help = new KHelpMenu( this, TDEGlobal::instance()->aboutData(), false); _opMnu->insertItem(SmallIconSet("help"), KStdGuiItem::help().text(), help->menu()); diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp index 78db46495..d11dee27f 100644 --- a/kicker/kicker/core/pluginmanager.cpp +++ b/kicker/kicker/core/pluginmanager.cpp @@ -365,7 +365,7 @@ LibUnloader::LibUnloader( const TQString &libName, TQObject *parent ) void LibUnloader::unload( const TQString &libName ) { - (void)new LibUnloader( libName, kapp ); + (void)new LibUnloader( libName, tdeApp ); } void LibUnloader::unload() diff --git a/kicker/kicker/core/usersizesel.cpp b/kicker/kicker/core/usersizesel.cpp index 654114d90..3119d8354 100644 --- a/kicker/kicker/core/usersizesel.cpp +++ b/kicker/kicker/core/usersizesel.cpp @@ -99,7 +99,7 @@ void UserSizeSel::mouseMoveEvent(TQMouseEvent * e) // int screen = xineramaScreen(); // if (screen < 0) // { -// screen = kapp->desktop()->screenNumber(this); +// screen = tdeApp->desktop()->screenNumber(this); // } // TQRect desktopGeom = TQApplication::desktop()->screenGeometry(screen); if (newSize < PANEL_MINIMUM_HEIGHT) diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp index 740260d7f..b38ca9fae 100644 --- a/kicker/kicker/ui/appletop_mnu.cpp +++ b/kicker/kicker/ui/appletop_mnu.cpp @@ -99,7 +99,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP insertSeparator(); } - TQPixmap iconPix(kapp->iconLoader()->loadIcon(icon, + TQPixmap iconPix(tdeApp->iconLoader()->loadIcon(icon, TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true)); @@ -175,7 +175,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP insertItem(SmallIcon("about_kde"), i18n("Switch to Trinity Classic Menu Style"), this, TQ_SLOT(toggleLegacy())); } - if ((actions & PanelAppletOpMenu::KMenuEditor) && kapp->authorizeTDEAction("menuedit")) + if ((actions & PanelAppletOpMenu::KMenuEditor) && tdeApp->authorizeTDEAction("menuedit")) { if (needSeparator) { @@ -187,7 +187,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP } if ((actions & PanelAppletOpMenu::BookmarkEditor) && - kapp->authorizeTDEAction("edit_bookmarks")) + tdeApp->authorizeTDEAction("edit_bookmarks")) { if (needSeparator) { diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp index a2d7b1e12..7fa213fad 100644 --- a/kicker/kicker/ui/browser_mnu.cpp +++ b/kicker/kicker/ui/browser_mnu.cpp @@ -139,7 +139,7 @@ void PanelBrowserMenu::initialize() KURL url; url.setPath(path()); - if (!kapp->authorizeURLAction("list", KURL(), url)) + if (!tdeApp->authorizeURLAction("list", KURL(), url)) { insertItem(i18n("Not Authorized to Read Folder")); return; @@ -152,7 +152,7 @@ void PanelBrowserMenu::initialize() TDEConfig *c = TDEGlobal::config(); c->setGroup("menus"); insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQ_SLOT(slotOpenFileManager())); - if (kapp->authorize("shell_access") && KickerSettings::showOpenInTerminal()) + if (tdeApp->authorize("shell_access") && KickerSettings::showOpenInTerminal()) insertItem(CICON("terminal"), i18n("Open in Terminal"), this, TQ_SLOT(slotOpenTerminal())); insertSeparator(); } @@ -437,7 +437,7 @@ void PanelBrowserMenu::dropEvent( TQDropEvent *ev ) void PanelBrowserMenu::slotExec(int id) { - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); if(!_filemap.contains(id)) return; @@ -449,7 +449,7 @@ void PanelBrowserMenu::slotExec(int id) void PanelBrowserMenu::slotOpenTerminal() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("General"); TQString term = config->readPathEntry("TerminalApplication", "konsole"); diff --git a/kicker/kicker/ui/client_mnu.cpp b/kicker/kicker/ui/client_mnu.cpp index 8a69f0749..72cc6b279 100644 --- a/kicker/kicker/ui/client_mnu.cpp +++ b/kicker/kicker/ui/client_mnu.cpp @@ -134,6 +134,6 @@ void KickerClientMenu::slotActivated(int id) TQByteArray data; TQDataStream dataStream( data, IO_WriteOnly ); dataStream << id; - kapp->dcopClient()->send( app, obj, "activated(int)", data ); + tdeApp->dcopClient()->send( app, obj, "activated(int)", data ); } } diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp index 3107fe17a..3bfd341c4 100644 --- a/kicker/kicker/ui/hidebutton.cpp +++ b/kicker/kicker/ui/hidebutton.cpp @@ -38,11 +38,11 @@ HideButton::HideButton(TQWidget *parent, const char *name) { setBackgroundOrigin(AncestorOrigin); - connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); - connect(kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int))); + connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); + connect(tdeApp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int))); - kapp->addKipcEventMask(KIPC::SettingsChanged); - kapp->addKipcEventMask(KIPC::IconChanged); + tdeApp->addKipcEventMask(KIPC::SettingsChanged); + tdeApp->addKipcEventMask(KIPC::IconChanged); slotSettingsChanged(TDEApplication::SETTINGS_MOUSE); } diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index 768056473..7048f02c1 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -125,13 +125,13 @@ void PanelKMenu::hideMenu() // Try to redraw the area under the menu // Qt makes this surprisingly difficult to do in a timely fashion! while (isShown() == true) - kapp->eventLoop()->processEvents(1000); + tdeApp->eventLoop()->processEvents(1000); TQTimer *windowtimer = new TQTimer( this ); connect( windowtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(windowClearTimeout()) ); windowTimerTimedOut = false; windowtimer->start( 0, TRUE ); // Wait for all window system events to be processed while (windowTimerTimedOut == false) - kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000); + tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000); // HACK // The TDE Menu takes an unknown amount of time to disappear, and redrawing @@ -144,7 +144,7 @@ void PanelKMenu::hideMenu() windowTimerTimedOut = false; delaytimer->start( 100, TRUE ); // Wait for 100 milliseconds while (windowTimerTimedOut == false) - kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000); + tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000); } void PanelKMenu::windowClearTimeout() @@ -247,9 +247,9 @@ void PanelKMenu::initialize() if (loadSidePixmap()) { // in case we've been through here before, let's disconnect - disconnect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), + disconnect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(paletteChanged())); - connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(paletteChanged())); } else @@ -317,7 +317,7 @@ void PanelKMenu::initialize() bool need_separator = false; // insert bookmarks - if (KickerSettings::useBookmarks() && kapp->authorizeTDEAction("bookmarks")) + if (KickerSettings::useBookmarks() && tdeApp->authorizeTDEAction("bookmarks")) { // Need to create a new popup each time, it's deleted by subMenus.clear() TDEPopupMenu * bookmarkParent = new TDEPopupMenu( this, "bookmarks" ); @@ -385,7 +385,7 @@ void PanelKMenu::initialize() } // run command - if (kapp->authorize("run_command")) + if (tdeApp->authorize("run_command")) { insertItem(KickerLib::menuIconSet("system-run"), i18n("Run Command..."), @@ -394,7 +394,7 @@ void PanelKMenu::initialize() insertSeparator(); } - if (DM().isSwitchable() && kapp->authorize("switch_user")) + if (DM().isSwitchable() && tdeApp->authorize("switch_user")) { sessionsMenu = new TQPopupMenu( this ); insertItem(KickerLib::menuIconSet("switchuser"), i18n("Switch User"), sessionsMenu); @@ -412,12 +412,12 @@ void PanelKMenu::initialize() insertItem(KickerLib::menuIconSet("document-save"), i18n("Save Session"), this, TQ_SLOT(slotSaveSession())); } - if (kapp->authorize("lock_screen")) + if (tdeApp->authorize("lock_screen")) { insertItem(KickerLib::menuIconSet("system-lock-screen"), i18n("Lock Session"), this, TQ_SLOT(slotLock())); } - if (kapp->authorize("logout")) + if (tdeApp->authorize("logout")) { insertItem(KickerLib::menuIconSet("system-log-out"), i18n("Log Out..."), this, TQ_SLOT(slotLogout())); } @@ -477,13 +477,13 @@ void PanelKMenu::slotLock() TQByteArray replyData; // Block here until lock is complete // If this is not done the desktop of the locked session will be shown after VT switch until the lock fully engages! - kapp->dcopClient()->call(appname, "KScreensaverIface", "lock()", TQCString(""), replyType, replyData); + tdeApp->dcopClient()->call(appname, "KScreensaverIface", "lock()", TQCString(""), replyType, replyData); } void PanelKMenu::slotLogout() { hide(); - kapp->requestShutDown(); + tdeApp->requestShutDown(); } void PanelKMenu::slotPopulateSessions() @@ -492,9 +492,9 @@ void PanelKMenu::slotPopulateSessions() DM dm; sessionsMenu->clear(); - if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) + if (tdeApp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) { - if (kapp->authorize("lock_screen")) { + if (tdeApp->authorize("lock_screen")) { sessionsMenu->insertItem(SmallIconSet("system-lock-screen"), i18n("Lock Current && Start New Session"), 100 ); } sessionsMenu->insertItem(SmallIconSet("switchuser"), i18n("Start New Session"), 101 ); @@ -528,7 +528,7 @@ void PanelKMenu::slotSessionActivated( int ent ) void PanelKMenu::doNewSession( bool lock ) { int result = KMessageBox::warningContinueCancel( - kapp->desktop()->screen(kapp->desktop()->screenNumber(this)), + tdeApp->desktop()->screen(tdeApp->desktop()->screenNumber(this)), i18n("<p>You have chosen to open another desktop session.<br>" "The current session will be hidden " "and a new login screen will be displayed.<br>" @@ -558,7 +558,7 @@ void PanelKMenu::doNewSession( bool lock ) void PanelKMenu::slotSaveSession() { TQByteArray data; - kapp->dcopClient()->send( "ksmserver", "default", + tdeApp->dcopClient()->send( "ksmserver", "default", "saveCurrentSession()", data ); } @@ -569,8 +569,8 @@ void PanelKMenu::slotRunCommand() if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->updateRemoteUserTimestamp( appname ); - kapp->dcopClient()->send( appname, "KDesktopIface", + tdeApp->updateRemoteUserTimestamp( appname ); + tdeApp->dcopClient()->send( appname, "KDesktopIface", "popupExecuteCommand()", data ); } diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index 5bf1d7231..b92440474 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -1225,9 +1225,9 @@ void KMenu::initialize() kdDebug(1210) << "KMenu::initialize()" << endl; // in case we've been through here before, let's disconnect - disconnect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), + disconnect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(paletteChanged())); - connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(paletteChanged())); /* @@ -1236,7 +1236,7 @@ void KMenu::initialize() TDEConfig ksmserver("ksmserverrc", false, false); ksmserver.setGroup("General"); connect( m_branding, TQ_SIGNAL(clicked()), TQ_SLOT(slotOpenHomepage())); - m_tabBar->setTabEnabled(LeaveTab, kapp->authorize("logout")); + m_tabBar->setTabEnabled(LeaveTab, tdeApp->authorize("logout")); // load search field history TQStringList histList = KickerSettings::history(); @@ -1309,10 +1309,10 @@ void KMenu::insertStaticExitItems() int index = 1; m_exitView->leftView()->insertSeparator( nId++, i18n("Session"), index++ ); - if (kapp->authorize("logout")) + if (tdeApp->authorize("logout")) m_exitView->leftView()->insertItem( "edit-undo", i18n( "Log out" ), i18n( "End current session" ), "kicker:/logout", nId++, index++ ); - if (kapp->authorize("lock_screen")) + if (tdeApp->authorize("lock_screen")) m_exitView->leftView()->insertItem( "system-lock-screen", i18n( "Lock" ), i18n( "Lock computer screen" ), "kicker:/lock", nId++, index++ ); @@ -1324,7 +1324,7 @@ void KMenu::insertStaticExitItems() i18n("Save current Session for next login"), "kicker:/savesession", nId++, index++ ); } - if (DM().isSwitchable() && kapp->authorize("switch_user")) + if (DM().isSwitchable() && tdeApp->authorize("switch_user")) { KMenuItem *switchuser = m_exitView->leftView()->insertItem( "switchuser", i18n( "Switch User" ), i18n( "Manage parallel sessions" ), "kicker:/switchuser/", nId++, index++ ); @@ -1386,7 +1386,7 @@ void KMenu::insertStaticItems() m_systemView->insertMenuItem(p, nId++, index++); // run command - if (kapp->authorize("run_command")) + if (tdeApp->authorize("run_command")) { m_systemView->insertItem( "system-run", i18n("Run Command..."), "", "kicker:/runusercommand", nId++, index++ ); @@ -1479,18 +1479,18 @@ void KMenu::slotLock() TQCString appname( "kdesktop" ); if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString("")); + tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString("")); } void KMenu::slotOpenHomepage() { accept(); - kapp->invokeBrowser("http://www.trinitydesktop.org"); + tdeApp->invokeBrowser("http://www.trinitydesktop.org"); } void KMenu::slotLogout() { - kapp->requestShutDown(); + tdeApp->requestShutDown(); } void KMenu::slotPopulateSessions() @@ -1499,9 +1499,9 @@ void KMenu::slotPopulateSessions() DM dm; sessionsMenu->clear(); - if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) + if (tdeApp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) { - if (kapp->authorize("lock_screen")) + if (tdeApp->authorize("lock_screen")) sessionsMenu->insertItem(/*SmallIconSet("lockfork"),*/ i18n("Lock Current && Start New Session"), 100 ); sessionsMenu->insertItem(SmallIconSet("fork"), i18n("Start New Session"), 101 ); if (!p) { @@ -1534,7 +1534,7 @@ void KMenu::slotSessionActivated( int ent ) void KMenu::doNewSession( bool lock ) { int result = KMessageBox::warningContinueCancel( - kapp->desktop()->screen(kapp->desktop()->screenNumber(this)), + tdeApp->desktop()->screen(tdeApp->desktop()->screenNumber(this)), i18n("<p>You have chosen to open another desktop session.<br>" "The current session will be hidden " "and a new login screen will be displayed.<br>" @@ -1583,8 +1583,8 @@ void KMenu::searchAccept() if ( logout ) { - kapp->propagateSessionManager(); - kapp->requestShutDown(); + tdeApp->propagateSessionManager(); + tdeApp->requestShutDown(); } if ( lock ) { @@ -1592,7 +1592,7 @@ void KMenu::searchAccept() int kicker_screen_number = tqt_xscreen(); if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString("")); + tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString("")); } } @@ -1656,7 +1656,7 @@ bool KMenu::runCommand() // fall-through to shell case case KURIFilterData::SHELL: { - if (kapp->authorize("shell_access")) + if (tdeApp->authorize("shell_access")) { exec = cmd; @@ -2419,7 +2419,7 @@ void KMenu::doQuery (bool return_pressed) #endif ) exe = TQString(); - else if (kapp->authorize("shell_access")) + else if (tdeApp->authorize("shell_access")) { if( filterData.hasArgsAndOptions() ) exe += filterData.argsAndOptions(); @@ -2660,7 +2660,7 @@ void KMenu::slotStartURL(const TQString& u) TQDataStream stream(params, IO_WriteOnly); stream << 0 << -1 << ""; - kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); + tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); } else if ( u == "kicker:/runcommand" ) { @@ -2675,14 +2675,14 @@ void KMenu::slotStartURL(const TQString& u) TQDataStream stream(params, IO_WriteOnly); stream << 2 << -1 << ""; - kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); + tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); } else if ( u == "kicker:/restart" ) { TQByteArray params; TQDataStream stream(params, IO_WriteOnly); stream << 1 << -1 << TQString(); - kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); + tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); } else if ( u == "kicker:/suspend_freeze" ) { slotSuspend( SuspendType::Freeze ); @@ -2701,7 +2701,7 @@ void KMenu::slotStartURL(const TQString& u) } else if ( u == "kicker:/savesession" ) { TQByteArray data; - kapp->dcopClient()->send( "ksmserver", "default", + tdeApp->dcopClient()->send( "ksmserver", "default", "saveCurrentSession()", data ); } else if ( u == "kicker:/switchuser" ) { @@ -2722,7 +2722,7 @@ void KMenu::slotStartURL(const TQString& u) TQDataStream stream(params, IO_WriteOnly); stream << 1 << -1 << rebootOptions[u.mid(16).toInt()]; - kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); + tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); } #warning restart entry not supported #if 0 @@ -2753,12 +2753,12 @@ void KMenu::slotStartURL(const TQString& u) TQDataStream arg(data, IO_WriteOnly); arg << u.mid(9,22); - kapp->dcopClient()->send("knotes","KNotesIface","showNote(TQString)", data); + tdeApp->dcopClient()->send("knotes","KNotesIface","showNote(TQString)", data); } return; } - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); (void) new KRun( u, parentWidget()); } } @@ -2837,7 +2837,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos if (hasEntries) m_popupMenu->insertSeparator(); - if (kapp->authorize("editable_desktop_icons") ) + if (tdeApp->authorize("editable_desktop_icons") ) { hasEntries = true; if (m_popupPath.menuPath.endsWith("/")) @@ -2847,7 +2847,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos m_popupMenu->insertItem(SmallIconSet("desktop"), i18n("Add Item to Desktop"), AddItemToDesktop); } - if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable()) + if (tdeApp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable()) { hasEntries = true; if (m_popupPath.menuPath.endsWith("/")) @@ -2857,7 +2857,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos m_popupMenu->insertItem(SmallIconSet("kicker"), i18n("Add Item to Main Panel"), AddItemToPanel); } - if (kapp->authorizeTDEAction("menuedit") && !kitem->menuPath().isEmpty()) + if (tdeApp->authorizeTDEAction("menuedit") && !kitem->menuPath().isEmpty()) { hasEntries = true; if (kitem->menuPath().endsWith("/")) @@ -2865,7 +2865,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos else m_popupMenu->insertItem(SmallIconSet("kmenuedit"), i18n("Edit Item"), EditItem); } - if (kapp->authorize("run_command") && (m_popupService || (!m_popupPath.menuPath.isEmpty() && !m_popupPath.menuPath.endsWith("/")))) + if (tdeApp->authorize("run_command") && (m_popupService || (!m_popupPath.menuPath.isEmpty() && !m_popupPath.menuPath.endsWith("/")))) { hasEntries = true; m_popupMenu->insertItem(SmallIconSet("system-run"), @@ -2969,10 +2969,10 @@ void KMenu::slotContextMenu(int selected) case AddItemToPanel: accept(); if (m_popupService) - kapp->dcopClient()->send("kicker", "Panel", "addServiceButton(TQString)", m_popupService->desktopEntryPath()); + tdeApp->dcopClient()->send("kicker", "Panel", "addServiceButton(TQString)", m_popupService->desktopEntryPath()); else #warning FIXME special RecentDocuments/foo.desktop handling - kapp->dcopClient()->send("kicker", "Panel", "addURLButton(TQString)", m_popupPath.path); + tdeApp->dcopClient()->send("kicker", "Panel", "addURLButton(TQString)", m_popupPath.path); accept(); break; @@ -2988,10 +2988,10 @@ void KMenu::slotContextMenu(int selected) case PutIntoRunDialog: accept(); if (m_popupService) - kapp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupService->exec()); + tdeApp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupService->exec()); else #warning FIXME special RecentDocuments/foo.desktop handling - kapp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupPath.path); + tdeApp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupPath.path); accept(); break; @@ -3010,7 +3010,7 @@ void KMenu::slotContextMenu(int selected) case AddMenuToPanel: accept(); ds << "foo" << m_popupPath.menuPath; - kapp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba); + tdeApp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba); break; case AddToFavorites: @@ -3243,7 +3243,7 @@ void KMenu::notifyServiceStarted(KService::Ptr service) TQDataStream stream(params, IO_WriteOnly); stream << "minicli" << service->storageId(); kdDebug() << "minicli appLauncher dcop signal: " << service->storageId() << endl; - TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher", + tdeApp->dcopClient()->emitDCOPSignal("appLauncher", "serviceStartedByStorageId(TQString,TQString)", params); } @@ -3569,7 +3569,7 @@ bool KMenu::ensureServiceRunning(const TQString & service) TQDataStream arg(data, IO_WriteOnly); arg << service << URLs; - if ( !kapp->dcopClient()->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)", + if ( !tdeApp->dcopClient()->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)", data, replyType, replyData) ) { tqWarning( "call to tdelauncher failed."); return false; @@ -3849,7 +3849,7 @@ void KMenu::runUserCommand() if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->updateRemoteUserTimestamp( appname ); - kapp->dcopClient()->send( appname, "KDesktopIface", + tdeApp->updateRemoteUserTimestamp( appname ); + tdeApp->dcopClient()->send( appname, "KDesktopIface", "popupExecuteCommand()", data ); } diff --git a/kicker/kicker/ui/media_watcher.cpp b/kicker/kicker/ui/media_watcher.cpp index 9ff74535c..d40178dc8 100644 --- a/kicker/kicker/ui/media_watcher.cpp +++ b/kicker/kicker/ui/media_watcher.cpp @@ -43,7 +43,7 @@ MediaWatcher::MediaWatcher( TQObject *parent ) : void MediaWatcher::updateDevices() { DCOPRef nsd( "kded", "mediamanager" ); - nsd.setDCOPClient( kapp->dcopClient() ); + nsd.setDCOPClient( tdeApp->dcopClient() ); m_devices = nsd.call( "fullList" ); } diff --git a/kicker/kicker/ui/popupmenutitle.h b/kicker/kicker/ui/popupmenutitle.h index 7aa839218..a6f3dec5e 100644 --- a/kicker/kicker/ui/popupmenutitle.h +++ b/kicker/kicker/ui/popupmenutitle.h @@ -46,7 +46,7 @@ public: { p->save(); TQRect r(x, y, w, h); - kapp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu, + tdeApp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu, p, r, cg); if (!m_desktopName.isEmpty()) @@ -73,7 +73,7 @@ public: { TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName); size.setHeight(size.height() + - (kapp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); + (tdeApp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); return size; } diff --git a/kicker/kicker/ui/quickbrowser_mnu.cpp b/kicker/kicker/ui/quickbrowser_mnu.cpp index 9efc1ab5c..4ca117f3f 100644 --- a/kicker/kicker/ui/quickbrowser_mnu.cpp +++ b/kicker/kicker/ui/quickbrowser_mnu.cpp @@ -44,17 +44,17 @@ void PanelQuickBrowser::initialize() KURL url; url.setPath(TQDir::homeDirPath()); - if (kapp->authorizeURLAction("list", KURL(), url)) + if (tdeApp->authorizeURLAction("list", KURL(), url)) insertItem(SmallIcon("kfm_home"), i18n("&Home Folder"), new PanelBrowserMenu(url.path(), this)); url.setPath(TQDir::rootDirPath()); - if (kapp->authorizeURLAction("list", KURL(), url)) + if (tdeApp->authorizeURLAction("list", KURL(), url)) insertItem(SmallIcon("folder_red"), i18n("&Root Folder"), new PanelBrowserMenu(url.path(), this)); url.setPath(TQDir::rootDirPath() + "etc"); - if (kapp->authorizeURLAction("list", KURL(), url)) + if (tdeApp->authorizeURLAction("list", KURL(), url)) insertItem(SmallIcon("folder_yellow"), i18n("System &Configuration"), new PanelBrowserMenu(url.path(), this)); } diff --git a/kicker/kicker/ui/recentapps.cpp b/kicker/kicker/ui/recentapps.cpp index ef2f5c6a1..0cb81b53f 100644 --- a/kicker/kicker/ui/recentapps.cpp +++ b/kicker/kicker/ui/recentapps.cpp @@ -112,7 +112,7 @@ void RecentlyLaunchedApps::appLaunched(const TQString& strApp) TQByteArray params; TQDataStream stream(params, IO_WriteOnly); stream << launchDCOPSignalSource() << strApp; - TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher", + tdeApp->dcopClient()->emitDCOPSignal("appLauncher", "serviceStartedByStorageId(TQString,TQString)", params); for (TQValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin(); diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index da5deae35..648b7088d 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -553,7 +553,7 @@ void PanelServiceMenu::slotExec(int id) KSycocaEntry * e = entryMap_[id]; - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); KService::Ptr service = static_cast<KService *>(e); TDEApplication::startServiceByDesktopPath(service->desktopEntryPath(), @@ -596,25 +596,25 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev) switch (contextKSycocaEntry_->sycocaType()) { case KST_KService: - if (kapp->authorize("editable_desktop_icons")) + if (tdeApp->authorize("editable_desktop_icons")) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("desktop"), i18n("Add Item to Desktop"), AddItemToDesktop); } - if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable()) + if (tdeApp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable()) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("kicker"), i18n("Add Item to Main Panel"), AddItemToPanel); } - if (kapp->authorizeTDEAction("menuedit")) + if (tdeApp->authorizeTDEAction("menuedit")) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("kmenuedit"), i18n("Edit Item"), EditItem); } - if (kapp->authorize("run_command")) + if (tdeApp->authorize("run_command")) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("system-run"), @@ -623,19 +623,19 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev) break; case KST_KServiceGroup: - if (kapp->authorize("editable_desktop_icons")) + if (tdeApp->authorize("editable_desktop_icons")) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("desktop"), i18n("Add Menu to Desktop"), AddMenuToDesktop); } - if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable()) + if (tdeApp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable()) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("kicker"), i18n("Add Menu to Main Panel"), AddMenuToPanel); } - if (kapp->authorizeTDEAction("menuedit")) + if (tdeApp->authorizeTDEAction("menuedit")) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("kmenuedit"), @@ -691,7 +691,7 @@ void PanelServiceMenu::slotContextMenu(int selected) if ( kicker_screen_number ) appname.sprintf("kicker-screen-%d", kicker_screen_number); service = static_cast<KService *>(contextKSycocaEntry_); - kapp->dcopClient()->send(appname, "Panel", "addServiceButton(TQString)", service->desktopEntryPath()); + tdeApp->dcopClient()->send(appname, "Panel", "addServiceButton(TQString)", service->desktopEntryPath()); break; } @@ -708,8 +708,8 @@ void PanelServiceMenu::slotContextMenu(int selected) if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); service = static_cast<KService *>(contextKSycocaEntry_); - kapp->updateRemoteUserTimestamp( appname ); - kapp->dcopClient()->send(appname, "default", "popupExecuteCommand(TQString)", service->exec()); + tdeApp->updateRemoteUserTimestamp( appname ); + tdeApp->dcopClient()->send(appname, "default", "popupExecuteCommand(TQString)", service->exec()); break; } @@ -735,7 +735,7 @@ void PanelServiceMenu::slotContextMenu(int selected) g = static_cast<KServiceGroup *>(contextKSycocaEntry_); ds << "foo" << g->relPath(); - kapp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba); + tdeApp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba); break; } diff --git a/kicker/libkicker/appletinfo.cpp b/kicker/libkicker/appletinfo.cpp index 4a851df55..73a13749f 100644 --- a/kicker/libkicker/appletinfo.cpp +++ b/kicker/libkicker/appletinfo.cpp @@ -81,7 +81,7 @@ AppletInfo::AppletInfo( const TQString& deskFile, const TQString& configFile, co else { m_configFile.append("_") - .append(kapp->randomString(20).lower()) + .append(tdeApp->randomString(20).lower()) .append("_rc"); } } diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp index c896c830a..d0aab24de 100644 --- a/kicker/libkicker/kickertip.cpp +++ b/kicker/libkicker/kickertip.cpp @@ -82,7 +82,7 @@ KickerTip::KickerTip(TQWidget * parent) hide(); connect(&m_frameTimer, TQ_SIGNAL(timeout()), TQ_SLOT(internalUpdate())); // // FIXME: The settingsChanged(SettingsCategory) signal is not available under Trinity; where was it originally supposed to come from? -// connect(kapp, TQ_SIGNAL(settingsChanged(SettingsCategory)), TQ_SLOT(slotSettingsChanged())); +// connect(tdeApp, TQ_SIGNAL(settingsChanged(SettingsCategory)), TQ_SLOT(slotSettingsChanged())); } KickerTip::~KickerTip() diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp index 8cdc4c664..808c90f80 100644 --- a/kicker/libkicker/menuinfo.cpp +++ b/kicker/libkicker/menuinfo.cpp @@ -39,13 +39,13 @@ MenuInfo::MenuInfo(const TQString& desktopFile) df.setGroup("Desktop Entry"); TQStringList list = df.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; } } diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index 0708d0b5f..688f5604d 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -89,12 +89,12 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard updateSettings(TDEApplication::SETTINGS_MOUSE); - kapp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged); + tdeApp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged); installEventFilter(KickerTip::the()); - connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(updateSettings(int))); - connect(kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(updateIcon(int))); + connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(updateSettings(int))); + connect(tdeApp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(updateIcon(int))); } void PanelButton::configure() @@ -1057,8 +1057,8 @@ void PanelPopupButton::slotExecMenu() m_pressedDuringPopup = false; KickerTip::enableTipping(false); - kapp->syncX(); - kapp->processEvents(); + tdeApp->syncX(); + tdeApp->processEvents(); if (!m_initialized) { diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp index 79fd19915..b6eaf3b79 100644 --- a/kicker/libkicker/simplebutton.cpp +++ b/kicker/libkicker/simplebutton.cpp @@ -47,13 +47,13 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name, bool forceStandar { setBackgroundOrigin( AncestorOrigin ); - connect( kapp, TQ_SIGNAL( settingsChanged( int ) ), + connect( tdeApp, TQ_SIGNAL( settingsChanged( int ) ), TQ_SLOT( slotSettingsChanged( int ) ) ); - connect( kapp, TQ_SIGNAL( iconChanged( int ) ), + connect( tdeApp, TQ_SIGNAL( iconChanged( int ) ), TQ_SLOT( slotIconChanged( int ) ) ); - kapp->addKipcEventMask( KIPC::SettingsChanged ); - kapp->addKipcEventMask( KIPC::IconChanged ); + tdeApp->addKipcEventMask( KIPC::SettingsChanged ); + tdeApp->addKipcEventMask( KIPC::IconChanged ); slotSettingsChanged( TDEApplication::SETTINGS_MOUSE ); } diff --git a/kicker/menuext/find/findmenu.cpp b/kicker/menuext/find/findmenu.cpp index a45bdabb5..3708a9dd1 100644 --- a/kicker/menuext/find/findmenu.cpp +++ b/kicker/menuext/find/findmenu.cpp @@ -67,13 +67,13 @@ void FindMenu::slotExec( int pos ) { TQString app = mConfigList[ pos ]; - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); KSimpleConfig config(app, true); config.setDesktopGroup(); - if (kapp && config.readEntry("Type") == "Link") + if (tdeApp && config.readEntry("Type") == "Link") { - kapp->invokeBrowser(config.readEntry("URL")); + tdeApp->invokeBrowser(config.readEntry("URL")); } else { diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp index 089a8ac93..a8f16053a 100644 --- a/kicker/menuext/kate/katesessionmenu.cpp +++ b/kicker/menuext/kate/katesessionmenu.cpp @@ -167,7 +167,7 @@ void KateSessionMenu::slotExec( int id ) else if ( id > 2 ) args << m_sessions[ id-3 ]; - kapp->tdeinitExec("kate", args); + tdeApp->tdeinitExec("kate", args); } void KateSessionMenu::reloadSessionsList() diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp index 321d9ac59..85f85b7bc 100644 --- a/kicker/menuext/konq-profiles/konqy_menu.cpp +++ b/kicker/menuext/konq-profiles/konqy_menu.cpp @@ -83,7 +83,7 @@ void KonquerorProfilesMenu::slotExec(int id) { TQStringList args; args<<"--profile"<<m_profiles[id-1]; - kapp->tdeinitExec("konqueror", args); + tdeApp->tdeinitExec("konqueror", args); } void KonquerorProfilesMenu::reload() diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp index 2e196186f..17ca9d629 100644 --- a/kicker/menuext/konsole/konsole_mnu.cpp +++ b/kicker/menuext/konsole/konsole_mnu.cpp @@ -91,7 +91,7 @@ void KonsoleMenu::initialize() } else { - kapp->iconLoader()->addAppDir("konsole"); + tdeApp->iconLoader()->addAppDir("konsole"); } setInitialized(true); @@ -244,7 +244,7 @@ void KonsoleMenu::slotExec(int id) } --id; - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); TQStringList args; if (static_cast<unsigned int>(id) < sessionList.count()) { @@ -273,7 +273,7 @@ void KonsoleMenu::launchProfile(int id) // this is a session, not a bookmark, so execute that instead TQStringList args; args << "--profile" << m_profiles[id]; - kapp->tdeinitExec("konsole", args); + tdeApp->tdeinitExec("konsole", args); } KURL KonsoleMenu::baseURL() const diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp index 5440c1ed7..97da9b986 100644 --- a/kicker/menuext/prefmenu/prefmenu.cpp +++ b/kicker/menuext/prefmenu/prefmenu.cpp @@ -328,7 +328,7 @@ void PrefMenu::slotExec(int id) return; } - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); KSycocaEntry *e = m_entryMap[id]; KService::Ptr service = static_cast<KService *>(e); TDEApplication::startServiceByDesktopPath(service->desktopEntryPath(), diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp index 90c84ee32..65834db13 100644 --- a/kicker/menuext/recentdocs/recentdocsmenu.cpp +++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp @@ -96,7 +96,7 @@ void RecentDocsMenu::slotClearHistory() { void RecentDocsMenu::slotExec(int id) { if (id >= 0) { - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); KURL u; u.setPath(_fileList[id]); KDEDesktopMimeType::run(u, true); diff --git a/kicker/menuext/tdeprint/print_mnu.cpp b/kicker/menuext/tdeprint/print_mnu.cpp index 3a1b31145..c0ca57d7c 100644 --- a/kicker/menuext/tdeprint/print_mnu.cpp +++ b/kicker/menuext/tdeprint/print_mnu.cpp @@ -103,13 +103,13 @@ void PrintMenu::slotExec(int ID) switch (ID) { case ADD_PRINTER_ID: - kapp->tdeinitExec("kaddprinterwizard"); + tdeApp->tdeinitExec("kaddprinterwizard"); break; case TDEPRINT_SETTINGS_ID: - kapp->tdeinitExec("kaddprinterwizard", TQStringList("--tdeconfig")); + tdeApp->tdeinitExec("kaddprinterwizard", TQStringList("--tdeconfig")); break; case CONFIG_SERVER_ID: - kapp->tdeinitExec("kaddprinterwizard", TQStringList("--serverconfig")); + tdeApp->tdeinitExec("kaddprinterwizard", TQStringList("--serverconfig")); break; case PRINT_MANAGER_ID: KRun::runCommand("tdecmshell tde-printers.desktop"); @@ -118,14 +118,14 @@ void PrintMenu::slotExec(int ID) KRun::runCommand("kfmclient openProfile filemanagement print:/", "kfmclient", "konqueror"); break; case KPRINTER_ID: - kapp->tdeinitExec("kprinter"); + tdeApp->tdeinitExec("kprinter"); break; default: { // start kjobviewer TQStringList args; args << "--show" << "-d" << text(ID).remove('&'); - kapp->tdeinitExec("kjobviewer", args); + tdeApp->tdeinitExec("kjobviewer", args); } break; } diff --git a/kicker/menuext/tom/tom.cpp b/kicker/menuext/tom/tom.cpp index 3e97cf385..17d1a8b01 100644 --- a/kicker/menuext/tom/tom.cpp +++ b/kicker/menuext/tom/tom.cpp @@ -143,7 +143,7 @@ class runMenuWidget : public TQWidget, public QMenuItem TQPainter p(this); TQRect r(rect()); // ew, nasty hack. may result in coredumps due to horrid C-style cast??? - kapp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled, + tdeApp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled, TQStyleOption(static_cast<TQMenuItem*>(this), 0, TDEIcon::SizeMedium )); p.drawPixmap(KDialog::spacingHint(), 1, icon); p.drawText((KDialog::spacingHint() * 2) + TDEIcon::SizeMedium, textRect.height() + ((height() - textRect.height()) / 2), i18n("Run:")); @@ -432,7 +432,7 @@ void TOM::initialize() } else { - connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged())); + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged())); }*/ // TASKS @@ -484,7 +484,7 @@ void TOM::initialize() { removeItem(destMenuTitleID); } - else if (kapp->authorize("run_command")) + else if (tdeApp->authorize("run_command")) { insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand())); } @@ -510,7 +510,7 @@ void TOM::initialize() insertTitle(i18n("Special Items"), contextMenuTitleID); // if we have no destinations, put the run command here - if (numDests == 0 && kapp->authorize("run_command")) + if (numDests == 0 && tdeApp->authorize("run_command")) { insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand())); } @@ -817,8 +817,8 @@ void TOM::runCommand() if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->updateRemoteUserTimestamp( appname ); - kapp->dcopClient()->send( appname, "KDesktopIface", + tdeApp->updateRemoteUserTimestamp( appname ); + tdeApp->dcopClient()->send( appname, "KDesktopIface", "popupExecuteCommand()", data ); } @@ -826,7 +826,7 @@ void TOM::runTask(int id) { if (!m_tasks.contains(id)) return; - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); TDEApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(), TQStringList(), 0, 0, 0, "", true); } @@ -840,7 +840,7 @@ void TOM::openRecentDocument(int id) { if (id >= 0) { - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); KURL u; u.setPath(m_recentDocURLs[id]); KDEDesktopMimeType::run(u, true); @@ -849,7 +849,7 @@ void TOM::openRecentDocument(int id) void TOM::logout() { - kapp->requestShutDown(); + tdeApp->requestShutDown(); } #include "tom.moc" diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index 9c0bdbfb4..ee443523c 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -126,7 +126,7 @@ AppletProxy::AppletProxy(TQObject* parent, const char* name) , _applet(0) { // try to attach to DCOP server - if (!kapp->dcopClient()->attach()) { + if (!tdeApp->dcopClient()->attach()) { kdError() << "Failed to attach to DCOP server." << endl; KMessageBox::error(0, i18n("The applet proxy could not be started due to DCOP communication problems."), @@ -134,7 +134,7 @@ AppletProxy::AppletProxy(TQObject* parent, const char* name) exit(0); } - if (kapp->dcopClient()->registerAs("applet_proxy", true) == 0) { + if (tdeApp->dcopClient()->registerAs("applet_proxy", true) == 0) { kdError() << "Failed to register at DCOP server." << endl; KMessageBox::error(0, i18n("The applet proxy could not be started due to DCOP registration problems."), @@ -147,7 +147,7 @@ AppletProxy::AppletProxy(TQObject* parent, const char* name) AppletProxy::~AppletProxy() { - kapp->dcopClient()->detach(); + tdeApp->dcopClient()->detach(); delete _info; delete _applet; } @@ -255,7 +255,7 @@ void AppletProxy::dock(const TQCString& callbackID) _callbackID = callbackID; // try to attach to DCOP server - DCOPClient* dcop = kapp->dcopClient(); + DCOPClient* dcop = tdeApp->dcopClient(); dcop->setNotifications(true); connect(dcop, TQ_SIGNAL(applicationRemoved(const TQCString&)), @@ -463,7 +463,7 @@ void AppletProxy::slotUpdateLayout() else appname.sprintf("kicker-screen-%d", screen_number); - kapp->dcopClient()->send(appname, _callbackID, "updateLayout()", data); + tdeApp->dcopClient()->send(appname, _callbackID, "updateLayout()", data); } void AppletProxy::slotRequestFocus() @@ -480,7 +480,7 @@ void AppletProxy::slotRequestFocus() else appname.sprintf("kicker-screen-%d", screen_number); - kapp->dcopClient()->send(appname, _callbackID, "requestFocus()", data); + tdeApp->dcopClient()->send(appname, _callbackID, "requestFocus()", data); } void AppletProxy::slotApplicationRemoved(const TQCString& appId) @@ -496,7 +496,7 @@ void AppletProxy::slotApplicationRemoved(const TQCString& appId) if(appId == appname) { kdDebug(1210) << "Connection to kicker lost, shutting down" << endl; - kapp->quit(); + tdeApp->quit(); } } @@ -510,7 +510,7 @@ void AppletProxy::showStandalone() _applet->resize( _applet->widthForHeight( 48 ), 48 ); _applet->setMinimumSize( _applet->size() ); _applet->setCaption( _info->name() ); - kapp->setMainWidget( _applet ); + tdeApp->setMainWidget( _applet ); _applet->show(); } diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index 9a255ab26..1c2a8d2a6 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -108,12 +108,12 @@ ExtensionProxy::ExtensionProxy(TQObject* parent, const char* name) , _extension(0) { // try to attach to DCOP server - if (!kapp->dcopClient()->attach()) { + if (!tdeApp->dcopClient()->attach()) { kdError() << "Failed to attach to DCOP server." << endl; exit(0); } - if (kapp->dcopClient()->registerAs("extension_proxy", true) == 0) { + if (tdeApp->dcopClient()->registerAs("extension_proxy", true) == 0) { kdError() << "Failed to register at DCOP server." << endl; exit(0); } @@ -121,7 +121,7 @@ ExtensionProxy::ExtensionProxy(TQObject* parent, const char* name) ExtensionProxy::~ExtensionProxy() { - kapp->dcopClient()->detach(); + tdeApp->dcopClient()->detach(); } void ExtensionProxy::loadExtension(const TQCString& desktopFile, const TQCString& configFile) @@ -195,7 +195,7 @@ void ExtensionProxy::dock(const TQCString& callbackID) _callbackID = callbackID; // try to attach to DCOP server - DCOPClient* dcop = kapp->dcopClient(); + DCOPClient* dcop = tdeApp->dcopClient(); dcop->setNotifications(true); connect(dcop, TQ_SIGNAL(applicationRemoved(const TQCString&)), @@ -380,7 +380,7 @@ void ExtensionProxy::slotUpdateLayout() else appname.sprintf("kicker-screen-%d", screen_number); - kapp->dcopClient()->send(appname, _callbackID, "updateLayout()", data); + tdeApp->dcopClient()->send(appname, _callbackID, "updateLayout()", data); } void ExtensionProxy::slotApplicationRemoved(const TQCString& appId) @@ -396,6 +396,6 @@ void ExtensionProxy::slotApplicationRemoved(const TQCString& appId) if(appId == appname) { kdDebug(1210) << "Connection to kicker lost, shutting down" << endl; - kapp->quit(); + tdeApp->quit(); } } diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index ac0133668..d6a7d0f4e 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -131,7 +131,7 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin blocklayout = false; - connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); + connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); keys = new TDEGlobalAccel( this ); #include "taskbarbindings.cpp" keys->readSettings(); diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp index efde7dd2c..32ad5531e 100644 --- a/kicker/taskbar/taskbarcontainer.cpp +++ b/kicker/taskbar/taskbarcontainer.cpp @@ -161,7 +161,7 @@ void TaskBarContainer::configure() break; } - windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon, + windowListButton->setPixmap(tdeApp->iconLoader()->loadIcon(icon, TDEIcon::Panel, 16)); windowListButton->setMinimumSize(windowListButton->sizeHint()); @@ -188,20 +188,20 @@ void TaskBarContainer::preferences() { TQByteArray data; - if (!kapp->dcopClient()->isAttached()) + if (!tdeApp->dcopClient()->isAttached()) { - kapp->dcopClient()->attach(); + tdeApp->dcopClient()->attach(); } if (configFile == GLOBAL_TASKBAR_CONFIG_FILE_NAME) { - kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data); + tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data); } else { TQDataStream args( data, IO_WriteOnly ); args << configFile; - kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig(TQString)", data); + tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig(TQString)", data); } } @@ -266,7 +266,7 @@ void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d) if (windowListButton) { - windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon, + windowListButton->setPixmap(tdeApp->iconLoader()->loadIcon(icon, TDEIcon::Panel, 16)); windowListButton->setMinimumSize(windowListButton->sizeHint()); diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index 5a8464cd5..bbb449a52 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -724,7 +724,7 @@ void TaskContainer::drawButton(TQPainter *p) if (taskBar->showIcons()) { if (pixmap.isNull() && m_startup) - pixmap = kapp->iconLoader()->loadIcon(m_startup->icon(), TDEIcon::Panel, iconSize); + pixmap = tdeApp->iconLoader()->loadIcon(m_startup->icon(), TDEIcon::Panel, iconSize); if ( !pixmap.isNull() ) { @@ -1254,7 +1254,7 @@ void TaskContainer::popupMenu(int action) } else if (action == m_settingsObject->ShowOperationsMenu) { - if (!kapp->authorizeTDEAction("twin_rmb")) + if (!tdeApp->authorizeTDEAction("twin_rmb")) { return; } diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp index 43cd3c7e9..3e941315f 100644 --- a/kicker/taskmanager/taskmanager.cpp +++ b/kicker/taskmanager/taskmanager.cpp @@ -1459,7 +1459,7 @@ void Task::tileTo(int position) TQByteArray params; TQDataStream stream(params, IO_WriteOnly); stream << _win << position; - TDEApplication::kApplication()->dcopClient()->send("twin", "KWinInterface", "tileWindowToBorder(unsigned long int, int)", params); + tdeApp->dcopClient()->send("twin", "KWinInterface", "tileWindowToBorder(unsigned long int, int)", params); } Startup::Startup(const TDEStartupInfoId& id, const TDEStartupInfoData& data, |