diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-04 14:14:55 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-04 14:14:55 -0600 |
commit | de9b6c9ad15f9f51812daae17cce635d1050a9ba (patch) | |
tree | 6b26400ab1a616925443c5d365246eb86c9bad57 /kicker/libkicker/global.cpp | |
parent | 4f841fbbbc5d3399535ade061699cc76363c7a3f (diff) | |
download | tdebase-de9b6c9ad15f9f51812daae17cce635d1050a9ba.tar.gz tdebase-de9b6c9ad15f9f51812daae17cce635d1050a9ba.zip |
Rename KIcon to enhance compatibility with KDE4
Diffstat (limited to 'kicker/libkicker/global.cpp')
-rw-r--r-- | kicker/libkicker/global.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp index 87f990b30..62f7f055a 100644 --- a/kicker/libkicker/global.cpp +++ b/kicker/libkicker/global.cpp @@ -159,11 +159,11 @@ int sizeValue(KPanelExtension::Size s) int maxButtonDim() { int maxDim; - //return (2 * KickerSettings::iconMargin()) + KIcon::SizeLarge; + //return (2 * KickerSettings::iconMargin()) + TDEIcon::SizeLarge; KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" )); kickerconfig->setGroup("General"); - maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);; + maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", TDEIcon::SizeLarge);; delete kickerconfig; return maxDim; } @@ -358,7 +358,7 @@ void colorize(TQImage& image) b = (b + (76 - gray) > 255 ? 255 : b + (76 - gray)); } color.setRgb(r, g, b); - KIconEffect::colorize(image, color, 1.0); + TDEIconEffect::colorize(image, color, 1.0); } TQColor blendColors(const TQColor& c1, const TQColor& c2) @@ -415,22 +415,22 @@ TQIconSet menuIconSet(const TQString& icon) if (iconSize > 0) { iconset = TDEGlobal::iconLoader()->loadIconSet(icon, - KIcon::NoGroup, + TDEIcon::NoGroup, iconSize, true); } else if (iconSize == 0) { TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(icon, - KIcon::Small, + TDEIcon::Small, 0, - KIcon::DefaultState, + TDEIcon::DefaultState, 0, true); TQPixmap active = TDEGlobal::iconLoader()->loadIcon(icon, - KIcon::Small, + TDEIcon::Small, 0, - KIcon::ActiveState, + TDEIcon::ActiveState, 0, true); |