From a5430e4b98efd05937bd3bfe78c56eb826f145fa Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:19:22 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

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

(limited to 'kcontrol/hwmanager')

diff --git a/kcontrol/hwmanager/deviceiconview.h b/kcontrol/hwmanager/deviceiconview.h
index cdc5cd6d4..2046c165f 100644
--- a/kcontrol/hwmanager/deviceiconview.h
+++ b/kcontrol/hwmanager/deviceiconview.h
@@ -20,7 +20,7 @@
 #ifndef __deviceiconview_h__
 #define __deviceiconview_h__
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 #include <tdehardwaredevices.h>
 
diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp
index 35845a380..0ea803ff5 100644
--- a/kcontrol/hwmanager/hwmanager.cpp
+++ b/kcontrol/hwmanager/hwmanager.cpp
@@ -33,10 +33,10 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kglobal.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kinputdialog.h>
 #include <kurlrequester.h>
 #include <kgenericfactory.h>
diff --git a/kcontrol/hwmanager/hwmanager.h b/kcontrol/hwmanager/hwmanager.h
index 9d0e86d40..b75a494d9 100644
--- a/kcontrol/hwmanager/hwmanager.h
+++ b/kcontrol/hwmanager/hwmanager.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <tdecmodule.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 
 #include <dcopobject.h>
 
-- 
cgit v1.2.3