summaryrefslogtreecommitdiffstats
path: root/kdesktop
diff options
context:
space:
mode:
Diffstat (limited to 'kdesktop')
-rw-r--r--kdesktop/bgmanager.cpp8
-rw-r--r--kdesktop/desktop.cpp40
-rw-r--r--kdesktop/init.cpp2
-rw-r--r--kdesktop/kcustommenu.cpp2
-rw-r--r--kdesktop/kdesktopbindings.cpp8
-rw-r--r--kdesktop/kdiconview.cpp12
-rw-r--r--kdesktop/krootwm.cpp38
-rw-r--r--kdesktop/kwebdesktop/kwebdesktop.cpp4
-rw-r--r--kdesktop/lock/lockdlg.cpp4
-rw-r--r--kdesktop/lock/lockprocess.cpp22
-rw-r--r--kdesktop/lockeng.cpp8
-rw-r--r--kdesktop/main.cpp6
-rw-r--r--kdesktop/minicli.cpp14
-rw-r--r--kdesktop/pixmapserver.cpp2
-rw-r--r--kdesktop/startupid.cpp4
-rw-r--r--kdesktop/xautolock.cpp2
16 files changed, 88 insertions, 88 deletions
diff --git a/kdesktop/bgmanager.cpp b/kdesktop/bgmanager.cpp
index a7078f12e..49cff2c16 100644
--- a/kdesktop/bgmanager.cpp
+++ b/kdesktop/bgmanager.cpp
@@ -102,7 +102,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule
}
#ifdef COMPOSITE
- m_tPixmap = new KPixmap(kapp->desktop()->size());
+ m_tPixmap = new KPixmap(tdeApp->desktop()->size());
m_tPixmap->fill(TQColor(0, 0x0));
connect(myApp, TQ_SIGNAL(cmBackgroundChanged( bool )),
TQ_SLOT(slotCmBackgroundChanged( bool )));
@@ -130,7 +130,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule
#if (TQT_VERSION-0 >= 0x030200)
- connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); // RANDR support
+ connect( tdeApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); // RANDR support
#endif
TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
@@ -1026,13 +1026,13 @@ void KBackgroundManager::desktopResized()
#ifdef COMPOSITE
if (m_tPixmap)
delete m_tPixmap;
- m_tPixmap = new KPixmap(kapp->desktop()->size());
+ m_tPixmap = new KPixmap(tdeApp->desktop()->size());
m_tPixmap->fill(TQColor(0, 0x0));
#endif
m_Hash = 0;
if( m_pDesktop ) {
- m_pDesktop->resize( kapp->desktop()->geometry().size());
+ m_pDesktop->resize( tdeApp->desktop()->geometry().size());
if (m_Renderer[effectiveDesktop()]->renderer(0)->usingCrossXml()){
m_Renderer[effectiveDesktop()]->renderer(0)->changeWallpaper();
}
diff --git a/kdesktop/desktop.cpp b/kdesktop/desktop.cpp
index fa3426023..ede2fadbc 100644
--- a/kdesktop/desktop.cpp
+++ b/kdesktop/desktop.cpp
@@ -71,8 +71,8 @@ extern TQCString kdesktop_name, kicker_name, twin_name;
KRootWidget::KRootWidget() : TQObject()
{
- kapp->desktop()->installEventFilter(this);
- kapp->desktop()->setAcceptDrops( true );
+ tdeApp->desktop()->installEventFilter(this);
+ tdeApp->desktop()->setAcceptDrops( true );
}
bool KRootWidget::eventFilter ( TQObject *, TQEvent * e )
@@ -157,8 +157,8 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) :
setAcceptDrops(true); // WStyle_Customize seems to disable that
m_pKwinmodule = new KWinModule( this );
- kapp->dcopClient()->setNotifications(true);
- kapp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(TQRect, int)",
+ tdeApp->dcopClient()->setNotifications(true);
+ tdeApp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(TQRect, int)",
"KDesktopIface", "desktopIconsAreaChanged(TQRect, int)", false);
// Dont repaint on configuration changes during construction
@@ -184,15 +184,15 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) :
setGeometry( TQApplication::desktop()->geometry() );
lower();
- connect( kapp, TQ_SIGNAL( shutDown() ),
+ connect( tdeApp, TQ_SIGNAL( shutDown() ),
this, TQ_SLOT( slotShutdown() ) );
- connect(kapp, TQ_SIGNAL(settingsChanged(int)),
+ connect(tdeApp, TQ_SIGNAL(settingsChanged(int)),
this, TQ_SLOT(slotSettingsChanged(int)));
- kapp->addKipcEventMask(KIPC::SettingsChanged);
+ tdeApp->addKipcEventMask(KIPC::SettingsChanged);
- kapp->addKipcEventMask(KIPC::IconChanged);
- connect(kapp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(slotIconChanged(int)));
+ tdeApp->addKipcEventMask(KIPC::IconChanged);
+ connect(tdeApp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(slotIconChanged(int)));
connect(KSycoca::self(), TQ_SIGNAL(databaseChanged()),
this, TQ_SLOT(slotDatabaseChanged()));
@@ -205,7 +205,7 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) :
TQTimer::singleShot(0, this, TQ_SLOT( slotStart() ));
#if (TQT_VERSION-0 >= 0x030200) // XRANDR support
- connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
+ connect( tdeApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
#endif
}
@@ -301,7 +301,7 @@ KDesktop::initRoot()
TQCString replyType;
TQRect area;
- if ( kapp->dcopClient()->call(kicker_name, kicker_name, "desktopIconsArea(int)",
+ if ( tdeApp->dcopClient()->call(kicker_name, kicker_name, "desktopIconsArea(int)",
data, replyType, result, false, 2000) )
{
TQDataStream res(result, IO_ReadOnly);
@@ -364,7 +364,7 @@ KDesktop::backgroundInitDone()
m_pIconView->setErasePixmap( *bg );
show();
- kapp->sendPostedEvents();
+ tdeApp->sendPostedEvents();
}
DCOPRef r( "ksmserver", "ksmserver" );
@@ -404,7 +404,7 @@ KDesktop::slotStart()
keys->readSettings();
keys->updateConnections();
- connect(kapp, TQ_SIGNAL(appearanceChanged()), TQ_SLOT(slotConfigure()));
+ connect(tdeApp, TQ_SIGNAL(appearanceChanged()), TQ_SLOT(slotConfigure()));
TQTimer::singleShot(300, this, TQ_SLOT( slotUpAndRunning() ));
}
@@ -504,7 +504,7 @@ void KDesktop::popupExecuteCommand(const TQString& command)
if (m_bInit)
return;
- if (!kapp->authorize("run_command"))
+ if (!tdeApp->authorize("run_command"))
return;
// Created on demand
@@ -839,7 +839,7 @@ void KDesktop::refresh()
m_bNeedRepaint |= 1;
updateWorkArea();
#endif
- kapp->dcopClient()->send( twin_name, "", "refresh()", TQString(""));
+ tdeApp->dcopClient()->send( twin_name, "", "refresh()", TQString(""));
refreshIcons();
}
@@ -907,7 +907,7 @@ void KDesktop::desktopIconsAreaChanged(const TQRect &area, int screen)
if (screen <= -2)
screen = kdesktop_screen_number;
else if (screen == -1)
- screen = kapp->desktop()->primaryScreen();
+ screen = tdeApp->desktop()->primaryScreen();
// This is pretty broken, mixes Xinerama and non-Xinerama multihead
// and generally doesn't seem to be required anyway => ignore screen.
@@ -1032,7 +1032,7 @@ void KDesktop::logout()
void KDesktop::logout( TDEApplication::ShutdownConfirm confirm,
TDEApplication::ShutdownType sdtype )
{
- if( !kapp->requestShutDown( confirm, sdtype ) )
+ if( !tdeApp->requestShutDown( confirm, sdtype ) )
// this i18n string is also in kicker/applets/run/runapplet
KMessageBox::error( this, i18n("Could not log out properly.\nThe session manager cannot "
"be contacted. You can try to force a shutdown by pressing "
@@ -1124,7 +1124,7 @@ void KDesktop::setIconsEnabled( bool enable )
void KDesktop::desktopResized()
{
- resize(kapp->desktop()->size());
+ resize(tdeApp->desktop()->size());
if ( m_pIconView )
{
@@ -1132,7 +1132,7 @@ void KDesktop::desktopResized()
// remove all icons, resize desktop, tell kdiconview new iconsArea size
// tell kdiconview to reget all icons
m_pIconView->slotClear();
- m_pIconView->resize(kapp->desktop()->size());
+ m_pIconView->resize(tdeApp->desktop()->size());
// get new desktopIconsArea from kicker
TQByteArray data, result;
@@ -1141,7 +1141,7 @@ void KDesktop::desktopResized()
TQCString replyType;
TQRect area;
- if ( kapp->dcopClient()->call(kicker_name, kicker_name, "desktopIconsArea(int)",
+ if ( tdeApp->dcopClient()->call(kicker_name, kicker_name, "desktopIconsArea(int)",
data, replyType, result, false, 2000) )
{
TQDataStream res(result, IO_ReadOnly);
diff --git a/kdesktop/init.cpp b/kdesktop/init.cpp
index 90211e8a5..f881d614f 100644
--- a/kdesktop/init.cpp
+++ b/kdesktop/init.cpp
@@ -134,7 +134,7 @@ static TQString realDesktopPath()
*/
static void copyDesktopLinks()
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("General");
if (!config->readBoolEntry("CopyDesktopLinks", true))
return;
diff --git a/kdesktop/kcustommenu.cpp b/kdesktop/kcustommenu.cpp
index cd1287d3d..f3d3cf817 100644
--- a/kdesktop/kcustommenu.cpp
+++ b/kdesktop/kcustommenu.cpp
@@ -71,7 +71,7 @@ KCustomMenu::slotActivated(int id)
KService::Ptr s = d->entryMap[id];
if (!s)
return;
- kapp->startServiceByDesktopPath(s->desktopEntryPath());
+ tdeApp->startServiceByDesktopPath(s->desktopEntryPath());
}
// The following is copied from kicker's PanelServiceMenu
diff --git a/kdesktop/kdesktopbindings.cpp b/kdesktop/kdesktopbindings.cpp
index 5f4fb24cd..a4f46e717 100644
--- a/kdesktop/kdesktopbindings.cpp
+++ b/kdesktop/kdesktopbindings.cpp
@@ -14,7 +14,7 @@
keys->insert( "Program:kdesktop", i18n("Desktop") );
#ifndef NOSLOTS
- if (kapp->authorize("run_command"))
+ if (tdeApp->authorize("run_command"))
{
#endif
DEF( I18N_NOOP("Run Command"), ALT+TQt::Key_F2, WIN+TQt::Key_Return, slotExecuteCommand() );
@@ -25,20 +25,20 @@
DEF( I18N_NOOP("Show Window List"), ALT+TQt::Key_F5, WIN+TQt::Key_0, slotShowWindowList() );
DEF( I18N_NOOP("Switch User"), ALT+CTRL+TQt::Key_Insert, WIN+TQt::Key_Insert, slotSwitchUser() );
#ifndef NOSLOTS
- if (kapp->authorize("lock_screen"))
+ if (tdeApp->authorize("lock_screen"))
{
#endif
DEF2( I18N_NOOP("Lock Session"), ALT+CTRL+TQt::Key_L, WIN+TQt::Key_ScrollLock, KRootWm::self(), TQ_SLOT(slotLock()) );
DEF2( I18N_NOOP("Lock Session (Hotkey)"), TDEShortcut(TQString("XF86ScreenSaver")), TDEShortcut(TQString("XF86ScreenSaver")), KRootWm::self(), TQ_SLOT(slotLock()) );
#ifndef NOSLOTS
}
- if (kapp->authorize("start_screensaver"))
+ if (tdeApp->authorize("start_screensaver"))
{
#endif
DEF2( I18N_NOOP("Start Screen Saver"), ALT+CTRL+TQt::Key_S, WIN+TQt::Key_S, KRootWm::self(), TQ_SLOT(slotSave()) );
#ifndef NOSLOTS
}
- if (kapp->authorize("logout"))
+ if (tdeApp->authorize("logout"))
{
#endif
DEF( I18N_NOOP("Log Out"), ALT+CTRL+TQt::Key_Delete, WIN+TQt::Key_Escape, slotLogout() );
diff --git a/kdesktop/kdiconview.cpp b/kdesktop/kdiconview.cpp
index 7d79d12cf..62319e1fd 100644
--- a/kdesktop/kdiconview.cpp
+++ b/kdesktop/kdiconview.cpp
@@ -138,7 +138,7 @@ KDIconView::KDIconView( TQWidget *parent, const char* name )
m_bNeedSave( false ),
m_autoAlign( false ),
m_hasExistingPos( false ),
- m_bEditableDesktopIcons( kapp->authorize("editable_desktop_icons") ),
+ m_bEditableDesktopIcons( tdeApp->authorize("editable_desktop_icons") ),
m_bShowDot( false ),
m_bVertAlign( true ),
m_dirLister( 0L ),
@@ -379,7 +379,7 @@ void KDIconView::start()
// Start the directory lister !
m_dirLister->setShowingDotFiles( m_bShowDot );
- kapp->allowURLAction("list", KURL(), url());
+ tdeApp->allowURLAction("list", KURL(), url());
startDirLister();
createActions();
}
@@ -566,7 +566,7 @@ void KDIconView::startDirLister()
u.setPath( *it );
m_mergeDirs.append( u );
// And start listing this dir right now
- kapp->allowURLAction("list", KURL(), u);
+ tdeApp->allowURLAction("list", KURL(), u);
m_dirLister->openURL( u, true );
}
configureMedia();
@@ -749,7 +749,7 @@ void KDIconView::slotReturnPressed( TQIconViewItem *item )
void KDIconView::slotExecuted( TQIconViewItem *item )
{
- kapp->propagateSessionManager();
+ tdeApp->propagateSessionManager();
m_lastDeletedIconPos = TQPoint(); // user action -> not renaming an icon
if (item) {
visualActivate(item);
@@ -839,7 +839,7 @@ void KDIconView::saveMediaListView()
appname = "kdesktop";
else
appname.sprintf("kdesktop-screen-%d", konq_screen_number);
- kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
+ tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
delete g_pConfig;
}
@@ -947,7 +947,7 @@ void KDIconView::slotDelete()
// Not to be confused with the global popup-menu, KRootWm, when doing RMB on the desktop
void KDIconView::popupMenu( const TQPoint &_global, const KFileItemList& _items )
{
- if (!kapp->authorize("action/kdesktop_rmb")) return;
+ if (!tdeApp->authorize("action/kdesktop_rmb")) return;
if (!m_dirLister) return;
if ( _items.count() == 1 )
m_popupURL = _items.getFirst()->url();
diff --git a/kdesktop/krootwm.cpp b/kdesktop/krootwm.cpp
index 00685c3d9..28d1dbd98 100644
--- a/kdesktop/krootwm.cpp
+++ b/kdesktop/krootwm.cpp
@@ -86,7 +86,7 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
// Creates the new menu
menuBar = 0; // no menubar yet
menuNew = 0;
- if (m_bDesktopEnabled && kapp->authorize("editable_desktop_icons"))
+ if (m_bDesktopEnabled && tdeApp->authorize("editable_desktop_icons"))
{
menuNew = new KNewMenu( m_actionCollection, "new_menu" );
connect(menuNew->popupMenu(), TQ_SIGNAL( aboutToShow() ),
@@ -95,7 +95,7 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
m_pDesktop->iconView(), TQ_SLOT( slotNewMenuActivated() ) );
}
- if (kapp->authorizeTDEAction("bookmarks"))
+ if (tdeApp->authorizeTDEAction("bookmarks"))
{
bookmarks = new TDEActionMenu( i18n("Bookmarks"), "bookmark", m_actionCollection, "bookmarks" );
// The KBookmarkMenu is needed to fill the Bookmarks menu in the desktop menubar.
@@ -132,7 +132,7 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
}
#endif
- if (kapp->authorize("run_command"))
+ if (tdeApp->authorize("run_command"))
{
new TDEAction(i18n("Run Command..."), "system-run", 0, m_pDesktop, TQ_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
new TDEAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQ_SLOT( slotOpenTerminal() ),
@@ -153,7 +153,7 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
m_actionCollection, "cascade" );
// arrange menu actions
- if (m_bDesktopEnabled && kapp->authorize("editable_desktop_icons"))
+ if (m_bDesktopEnabled && tdeApp->authorize("editable_desktop_icons"))
{
new TDEAction(i18n("By Name (Case Sensitive)"), 0, this, TQ_SLOT( slotArrangeByNameCS() ),
m_actionCollection, "sort_ncs");
@@ -189,22 +189,22 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
m_actionCollection, "refresh" );
}
// Icons in sync with kicker
- if (kapp->authorize("lock_screen"))
+ if (tdeApp->authorize("lock_screen"))
{
new TDEAction(i18n("Lock Session"), "system-lock-screen", 0, this, TQ_SLOT( slotLock() ),
m_actionCollection, "lock" );
}
- if (kapp->authorize("logout"))
+ if (tdeApp->authorize("logout"))
{
new TDEAction(i18n("Log Out \"%1\"...").arg(KUser().loginName()), "system-log-out", 0,
this, TQ_SLOT( slotLogout() ), m_actionCollection, "logout" );
}
- if (kapp->authorize("start_new_session") && DM().isSwitchable())
+ if (tdeApp->authorize("start_new_session") && DM().isSwitchable())
{
new TDEAction(i18n("Start New Session"), "fork", 0, this,
TQ_SLOT( slotNewSession() ), m_actionCollection, "newsession" );
- if (kapp->authorize("lock_screen"))
+ if (tdeApp->authorize("lock_screen"))
{
new TDEAction(i18n("Lock Current && Start New Session"), "system-lock-screen", 0, this,
TQ_SLOT( slotLockNNewSession() ), m_actionCollection, "lockNnewsession" );
@@ -249,7 +249,7 @@ void KRootWm::initConfig()
// Read configuration for icons alignment
if ( m_bDesktopEnabled ) {
m_pDesktop->iconView()->setAutoAlign( KDesktopSettings::autoLineUpIcons() );
- if ( kapp->authorize( "editable_desktop_icons" ) ) {
+ if ( tdeApp->authorize( "editable_desktop_icons" ) ) {
m_pDesktop->iconView()->setIconsLocked( KDesktopSettings::lockIcons() );
TDEToggleAction *aLockIcons = static_cast<TDEToggleAction*>(m_actionCollection->action("lock_icons"));
if (aLockIcons)
@@ -464,7 +464,7 @@ void KRootWm::buildMenus()
}
int lastSep = desktopMenu->insertSeparator();
- if (sessionsMenu && kapp->authorize("switch_user"))
+ if (sessionsMenu && tdeApp->authorize("switch_user"))
{
desktopMenu->insertItem(SmallIconSet("switchuser" ), i18n("Switch User"), sessionsMenu);
needSeparator = true;
@@ -618,7 +618,7 @@ void KRootWm::mousePressed( const TQPoint& _global, int _button )
activateMenu( middleButtonChoice, _global );
break;
case TQt::RightButton:
- if (!kapp->authorize("action/kdesktop_rmb")) return;
+ if (!tdeApp->authorize("action/kdesktop_rmb")) return;
activateMenu( rightButtonChoice, _global );
break;
default:
@@ -791,7 +791,7 @@ void KRootWm::slotConfigureDesktop() {
TQStringList modules = configModules();
for (TQStringList::const_iterator it = modules.constBegin(); it != modules.constEnd(); ++it)
{
- if (kapp->authorizeControlModule(*it))
+ if (tdeApp->authorizeControlModule(*it))
{
m_configDialog->addModule(*it);
}
@@ -815,22 +815,22 @@ void KRootWm::slotToggleDesktopMenu()
KDesktopSettings::writeConfig();
TQByteArray data;
- kapp->dcopClient()->send( kdesktop_name, "KDesktopIface", "configure()", data);
+ tdeApp->dcopClient()->send( kdesktop_name, "KDesktopIface", "configure()", data);
// for the standalone menubar setting
- kapp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
- kapp->dcopClient()->send( kicker_name, kicker_name, "configureMenubar()", data );
- kapp->dcopClient()->send( "twin*", "", "reconfigure()", data );
+ tdeApp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
+ tdeApp->dcopClient()->send( kicker_name, kicker_name, "configureMenubar()", data );
+ tdeApp->dcopClient()->send( "twin*", "", "reconfigure()", data );
}
void KRootWm::slotUnclutterWindows()
{
- kapp->dcopClient()->send(twin_name, "KWinInterface", "unclutterDesktop()", TQString(""));
+ tdeApp->dcopClient()->send(twin_name, "KWinInterface", "unclutterDesktop()", TQString(""));
}
void KRootWm::slotCascadeWindows() {
- kapp->dcopClient()->send(twin_name, "KWinInterface", "cascadeDesktop()", TQString(""));
+ tdeApp->dcopClient()->send(twin_name, "KWinInterface", "cascadeDesktop()", TQString(""));
}
@@ -840,7 +840,7 @@ void KRootWm::slotLock() {
void KRootWm::slotSave() {
- kapp->dcopClient()->send(kdesktop_name, "KScreensaverIface", "save()", TQString(""));
+ tdeApp->dcopClient()->send(kdesktop_name, "KScreensaverIface", "save()", TQString(""));
}
diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp
index 67a55192f..37358f758 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.cpp
+++ b/kdesktop/kwebdesktop/kwebdesktop.cpp
@@ -79,7 +79,7 @@ void KWebDesktopRun::slotFinished( TDEIO::Job * job )
if (job->error())
{
kdDebug() << job->errorString() << endl;
- kapp->exit(1);
+ tdeApp->exit(1);
}
}
@@ -141,7 +141,7 @@ void KWebDesktop::slotCompleted()
TQPixmap snapshot = TQPixmap::grabWidget( m_part->widget() );
snapshot.save( m_imageFile, "PNG" );
// And terminate the app.
- kapp->quit();
+ tdeApp->quit();
}
KParts::ReadOnlyPart* KWebDesktop::createPart( const TQString& mimeType )
diff --git a/kdesktop/lock/lockdlg.cpp b/kdesktop/lock/lockdlg.cpp
index c8d82e8d9..d26830e3a 100644
--- a/kdesktop/lock/lockdlg.cpp
+++ b/kdesktop/lock/lockdlg.cpp
@@ -244,7 +244,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(slotOK()));
connect(mNewSessButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotSwitchUser()));
- if (!DM().isSwitchable() || !kapp->authorize("switch_user")) {
+ if (!DM().isSwitchable() || !tdeApp->authorize("switch_user")) {
mNewSessButton->hide();
}
@@ -939,7 +939,7 @@ void PasswordDlg::slotSwitchUser()
vbox2->addStretch( 2 );
}
- if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) {
+ if (tdeApp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) {
btn = new KPushButton( KGuiItem(i18n("Start &New Session"), "fork"), winFrame );
connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotStartNewSession()) );
connect( btn, TQ_SIGNAL(clicked()), &dialog, TQ_SLOT(accept()) );
diff --git a/kdesktop/lock/lockprocess.cpp b/kdesktop/lock/lockprocess.cpp
index 163d76fe6..47db882ef 100644
--- a/kdesktop/lock/lockprocess.cpp
+++ b/kdesktop/lock/lockprocess.cpp
@@ -247,7 +247,7 @@ LockProcess::LockProcess()
kde_wm_transparent_to_desktop = XInternAtom(tqt_xdisplay(), "_TDE_TRANSPARENT_TO_DESKTOP", False);
kde_wm_transparent_to_black = XInternAtom(tqt_xdisplay(), "_TDE_TRANSPARENT_TO_BLACK", False);
- kapp->installX11EventFilter(this);
+ tdeApp->installX11EventFilter(this);
mForceContinualLockDisplayTimer = new TQTimer( this );
mHackDelayStartupTimer = new TQTimer( this );
@@ -413,7 +413,7 @@ void LockProcess::init(bool child, bool useBlankOnly)
#endif
#if (TQT_VERSION-0 >= 0x030200) // XRANDR support
- connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
+ connect( tdeApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
#endif
if (!trinity_desktop_lock_use_system_modal_dialogs) {
@@ -622,7 +622,7 @@ void LockProcess::quitSaver()
return;
}
stopSaver();
- kapp->quit();
+ tdeApp->quit();
}
//---------------------------------------------------------------------------
@@ -650,7 +650,7 @@ void LockProcess::startSecureDialog()
mInSecureDialog = false;
if (ret == 0) {
mClosingWindows = 1;
- kapp->quit();
+ tdeApp->quit();
}
if (ret == 1) {
// In case of a forced lock we don't react to events during
@@ -699,12 +699,12 @@ void LockProcess::startSecureDialog()
if (system("ksysguard &") == -1) {
// Error handler to shut up gcc warnings
}
- kapp->quit();
+ tdeApp->quit();
}
if (ret == 3) {
mClosingWindows = 1;
DCOPRef("ksmserver","ksmserver").send("logout", (int)TDEApplication::ShutdownConfirmYes, (int)TDEApplication::ShutdownTypeNone, (int)TDEApplication::ShutdownModeInteractive);
- kapp->quit();
+ tdeApp->quit();
}
// FIXME
// Handle remaining case (switch user)
@@ -798,8 +798,8 @@ void LockProcess::readSaver()
if (!mSaver.isEmpty()) {
TQString file = locate("scrsav", mSaver);
- bool opengl = kapp->authorize("opengl_screensavers");
- bool manipulatescreen = kapp->authorize("manipulatescreen_screensavers");
+ bool opengl = tdeApp->authorize("opengl_screensavers");
+ bool manipulatescreen = tdeApp->authorize("manipulatescreen_screensavers");
KDesktopFile config(file, true);
if (config.readEntry("X-TDE-Type").utf8() != 0) {
TQString saverType = config.readEntry("X-TDE-Type").utf8();
@@ -1799,7 +1799,7 @@ void LockProcess::displayLockDialogIfNeeded()
if (checkPass()) {
mClosingWindows = true;
stopSaver();
- kapp->quit();
+ tdeApp->quit();
}
}
mBusy = false;
@@ -2207,7 +2207,7 @@ bool LockProcess::x11Event(XEvent *event)
}
if ((!mLocked) && (!mInSecureDialog)) {
stopSaver();
- kapp->quit();
+ tdeApp->quit();
}
if (mAutoLogout) {
// we need to restart the auto logout countdown
@@ -2219,7 +2219,7 @@ bool LockProcess::x11Event(XEvent *event)
if (!mLocked || checkPass()) {
mClosingWindows = true;
stopSaver();
- kapp->quit();
+ tdeApp->quit();
}
else if (mAutoLogout) {
// we need to restart the auto logout countdown
diff --git a/kdesktop/lockeng.cpp b/kdesktop/lockeng.cpp
index e121daaa1..57a33bf53 100644
--- a/kdesktop/lockeng.cpp
+++ b/kdesktop/lockeng.cpp
@@ -333,7 +333,7 @@ void SaverEngine::lockScreen(bool DCOP)
if( ok && mState != Saving )
{
if (DCOP) {
- DCOPClientTransaction* trans = kapp->dcopClient()->beginTransaction();
+ DCOPClientTransaction* trans = tdeApp->dcopClient()->beginTransaction();
if (trans) {
mLockTransactions.append( trans );
}
@@ -354,7 +354,7 @@ void SaverEngine::processLockTransactions()
{
TQCString replyType = "void";
TQByteArray arr;
- kapp->dcopClient()->endTransaction( *it, replyType, arr );
+ tdeApp->dcopClient()->endTransaction( *it, replyType, arr );
}
mLockTransactions.clear();
}
@@ -447,7 +447,7 @@ void SaverEngine::enableExports()
{
#ifdef TQ_WS_X11
kdDebug(270) << k_lineinfo << "activating background exports.\n";
- DCOPClient *client = kapp->dcopClient();
+ DCOPClient *client = tdeApp->dcopClient();
if (!client->isAttached()) {
client->attach();
}
@@ -675,7 +675,7 @@ void SaverEngine::recoverFromHackingAttempt()
TQByteArray data;
TQDataStream arg(data, IO_WriteOnly);
arg << (int)0 << (int)0 << (int)2;
- if (!kapp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data)) {
+ if (!tdeApp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data)) {
// Someone got to DCOP before we did
// Try an emergency system logout
system("logout");
diff --git a/kdesktop/main.cpp b/kdesktop/main.cpp
index 1fe29230e..f3e61e2f2 100644
--- a/kdesktop/main.cpp
+++ b/kdesktop/main.cpp
@@ -94,8 +94,8 @@ static void signalHandler(int sigId)
// try to cleanup all windows
signal(SIGTERM, SIG_DFL); // next one kills
signal(SIGHUP, SIG_DFL); // next one kills
- if (kapp)
- kapp->quit(); // turn catchable signals into clean shutdown
+ if (tdeApp)
+ tdeApp->quit(); // turn catchable signals into clean shutdown
}
void KDesktop::slotUpAndRunning()
@@ -273,7 +273,7 @@ extern "C" TDE_EXPORT int kdemain( int argc, char **argv )
// Mark kdeskop as immutable if all of its config modules have been disabled
if (!myApp->config()->isImmutable() &&
- kapp->authorizeControlModules(KRootWm::configModules()).isEmpty())
+ tdeApp->authorizeControlModules(KRootWm::configModules()).isEmpty())
{
myApp->config()->setReadOnly(true);
myApp->config()->reparseConfiguration();
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index fe4bd2063..15abec3f5 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -101,7 +101,7 @@ Minicli::Minicli( TQWidget *parent, const char *name)
// Cancel button...
m_dlg->pbCancel->setGuiItem ( KStdGuiItem::cancel() );
- if (!kapp->authorize("shell_access"))
+ if (!tdeApp->authorize("shell_access"))
m_dlg->pbOptions->hide();
m_dlg->pbRun->setEnabled(!m_dlg->cbCommand->currentText().isEmpty());
@@ -317,8 +317,8 @@ void Minicli::accept()
if ( logout )
{
- kapp->propagateSessionManager();
- kapp->requestShutDown();
+ tdeApp->propagateSessionManager();
+ tdeApp->requestShutDown();
}
if ( lock )
{
@@ -326,7 +326,7 @@ void Minicli::accept()
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(""));
}
}
@@ -437,7 +437,7 @@ int Minicli::runCommand()
kdDebug (1207) << "Use terminal ? " << useTerminal << endl;
- if (!kapp->authorize("shell_access"))
+ if (!tdeApp->authorize("shell_access"))
useTerminal = false;
if( needsTDEsu() )
@@ -585,7 +585,7 @@ int Minicli::runCommand()
// fall-through to shell case
case KURIFilterData::SHELL:
{
- if (kapp->authorize("shell_access"))
+ if (tdeApp->authorize("shell_access"))
{
exec = cmd;
@@ -651,7 +651,7 @@ void Minicli::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);
}
diff --git a/kdesktop/pixmapserver.cpp b/kdesktop/pixmapserver.cpp
index 56224f37a..b60942277 100644
--- a/kdesktop/pixmapserver.cpp
+++ b/kdesktop/pixmapserver.cpp
@@ -39,7 +39,7 @@
KPixmapServer::KPixmapServer()
: TQWidget(0L, "shpixmap comm window")
{
- kapp->installX11EventFilter(this);
+ tdeApp->installX11EventFilter(this);
pixmap = XInternAtom(tqt_xdisplay(), "PIXMAP", false);
}
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp
index 7d448c089..2aeac904a 100644
--- a/kdesktop/startupid.cpp
+++ b/kdesktop/startupid.cpp
@@ -54,7 +54,7 @@ StartupId::StartupId( TQWidget* parent, const char* name )
XWindowAttributes attrs;
XGetWindowAttributes( tqt_xdisplay(), tqt_xrootwin(), &attrs);
XSelectInput( tqt_xdisplay(), tqt_xrootwin(), attrs.your_event_mask | SubstructureNotifyMask);
- kapp->installX11EventFilter( this );
+ tdeApp->installX11EventFilter( this );
}
connect( &update_timer, TQ_SIGNAL( timeout()), TQ_SLOT( update_startupid()));
connect( &startup_info,
@@ -140,7 +140,7 @@ bool StartupId::x11Event( XEvent* e )
void StartupId::finishKDEStartup()
{
kde_startup_status = StartupDone;
- kapp->removeX11EventFilter( this );
+ tdeApp->removeX11EventFilter( this );
if( startups.count() == 0 )
stop_startupid();
}
diff --git a/kdesktop/xautolock.cpp b/kdesktop/xautolock.cpp
index 3c7e62670..95de8f3d6 100644
--- a/kdesktop/xautolock.cpp
+++ b/kdesktop/xautolock.cpp
@@ -71,7 +71,7 @@ XAutoLock::XAutoLock()
#endif
if( !xautolock_useXidle && !xautolock_useMit )
{
- kapp->installX11EventFilter( this );
+ tdeApp->installX11EventFilter( this );
int (*oldHandler)(Display *, XErrorEvent *);
oldHandler = XSetErrorHandler(catchFalseAlarms);
XSync(tqt_xdisplay(), False );
generated by cgit v1.2.1 (git 2.18.0) at 2025-02-23 18:00:20 +0000