From fc02f656b0c119d77b36b1f8d160d525eac44614 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:17:17 -0600 Subject: [PATCH] Rename KIcon to enhance compatibility with KDE4 --- arts/builder/module.cpp | 10 +++++----- arts/builder/portposdlg.cpp | 6 +++--- juk/coverdialogbase.ui | 4 ++-- juk/covericonview.cpp | 6 +++--- juk/covericonview.h | 6 +++--- juk/deletedialog.cpp | 4 ++-- juk/systemtray.cpp | 6 +++--- juk/webimagefetcherdialog.cpp | 4 ++-- juk/webimagefetcherdialog.h | 4 ++-- kscd/docking.cpp | 10 +++++----- noatun/library/effectview.cpp | 10 +++++----- noatun/library/pref.cpp | 2 +- noatun/modules/metatag/edit.cpp | 2 +- noatun/modules/simple/propertiesdialog.ui.h | 2 +- 14 files changed, 38 insertions(+), 38 deletions(-) diff --git a/arts/builder/module.cpp b/arts/builder/module.cpp index 099f01e7..e11da759 100644 --- a/arts/builder/module.cpp +++ b/arts/builder/module.cpp @@ -95,7 +95,7 @@ Module::Module(const Arts::ModuleInfo& minfo, Arts::StructureDesc structuredesc, void Module::initModule() { TQString iconname; - KIconLoader iconloader; + TDEIconLoader iconloader; _selected = false; _visible = false; @@ -107,12 +107,12 @@ void Module::initModule() iconname = _name + ".xpm"; - _pixmap = new TQPixmap(iconloader.loadIcon(iconname, KIcon::User)); + _pixmap = new TQPixmap(iconloader.loadIcon(iconname, TDEIcon::User)); if(!_pixmap->height()) { iconname = _name + ".png"; delete _pixmap; - _pixmap = new TQPixmap( iconloader.loadIcon( iconname, KIcon::User ) ); + _pixmap = new TQPixmap( iconloader.loadIcon( iconname, TDEIcon::User ) ); if( !_pixmap->height() ) { delete _pixmap; @@ -125,12 +125,12 @@ void Module::initModule() { iconname = iconname.mid(6); - _pixmap = new TQPixmap(iconloader.loadIcon(iconname, KIcon::User)); + _pixmap = new TQPixmap(iconloader.loadIcon(iconname, TDEIcon::User)); if(!_pixmap->height()) { iconname.replace( iconname.length() - 4, 3, "png" ); delete _pixmap; - _pixmap = new TQPixmap(iconloader.loadIcon(iconname, KIcon::User)); + _pixmap = new TQPixmap(iconloader.loadIcon(iconname, TDEIcon::User)); if( !_pixmap->height() ) { delete _pixmap; diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp index b200d812..021d39f3 100644 --- a/arts/builder/portposdlg.cpp +++ b/arts/builder/portposdlg.cpp @@ -114,13 +114,13 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent, bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() )); bbox->addStretch(1); - KIconLoader iconloader; + TDEIconLoader iconloader; TQButton *raise = bbox->addButton(i18n("&Raise")); - raise->setPixmap(iconloader.loadIcon("up", KIcon::Small)); + raise->setPixmap(iconloader.loadIcon("up", TDEIcon::Small)); connect( raise, TQT_SIGNAL( clicked() ), TQT_SLOT( raise() )); TQButton *lower = bbox->addButton(i18n("&Lower")); - lower->setPixmap(iconloader.loadIcon("down", KIcon::Small)); + lower->setPixmap(iconloader.loadIcon("down", TDEIcon::Small)); connect( lower, TQT_SIGNAL( clicked() ), TQT_SLOT( lower() )); TQButton *rename = bbox->addButton(i18n("R&ename...")); diff --git a/juk/coverdialogbase.ui b/juk/coverdialogbase.ui index 848d36c6..7e078115 100644 --- a/juk/coverdialogbase.ui +++ b/juk/coverdialogbase.ui @@ -93,7 +93,7 @@ Clear the current cover search. - + m_searchLine @@ -133,7 +133,7 @@ - KIconViewSearchLine + TDEIconViewSearchLine
kiconviewsearchline.h
100 diff --git a/juk/covericonview.cpp b/juk/covericonview.cpp index fc400e78..d73a5739 100644 --- a/juk/covericonview.cpp +++ b/juk/covericonview.cpp @@ -19,21 +19,21 @@ using CoverUtility::CoverIconViewItem; CoverIconViewItem::CoverIconViewItem(coverKey id, TQIconView *parent) : - KIconViewItem(parent), m_id(id) + TDEIconViewItem(parent), m_id(id) { CoverDataPtr data = CoverManager::coverInfo(id); setText(TQString("%1 - %2").arg(data->artist, data->album)); setPixmap(data->thumbnail()); } -CoverIconView::CoverIconView(TQWidget *parent, const char *name) : KIconView(parent, name) +CoverIconView::CoverIconView(TQWidget *parent, const char *name) : TDEIconView(parent, name) { setResizeMode(Adjust); } CoverIconViewItem *CoverIconView::currentItem() const { - return static_cast(KIconView::currentItem()); + return static_cast(TDEIconView::currentItem()); } TQDragObject *CoverIconView::dragObject() diff --git a/juk/covericonview.h b/juk/covericonview.h index 42e44d66..cab60b58 100644 --- a/juk/covericonview.h +++ b/juk/covericonview.h @@ -26,7 +26,7 @@ // and such. namespace CoverUtility { - class CoverIconViewItem : public KIconViewItem + class CoverIconViewItem : public TDEIconViewItem { public: CoverIconViewItem(coverKey id, TQIconView *parent); @@ -41,12 +41,12 @@ namespace CoverUtility using CoverUtility::CoverIconViewItem; /** - * This class subclasses KIconView in order to provide cover drag-and-drop + * This class subclasses TDEIconView in order to provide cover drag-and-drop * support. * * @author Michael Pyne */ -class CoverIconView : public KIconView +class CoverIconView : public TDEIconView { public: CoverIconView(TQWidget *parent, const char *name); diff --git a/juk/deletedialog.cpp b/juk/deletedialog.cpp index 5bb3c4d3..5062624a 100644 --- a/juk/deletedialog.cpp +++ b/juk/deletedialog.cpp @@ -56,12 +56,12 @@ void DeleteWidget::slotShouldDelete(bool shouldDelete) ddDeleteText->setText(i18n("These items will be permanently " "deleted from your hard disk.")); ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning", - KIcon::Desktop, KIcon::SizeLarge)); + TDEIcon::Desktop, TDEIcon::SizeLarge)); } else { ddDeleteText->setText(i18n("These items will be moved to the Trash Bin.")); ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("trashcan_full", - KIcon::Desktop, KIcon::SizeLarge)); + TDEIcon::Desktop, TDEIcon::SizeLarge)); } } diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp index e71fc37d..48e6ba5f 100644 --- a/juk/systemtray.cpp +++ b/juk/systemtray.cpp @@ -432,7 +432,7 @@ TQPixmap SystemTray::createPixmap(const TQString &pixName) TQImage bgImage = bgPix.convertToImage(); // Probably 22x22 TQImage fgImage = fgPix.convertToImage(); // Should be 16x16 - KIconEffect::semiTransparent(bgImage); + TDEIconEffect::semiTransparent(bgImage); copyImage(bgImage, fgImage, (bgImage.width() - fgImage.width()) / 2, (bgImage.height() - fgImage.height()) / 2); @@ -602,7 +602,7 @@ static bool copyImage(TQImage &dest, TQImage &src, int x, int y) if((y + src.height()) >= dest.height()) return false; - // We want to use KIconEffect::overlay to do this, since it handles + // We want to use TDEIconEffect::overlay to do this, since it handles // alpha, but the images need to be the same size. We can handle that. TQImage large_src(dest); @@ -628,7 +628,7 @@ static bool copyImage(TQImage &dest, TQImage &src, int x, int y) // Apply effect to image - KIconEffect::overlay(dest, large_src); + TDEIconEffect::overlay(dest, large_src); return true; } diff --git a/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp index 5a2de5b2..c08b0015 100644 --- a/juk/webimagefetcherdialog.cpp +++ b/juk/webimagefetcherdialog.cpp @@ -48,7 +48,7 @@ WebImageFetcherDialog::WebImageFetcherDialog(const WebImageList &imageList, TQWidget *mainBox = new TQWidget(this); TQBoxLayout *mainLayout = new TQVBoxLayout(mainBox); - m_iconWidget = new KIconView(mainBox); + m_iconWidget = new TDEIconView(mainBox); m_iconWidget->setResizeMode(TQIconView::Adjust); m_iconWidget->setSpacing(10); m_iconWidget->setFixedSize(500,550); @@ -185,7 +185,7 @@ TQPixmap WebImageFetcherDialog::pixmapFromURL(const KURL &url) const //////////////////////////////////////////////////////////////////////////////// CoverIconViewItem::CoverIconViewItem(TQIconView *parent, const WebImage &image) : - TQObject(parent), KIconViewItem(parent, parent->lastItem(), image.size()), m_job(0) + TQObject(parent), TDEIconViewItem(parent, parent->lastItem(), image.size()), m_job(0) { // Set up the iconViewItem diff --git a/juk/webimagefetcherdialog.h b/juk/webimagefetcherdialog.h index 4af0cf41..afe2cd18 100644 --- a/juk/webimagefetcherdialog.h +++ b/juk/webimagefetcherdialog.h @@ -62,7 +62,7 @@ private: TQPixmap m_pixmap; WebImageList m_imageList; - KIconView *m_iconWidget; + TDEIconView *m_iconWidget; FileHandle m_file; }; @@ -71,7 +71,7 @@ namespace TDEIO class TransferJob; } -class CoverIconViewItem : public TQObject, public KIconViewItem +class CoverIconViewItem : public TQObject, public TDEIconViewItem { Q_OBJECT diff --git a/kscd/docking.cpp b/kscd/docking.cpp index 9c21f1de..845f434d 100644 --- a/kscd/docking.cpp +++ b/kscd/docking.cpp @@ -53,11 +53,11 @@ DockWidget::DockWidget( KSCD* parent, const char *name) // popup menu for right mouse button TQPopupMenu* popup = contextMenu(); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play/Pause"), parent, TQT_SLOT(playClicked())); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_stop", KIcon::Small), i18n("Stop"), parent, TQT_SLOT(stopClicked())); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_end", KIcon::Small), i18n("Next"), parent, TQT_SLOT(nextClicked())); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_start", KIcon::Small), i18n("Previous"), parent, TQT_SLOT(prevClicked())); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_eject", KIcon::Small), i18n("Eject"), parent, TQT_SLOT(ejectClicked())); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_play", TDEIcon::Small), i18n("Play/Pause"), parent, TQT_SLOT(playClicked())); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_stop", TDEIcon::Small), i18n("Stop"), parent, TQT_SLOT(stopClicked())); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_end", TDEIcon::Small), i18n("Next"), parent, TQT_SLOT(nextClicked())); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_start", TDEIcon::Small), i18n("Previous"), parent, TQT_SLOT(prevClicked())); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_eject", TDEIcon::Small), i18n("Eject"), parent, TQT_SLOT(ejectClicked())); TQToolTip::add(this, kapp->aboutData()->programName()); } diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp index 5d40e37e..e332a456 100644 --- a/noatun/library/effectview.cpp +++ b/noatun/library/effectview.cpp @@ -116,7 +116,7 @@ void EffectView::init(void) TQHBoxLayout *topTopLayout = new TQHBoxLayout(topTopFrame, 0, KDialog::spacingHint()); topTopLayout->setAutoAdd(true); available = new KComboBox(false, topTopFrame); - TQToolButton *add = newButton(BarIconSet("down", KIcon::SizeSmall), i18n("Add"), TQT_TQOBJECT(this), TQT_SLOT(addEffect()), topTopFrame); + TQToolButton *add = newButton(BarIconSet("down", TDEIcon::SizeSmall), i18n("Add"), TQT_TQOBJECT(this), TQT_SLOT(addEffect()), topTopFrame); // Active TQHGroupBox *bottomBox = new TQHGroupBox(i18n("Active Effects"), box); @@ -153,10 +153,10 @@ void EffectView::init(void) // the buttons TQFrame *bottomLeftFrame = new TQFrame(bottomBox); TQVBoxLayout *bottomLeftLayout = new TQVBoxLayout(bottomLeftFrame, 0, KDialog::spacingHint()); - up = newButton(BarIconSet("up", KIcon::SizeSmall), i18n("Up"), TQT_TQOBJECT(this), TQT_SLOT(moveUp()), bottomLeftFrame); - down = newButton(BarIconSet("down", KIcon::SizeSmall), i18n("Down"), TQT_TQOBJECT(this), TQT_SLOT(moveDown()), bottomLeftFrame); - configure = newButton(BarIconSet("configure", KIcon::SizeSmall), i18n("Configure"), TQT_TQOBJECT(this), TQT_SLOT(configureEffect()), bottomLeftFrame); - remove = newButton(BarIconSet("remove", KIcon::SizeSmall), i18n("Remove"), TQT_TQOBJECT(this), TQT_SLOT(removeEffect()), bottomLeftFrame); + up = newButton(BarIconSet("up", TDEIcon::SizeSmall), i18n("Up"), TQT_TQOBJECT(this), TQT_SLOT(moveUp()), bottomLeftFrame); + down = newButton(BarIconSet("down", TDEIcon::SizeSmall), i18n("Down"), TQT_TQOBJECT(this), TQT_SLOT(moveDown()), bottomLeftFrame); + configure = newButton(BarIconSet("configure", TDEIcon::SizeSmall), i18n("Configure"), TQT_TQOBJECT(this), TQT_SLOT(configureEffect()), bottomLeftFrame); + remove = newButton(BarIconSet("remove", TDEIcon::SizeSmall), i18n("Remove"), TQT_TQOBJECT(this), TQT_SLOT(removeEffect()), bottomLeftFrame); bottomLeftLayout->addWidget(up); bottomLeftLayout->addWidget(down); bottomLeftLayout->addWidget(configure); diff --git a/noatun/library/pref.cpp b/noatun/library/pref.cpp index 73285ad1..2d30a413 100644 --- a/noatun/library/pref.cpp +++ b/noatun/library/pref.cpp @@ -56,7 +56,7 @@ void NoatunPreferences::remove(CModule *page) CModule::CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *owner) : TQWidget(napp->preferencesBox()->addPage(name, description, TDEGlobal::iconLoader()->loadIcon( - icon, KIcon::Small,0, KIcon::DefaultState,0, true))) + icon, TDEIcon::Small,0, TDEIcon::DefaultState,0, true))) { if (owner) connect(owner, TQT_SIGNAL(destroyed()), TQT_SLOT(ownerDeleted())); diff --git a/noatun/modules/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp index 6f16a4b3..c354e96e 100644 --- a/noatun/modules/metatag/edit.cpp +++ b/noatun/modules/metatag/edit.cpp @@ -67,7 +67,7 @@ void Editor::open(const PlaylistItem & file) mFile->setText("" + file.url().fileName(false) + ""); TQToolTip::add(mFile, file.url().prettyURL()); mFileIcon-> - setPixmap(KMimeType::pixmapForURL(file.url(), 0, KIcon::Small)); + setPixmap(KMimeType::pixmapForURL(file.url(), 0, TDEIcon::Small)); if (file.url().isLocalFile()) { TQFileInfo file_info(file.file()); diff --git a/noatun/modules/simple/propertiesdialog.ui.h b/noatun/modules/simple/propertiesdialog.ui.h index 5a322a98..5a3953c8 100644 --- a/noatun/modules/simple/propertiesdialog.ui.h +++ b/noatun/modules/simple/propertiesdialog.ui.h @@ -49,7 +49,7 @@ void PropertiesDialog::setPlayObject( PlaylistItem pi, Arts::PlayObject po ) setCaption( i18n("Properties for %1").arg(pi.url().fileName()) ); TDESharedPtr mime = KMimeType::mimeType( pi.mimetype() ); - iconLabel->setPixmap( mime->pixmap( KIcon::Desktop, KIcon::SizeMedium ) ); + iconLabel->setPixmap( mime->pixmap( TDEIcon::Desktop, TDEIcon::SizeMedium ) ); nameField->setText( pi.url().fileName() ); typeLabel->setText( pi.mimetype() );