diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
| commit | 703fb0c89c2eee56a1e613e67a446db9d4287929 (patch) | |
| tree | dd8c5ca66075cd89c2638a2b48cf78386a9870a7 /tdecore/kicontheme.cpp | |
| parent | 818e7abec3d5d3809b6b77293558678371c16b71 (diff) | |
| download | tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kicontheme.cpp')
| -rw-r--r-- | tdecore/kicontheme.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tdecore/kicontheme.cpp b/tdecore/kicontheme.cpp index 103d37a05..853c0ab78 100644 --- a/tdecore/kicontheme.cpp +++ b/tdecore/kicontheme.cpp @@ -52,7 +52,7 @@ public: class KIconThemeDir { public: - KIconThemeDir(const TQString& dir, const KConfigBase *config); + KIconThemeDir(const TQString& dir, const TDEConfigBase *config); bool isValid() const { return mbValid; } TQString iconPath(const TQString& name) const; @@ -139,7 +139,7 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName) // Use KSharedConfig to avoid parsing the file many times, from each kinstance. // Need to keep a ref to it to make this useful d->sharedConfig = KSharedConfig::openConfig( fileName, true /*readonly*/, false /*useKDEGlobals*/ ); - KConfig& cfg = *d->sharedConfig; + TDEConfig& cfg = *d->sharedConfig; //was: KSimpleConfig cfg(fileName); cfg.setGroup(mainSection); @@ -448,8 +448,8 @@ TQString KIconTheme::current() return *_theme; _theme = new TQString(); - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver(config, "Icons"); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver(config, "Icons"); *_theme = config->readEntry("Theme",defaultThemeName()); if ( *_theme == TQString::fromLatin1("hicolor") ) *_theme = defaultThemeName(); /* if (_theme->isEmpty()) @@ -516,7 +516,7 @@ TQString KIconTheme::defaultThemeName() /*** KIconThemeDir ***/ -KIconThemeDir::KIconThemeDir(const TQString& dir, const KConfigBase *config) +KIconThemeDir::KIconThemeDir(const TQString& dir, const TDEConfigBase *config) { mbValid = false; mDir = dir; |