diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /ksysguard/gui/Workspace.cc | |
parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'ksysguard/gui/Workspace.cc')
-rw-r--r-- | ksysguard/gui/Workspace.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ksysguard/gui/Workspace.cc b/ksysguard/gui/Workspace.cc index 3c1a92a56..1fb1e1e62 100644 --- a/ksysguard/gui/Workspace.cc +++ b/ksysguard/gui/Workspace.cc @@ -91,7 +91,7 @@ void Workspace::readProperties( KConfig *cfg ) /* If workDir is not specified in the config file, it's * probably the first time the user has started KSysGuard. We * then "restore" a special default configuration. */ - KStandardDirs* kstd = KGlobal::dirs(); + KStandardDirs* kstd = TDEGlobal::dirs(); kstd->addResourceType( "data", "share/apps/ksysguard" ); mWorkDir = kstd->saveLocation( "data", "ksysguard" ); @@ -440,7 +440,7 @@ void Workspace::applyStyle() void Workspace::showProcesses() { - KStandardDirs* kstd = KGlobal::dirs(); + KStandardDirs* kstd = TDEGlobal::dirs(); kstd->addResourceType( "data", "share/apps/ksysguard" ); TQString file = kstd->findResource( "data", "ProcessTable.sgrd" ); |