From f2bfcad7ffdd09911f282afe2a2051b3708601c9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:16:51 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- tdeui/tdetoolbar.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'tdeui/tdetoolbar.cpp') diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp index c6049e658..02173e41b 100644 --- a/tdeui/tdetoolbar.cpp +++ b/tdeui/tdetoolbar.cpp @@ -913,9 +913,9 @@ int TDEToolBar::iconSize() const int TDEToolBar::iconSizeDefault() const { if (!::qstrcmp(name(), "mainToolBar")) - return TDEGlobal::iconLoader()->currentSize(KIcon::MainToolbar); + return TDEGlobal::iconLoader()->currentSize(TDEIcon::MainToolbar); - return TDEGlobal::iconLoader()->currentSize(KIcon::Toolbar); + return TDEGlobal::iconLoader()->currentSize(TDEIcon::Toolbar); } void TDEToolBar::setEnableContextMenu(bool enable ) @@ -1452,9 +1452,9 @@ void TDEToolBar::resizeEvent( TQResizeEvent *e ) void TDEToolBar::slotIconChanged(int group) { - if ((group != KIcon::Toolbar) && (group != KIcon::MainToolbar)) + if ((group != TDEIcon::Toolbar) && (group != TDEIcon::MainToolbar)) return; - if ((group == KIcon::MainToolbar) != !::qstrcmp(name(), "mainToolBar")) + if ((group == TDEIcon::MainToolbar) != !::qstrcmp(name(), "mainToolBar")) return; doModeChange(); @@ -2062,14 +2062,14 @@ TDEPopupMenu *TDEToolBar::contextMenu() TDEPopupMenu *size = new TDEPopupMenu( context, "size" ); size->insertItem( i18n("Default"), CONTEXT_ICONSIZES ); // Query the current theme for available sizes - KIconTheme *theme = TDEGlobal::instance()->iconLoader()->theme(); + TDEIconTheme *theme = TDEGlobal::instance()->iconLoader()->theme(); TQValueList avSizes; if (theme) { if (!::qstrcmp(name(), "mainToolBar")) - avSizes = theme->querySizes( KIcon::MainToolbar); + avSizes = theme->querySizes( TDEIcon::MainToolbar); else - avSizes = theme->querySizes( KIcon::Toolbar); + avSizes = theme->querySizes( TDEIcon::Toolbar); } d->iconSizes = avSizes; -- cgit v1.2.1