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 /kicker/libkicker/global.cpp | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kicker/libkicker/global.cpp')
| -rw-r--r-- | kicker/libkicker/global.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp index d4735c2ba..0527f8224 100644 --- a/kicker/libkicker/global.cpp +++ b/kicker/libkicker/global.cpp @@ -326,7 +326,7 @@ TQPoint popupPosition(KPanelApplet::Direction d, void colorize(TQImage& image) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("WM"); TQColor color = TQApplication::palette().active().highlight(); TQColor activeTitle = config->readColorEntry("activeBackground", &color); @@ -414,20 +414,20 @@ TQIconSet menuIconSet(const TQString& icon) { if (iconSize > 0) { - iconset = KGlobal::iconLoader()->loadIconSet(icon, + iconset = TDEGlobal::iconLoader()->loadIconSet(icon, KIcon::NoGroup, iconSize, true); } else if (iconSize == 0) { - TQPixmap normal = KGlobal::iconLoader()->loadIcon(icon, + TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(icon, KIcon::Small, 0, KIcon::DefaultState, 0, true); - TQPixmap active = KGlobal::iconLoader()->loadIcon(icon, + TQPixmap active = TDEGlobal::iconLoader()->loadIcon(icon, KIcon::Small, 0, KIcon::ActiveState, |