From 1c53bf78a70a66d8ec15a77cbf98606694d7e6e7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:20:11 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- 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 +- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'quanta') 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))); -- cgit v1.2.1