From 635228158f83d13a8ffe451c495232b35b03fffa Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:03:10 -0600 Subject: [PATCH] Rename KIcon to enhance compatibility with KDE4 --- src/kile/cleandialog.cpp | 2 +- src/kile/kileconfigdialog.cpp | 6 +++--- src/kile/kiletoolconfigwidget.cpp | 2 +- src/kile/kileviewmanager.cpp | 2 +- src/kile/managetemplatesdialog.cpp | 6 +++--- src/kile/symbolview.cpp | 10 +++++----- src/kile/symbolview.h | 2 +- src/kile/templates.cpp | 4 ++-- src/kile/templates.h | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/kile/cleandialog.cpp b/src/kile/cleandialog.cpp index 337ba20..cb1d4b0 100644 --- a/src/kile/cleandialog.cpp +++ b/src/kile/cleandialog.cpp @@ -43,7 +43,7 @@ namespace KileDialog // line 1: picture and label TQLabel *picture = new TQLabel("", labelwidget); - picture->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium) ); + picture->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium) ); TQLabel *label = new TQLabel(i18n( "Do you really want to delete these files?" ), labelwidget); labellayout->addWidget(picture); labellayout->addSpacing(20); diff --git a/src/kile/kileconfigdialog.cpp b/src/kile/kileconfigdialog.cpp index 1f3a17e..c52c92e 100644 --- a/src/kile/kileconfigdialog.cpp +++ b/src/kile/kileconfigdialog.cpp @@ -122,7 +122,7 @@ namespace KileDialog path << section; #if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0) - setFolderIcon(path, SmallIcon(icon, KIcon::SizeSmallMedium)); + setFolderIcon(path, SmallIcon(icon, TDEIcon::SizeSmallMedium)); #else setFolderIcon(path, SmallIcon(icon)); #endif @@ -143,7 +143,7 @@ namespace KileDialog TQVBox *vbox = addVBoxPage(path, header, #if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0) - SmallIcon(pixmapName,KIcon::SizeSmallMedium) + SmallIcon(pixmapName,TDEIcon::SizeSmallMedium) #else SmallIcon(pixmapName) #endif @@ -278,7 +278,7 @@ namespace KileDialog // create a new vbox page and add the config page #if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0) - TQVBox *page = addVBoxPage(path,iface->configPageFullName(i), iface->configPagePixmap(i,KIcon::SizeSmallMedium) ); + TQVBox *page = addVBoxPage(path,iface->configPageFullName(i), iface->configPagePixmap(i,TDEIcon::SizeSmallMedium) ); #else TQVBox *page = addVBoxPage(path,iface->configPageFullName(i), iface->configPagePixmap(i) ); #endif diff --git a/src/kile/kiletoolconfigwidget.cpp b/src/kile/kiletoolconfigwidget.cpp index 4a29560..0c66d59 100644 --- a/src/kile/kiletoolconfigwidget.cpp +++ b/src/kile/kiletoolconfigwidget.cpp @@ -354,7 +354,7 @@ namespace KileWidget { KILE_DEBUG() << "icon ---> " << m_icon << endl; //KILE_DEBUG() << "==ToolConfig::selectIcon()=====================" << endl; - KIconDialog *dlg = new KIconDialog(this); + TDEIconDialog *dlg = new TDEIconDialog(this); TQString res = dlg->openDialog(); if ( m_icon != res ) { if ( res.isEmpty() ) return; diff --git a/src/kile/kileviewmanager.cpp b/src/kile/kileviewmanager.cpp index 6fca38f..cb0bf96 100644 --- a/src/kile/kileviewmanager.cpp +++ b/src/kile/kileviewmanager.cpp @@ -316,7 +316,7 @@ void Manager::reflectDocumentStatus(Kate::Document *doc, bool isModified, unsign else if ( m_ki->extensions()->isScriptFile(doc->url()) ) icon = SmallIcon("js"); else - icon = KMimeType::pixmapForURL (doc->url(), 0, KIcon::Small); + icon = KMimeType::pixmapForURL (doc->url(), 0, TDEIcon::Small); changeTab(doc->views().first(), icon, m_ki->getShortName(doc)); } diff --git a/src/kile/managetemplatesdialog.cpp b/src/kile/managetemplatesdialog.cpp index 59591e8..e41be18 100644 --- a/src/kile/managetemplatesdialog.cpp +++ b/src/kile/managetemplatesdialog.cpp @@ -183,12 +183,12 @@ void ManageTemplatesDialog::slotSelectedTemplate(TQListViewItem *item) { } void ManageTemplatesDialog::slotSelectIcon() { - KIconDialog *dlg = new KIconDialog(); + TDEIconDialog *dlg = new TDEIconDialog(); TQString res = dlg->openDialog(); - KIconLoader kil; + TDEIconLoader kil; if (!res.isNull() ) { - m_iconEdit->setText(kil.iconPath(res,-KIcon::SizeLarge, false)); + m_iconEdit->setText(kil.iconPath(res,-TDEIcon::SizeLarge, false)); } } diff --git a/src/kile/symbolview.cpp b/src/kile/symbolview.cpp index 83d41da..cd1ff60 100644 --- a/src/kile/symbolview.cpp +++ b/src/kile/symbolview.cpp @@ -48,7 +48,7 @@ tbraun 2007-06-13 #include -SymbolView::SymbolView(TQWidget *parent, int type, const char *name): KIconView( parent, name ),m_toolTip(0L) +SymbolView::SymbolView(TQWidget *parent, int type, const char *name): TDEIconView( parent, name ),m_toolTip(0L) { setGridX( 36 ); setGridY( 36); @@ -163,7 +163,7 @@ void SymbolView::removeToolTip() void SymbolView::hideEvent( TQHideEvent *e ) { removeToolTip(); - KIconView::hideEvent( e ); + TDEIconView::hideEvent( e ); } void SymbolView::initPage(int page) @@ -255,7 +255,7 @@ void SymbolView::fillWidget(const TQString& prefix) { KILE_DEBUG() << "===SymbolView::fillWidget(const TQString& " << prefix << " )===" << endl; TQImage image; - KIconViewItem* item; + TDEIconViewItem* item; TQStringList refCnts,paths; if( prefix == MFUSprefix) @@ -286,7 +286,7 @@ void SymbolView::fillWidget(const TQString& prefix) if ( image.load(paths[i]) ) { // KILE_DEBUG() << "path is " << paths[i] << endl; - item = new KIconViewItem(this); + item = new TDEIconViewItem(this); item->setPixmap(image); item->setKey( refCnts[i] + '%' + image.text("Command") + '%' + image.text("Packages") + '%' + paths[i] ); image = KImageEffect::blend(colorGroup().text(), image, 1); // destroys our png comments, so we do it after reading the comments @@ -377,7 +377,7 @@ void SymbolView::slotAddToList(const TQIconViewItem *item) } else { - tmpItem = new KIconViewItem(this,TQString(),*(item->pixmap())); + tmpItem = new TDEIconViewItem(this,TQString(),*(item->pixmap())); tmpItem->setKey(item->key()); } } diff --git a/src/kile/symbolview.h b/src/kile/symbolview.h index 98bc4be..67c4a80 100644 --- a/src/kile/symbolview.h +++ b/src/kile/symbolview.h @@ -27,7 +27,7 @@ static const TQString MFUSGroup = "MostFrequentlyUsedSymbols"; static const TQString MFUSprefix = "MFUS"; -class SymbolView : public KIconView +class SymbolView : public TDEIconView { Q_OBJECT diff --git a/src/kile/templates.cpp b/src/kile/templates.cpp index 8bbb90c..65d605f 100644 --- a/src/kile/templates.cpp +++ b/src/kile/templates.cpp @@ -228,9 +228,9 @@ int TemplateItem::compare( TQIconViewItem *i ) const ////////////////////// TemplateIconView ////////////////////// -TemplateIconView::TemplateIconView(TQWidget *parent, const char *name, WFlags f) : KIconView(parent, name, f), m_templateManager(NULL), m_proc(NULL) { +TemplateIconView::TemplateIconView(TQWidget *parent, const char *name, WFlags f) : TDEIconView(parent, name, f), m_templateManager(NULL), m_proc(NULL) { setItemsMovable(false); - setMode(KIconView::Select); + setMode(TDEIconView::Select); setResizeMode(TQIconView::Adjust); setSelectionMode(TQIconView::Single); setResizePolicy(TQScrollView::Default); diff --git a/src/kile/templates.h b/src/kile/templates.h index fc023de..07da4f9 100644 --- a/src/kile/templates.h +++ b/src/kile/templates.h @@ -134,7 +134,7 @@ private: KileTemplate::Info m_info; }; -class TemplateIconView : public KIconView { +class TemplateIconView : public TDEIconView { Q_OBJECT