From 799fae5feea55e95876c3722c79fd7dabadd2cd6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:19:44 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- parts/abbrev/abbrevpart.cpp | 2 +- parts/appwizard/appwizarddlg.cpp | 2 +- parts/appwizard/appwizarddlgbase.ui | 2 +- parts/classview/classtooldlg.cpp | 12 ++++++------ parts/classview/classtreebase.cpp | 10 +++++----- parts/classview/classviewwidget.cpp | 10 +++++----- parts/classview/navigator.cpp | 2 +- parts/classview/viewcombos.cpp | 8 ++++---- parts/filecreate/fctypeeditbase.ui | 2 +- parts/filecreate/filecreate_listitem.cpp | 8 ++++---- parts/filecreate/filecreate_part.cpp | 10 +++++----- parts/filecreate/filecreate_widget2.cpp | 4 ++-- parts/filecreate/filecreate_widget2.h | 4 ++-- parts/filelist/filelist_item.cpp | 4 ++-- parts/fileselector/fileselector_part.cpp | 2 +- parts/fileselector/tdeactionselector.cpp | 2 +- parts/fileselector/tdeactionselector.h | 4 ++-- parts/fileview/filetreewidget.cpp | 2 +- parts/snippet/snippet_part.cpp | 2 +- 19 files changed, 46 insertions(+), 46 deletions(-) (limited to 'parts') diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp index 197457eb..2b69c7d5 100644 --- a/parts/abbrev/abbrevpart.cpp +++ b/parts/abbrev/abbrevpart.cpp @@ -241,7 +241,7 @@ TQString AbbrevPart::currentWord() const void AbbrevPart::configWidget(KDialogBase *dlg) { - TQVBox *vbox = dlg->addVBoxPage(i18n("Abbreviations"), i18n("Abbreviations"), BarIcon( info()->icon(), KIcon::SizeMedium) ); + TQVBox *vbox = dlg->addVBoxPage(i18n("Abbreviations"), i18n("Abbreviations"), BarIcon( info()->icon(), TDEIcon::SizeMedium) ); AbbrevConfigWidget *w = new AbbrevConfigWidget(this, vbox, "abbrev config widget"); connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); } diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index 76ac124c..8b841371 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -1112,7 +1112,7 @@ void AppWizardDialog::addFavourite(TQListViewItem* item, TQString favouriteName) if(!info->favourite) { - info->favourite = new KIconViewItem(favourites_iconview, + info->favourite = new TDEIconViewItem(favourites_iconview, ((favouriteName=="")?info->name:favouriteName), DesktopIcon("tdevelop")); diff --git a/parts/appwizard/appwizarddlgbase.ui b/parts/appwizard/appwizarddlgbase.ui index 891c1c10..a8071f83 100644 --- a/parts/appwizard/appwizarddlgbase.ui +++ b/parts/appwizard/appwizarddlgbase.ui @@ -110,7 +110,7 @@ unnamed - + favourites_iconview diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp index 43ccfa18..845352fb 100644 --- a/parts/classview/classtooldlg.cpp +++ b/parts/classview/classtooldlg.cpp @@ -39,37 +39,37 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part ) TQPushButton *close_button = new KPushButton(KStdGuiItem::close(), this); parents_button = new TQToolButton(this); - parents_button->setPixmap( UserIcon("CTparents", KIcon::DefaultState, ClassViewFactory::instance()) ); + parents_button->setPixmap( UserIcon("CTparents", TDEIcon::DefaultState, ClassViewFactory::instance()) ); parents_button->setToggleButton(true); parents_button->setFixedSize(parents_button->sizeHint()); TQToolTip::add(parents_button, i18n("Show parents")); children_button = new TQToolButton(this); - children_button->setPixmap( UserIcon("CTchildren", KIcon::DefaultState, ClassViewFactory::instance()) ); + children_button->setPixmap( UserIcon("CTchildren", TDEIcon::DefaultState, ClassViewFactory::instance()) ); children_button->setToggleButton(true); children_button->setFixedSize(children_button->sizeHint()); TQToolTip::add(children_button, i18n("Show children")); clients_button = new TQToolButton(this); - clients_button->setPixmap( UserIcon("CTclients", KIcon::DefaultState, ClassViewFactory::instance()) ); + clients_button->setPixmap( UserIcon("CTclients", TDEIcon::DefaultState, ClassViewFactory::instance()) ); clients_button->setToggleButton(true); clients_button->setFixedSize(clients_button->sizeHint()); TQToolTip::add(clients_button, i18n("Show clients")); suppliers_button = new TQToolButton(this); - suppliers_button->setPixmap( UserIcon("CTsuppliers", KIcon::DefaultState, ClassViewFactory::instance()) ); + suppliers_button->setPixmap( UserIcon("CTsuppliers", TDEIcon::DefaultState, ClassViewFactory::instance()) ); suppliers_button->setToggleButton(true); suppliers_button->setFixedSize(suppliers_button->sizeHint()); TQToolTip::add(suppliers_button, i18n("Show suppliers")); methods_button = new TQToolButton(this); - methods_button->setPixmap( UserIcon("CVpublic_meth", KIcon::DefaultState, ClassViewFactory::instance()) ); + methods_button->setPixmap( UserIcon("CVpublic_meth", TDEIcon::DefaultState, ClassViewFactory::instance()) ); methods_button->setToggleButton(true); methods_button->setFixedSize(methods_button->sizeHint()); TQToolTip::add(methods_button, i18n("Show methods")); attributes_button = new TQToolButton(this); - attributes_button->setPixmap( UserIcon("CVpublic_var", KIcon::DefaultState, ClassViewFactory::instance()) ); + attributes_button->setPixmap( UserIcon("CVpublic_var", TDEIcon::DefaultState, ClassViewFactory::instance()) ); attributes_button->setToggleButton(true); attributes_button->setFixedSize(attributes_button->sizeHint()); TQToolTip::add(attributes_button, i18n("Show attributes")); diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp index 8af0efc8..d6d75974 100644 --- a/parts/classview/classtreebase.cpp +++ b/parts/classview/classtreebase.cpp @@ -142,7 +142,7 @@ void ClassTreeOrganizerItem::init() void ClassTreeScopeItem::init() { setExpandable(true); - setPixmap(0, UserIcon("CVnamespace", KIcon::DefaultState, ClassViewFactory::instance())); + setPixmap(0, UserIcon("CVnamespace", TDEIcon::DefaultState, ClassViewFactory::instance())); } @@ -217,7 +217,7 @@ void ClassTreeScopeItem::setOpen(bool o) void ClassTreeClassItem::init() { setExpandable(true); - setPixmap(0, UserIcon(m_isStruct ? "CVstruct" : "CVclass", KIcon::DefaultState, ClassViewFactory::instance())); + setPixmap(0, UserIcon(m_isStruct ? "CVstruct" : "CVclass", TDEIcon::DefaultState, ClassViewFactory::instance())); } @@ -302,7 +302,7 @@ ClassTreeMethodItem::ClassTreeMethodItem(ClassTreeItem *parent, ClassTreeItem *l else icon = "CVglobal_meth"; - setPixmap(0, UserIcon(icon, KIcon::DefaultState, ClassViewFactory::instance())); + setPixmap(0, UserIcon(icon, TDEIcon::DefaultState, ClassViewFactory::instance())); } TQString ClassTreeMethodItem::text( int ) const @@ -356,7 +356,7 @@ ClassTreeAttrItem::ClassTreeAttrItem(ClassTreeItem *parent, ClassTreeItem *lastS else icon = "CVglobal_var"; - setPixmap(0, UserIcon(icon, KIcon::DefaultState, ClassViewFactory::instance())); + setPixmap(0, UserIcon(icon, TDEIcon::DefaultState, ClassViewFactory::instance())); } @@ -380,7 +380,7 @@ ClassTreeScriptItem::ClassTreeScriptItem(ClassTreeItem *parent, ClassTreeItem *l //need a icon for scripts icon = "CVpublic_var"; - setPixmap(0, UserIcon(icon, KIcon::DefaultState, ClassViewFactory::instance())); + setPixmap(0, UserIcon(icon, TDEIcon::DefaultState, ClassViewFactory::instance())); } diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp index de025d7b..89c0db1e 100644 --- a/parts/classview/classviewwidget.cpp +++ b/parts/classview/classviewwidget.cpp @@ -948,7 +948,7 @@ void FolderBrowserItem::setup( ) void NamespaceDomBrowserItem::setup( ) { ClassViewItem::setup(); - setPixmap( 0, UserIcon("CVnamespace", KIcon::DefaultState, listView()->m_part->instance()) ); + setPixmap( 0, UserIcon("CVnamespace", TDEIcon::DefaultState, listView()->m_part->instance()) ); setExpandable( true ); TQString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true); @@ -958,7 +958,7 @@ void NamespaceDomBrowserItem::setup( ) void ClassDomBrowserItem::setup( ) { ClassViewItem::setup(); - setPixmap( 0, UserIcon("CVclass", KIcon::DefaultState, listView()->m_part->instance()) ); + setPixmap( 0, UserIcon("CVclass", TDEIcon::DefaultState, listView()->m_part->instance()) ); setExpandable( true ); TQString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true); @@ -968,7 +968,7 @@ void ClassDomBrowserItem::setup( ) void TypeAliasDomBrowserItem::setup( ) { ClassViewItem::setup(); - setPixmap( 0, UserIcon("CVtypedef", KIcon::DefaultState, listView()->m_part->instance()) ); + setPixmap( 0, UserIcon("CVtypedef", TDEIcon::DefaultState, listView()->m_part->instance()) ); setExpandable( false ); TQString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true); @@ -996,7 +996,7 @@ void FunctionDomBrowserItem::setup( ) else iconName = "CVpublic_" + methodType; - setPixmap( 0, UserIcon(iconName, KIcon::DefaultState, listView()->m_part->instance()) ); + setPixmap( 0, UserIcon(iconName, TDEIcon::DefaultState, listView()->m_part->instance()) ); TQString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true); @@ -1058,7 +1058,7 @@ void VariableDomBrowserItem::setup( ) else iconName = "CVpublic_var"; - setPixmap( 0, UserIcon(iconName, KIcon::DefaultState, listView()->m_part->instance()) ); + setPixmap( 0, UserIcon(iconName, TDEIcon::DefaultState, listView()->m_part->instance()) ); TQString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true); setText( 0, txt ); diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp index 389b1d6f..939dbdaf 100644 --- a/parts/classview/navigator.cpp +++ b/parts/classview/navigator.cpp @@ -94,7 +94,7 @@ public: virtual void setup() { FancyListViewItem::setup(); - setPixmap( 0, UserIcon("CVpublic_meth", KIcon::DefaultState, m_part->instance()) ); + setPixmap( 0, UserIcon("CVpublic_meth", TDEIcon::DefaultState, m_part->instance()) ); } Type type() { return m_type; } diff --git a/parts/classview/viewcombos.cpp b/parts/classview/viewcombos.cpp index cf8b278e..52afd26f 100644 --- a/parts/classview/viewcombos.cpp +++ b/parts/classview/viewcombos.cpp @@ -49,7 +49,7 @@ NamespaceDom NamespaceItem::dom() const void NamespaceItem::setup() { TQListViewItem::setup(); - setPixmap( 0, UserIcon("CVnamespace", KIcon::DefaultState, m_part->instance()) ); + setPixmap( 0, UserIcon("CVnamespace", TDEIcon::DefaultState, m_part->instance()) ); } @@ -75,7 +75,7 @@ ClassDom ClassItem::dom() const void ClassItem::setup() { TQListViewItem::setup(); - setPixmap( 0, UserIcon("CVclass", KIcon::DefaultState, m_part->instance()) ); + setPixmap( 0, UserIcon("CVclass", TDEIcon::DefaultState, m_part->instance()) ); } @@ -108,7 +108,7 @@ void FunctionItem::setup() iconName = "CVprotected_meth"; else iconName = "CVpublic_meth"; - setPixmap( 0, UserIcon(iconName, KIcon::DefaultState, m_part->instance()) ); + setPixmap( 0, UserIcon(iconName, TDEIcon::DefaultState, m_part->instance()) ); } @@ -120,7 +120,7 @@ void refreshNamespaces(ClassViewPart *part, KComboView *view) NamespaceItem *global_item = new NamespaceItem( part, view->listView(), i18n("(Global Namespace)"), part->codeModel()->globalNamespace() ); view->addItem(global_item); - global_item->setPixmap( 0, UserIcon("CVnamespace", KIcon::DefaultState, part->instance()) ); + global_item->setPixmap( 0, UserIcon("CVnamespace", TDEIcon::DefaultState, part->instance()) ); NamespaceList namespaces = part->codeModel()->globalNamespace()->namespaceList(); for (NamespaceList::const_iterator it = namespaces.begin(); it != namespaces.end(); ++it) { diff --git a/parts/filecreate/fctypeeditbase.ui b/parts/filecreate/fctypeeditbase.ui index 9d97d82b..e456e146 100644 --- a/parts/filecreate/fctypeeditbase.ui +++ b/parts/filecreate/fctypeeditbase.ui @@ -121,7 +121,7 @@ - + icon_url diff --git a/parts/filecreate/filecreate_listitem.cpp b/parts/filecreate/filecreate_listitem.cpp index d792ab26..6dd1e35a 100644 --- a/parts/filecreate/filecreate_listitem.cpp +++ b/parts/filecreate/filecreate_listitem.cpp @@ -82,10 +82,10 @@ namespace FileCreate { setText(0, m_filetype->ext()!="" ? TQString("." + m_filetype->ext()) : TQString("") ); setText(1, ""+m_filetype->name()+". " + m_filetype->descr() ); - KIconLoader * loader = TDEGlobal::iconLoader(); - TQPixmap iconPix = loader->loadIcon(m_filetype->icon(), KIcon::Desktop, - KIcon::SizeMedium, - KIcon::DefaultState, NULL, + TDEIconLoader * loader = TDEGlobal::iconLoader(); + TQPixmap iconPix = loader->loadIcon(m_filetype->icon(), TDEIcon::Desktop, + TDEIcon::SizeMedium, + TDEIcon::DefaultState, NULL, true); if (!iconPix.isNull()) { setPixmap(0, iconPix); diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp index 50009952..9b99c83a 100644 --- a/parts/filecreate/filecreate_part.cpp +++ b/parts/filecreate/filecreate_part.cpp @@ -120,7 +120,7 @@ void FileCreatePart::insertConfigWidget( const KDialogBase * dlg, TQWidget * pag void FileCreatePart::slotAboutToShowNewPopupMenu() { - KIconLoader * m_iconLoader = TDEGlobal::iconLoader(); + TDEIconLoader * m_iconLoader = TDEGlobal::iconLoader(); m_newPopupMenu->clear(); delete m_subPopups; m_subPopups = NULL; @@ -133,8 +133,8 @@ void FileCreatePart::slotAboutToShowNewPopupMenu() if (filetype->subtypes().count()==0) { TQPixmap iconPix = m_iconLoader->loadIcon( - filetype->icon(), KIcon::Desktop, KIcon::SizeSmall, - KIcon::DefaultState, NULL, true); + filetype->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall, + TDEIcon::DefaultState, NULL, true); m_newPopupMenu->insertItem(iconPix, filetype->name(), this, TQT_SLOT(slotNewFilePopup(int)), 0, ++id ); m_newPopupMenu->setItemParameter( id, (long)filetype ); @@ -148,8 +148,8 @@ void FileCreatePart::slotAboutToShowNewPopupMenu() if( !subMenu ) subMenu = new TDEPopupMenu(0,0); TQPixmap iconPix = m_iconLoader->loadIcon( - subtype->icon(), KIcon::Desktop, KIcon::SizeSmall, - KIcon::DefaultState, NULL, true); + subtype->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall, + TDEIcon::DefaultState, NULL, true); subMenu->insertItem(iconPix, subtype->name(), this, TQT_SLOT(slotNewFilePopup(int)), 0, ++id ); subMenu->setItemParameter( id, (long)subtype ); diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp index 59ec1a33..57fbe8f3 100644 --- a/parts/filecreate/filecreate_widget2.cpp +++ b/parts/filecreate/filecreate_widget2.cpp @@ -130,8 +130,8 @@ namespace FileCreate { item(row,1)->setWordWrap(true); item(row,3)->setWordWrap(true); //setRowStretchable(row,true); - TQPixmap iconPix = m_iconLoader->loadIcon(filetype->icon(), KIcon::Desktop, KIcon::SizeMedium, - KIcon::DefaultState, NULL, + TQPixmap iconPix = m_iconLoader->loadIcon(filetype->icon(), TDEIcon::Desktop, TDEIcon::SizeMedium, + TDEIcon::DefaultState, NULL, true); if (!iconPix.isNull()) { setPixmap(row, 0, iconPix); diff --git a/parts/filecreate/filecreate_widget2.h b/parts/filecreate/filecreate_widget2.h index 027333c9..217d37ce 100644 --- a/parts/filecreate/filecreate_widget2.h +++ b/parts/filecreate/filecreate_widget2.h @@ -20,7 +20,7 @@ #include "filecreate_typechooser.h" -class KIconLoader; +class TDEIconLoader; class KDevProject; class FileCreatePart; @@ -79,7 +79,7 @@ namespace FileCreate { /** * The default icon loader, here for convenience. */ - KIconLoader * m_iconLoader; + TDEIconLoader * m_iconLoader; /** * A mapping of each row number to a file type. */ diff --git a/parts/filelist/filelist_item.cpp b/parts/filelist/filelist_item.cpp index 9e6b1fdd..16ab77bd 100644 --- a/parts/filelist/filelist_item.cpp +++ b/parts/filelist/filelist_item.cpp @@ -26,7 +26,7 @@ FileListItem::FileListItem( TQListView * parent, KURL const & url, DocumentState { KFileItem fileItem( KFileItem::Unknown, KFileItem::Unknown, _url ); - _icon = fileItem.pixmap(KIcon::SizeSmall); + _icon = fileItem.pixmap(TDEIcon::SizeSmall); setState( state ); } @@ -64,7 +64,7 @@ void FileListItem::setState( DocumentState state ) void FileListItem::setHeight( int ) { - TQListViewItem::setHeight( KIcon::SizeSmall > listView()->fontMetrics().height() ? KIcon::SizeSmall : listView()->fontMetrics().height() ); + TQListViewItem::setHeight( TDEIcon::SizeSmall > listView()->fontMetrics().height() ? TDEIcon::SizeSmall : listView()->fontMetrics().height() ); } void FileListItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ) diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp index a98200ed..ca0f1265 100644 --- a/parts/fileselector/fileselector_part.cpp +++ b/parts/fileselector/fileselector_part.cpp @@ -82,7 +82,7 @@ void FileSelectorPart::slotProjectOpened() void FileSelectorPart::slotConfigWidget( KDialogBase * dlg ) { - TQVBox* vbox = dlg->addVBoxPage( i18n("File Selector"), i18n("File Selector"), BarIcon( info()->icon(), KIcon::SizeMedium) ); + TQVBox* vbox = dlg->addVBoxPage( i18n("File Selector"), i18n("File Selector"), BarIcon( info()->icon(), TDEIcon::SizeMedium) ); KFSConfigPage* page = new KFSConfigPage( vbox, 0, m_filetree ); connect( dlg, TQT_SIGNAL( okClicked( ) ), page, TQT_SLOT( apply( ) ) ); // ### implement reload diff --git a/parts/fileselector/tdeactionselector.cpp b/parts/fileselector/tdeactionselector.cpp index 598fe496..a4c75543 100644 --- a/parts/fileselector/tdeactionselector.cpp +++ b/parts/fileselector/tdeactionselector.cpp @@ -61,7 +61,7 @@ TDEActionSelector::TDEActionSelector( TQWidget *parent, const char *name ) d->selectedInsertionPolicy = BelowCurrent; d->showUpDownButtons = true; - //int isz = IconSize( KIcon::Small ); + //int isz = IconSize( TDEIcon::Small ); TQHBoxLayout *lo = new TQHBoxLayout( this ); lo->setSpacing( KDialog::spacingHint() ); diff --git a/parts/fileselector/tdeactionselector.h b/parts/fileselector/tdeactionselector.h index a1c26394..c1d03486 100644 --- a/parts/fileselector/tdeactionselector.h +++ b/parts/fileselector/tdeactionselector.h @@ -113,7 +113,7 @@ public: /** This enum identifies the icon sizes, used for the move buttons. The values correspond to the following pixel sizes: - @li SmallIcon - the return value of IconSize( KIcon::Small ), the user defined size + @li SmallIcon - the return value of IconSize( TDEIcon::Small ), the user defined size of a small icon in KDE. This is the default setting. @li Small - 16px @li Medium - 22px @@ -272,7 +272,7 @@ public: Sets the iconset for button @p button to @p iconset. You can use this method to et a costum icon set. Either created by @ref TQIconSet, or use the application instance of - @ref KIconLoader (recommended). + @ref TDEIconLoader (recommended). */ void setButtonIconSet( const TQIconSet &iconset, MoveButton button ); diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp index 06322e38..13c5080f 100644 --- a/parts/fileview/filetreewidget.cpp +++ b/parts/fileview/filetreewidget.cpp @@ -120,7 +120,7 @@ void FileTreeWidget::openDirectory( const TQString& dirName ) addProjectFiles( m_part->project()->allFiles(), true ); KURL url = KURL::fromPathOrURL( dirName ); - const TQPixmap& pix = KMimeType::mimeType("inode/directory")->pixmap( KIcon::Small ); + const TQPixmap& pix = KMimeType::mimeType("inode/directory")->pixmap( TDEIcon::Small ); // this is a bit odd, but the order of these calls seems to be important //FileTreeBranch *b = new FileTreeBranch( this, url, url.prettyURL(), pix ); diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp index 9707f4e8..fe7bdc30 100644 --- a/parts/snippet/snippet_part.cpp +++ b/parts/snippet/snippet_part.cpp @@ -97,7 +97,7 @@ TDEAboutData* SnippetPart::aboutData() */ void SnippetPart::slotConfigWidget( KDialogBase *dlg ) { - TQVBox *vbox = dlg->addVBoxPage( i18n("Code Snippets"), i18n("Code Snippets"), BarIcon( info()->icon(), KIcon::SizeMedium ) ); + TQVBox *vbox = dlg->addVBoxPage( i18n("Code Snippets"), i18n("Code Snippets"), BarIcon( info()->icon(), TDEIcon::SizeMedium ) ); SnippetSettings * w = new SnippetSettings( m_widget, vbox ); -- cgit v1.2.1