summaryrefslogtreecommitdiffstats
path: root/kdesktop/desktop.cc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:06 -0600
commite4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch)
tree8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /kdesktop/desktop.cc
parentd41050ea3f6904e5156d35f664346b816b9e4d12 (diff)
downloadtdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz
tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kdesktop/desktop.cc')
-rw-r--r--kdesktop/desktop.cc28
1 files changed, 14 insertions, 14 deletions
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index 0a105a373..42f7f8a7d 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -794,13 +794,13 @@ void KDesktop::configure()
void KDesktop::slotSettingsChanged(int category)
{
//kdDebug(1204) << "KDesktop::slotSettingsChanged" << endl;
- if (category == KApplication::SETTINGS_PATHS)
+ if (category == TDEApplication::SETTINGS_PATHS)
{
kdDebug(1204) << "KDesktop::slotSettingsChanged SETTINGS_PATHS" << endl;
if (m_pIconView)
m_pIconView->recheckDesktopURL();
}
- else if (category == KApplication::SETTINGS_SHORTCUTS)
+ else if (category == TDEApplication::SETTINGS_SHORTCUTS)
{
kdDebug(1204) << "KDesktop::slotSettingsChanged SETTINGS_SHORTCUTS" << endl;
keys->readSettings();
@@ -1021,12 +1021,12 @@ void KDesktop::slotNewWallpaper(const KURL &url)
// for dcop interface backward compatibility
void KDesktop::logout()
{
- logout( KApplication::ShutdownConfirmDefault,
- KApplication::ShutdownTypeNone );
+ logout( TDEApplication::ShutdownConfirmDefault,
+ TDEApplication::ShutdownTypeNone );
}
-void KDesktop::logout( KApplication::ShutdownConfirm confirm,
- KApplication::ShutdownType sdtype )
+void KDesktop::logout( TDEApplication::ShutdownConfirm confirm,
+ TDEApplication::ShutdownType sdtype )
{
if( !kapp->requestShutDown( confirm, sdtype ) )
// this i18n string is also in kicker/applets/run/runapplet
@@ -1038,26 +1038,26 @@ void KDesktop::logout( KApplication::ShutdownConfirm confirm,
void KDesktop::slotLogout()
{
- logout( KApplication::ShutdownConfirmDefault,
- KApplication::ShutdownTypeDefault );
+ logout( TDEApplication::ShutdownConfirmDefault,
+ TDEApplication::ShutdownTypeDefault );
}
void KDesktop::slotLogoutNoCnf()
{
- logout( KApplication::ShutdownConfirmNo,
- KApplication::ShutdownTypeNone );
+ logout( TDEApplication::ShutdownConfirmNo,
+ TDEApplication::ShutdownTypeNone );
}
void KDesktop::slotHaltNoCnf()
{
- logout( KApplication::ShutdownConfirmNo,
- KApplication::ShutdownTypeHalt );
+ logout( TDEApplication::ShutdownConfirmNo,
+ TDEApplication::ShutdownTypeHalt );
}
void KDesktop::slotRebootNoCnf()
{
- logout( KApplication::ShutdownConfirmNo,
- KApplication::ShutdownTypeReboot );
+ logout( TDEApplication::ShutdownConfirmNo,
+ TDEApplication::ShutdownTypeReboot );
}
void KDesktop::setVRoot( bool enable )