summaryrefslogtreecommitdiffstats
path: root/twin/workspace.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-20 00:17:06 -0600
committerTimothy Pearson <[email protected]>2013-01-20 00:17:06 -0600
commite4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch)
tree8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /twin/workspace.cpp
parentd41050ea3f6904e5156d35f664346b816b9e4d12 (diff)
downloadtdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz
tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'twin/workspace.cpp')
-rw-r--r--twin/workspace.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/twin/workspace.cpp b/twin/workspace.cpp
index cc109918c..16f722634 100644
--- a/twin/workspace.cpp
+++ b/twin/workspace.cpp
@@ -999,7 +999,7 @@ void Workspace::reconfigure()
void Workspace::slotSettingsChanged(int category)
{
kdDebug(1212) << "Workspace::slotSettingsChanged()" << endl;
- if( category == (int) KApplication::SETTINGS_SHORTCUTS )
+ if( category == (int) TDEApplication::SETTINGS_SHORTCUTS )
readShortcuts();
}
@@ -1220,7 +1220,7 @@ TQStringList Workspace::configModules(bool controlCenter)
void Workspace::configureWM()
{
- KApplication::tdeinitExec( "kcmshell", configModules(false) );
+ TDEApplication::tdeinitExec( "kcmshell", configModules(false) );
}
/*!