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

---
 knetworkmanager-0.8/src/connection_setting_wireless.ui                | 2 +-
 knetworkmanager-0.8/src/knetworkmanager-connection_editor.cpp         | 2 +-
 .../src/knetworkmanager-connection_setting_wireless_widget.cpp        | 4 ++--
 knetworkmanager-0.8/src/knetworkmanager-device_tray.h                 | 4 ++--
 knetworkmanager-0.8/src/knetworkmanager-menu_subhead.h                | 4 ++--
 knetworkmanager-0.8/src/knetworkmanager-tray.h                        | 4 ++--
 knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.h           | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'knetworkmanager-0.8')

diff --git a/knetworkmanager-0.8/src/connection_setting_wireless.ui b/knetworkmanager-0.8/src/connection_setting_wireless.ui
index 277f6ae..3b35de1 100644
--- a/knetworkmanager-0.8/src/connection_setting_wireless.ui
+++ b/knetworkmanager-0.8/src/connection_setting_wireless.ui
@@ -135,6 +135,6 @@
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_editor.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_editor.cpp
index 07ae0f3..9cb2b53 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_editor.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_editor.cpp
@@ -37,7 +37,7 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kcombobox.h>
 
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp
index 7ad83d7..c1e3fb8 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp
@@ -28,9 +28,9 @@
 #include <tqlayout.h>
 #include <tqlistview.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <kpushbutton.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-device_tray.h b/knetworkmanager-0.8/src/knetworkmanager-device_tray.h
index 64ec9b7..07b7476 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-device_tray.h
+++ b/knetworkmanager-0.8/src/knetworkmanager-device_tray.h
@@ -31,8 +31,8 @@
 #include <tqtooltip.h>
 #include <ksystemtray.h>
 #include <kuniqueapplication.h>
-#include <kpopupmenu.h>
-#include <kactionclasses.h>
+#include <tdepopupmenu.h>
+#include <tdeactionclasses.h>
 #include <kstdaction.h>
 #include <kstdguiitem.h>
 
diff --git a/knetworkmanager-0.8/src/knetworkmanager-menu_subhead.h b/knetworkmanager-0.8/src/knetworkmanager-menu_subhead.h
index 8891fc4..7897dc4 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-menu_subhead.h
+++ b/knetworkmanager-0.8/src/knetworkmanager-menu_subhead.h
@@ -33,8 +33,8 @@
 #include <tqtooltip.h>
 #include <ksystemtray.h>
 #include <kuniqueapplication.h>
-#include <kpopupmenu.h>
-#include <kactionclasses.h>
+#include <tdepopupmenu.h>
+#include <tdeactionclasses.h>
 #include <kstdaction.h>
 #include <kstdguiitem.h>
 
diff --git a/knetworkmanager-0.8/src/knetworkmanager-tray.h b/knetworkmanager-0.8/src/knetworkmanager-tray.h
index 9abb4a9..2f06afe 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-tray.h
+++ b/knetworkmanager-0.8/src/knetworkmanager-tray.h
@@ -35,8 +35,8 @@
 #include <tqtooltip.h>
 #include <ksystemtray.h>
 #include <kuniqueapplication.h>
-#include <kpopupmenu.h>
-#include <kactionclasses.h>
+#include <tdepopupmenu.h>
+#include <tdeactionclasses.h>
 #include <kstdaction.h>
 #include <kstdguiitem.h>
 
diff --git a/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.h b/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.h
index 98b6321..23bc8b5 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.h
+++ b/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.h
@@ -33,8 +33,8 @@
 #include <tqtooltip.h>
 #include <ksystemtray.h>
 #include <kuniqueapplication.h>
-#include <kpopupmenu.h>
-#include <kactionclasses.h>
+#include <tdepopupmenu.h>
+#include <tdeactionclasses.h>
 #include <kstdaction.h>
 #include <kstdguiitem.h>
 
-- 
cgit v1.2.1