diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /ksysguard/gui/KSysGuardApplet.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/KSysGuardApplet.cc')
| -rw-r--r-- | ksysguard/gui/KSysGuardApplet.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ksysguard/gui/KSysGuardApplet.cc b/ksysguard/gui/KSysGuardApplet.cc index 0019cdd5c..adf6b7b7c 100644 --- a/ksysguard/gui/KSysGuardApplet.cc +++ b/ksysguard/gui/KSysGuardApplet.cc @@ -52,7 +52,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) { - KGlobal::locale()->insertCatalogue( "ksysguard" ); + TDEGlobal::locale()->insertCatalogue( "ksysguard" ); return new KSysGuardApplet( configFile, KPanelApplet::Normal, KPanelApplet::Preferences, parent, "ksysguardapplet" ); @@ -309,7 +309,7 @@ void KSysGuardApplet::resizeDocks( uint newDockCount ) bool KSysGuardApplet::load() { - KStandardDirs* kstd = KGlobal::dirs(); + KStandardDirs* kstd = TDEGlobal::dirs(); kstd->addResourceType( "data", "share/apps/ksysguard" ); TQString fileName = kstd->findResource( "data", "KSysGuardApplet.xml" ); @@ -458,7 +458,7 @@ bool KSysGuardApplet::save() ((KSGRD::SensorDisplay*)mDockList[ i ])->saveSettings( doc, element ); } - KStandardDirs* kstd = KGlobal::dirs(); + KStandardDirs* kstd = TDEGlobal::dirs(); kstd->addResourceType( "data", "share/apps/ksysguard" ); TQString fileName = kstd->saveLocation( "data", "ksysguard" ); fileName += "/KSysGuardApplet.xml"; |