Rename KIcon to enhance compatibility with KDE4

4 files changed, 8 insertions, 8 deletions

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("<nobr><b>" + file.url().fileName(false) + "</b></nobr>");
     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<KMimeType> 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() );