Rename KIcon to enhance compatibility with KDE4

10 files changed, 30 insertions, 30 deletions

diff --git a/tdeprint/management/kiconselectaction.cpp b/tdeprint/management/kiconselectaction.cpp
index 230119d27..984d2c128 100644
--- a/tdeprint/management/kiconselectaction.cpp
+++ b/tdeprint/management/kiconselectaction.cpp
@@ -25,10 +25,10 @@
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>
 
-class KIconSelectActionPrivate
+class TDEIconSelectActionPrivate
 {
 public:
-	KIconSelectActionPrivate()
+	TDEIconSelectActionPrivate()
 	{
 		m_menu = 0;
 	}
@@ -36,18 +36,18 @@ public:
 	TQPopupMenu*	m_menu;
 };
 
-KIconSelectAction::KIconSelectAction(const TQString& text, int accel, TQObject* parent, const char* name)
+TDEIconSelectAction::TDEIconSelectAction(const TQString& text, int accel, TQObject* parent, const char* name)
 : TDESelectAction(text, accel, parent, name)
 {
-	d = new KIconSelectActionPrivate;
+	d = new TDEIconSelectActionPrivate;
 }
 
-KIconSelectAction::~KIconSelectAction()
+TDEIconSelectAction::~TDEIconSelectAction()
 {
 	delete d;
 }
 
-void KIconSelectAction::updateIcons()
+void TDEIconSelectAction::updateIcons()
 {
 	if (d->m_menu)
 	{
@@ -57,7 +57,7 @@ void KIconSelectAction::updateIcons()
 	}
 }
 
-void KIconSelectAction::createPopupMenu()
+void TDEIconSelectAction::createPopupMenu()
 {
 	if (!d->m_menu)
 	{
@@ -66,14 +66,14 @@ void KIconSelectAction::createPopupMenu()
 	}
 }
 
-void KIconSelectAction::setItems(const TQStringList& lst, const TQStringList& iconlst)
+void TDEIconSelectAction::setItems(const TQStringList& lst, const TQStringList& iconlst)
 {
 	TDESelectAction::setItems(lst);
 	d->m_iconlst = iconlst;
 	updateIcons();
 }
 
-int KIconSelectAction::plug(TQWidget* widget, int index)
+int TDEIconSelectAction::plug(TQWidget* widget, int index)
 {
 	int	value(-1);
 	if (widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING))
@@ -101,7 +101,7 @@ int KIconSelectAction::plug(TQWidget* widget, int index)
 	return value;
 }
 
-void KIconSelectAction::updateCurrentItem(int id)
+void TDEIconSelectAction::updateCurrentItem(int id)
 {
 	TQWidget*	w = container(id);
 	if (w->inherits("TDEToolBar"))
@@ -110,7 +110,7 @@ void KIconSelectAction::updateCurrentItem(int id)
 		TDESelectAction::updateCurrentItem(id);
 }
 
-void KIconSelectAction::setCurrentItem(int index)
+void TDEIconSelectAction::setCurrentItem(int index)
 {
 	TDESelectAction::setCurrentItem(index);
 }
diff --git a/tdeprint/management/kiconselectaction.h b/tdeprint/management/kiconselectaction.h
index 289e1cf20..26e703fbf 100644
--- a/tdeprint/management/kiconselectaction.h
+++ b/tdeprint/management/kiconselectaction.h
@@ -22,14 +22,14 @@
 
 #include <tdeaction.h>
 
-class KIconSelectActionPrivate;
+class TDEIconSelectActionPrivate;
 
-class KIconSelectAction : public TDESelectAction
+class TDEIconSelectAction : public TDESelectAction
 {
 	Q_OBJECT
 public:
-	KIconSelectAction(const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0);
-	virtual ~KIconSelectAction();
+	TDEIconSelectAction(const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0);
+	virtual ~TDEIconSelectAction();
 
 	virtual int plug(TQWidget* widget, int index = -1);
 
@@ -43,7 +43,7 @@ protected:
 	virtual void updateCurrentItem(int id);
 
 private:
-	KIconSelectActionPrivate*	d;
+	TDEIconSelectActionPrivate*	d;
 };
 
 #endif
diff --git a/tdeprint/management/kmconfigdialog.cpp b/tdeprint/management/kmconfigdialog.cpp
index b3ef6e329..6f0e76e19 100644
--- a/tdeprint/management/kmconfigdialog.cpp
+++ b/tdeprint/management/kmconfigdialog.cpp
@@ -62,8 +62,8 @@ void KMConfigDialog::addConfigPage(KMConfigPage *page)
 	{
 		TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon(
 		                                                           page->pagePixmap(),
-		                                                           KIcon::NoGroup,
-                        	                                           KIcon::SizeMedium
+		                                                           TDEIcon::NoGroup,
+                        	                                           TDEIcon::SizeMedium
 		                                                          );
 
 		TQFrame	*frame = addPage(page->pageName(),page->pageHeader(),icon);
diff --git a/tdeprint/management/kmiconview.cpp b/tdeprint/management/kmiconview.cpp
index 0978c0782..8ab3a7279 100644
--- a/tdeprint/management/kmiconview.cpp
+++ b/tdeprint/management/kmiconview.cpp
@@ -104,7 +104,7 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode)
 	}
 	if (mode != m_mode || ((oldstate&0x4) != (m_state&0x4)) || (p && p->pixmap() != m_pixmap))
 	{
-		int	iconstate = (m_state&0x4 ? (int)KIcon::DefaultState : (int)KIcon::LockOverlay);
+		int	iconstate = (m_state&0x4 ? (int)TDEIcon::DefaultState : (int)TDEIcon::LockOverlay);
 		if (p)
 			m_pixmap = p->pixmap();
 		m_mode = mode;
@@ -119,9 +119,9 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode)
 }
 
 KMIconView::KMIconView(TQWidget *parent, const char *name)
