diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /tdecore/kicontheme.cpp | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kicontheme.cpp')
| -rw-r--r-- | tdecore/kicontheme.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tdecore/kicontheme.cpp b/tdecore/kicontheme.cpp index d30e254d0..103d37a05 100644 --- a/tdecore/kicontheme.cpp +++ b/tdecore/kicontheme.cpp @@ -95,7 +95,7 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName) if (!appName.isEmpty() && ( name == "crystalsvg" || name== "hicolor" || name == "locolor" ) ) { - icnlibs = KGlobal::dirs()->resourceDirs("data"); + icnlibs = TDEGlobal::dirs()->resourceDirs("data"); for (it=icnlibs.begin(); it!=icnlibs.end(); ++it) { cDir = *it + appName + "/icons/" + name; @@ -105,11 +105,11 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName) } // Find the theme description file. These are always global. - icnlibs = KGlobal::dirs()->resourceDirs("icon"); - icnlibs += KGlobal::dirs()->resourceDirs("xdgdata-icon"); + icnlibs = TDEGlobal::dirs()->resourceDirs("icon"); + icnlibs += TDEGlobal::dirs()->resourceDirs("xdgdata-icon"); icnlibs += "/usr/share/pixmaps"; // These are not in the icon spec, but e.g. GNOME puts some icons there anyway. - icnlibs += KGlobal::dirs()->resourceDirs("xdgdata-pixmap"); + icnlibs += TDEGlobal::dirs()->resourceDirs("xdgdata-pixmap"); for (it=icnlibs.begin(); it!=icnlibs.end(); ++it) { cDir = *it + name + "/"; @@ -448,7 +448,7 @@ TQString KIconTheme::current() return *_theme; _theme = new TQString(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver(config, "Icons"); *_theme = config->readEntry("Theme",defaultThemeName()); if ( *_theme == TQString::fromLatin1("hicolor") ) *_theme = defaultThemeName(); @@ -470,11 +470,11 @@ TQStringList KIconTheme::list() return *_theme_list; _theme_list = new TQStringList(); - TQStringList icnlibs = KGlobal::dirs()->resourceDirs("icon"); - icnlibs += (KGlobal::dirs()->resourceDirs("xdgdata-icon")); + TQStringList icnlibs = TDEGlobal::dirs()->resourceDirs("icon"); + icnlibs += (TDEGlobal::dirs()->resourceDirs("xdgdata-icon")); icnlibs += "/usr/share/pixmaps"; // These are not in the icon spec, but e.g. GNOME puts some icons there anyway. - icnlibs += KGlobal::dirs()->resourceDirs("xdgdata-pixmap"); + icnlibs += TDEGlobal::dirs()->resourceDirs("xdgdata-pixmap"); TQStringList::ConstIterator it; for (it=icnlibs.begin(); it!=icnlibs.end(); ++it) { |