Rename KIcon to enhance compatibility with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 994762d18b
commit 635228158f

@ -43,7 +43,7 @@ namespace KileDialog
// line 1: picture and label // line 1: picture and label
TQLabel *picture = new TQLabel("", labelwidget); 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); TQLabel *label = new TQLabel(i18n( "Do you really want to delete these files?" ), labelwidget);
labellayout->addWidget(picture); labellayout->addWidget(picture);
labellayout->addSpacing(20); labellayout->addSpacing(20);

@ -122,7 +122,7 @@ namespace KileDialog
path << section; path << section;
#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0) #if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
setFolderIcon(path, SmallIcon(icon, KIcon::SizeSmallMedium)); setFolderIcon(path, SmallIcon(icon, TDEIcon::SizeSmallMedium));
#else #else
setFolderIcon(path, SmallIcon(icon)); setFolderIcon(path, SmallIcon(icon));
#endif #endif
@ -143,7 +143,7 @@ namespace KileDialog
TQVBox *vbox = addVBoxPage(path, header, TQVBox *vbox = addVBoxPage(path, header,
#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0) #if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
SmallIcon(pixmapName,KIcon::SizeSmallMedium) SmallIcon(pixmapName,TDEIcon::SizeSmallMedium)
#else #else
SmallIcon(pixmapName) SmallIcon(pixmapName)
#endif #endif
@ -278,7 +278,7 @@ namespace KileDialog
// create a new vbox page and add the config page // create a new vbox page and add the config page
#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0) #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 #else
TQVBox *page = addVBoxPage(path,iface->configPageFullName(i), iface->configPagePixmap(i) ); TQVBox *page = addVBoxPage(path,iface->configPageFullName(i), iface->configPagePixmap(i) );
#endif #endif

@ -354,7 +354,7 @@ namespace KileWidget
{ {
KILE_DEBUG() << "icon ---> " << m_icon << endl; KILE_DEBUG() << "icon ---> " << m_icon << endl;
//KILE_DEBUG() << "==ToolConfig::selectIcon()=====================" << endl; //KILE_DEBUG() << "==ToolConfig::selectIcon()=====================" << endl;
KIconDialog *dlg = new KIconDialog(this); TDEIconDialog *dlg = new TDEIconDialog(this);
TQString res = dlg->openDialog(); TQString res = dlg->openDialog();
if ( m_icon != res ) { if ( m_icon != res ) {
if ( res.isEmpty() ) return; if ( res.isEmpty() ) return;

@ -316,7 +316,7 @@ void Manager::reflectDocumentStatus(Kate::Document *doc, bool isModified, unsign
else if ( m_ki->extensions()->isScriptFile(doc->url()) ) else if ( m_ki->extensions()->isScriptFile(doc->url()) )
icon = SmallIcon("js"); icon = SmallIcon("js");
else 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)); changeTab(doc->views().first(), icon, m_ki->getShortName(doc));
} }

@ -183,12 +183,12 @@ void ManageTemplatesDialog::slotSelectedTemplate(TQListViewItem *item) {
} }
void ManageTemplatesDialog::slotSelectIcon() { void ManageTemplatesDialog::slotSelectIcon() {
KIconDialog *dlg = new KIconDialog(); TDEIconDialog *dlg = new TDEIconDialog();
TQString res = dlg->openDialog(); TQString res = dlg->openDialog();
KIconLoader kil; TDEIconLoader kil;
if (!res.isNull() ) { if (!res.isNull() ) {
m_iconEdit->setText(kil.iconPath(res,-KIcon::SizeLarge, false)); m_iconEdit->setText(kil.iconPath(res,-TDEIcon::SizeLarge, false));
} }
} }

@ -48,7 +48,7 @@ tbraun 2007-06-13
#include <tqapplication.h> #include <tqapplication.h>
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 ); setGridX( 36 );
setGridY( 36); setGridY( 36);
@ -163,7 +163,7 @@ void SymbolView::removeToolTip()
void SymbolView::hideEvent( TQHideEvent *e ) void SymbolView::hideEvent( TQHideEvent *e )
{ {
removeToolTip(); removeToolTip();
KIconView::hideEvent( e ); TDEIconView::hideEvent( e );
} }
void SymbolView::initPage(int page) void SymbolView::initPage(int page)
@ -255,7 +255,7 @@ void SymbolView::fillWidget(const TQString& prefix)
{ {
KILE_DEBUG() << "===SymbolView::fillWidget(const TQString& " << prefix << " )===" << endl; KILE_DEBUG() << "===SymbolView::fillWidget(const TQString& " << prefix << " )===" << endl;
TQImage image; TQImage image;
KIconViewItem* item; TDEIconViewItem* item;
TQStringList refCnts,paths; TQStringList refCnts,paths;
if( prefix == MFUSprefix) if( prefix == MFUSprefix)
@ -286,7 +286,7 @@ void SymbolView::fillWidget(const TQString& prefix)
if ( image.load(paths[i]) ) if ( image.load(paths[i]) )
{ {
// KILE_DEBUG() << "path is " << paths[i] << endl; // KILE_DEBUG() << "path is " << paths[i] << endl;
item = new KIconViewItem(this); item = new TDEIconViewItem(this);
item->setPixmap(image); item->setPixmap(image);
item->setKey( refCnts[i] + '%' + image.text("Command") + '%' + image.text("Packages") + '%' + paths[i] ); 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 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 else
{ {
tmpItem = new KIconViewItem(this,TQString(),*(item->pixmap())); tmpItem = new TDEIconViewItem(this,TQString(),*(item->pixmap()));
tmpItem->setKey(item->key()); tmpItem->setKey(item->key());
} }
} }

@ -27,7 +27,7 @@
static const TQString MFUSGroup = "MostFrequentlyUsedSymbols"; static const TQString MFUSGroup = "MostFrequentlyUsedSymbols";
static const TQString MFUSprefix = "MFUS"; static const TQString MFUSprefix = "MFUS";
class SymbolView : public KIconView class SymbolView : public TDEIconView
{ {
Q_OBJECT Q_OBJECT

@ -228,9 +228,9 @@ int TemplateItem::compare( TQIconViewItem *i ) const
////////////////////// TemplateIconView ////////////////////// ////////////////////// 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); setItemsMovable(false);
setMode(KIconView::Select); setMode(TDEIconView::Select);
setResizeMode(TQIconView::Adjust); setResizeMode(TQIconView::Adjust);
setSelectionMode(TQIconView::Single); setSelectionMode(TQIconView::Single);
setResizePolicy(TQScrollView::Default); setResizePolicy(TQScrollView::Default);

@ -134,7 +134,7 @@ private:
KileTemplate::Info m_info; KileTemplate::Info m_info;
}; };
class TemplateIconView : public KIconView { class TemplateIconView : public TDEIconView {
Q_OBJECT Q_OBJECT

Loading…
Cancel
Save