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/kedittoolbar.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tdeui/kedittoolbar.cpp') diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp index cd6111a48..e1abdc875 100644 --- a/tdeui/kedittoolbar.cpp +++ b/tdeui/kedittoolbar.cpp @@ -767,10 +767,10 @@ void KEditToolbarWidget::setupLayout() this, TQT_SLOT(slotToolbarSelected(const TQString&))); // TQPushButton *new_toolbar = new TQPushButton(i18n("&New"), this); -// new_toolbar->setPixmap(BarIcon("filenew", KIcon::SizeSmall)); +// new_toolbar->setPixmap(BarIcon("filenew", TDEIcon::SizeSmall)); // new_toolbar->setEnabled(false); // disabled until implemented // TQPushButton *del_toolbar = new TQPushButton(i18n("&Delete"), this); -// del_toolbar->setPixmap(BarIcon("editdelete", KIcon::SizeSmall)); +// del_toolbar->setPixmap(BarIcon("editdelete", TDEIcon::SizeSmall)); // del_toolbar->setEnabled(false); // disabled until implemented // our list of inactive actions @@ -966,7 +966,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem) TQMap active_list; // see if our current action is in this toolbar - KIconLoader *loader = TDEGlobal::instance()->iconLoader(); + TDEIconLoader *loader = TDEGlobal::instance()->iconLoader(); TQDomNode n = elem.lastChild(); for( ; !n.isNull(); n = n.previousSibling() ) { @@ -1018,9 +1018,9 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem) act->setText(1, action->plainText()); if (action->hasIcon()) if (!action->icon().isEmpty()) - act->setPixmap(0, loader->loadIcon(action->icon(), KIcon::Toolbar, 16, KIcon::DefaultState, 0, true) ); + act->setPixmap(0, loader->loadIcon(action->icon(), TDEIcon::Toolbar, 16, TDEIcon::DefaultState, 0, true) ); else // Has iconset - act->setPixmap(0, action->iconSet(KIcon::Toolbar).pixmap()); + act->setPixmap(0, action->iconSet(TDEIcon::Toolbar).pixmap()); active_list.insert(action->name(), true); break; @@ -1041,9 +1041,9 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem) act->setText(1, action->plainText()); if (action->hasIcon()) if (!action->icon().isEmpty()) - act->setPixmap(0, loader->loadIcon(action->icon(), KIcon::Toolbar, 16, KIcon::DefaultState, 0, true) ); + act->setPixmap(0, loader->loadIcon(action->icon(), TDEIcon::Toolbar, 16, TDEIcon::DefaultState, 0, true) ); else // Has iconset - act->setPixmap(0, action->iconSet(KIcon::Toolbar).pixmap()); + act->setPixmap(0, action->iconSet(TDEIcon::Toolbar).pixmap()); } // finally, add default separators to the inactive list @@ -1373,7 +1373,7 @@ void KEditToolbarWidget::updateLocal(TQDomElement& elem) void KEditToolbarWidget::slotChangeIcon() { - // We can't use KIconChooser here, since it's in libtdeio + // We can't use TDEIconChooser here, since it's in libtdeio // ##### KDE4: reconsider this, e.g. move KEditToolbar to libtdeio //if the process is already running (e.g. when somebody clicked the change button twice (see #127149)) - do nothing... -- cgit v1.2.1