summaryrefslogtreecommitdiffstats
path: root/twin/workspace.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /twin/workspace.h
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'twin/workspace.h')
-rw-r--r--twin/workspace.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/twin/workspace.h b/twin/workspace.h
index 386219e07..8abb669f8 100644
--- a/twin/workspace.h
+++ b/twin/workspace.h
@@ -27,7 +27,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <X11/Xlib.h>
class TQPopupMenu;
-class KConfig;
+class TDEConfig;
class TDEGlobalAccel;
class KShortcutDialog;
class KStartupInfo;
@@ -222,7 +222,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
void performWindowOperation( Client* c, WindowOperation op );
- void storeSession( KConfig* config, SMSavePhase phase );
+ void storeSession( TDEConfig* config, SMSavePhase phase );
SessionInfo* takeSessionInfo( Client* );
WindowRules findWindowRules( const Client*, bool );