From de9b6c9ad15f9f51812daae17cce635d1050a9ba Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 4 Feb 2013 14:14:55 -0600
Subject: Rename KIcon to enhance compatibility with KDE4

---
 kcontrol/hwmanager/deviceiconview.cpp | 4 ++--
 kcontrol/hwmanager/deviceiconview.h   | 2 +-
 kcontrol/hwmanager/devicepropsdlg.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kcontrol/hwmanager')

diff --git a/kcontrol/hwmanager/deviceiconview.cpp b/kcontrol/hwmanager/deviceiconview.cpp
index d5ebbabce..0255c01c1 100644
--- a/kcontrol/hwmanager/deviceiconview.cpp
+++ b/kcontrol/hwmanager/deviceiconview.cpp
@@ -103,6 +103,6 @@ TQPixmap DeviceIconView::loadIcon( const TQString &name )
 	return icon;
 }
 
-KIcon::StdSizes DeviceIconView::iconSize() {
-	return KIcon::SizeSmall;
+TDEIcon::StdSizes DeviceIconView::iconSize() {
+	return TDEIcon::SizeSmall;
 }
\ No newline at end of file
diff --git a/kcontrol/hwmanager/deviceiconview.h b/kcontrol/hwmanager/deviceiconview.h
index 2046c165f..913c4c9ef 100644
--- a/kcontrol/hwmanager/deviceiconview.h
+++ b/kcontrol/hwmanager/deviceiconview.h
@@ -65,7 +65,7 @@ class DeviceIconView : public TDEListView
 
 public:
 	DeviceIconView(TQWidget * parent = 0, const char * name = 0);
-	KIcon::StdSizes iconSize();
+	TDEIcon::StdSizes iconSize();
 
 signals:
 	void deviceSelected(TDEGenericDevice*);
diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp
index c271fa13b..80a930e02 100644
--- a/kcontrol/hwmanager/devicepropsdlg.cpp
+++ b/kcontrol/hwmanager/devicepropsdlg.cpp
@@ -343,7 +343,7 @@ TQString assembleSwitchList(TDESwitchType::TDESwitchType switches) {
 void DevicePropertiesDialog::populateDeviceInformation() {
 	if (m_device) {
 		base->labelDeviceType->setText(m_device->friendlyDeviceType());
-		base->iconDeviceType->setPixmap(m_device->icon(KIcon::SizeSmall));
+		base->iconDeviceType->setPixmap(m_device->icon(TDEIcon::SizeSmall));
 		base->labelDeviceName->setText(m_device->friendlyName());
 		base->labelDeviceNode->setText((m_device->deviceNode().isNull())?i18n("<none>"):m_device->deviceNode());
 		base->labelSystemPath->setText(m_device->systemPath());
-- 
cgit v1.2.3