-: KIconView(parent,name)
+: TDEIconView(parent,name)
 {
-	setMode(KIconView::Select);
+	setMode(TDEIconView::Select);
 	setSelectionMode(TQIconView::Single);
 	setItemsMovable(false);
 	setResizeMode(TQIconView::Adjust);
diff --git a/tdeprint/management/kmiconview.h b/tdeprint/management/kmiconview.h
index 1fd6fbbda..1c8cb197e 100644
--- a/tdeprint/management/kmiconview.h
+++ b/tdeprint/management/kmiconview.h
@@ -45,7 +45,7 @@ private:
 	bool		m_isclass;
 };
 
-class KMIconView : public KIconView
+class KMIconView : public TDEIconView
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/management/kmlistview.cpp b/tdeprint/management/kmlistview.cpp
index 4bddf9203..10741d7fe 100644
--- a/tdeprint/management/kmlistview.cpp
+++ b/tdeprint/management/kmlistview.cpp
@@ -78,7 +78,7 @@ void KMListViewItem::updatePrinter(KMPrinter *p)
 	if (p)
 	{
 		int	oldstate = m_state;
-		int	st(p->isValid() ? (int)KIcon::DefaultState : (int)KIcon::LockOverlay);
+		int	st(p->isValid() ? (int)TDEIcon::DefaultState : (int)TDEIcon::LockOverlay);
 		m_state = ((p->isHardDefault() ? 0x1 : 0x0) | (p->ownSoftDefault() ? 0x2 : 0x0) | (p->isValid() ? 0x4 : 0x0));
 		update = (oldstate != m_state);
 		QString	name = (p->isVirtual() ? p->instanceName() : p->name());
diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp
index fbff73671..da5b2dd0a 100644
--- a/tdeprint/management/kmmainview.cpp
+++ b/tdeprint/management/kmmainview.cpp
@@ -174,7 +174,7 @@ void KMMainView::saveSettings()
 
 void KMMainView::initActions()
 {
-	KIconSelectAction	*vact = new KIconSelectAction(i18n("&View"),0,m_actions,"view_change");
+	TDEIconSelectAction	*vact = new TDEIconSelectAction(i18n("&View"),0,m_actions,"view_change");
 	TQStringList	iconlst;
 	iconlst << "view_icon" << "view_detailed" << "view_tree";
 	vact->setItems(TQStringList::split(',',i18n("&Icons,&List,&Tree"),false), iconlst);
@@ -201,7 +201,7 @@ void KMMainView::initActions()
 	new TDEAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,TQT_TQOBJECT(this),TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure");
 	new TDEAction(i18n("Initialize Manager/&View"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotInit()),m_actions,"view_refresh");
 
-	KIconSelectAction	*dact = new KIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change");
+	TDEIconSelectAction	*dact = new TDEIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change");
 	iconlst.clear();
 	iconlst << "view_top_bottom" << "view_left_right";
 	dact->setItems(TQStringList::split(',',i18n("&Vertical,&Horizontal"),false), iconlst);
diff --git a/tdeprint/management/kmpropertypage.cpp b/tdeprint/management/kmpropertypage.cpp
index 5586f110f..c38b399c6 100644
--- a/tdeprint/management/kmpropertypage.cpp
+++ b/tdeprint/management/kmpropertypage.cpp
@@ -59,8 +59,8 @@ void KMPropertyPage::addPropPage(KMPropWidget *w)
 
 		TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon(
 		                                                           w->pixmap(),
-		                                                           KIcon::NoGroup,
-		                                                           KIcon::SizeMedium
+		                                                           TDEIcon::NoGroup,
+		                                                           TDEIcon::SizeMedium
  		                                                          );
 		addPage(ctn,w->title(),w->header(),icon);
 	}
diff --git a/tdeprint/management/kmspecialprinterdlg.cpp b/tdeprint/management/kmspecialprinterdlg.cpp
index ba6801769..2d2a245c7 100644
--- a/tdeprint/management/kmspecialprinterdlg.cpp
+++ b/tdeprint/management/kmspecialprinterdlg.cpp
@@ -88,7 +88,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
 	TQLabel	*m_extensionlabel = new TQLabel(i18n("Filename e&xtension:"), m_outfile_gb);
 	m_extensionlabel->setBuddy(m_extension);
 
-	m_icon = new KIconButton(dummy);
+	m_icon = new TDEIconButton(dummy);
 	m_icon->setIcon("fileprint");
 	m_icon->setFixedSize(TQSize(48,48));
 
diff --git a/tdeprint/management/kmspecialprinterdlg.h b/tdeprint/management/kmspecialprinterdlg.h
index bc7497a05..3d334c7fd 100644
--- a/tdeprint/management/kmspecialprinterdlg.h
+++ b/tdeprint/management/kmspecialprinterdlg.h
@@ -26,7 +26,7 @@ class KMPrinter;
 class TQLineEdit;
 class TQCheckBox;
 class TQComboBox;
-class KIconButton;
+class TDEIconButton;
 class KXmlCommandSelector;
 
 class KMSpecialPrinterDlg : public KDialogBase
@@ -50,7 +50,7 @@ private:
 	TQComboBox	*m_mimetype;
 	TQCheckBox	*m_usefile;
 	TQStringList	m_mimelist;
-	KIconButton	*m_icon;
+	TDEIconButton	*m_icon;
 	KXmlCommandSelector	*m_command;
 };