From 580d345952faf597f69347256e0ad3411725988a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:16:27 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- kolourpaint/tools/kptoolresizescale.cpp | 6 +++--- kolourpaint/widgets/kptooltoolbar.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'kolourpaint') diff --git a/kolourpaint/tools/kptoolresizescale.cpp b/kolourpaint/tools/kptoolresizescale.cpp index d3ae370d..31c96809 100644 --- a/kolourpaint/tools/kptoolresizescale.cpp +++ b/kolourpaint/tools/kptoolresizescale.cpp @@ -606,13 +606,13 @@ static TQIconSet toolButtonIconSet (const TQString &iconName) TQPixmap disabledIcon = TDEGlobal::iconLoader ()->iconEffect ()->apply ( UserIcon (iconName), - KIcon::Toolbar, KIcon::DisabledState); + TDEIcon::Toolbar, TDEIcon::DisabledState); const TQPixmap iconSetNormalIcon = iconSet.pixmap (TQIconSet::Small, TQIconSet::Normal); - // I bet past or future versions of KIconEffect::apply() resize the - // disabled icon if we claim it's in group KIcon::Toolbar. So resize + // I bet past or future versions of TDEIconEffect::apply() resize the + // disabled icon if we claim it's in group TDEIcon::Toolbar. So resize // it to match the TQIconSet::Normal icon, just in case. disabledIcon = kpPixmapFX::scale (disabledIcon, iconSetNormalIcon.width (), diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp index fb0ca446..b0d5e93b 100644 --- a/kolourpaint/widgets/kptooltoolbar.cpp +++ b/kolourpaint/widgets/kptooltoolbar.cpp @@ -206,9 +206,9 @@ int kpToolToolBar::defaultIconSize () #endif if (desktopSize.width () >= 1024 && desktopSize.height () >= 768) - m_defaultIconSize = KIcon::SizeSmallMedium/*22x22*/; + m_defaultIconSize = TDEIcon::SizeSmallMedium/*22x22*/; else - m_defaultIconSize = KIcon::SizeSmall/*16x16*/; + m_defaultIconSize = TDEIcon::SizeSmall/*16x16*/; } -- cgit v1.2.1