From 98841fe5a255d63ee9d05d74acc4c90c4598bb00 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:13:16 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- kbstateapplet/kbstate.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'kbstateapplet') diff --git a/kbstateapplet/kbstate.cpp b/kbstateapplet/kbstate.cpp index 19e7a28..49eb509 100644 --- a/kbstateapplet/kbstate.cpp +++ b/kbstateapplet/kbstate.cpp @@ -786,17 +786,17 @@ void KeyIcon::resizeEvent( TQResizeEvent*e ) void KeyIcon::updateImages () { int size = width()iconLoader()->loadIcon("lock_overlay", KIcon::Panel, size-4); + locked = instance->iconLoader()->loadIcon("lock_overlay", TDEIcon::Panel, size-4); if (strcmp(modifierKeys[keyId].icon, "")) { - latched = instance->iconLoader()->loadIcon(modifierKeys[keyId].icon, KIcon::NoGroup, size-4); - unlatched = instance->iconLoader()->loadIcon(modifierKeys[keyId].icon, KIcon::NoGroup, size-4); + latched = instance->iconLoader()->loadIcon(modifierKeys[keyId].icon, TDEIcon::NoGroup, size-4); + unlatched = instance->iconLoader()->loadIcon(modifierKeys[keyId].icon, TDEIcon::NoGroup, size-4); TQImage img = latched.convertToImage(); - KIconEffect::colorize(img, TDEGlobalSettings::highlightedTextColor(), 1.0); + TDEIconEffect::colorize(img, TDEGlobalSettings::highlightedTextColor(), 1.0); latched.convertFromImage (img); img = unlatched.convertToImage(); - KIconEffect::colorize(img, TDEGlobalSettings::textColor(), 1.0); + TDEIconEffect::colorize(img, TDEGlobalSettings::textColor(), 1.0); unlatched.convertFromImage (img); } @@ -887,11 +887,11 @@ void MouseIcon::resizeEvent( TQResizeEvent*e ) } TQPixmap loadIcon(TDEInstance *instance, int size, TQColor color, TQString name) { - KIconLoader *loader = instance->iconLoader(); - TQPixmap result = loader->loadIcon(name, KIcon::NoGroup, size); + TDEIconLoader *loader = instance->iconLoader(); + TQPixmap result = loader->loadIcon(name, TDEIcon::NoGroup, size); TQImage img = result.convertToImage(); - KIconEffect::colorize(img, color, 1.0); + TDEIconEffect::colorize(img, color, 1.0); result.convertFromImage (img); return result; @@ -973,10 +973,10 @@ TimeoutIcon::~TimeoutIcon () { void TimeoutIcon::update () { int size = width()iconLoader()->loadIcon(iconname, KIcon::NoGroup, size); + pixmap = instance->iconLoader()->loadIcon(iconname, TDEIcon::NoGroup, size); TQImage img = pixmap.convertToImage(); - KIconEffect::colorize(img, TDEGlobalSettings::textColor(), 1.0); + TDEIconEffect::colorize(img, TDEGlobalSettings::textColor(), 1.0); pixmap.convertFromImage (img); image = pixmap; @@ -988,7 +988,7 @@ void TimeoutIcon::setGlyth (const TQString &glyth) { this->glyth = glyth; TQImage img = pixmap.convertToImage(); - KIconEffect::colorize(img, TDEGlobalSettings::textColor(), 1.0); + TDEIconEffect::colorize(img, TDEGlobalSettings::textColor(), 1.0); pixmap.convertFromImage (img); image = pixmap; @@ -1000,10 +1000,10 @@ void TimeoutIcon::setImage (const TQString &name, int timeout) { iconname = name; if (!name.isNull() && !name.isEmpty()) { int size = width()iconLoader()->loadIcon(iconname, KIcon::NoGroup, size); + pixmap = instance->iconLoader()->loadIcon(iconname, TDEIcon::NoGroup, size); TQImage img = pixmap.convertToImage(); - KIconEffect::colorize(img, TDEGlobalSettings::textColor(), 1.0); + TDEIconEffect::colorize(img, TDEGlobalSettings::textColor(), 1.0); pixmap.convertFromImage (img); image = pixmap; -- cgit v1.2.1