From de9b6c9ad15f9f51812daae17cce635d1050a9ba Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:14:55 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- kicker/libkicker/global.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'kicker/libkicker/global.cpp') 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); -- cgit v1.2.1