From 1c53bf78a70a66d8ec15a77cbf98606694d7e6e7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:20:11 -0600 Subject: [PATCH] Rename KIcon to enhance compatibility with KDE4 --- doc/kommander/extending.docbook | 6 +++--- klinkstatus/src/ui/resultssearchbar.cpp | 10 +++++----- klinkstatus/src/ui/sessionwidget.cpp | 4 ++-- kommander/editor/assoctexteditorimpl.cpp | 2 +- kommander/editor/functionsimpl.cpp | 4 ++-- kommander/widgets/aboutdialog.cpp | 4 ++-- kommander/widgets/fontdialog.cpp | 2 +- kommander/widgets/listbox.cpp | 2 +- kommander/widgets/pixmaplabel.cpp | 2 +- kommander/widgets/plugin.cpp | 8 ++++---- kommander/widgets/popupmenu.cpp | 8 ++++---- kommander/widgets/scriptobject.cpp | 2 +- kommander/widgets/tabwidget.cpp | 2 +- kommander/widgets/timer.cpp | 2 +- kommander/widgets/treewidget.cpp | 2 +- kommander/working/plugintemplate/plugin.cpp | 2 +- kommander/working/plugintemplate/widget.cpp | 2 +- lib/compatibility/knewstuff/downloaddialog.cpp | 8 ++++---- lib/compatibility/tdemdi/qextmdi/ktabbar.cpp | 2 +- quanta/dialogs/actionconfigdialogs.ui | 2 +- quanta/dialogs/dtepstructureeditdlgs.ui | 2 +- quanta/plugins/pluginconfig.ui | 2 +- quanta/src/quanta.cpp | 14 +++++++------- quanta/src/quantaview.cpp | 2 +- quanta/treeviews/basetreeview.cpp | 2 +- 25 files changed, 49 insertions(+), 49 deletions(-) diff --git a/doc/kommander/extending.docbook b/doc/kommander/extending.docbook index d909338e..8425dd82 100644 --- a/doc/kommander/extending.docbook +++ b/doc/kommander/extending.docbook @@ -213,7 +213,7 @@ derive from QLabel, and use this in the constructor: if (KommanderWidget::inEditor) { - setPixmap(TDEGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium)); + setPixmap(TDEGlobal::iconLoader()->loadIcon("iconname", TDEIcon::NoGroup, TDEIcon::SizeMedium)); setFrameStyle(QFrame::Box | QFrame::Plain); setLineWidth(1); setFixedSize(pixmap()->size()); @@ -297,7 +297,7 @@ This class simply has a constructor and an overridden create method. MyKomPlugin::MyKomPlugin() { - addWidget( "KomLineEdit", "My Widget Group", i18n("A Kommander line edit widget") new QIconSet(TDEGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium))); + addWidget( "KomLineEdit", "My Widget Group", i18n("A Kommander line edit widget") new QIconSet(TDEGlobal::iconLoader()->loadIcon("iconname", TDEIcon::NoGroup, TDEIcon::SizeMedium))); //add my other widgets here } @@ -427,7 +427,7 @@ To register to the executor (actually to the plugin system), add this to KomStdPlugin::KomStdPlugin() { ... - addWidget("MyWidgetName", group, "", new QIconSet(TDEGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium))); + addWidget("MyWidgetName", group, "", new QIconSet(TDEGlobal::iconLoader()->loadIcon("iconname", TDEIcon::NoGroup, TDEIcon::SizeMedium))); ... } diff --git a/klinkstatus/src/ui/resultssearchbar.cpp b/klinkstatus/src/ui/resultssearchbar.cpp index eed8df79..d99626b4 100644 --- a/klinkstatus/src/ui/resultssearchbar.cpp +++ b/klinkstatus/src/ui/resultssearchbar.cpp @@ -84,11 +84,11 @@ ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name) d->layout->addWidget(statusLabel); d->searchCombo = new KComboBox(this, "searchcombo"); - TQPixmap iconAll = TDEGlobal::iconLoader()->loadIcon("exec", KIcon::Small); - TQPixmap iconGood = TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small); - TQPixmap iconBroken = TDEGlobal::iconLoader()->loadIcon("no", KIcon::Small); - TQPixmap iconMalformed = TDEGlobal::iconLoader()->loadIcon("bug", KIcon::Small); - TQPixmap iconUndetermined = TDEGlobal::iconLoader()->loadIcon("help", KIcon::Small); + TQPixmap iconAll = TDEGlobal::iconLoader()->loadIcon("exec", TDEIcon::Small); + TQPixmap iconGood = TDEGlobal::iconLoader()->loadIcon("ok", TDEIcon::Small); + TQPixmap iconBroken = TDEGlobal::iconLoader()->loadIcon("no", TDEIcon::Small); + TQPixmap iconMalformed = TDEGlobal::iconLoader()->loadIcon("bug", TDEIcon::Small); + TQPixmap iconUndetermined = TDEGlobal::iconLoader()->loadIcon("help", TDEIcon::Small); d->searchCombo->insertItem(iconAll, i18n("All Links")); d->searchCombo->insertItem(iconGood, i18n("Good Links")); diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp index 49fa9759..3629b70e 100644 --- a/klinkstatus/src/ui/sessionwidget.cpp +++ b/klinkstatus/src/ui/sessionwidget.cpp @@ -104,8 +104,8 @@ void SessionWidget::init() toolButton_clear_combo->setIconSet(SmallIconSet("locationbar_erase")); - pushbutton_url->setIconSet(TDEGlobal::iconLoader()->loadIconSet("fileopen", KIcon::Small)); - TQPixmap pixMap = TDEGlobal::iconLoader()->loadIcon("fileopen", KIcon::Small); + pushbutton_url->setIconSet(TDEGlobal::iconLoader()->loadIconSet("fileopen", TDEIcon::Small)); + TQPixmap pixMap = TDEGlobal::iconLoader()->loadIcon("fileopen", TDEIcon::Small); pushbutton_url->setFixedSize(pixMap.width() + 8, pixMap.height() + 8); connect(pushbutton_url, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChooseUrlDialog())); diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp index 4ee27476..f034f4a7 100644 --- a/kommander/editor/assoctexteditorimpl.cpp +++ b/kommander/editor/assoctexteditorimpl.cpp @@ -73,7 +73,7 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form, associatedTextEdit->setTextFormat(TQt::PlainText);*/ // icon for non-empty scripts - scriptPixmap = TDEGlobal::iconLoader()->loadIcon("source", KIcon::Small); + scriptPixmap = TDEGlobal::iconLoader()->loadIcon("source", TDEIcon::Small); // signals and slots connections m_formWindow = a_form; diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp index c37116c5..ab56089a 100644 --- a/kommander/editor/functionsimpl.cpp +++ b/kommander/editor/functionsimpl.cpp @@ -45,8 +45,8 @@ FunctionsDialog::FunctionsDialog(TQWidget* a_parent, const TQDict& a_w bool a_modal) : FunctionsDialogBase(a_parent, a_name, a_modal), m_widgetList(a_widgetList), m_useInternalParser(useInternalParser) { - clearButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("locationbar_erase", KIcon::Toolbar)); - copyButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("1downarrow", KIcon::Toolbar)); + clearButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("locationbar_erase", TDEIcon::Toolbar)); + copyButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("1downarrow", TDEIcon::Toolbar)); groupComboBox->insertStringList(SpecialInformation::groups()); connect(groupComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(groupChanged(int))); diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp index 1180f652..66056c90 100644 --- a/kommander/widgets/aboutdialog.cpp +++ b/kommander/widgets/aboutdialog.cpp @@ -45,7 +45,7 @@ AboutDialog::AboutDialog(TQWidget *parent, const char *name) setDisplayStates(states); if (KommanderWidget::inEditor) { - setPixmap(TDEGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium)); + setPixmap(TDEGlobal::iconLoader()->loadIcon("kommander", TDEIcon::NoGroup, TDEIcon::SizeMedium)); setFrameStyle(TQFrame::Box | TQFrame::Plain); setLineWidth(1); setFixedSize(pixmap()->size()); @@ -122,7 +122,7 @@ void AboutDialog::initialize(const TQString& appName, const TQString &icon, cons m_aboutData = new TDEAboutData(m_appName, m_appName, m_version); m_aboutData->setCopyrightStatement(m_copyright); if (!m_icon.isEmpty()) - m_aboutData->setProgramLogo(TDEGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeMedium).convertToImage()); + m_aboutData->setProgramLogo(TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, TDEIcon::SizeMedium).convertToImage()); } void AboutDialog::addAuthor(const TQString& author, const TQString &task, const TQString& email, const TQString &webAddress) diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp index ba5b23ac..d03f87d8 100644 --- a/kommander/widgets/fontdialog.cpp +++ b/kommander/widgets/fontdialog.cpp @@ -37,7 +37,7 @@ FontDialog::FontDialog(TQWidget *parent, const char *name) setDisplayStates(states); if (KommanderWidget::inEditor) { - setPixmap(TDEGlobal::iconLoader()->loadIcon("tdefontcombo", KIcon::NoGroup, KIcon::SizeMedium)); + setPixmap(TDEGlobal::iconLoader()->loadIcon("tdefontcombo", TDEIcon::NoGroup, TDEIcon::SizeMedium)); setFrameStyle(TQFrame::Box | TQFrame::Plain); setLineWidth(1); setFixedSize(pixmap()->size()); diff --git a/kommander/widgets/listbox.cpp b/kommander/widgets/listbox.cpp index 9a84bd4b..618e054d 100644 --- a/kommander/widgets/listbox.cpp +++ b/kommander/widgets/listbox.cpp @@ -177,7 +177,7 @@ TQString ListBox::handleDCOP(int function, const TQStringList& args) } case DCOP::setPixmap: { - TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(args[0], KIcon::Small); + TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(args[0], TDEIcon::Small); if (pixmap.isNull()) pixmap.load(args[0]); int index = args[1].toInt(); diff --git a/kommander/widgets/pixmaplabel.cpp b/kommander/widgets/pixmaplabel.cpp index f49a35ae..7eab9e0d 100644 --- a/kommander/widgets/pixmaplabel.cpp +++ b/kommander/widgets/pixmaplabel.cpp @@ -38,7 +38,7 @@ PixmapLabel::PixmapLabel(TQWidget *a_parent, const char *a_name) setStates(states); setDisplayStates(states); if (KommanderWidget::inEditor) - setPixmap(TDEGlobal::iconLoader()->loadIcon("tux", KIcon::NoGroup, 128)); + setPixmap(TDEGlobal::iconLoader()->loadIcon("tux", TDEIcon::NoGroup, 128)); setAutoResize(false); } diff --git a/kommander/widgets/plugin.cpp b/kommander/widgets/plugin.cpp index 721ad120..af07eef2 100644 --- a/kommander/widgets/plugin.cpp +++ b/kommander/widgets/plugin.cpp @@ -80,7 +80,7 @@ KomStdPlugin::KomStdPlugin() addWidget("SpinBoxInt", group, "", 0); // addWidget("Wizard", group, ""); addWidget("TabWidget", group, "", 0); - addWidget("ToolBox", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("toolbox", KIcon::NoGroup, KIcon::SizeMedium)), "", true); + addWidget("ToolBox", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("toolbox", TDEIcon::NoGroup, TDEIcon::SizeMedium)), "", true); // addWidget("SubDialog", group, ""); addWidget("ListBox", group, "", 0); addWidget("Timer", group, "", 0); @@ -92,9 +92,9 @@ KomStdPlugin::KomStdPlugin() addWidget("Slider", group, "", 0); addWidget("Table", group, "", 0); addWidget("DatePicker", group, "", 0); - addWidget("PopupMenu", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("contents", KIcon::NoGroup, KIcon::SizeMedium))); - addWidget("FontDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("tdefontcombo", KIcon::NoGroup, KIcon::SizeMedium))); - addWidget("AboutDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium))); + addWidget("PopupMenu", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("contents", TDEIcon::NoGroup, TDEIcon::SizeMedium))); + addWidget("FontDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("tdefontcombo", TDEIcon::NoGroup, TDEIcon::SizeMedium))); + addWidget("AboutDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("kommander", TDEIcon::NoGroup, TDEIcon::SizeMedium))); } TQWidget *KomStdPlugin::create( const TQString &key, TQWidget *parent, const char *name ) diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp index 1320ce8b..cfeb1e7d 100644 --- a/kommander/widgets/popupmenu.cpp +++ b/kommander/widgets/popupmenu.cpp @@ -41,7 +41,7 @@ PopupMenu::PopupMenu(TQWidget *parent, const char *name) setDisplayStates(states); if (KommanderWidget::inEditor) { - setPixmap(TDEGlobal::iconLoader()->loadIcon("contents", KIcon::NoGroup, KIcon::SizeMedium)); + setPixmap(TDEGlobal::iconLoader()->loadIcon("contents", TDEIcon::NoGroup, TDEIcon::SizeMedium)); setFrameStyle(TQFrame::Box | TQFrame::Plain); setLineWidth(1); setFixedSize(pixmap()->size()); @@ -130,7 +130,7 @@ TQString PopupMenu::insertSubmenu(const TQString& title, const TQString &menuWid if (icon.isEmpty()) return TQString::number(m_menu->insertItem(title, dynamic_cast(w)->menu(), index)); else - return TQString::number( m_menu->insertItem(TDEGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, KIcon::SizeMedium), title, dynamic_cast(w)->menu(), index)); + return TQString::number( m_menu->insertItem(TDEGlobal::iconLoader()->loadIcon(icon, TDEIcon::NoGroup, TDEIcon::SizeMedium), title, dynamic_cast(w)->menu(), index)); } return TQString(); } @@ -159,7 +159,7 @@ TQString PopupMenu::handleDCOP(int function, const TQStringList& args) if (args[3].isEmpty()) id = m_menu->insertItem(args[0], index); else - id = m_menu->insertItem(TDEGlobal::iconLoader()->loadIcon(args[3], KIcon::NoGroup, KIcon::SizeMedium), args[0], index); + id = m_menu->insertItem(TDEGlobal::iconLoader()->loadIcon(args[3], TDEIcon::NoGroup, TDEIcon::SizeMedium), args[0], index); m_associations[id] = args[1]; return TQString::number(id); break; @@ -175,7 +175,7 @@ TQString PopupMenu::handleDCOP(int function, const TQStringList& args) if (args[3].isEmpty()) m_menu->changeItem(id, args[1]); else - m_menu->changeItem(id, TDEGlobal::iconLoader()->loadIcon(args[3], KIcon::NoGroup, KIcon::SizeMedium), args[1]); + m_menu->changeItem(id, TDEGlobal::iconLoader()->loadIcon(args[3], TDEIcon::NoGroup, TDEIcon::SizeMedium), args[1]); m_associations[id] = args[2]; break; } diff --git a/kommander/widgets/scriptobject.cpp b/kommander/widgets/scriptobject.cpp index 28f7ad5c..d1cc6951 100644 --- a/kommander/widgets/scriptobject.cpp +++ b/kommander/widgets/scriptobject.cpp @@ -38,7 +38,7 @@ ScriptObject::ScriptObject(TQWidget *a_parent, const char *a_name) setDisplayStates(states); if (KommanderWidget::inEditor) { - setPixmap(TDEGlobal::iconLoader()->loadIcon("shellscript", KIcon::NoGroup, KIcon::SizeMedium)); + setPixmap(TDEGlobal::iconLoader()->loadIcon("shellscript", TDEIcon::NoGroup, TDEIcon::SizeMedium)); setFrameStyle(TQFrame::Box | TQFrame::Plain); setLineWidth(1); setFixedSize(pixmap()->size()); diff --git a/kommander/widgets/tabwidget.cpp b/kommander/widgets/tabwidget.cpp index 04f3cb41..a56c9118 100644 --- a/kommander/widgets/tabwidget.cpp +++ b/kommander/widgets/tabwidget.cpp @@ -137,7 +137,7 @@ TQString TabWidget::handleDCOP(int function, const TQStringList& args) case TAB_setTabIcon: { TQWidget *w = page(args[0].toInt()); - setTabIconSet(w, TDEGlobal::iconLoader()->loadIcon(args[1], KIcon::NoGroup, KIcon::SizeMedium)); + setTabIconSet(w, TDEGlobal::iconLoader()->loadIcon(args[1], TDEIcon::NoGroup, TDEIcon::SizeMedium)); break; } case TAB_isTabEnabled: diff --git a/kommander/widgets/timer.cpp b/kommander/widgets/timer.cpp index c11e6c4a..44de93a5 100644 --- a/kommander/widgets/timer.cpp +++ b/kommander/widgets/timer.cpp @@ -46,7 +46,7 @@ Timer::Timer(TQWidget *a_parent, const char *a_name) setDisplayStates(states); if (KommanderWidget::inEditor) { - setPixmap(TDEGlobal::iconLoader()->loadIcon("kalarm", KIcon::NoGroup, KIcon::SizeMedium)); + setPixmap(TDEGlobal::iconLoader()->loadIcon("kalarm", TDEIcon::NoGroup, TDEIcon::SizeMedium)); setFrameStyle(TQFrame::Box | TQFrame::Plain); setLineWidth(1); setFixedSize(pixmap()->size()); diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp index e54077dd..3e62a26d 100644 --- a/kommander/widgets/treewidget.cpp +++ b/kommander/widgets/treewidget.cpp @@ -431,7 +431,7 @@ TQString TreeWidget::handleDCOP(int function, const TQStringList& args) } case DCOP::setPixmap: { - TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(args[0], KIcon::Small); + TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(args[0], TDEIcon::Small); if (args[1].toInt() == -1) for (TQListViewItemIterator it(this); it.current(); ++it) it.current()->setPixmap(0, pixmap); diff --git a/kommander/working/plugintemplate/plugin.cpp b/kommander/working/plugintemplate/plugin.cpp index ffaa8080..d8b91da0 100644 --- a/kommander/working/plugintemplate/plugin.cpp +++ b/kommander/working/plugintemplate/plugin.cpp @@ -16,7 +16,7 @@ public: %{APPNAME}Plugin::%{APPNAME}Plugin() { - addWidget( "%{APPNAME}", "Custom", i18n("Kommander %{APPNAME} plugin."), new TQIconSet(TDEGlobal::iconLoader()->loadIcon("%{APPNAMELC}", KIcon::NoGroup, KIcon::SizeMedium)) ); + addWidget( "%{APPNAME}", "Custom", i18n("Kommander %{APPNAME} plugin."), new TQIconSet(TDEGlobal::iconLoader()->loadIcon("%{APPNAMELC}", TDEIcon::NoGroup, TDEIcon::SizeMedium)) ); } TQWidget *%{APPNAME}Plugin::create( const TQString &className, TQWidget *parent, const char *name) diff --git a/kommander/working/plugintemplate/widget.cpp b/kommander/working/plugintemplate/widget.cpp index e950205e..d6ad8a0b 100644 --- a/kommander/working/plugintemplate/widget.cpp +++ b/kommander/working/plugintemplate/widget.cpp @@ -28,7 +28,7 @@ enum Functions { /* if (KommanderWidget::inEditor) { - setPixmap(TDEGlobal::iconLoader()->loadIcon("%{APPNAMELC}", KIcon::NoGroup, KIcon::SizeMedium)); + setPixmap(TDEGlobal::iconLoader()->loadIcon("%{APPNAMELC}", TDEIcon::NoGroup, TDEIcon::SizeMedium)); setFrameStyle(TQFrame::Box | TQFrame::Plain); setLineWidth(1); setAlignment(TQt::AlignCenter); diff --git a/lib/compatibility/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp index 54d82d6e..196b4832 100644 --- a/lib/compatibility/knewstuff/downloaddialog.cpp +++ b/lib/compatibility/knewstuff/downloaddialog.cpp @@ -197,7 +197,7 @@ void DownloadDialog::addProvider(Provider *p) if(!p->icon().isValid()) ret = false; else ret = TDEIO::NetAccess::download(p->icon(), tmp, this); if(ret) pix = TQPixmap(tmp); - else pix = TDEGlobal::iconLoader()->loadIcon("knewstuff", KIcon::Panel); + else pix = TDEGlobal::iconLoader()->loadIcon("knewstuff", TDEIcon::Panel); frame = addPage(p->name(), p->name(), pix); m_frame = frame; @@ -359,8 +359,8 @@ void DownloadDialog::addEntry(Entry *entry) }*/ installed = installStatus(entry); - if(installed > 0) pix = TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small); - else if(installed < 0) pix = TDEGlobal::iconLoader()->loadIcon("history", KIcon::Small); + if(installed > 0) pix = TDEGlobal::iconLoader()->loadIcon("ok", TDEIcon::Small); + else if(installed < 0) pix = TDEGlobal::iconLoader()->loadIcon("history", TDEIcon::Small); else pix = TQPixmap(); TDEListViewItem *tmp_r = new TDEListViewItem(lv_r, @@ -457,7 +457,7 @@ void DownloadDialog::install(Entry *e) kapp->config()->writeEntry(m_entryname, e->releaseDate().toString(Qt::ISODate)); kapp->config()->sync(); - TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small); + TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("ok", TDEIcon::Small); m_entryitem = lv_r->findItem(m_entryname, 0); if(m_entryitem) m_entryitem->setPixmap(0, pix); m_entryitem = lv_d->findItem(m_entryname, 0); diff --git a/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp index a3fa51c8..6ef95971 100644 --- a/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp +++ b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp @@ -190,7 +190,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } mHoverCloseButton = new TQPushButton( this ); - mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("fileclose", KIcon::Toolbar, KIcon::SizeSmall) ); + mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("fileclose", TDEIcon::Toolbar, TDEIcon::SizeSmall) ); mHoverCloseButton->setGeometry( rect ); TQToolTip::add(mHoverCloseButton,i18n("Close this tab")); mHoverCloseButton->setFlat(true); diff --git a/quanta/dialogs/actionconfigdialogs.ui b/quanta/dialogs/actionconfigdialogs.ui index 1f803770..fae092c2 100644 --- a/quanta/dialogs/actionconfigdialogs.ui +++ b/quanta/dialogs/actionconfigdialogs.ui @@ -299,7 +299,7 @@ lineText - + actionIcon diff --git a/quanta/dialogs/dtepstructureeditdlgs.ui b/quanta/dialogs/dtepstructureeditdlgs.ui index 802f6753..ce90582b 100644 --- a/quanta/dialogs/dtepstructureeditdlgs.ui +++ b/quanta/dialogs/dtepstructureeditdlgs.ui @@ -64,7 +64,7 @@ iconButton - + iconButton diff --git a/quanta/plugins/pluginconfig.ui b/quanta/plugins/pluginconfig.ui index ad15ff72..05766e6b 100644 --- a/quanta/plugins/pluginconfig.ui +++ b/quanta/plugins/pluginconfig.ui @@ -105,7 +105,7 @@ The plugin name as it appears in the Plugins menu. - + iconButton diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp index 67a88532..c68bd71f 100644 --- a/quanta/src/quanta.cpp +++ b/quanta/src/quanta.cpp @@ -1161,7 +1161,7 @@ void QuantaApp::slotOptions() KDialogBase::Ok, this, "tabdialog"); // Tag Style options - TQVBox *page=kd->addVBoxPage(i18n("Tag Style"), TQString(), BarIcon("kwrite", KIcon::SizeMedium)); + TQVBox *page=kd->addVBoxPage(i18n("Tag Style"), TQString(), BarIcon("kwrite", TDEIcon::SizeMedium)); StyleOptionsS *styleOptionsS = new StyleOptionsS( (TQWidget *)page); styleOptionsS->tagCase->setCurrentItem( qConfig.tagCase); @@ -1175,7 +1175,7 @@ void QuantaApp::slotOptions() // Environment options //TODO FileMasks name is not good anymore - page=kd->addVBoxPage(i18n("Environment"), TQString(), UserIcon("files", KIcon::SizeMedium ) ); + page=kd->addVBoxPage(i18n("Environment"), TQString(), UserIcon("files", TDEIcon::SizeMedium ) ); FileMasks *fileMasks = new FileMasks((TQWidget *)page); fileMasks->lineMarkup->setText( qConfig.markupMimeTypes ); @@ -1215,7 +1215,7 @@ void QuantaApp::slotOptions() fileMasks->defaultDTDCombo->setCurrentItem(pos); // Preview options - page=kd->addVBoxPage(i18n("User Interface"), TQString(), BarIcon("view_choose", KIcon::SizeMedium ) ); + page=kd->addVBoxPage(i18n("User Interface"), TQString(), BarIcon("view_choose", TDEIcon::SizeMedium ) ); PreviewOptions *uiOptions = new PreviewOptions( (TQWidget *)page ); uiOptions->setPosition(qConfig.previewPosition); @@ -1238,10 +1238,10 @@ void QuantaApp::slotOptions() uiOptions->warnEventActions->setChecked(true); } //kafka options - page = kd->addVBoxPage(i18n("VPL View"), TQString(), UserIcon("vpl_text", KIcon::SizeMedium)); + page = kd->addVBoxPage(i18n("VPL View"), TQString(), UserIcon("vpl_text", TDEIcon::SizeMedium)); KafkaSyncOptions *kafkaOptions = new KafkaSyncOptions( m_config, (TQWidget *)page ); - page=kd->addVBoxPage(i18n("Parser"), TQString(), BarIcon("kcmsystem", KIcon::SizeMedium ) ); + page=kd->addVBoxPage(i18n("Parser"), TQString(), BarIcon("kcmsystem", TDEIcon::SizeMedium ) ); ParserOptions *parserOptions = new ParserOptions( m_config, (TQWidget *)page ); parserOptions->refreshFrequency->setValue(qConfig.refreshFrequency); @@ -1250,7 +1250,7 @@ void QuantaApp::slotOptions() parserOptions->showClosingTags->setChecked(qConfig.showClosingTags); parserOptions->spinExpand->setValue(qConfig.expandLevel); - page = kd->addVBoxPage(i18n("Abbreviations"), TQString(), BarIcon("fontsizeup", KIcon::SizeMedium)); + page = kd->addVBoxPage(i18n("Abbreviations"), TQString(), BarIcon("fontsizeup", TDEIcon::SizeMedium)); AbbreviationDlg *abbreviationOptions = new AbbreviationDlg((TQWidget*)(page)); bool reloadTrees = false; @@ -3306,7 +3306,7 @@ bool QuantaApp::slotRemoveToolbar(const TQString& a_name) FourButtonMessageBox dlg(this, 0, true); dlg.textLabel->setText(i18n("The toolbar %1 was modified. Do you want to save it before it is removed?").arg(p_toolbar->name)); dlg.setCaption(i18n("Save Toolbar")); - dlg.pixmapLabel->setPixmap(BarIcon("messagebox_info", KIcon::SizeMedium)); + dlg.pixmapLabel->setPixmap(BarIcon("messagebox_info", TDEIcon::SizeMedium)); dlg.exec(); result = dlg.status(); switch (result) diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp index e8d6c6a0..d5dabb1e 100644 --- a/quanta/src/quantaview.cpp +++ b/quanta/src/quantaview.cpp @@ -287,7 +287,7 @@ void QuantaView::updateTab() if (m_document) { // try to set the icon from mimetype - TQIconSet mimeIcon (KMimeType::pixmapForURL(m_document->url(), 0, KIcon::Small)); + TQIconSet mimeIcon (KMimeType::pixmapForURL(m_document->url(), 0, TDEIcon::Small)); if (mimeIcon.isNull()) mimeIcon = TQIconSet(SmallIcon("document")); TQString urlStr = QExtFileInfo::shortName(m_document->url().path()); diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index dc9644e0..717e94e7 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -618,7 +618,7 @@ void BaseTreeView::insertOpenWithMenu(TDEPopupMenu *menu, int position) TQDictIterator it2(plugins); for(;it2.current();++it2) { - int id = m_openWithMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet(it2.current()->icon(),KIcon::Small), it2.current()->name()); + int id = m_openWithMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet(it2.current()->icon(),TDEIcon::Small), it2.current()->name()); m_pluginIds[id] = it2.current(); } connect(m_openWithMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOpenWithActivated(int)));