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

---
 ksim/monitors/cpu/ksimcpu.cpp               | 2 +-
 ksim/monitors/disk/ksimdisk.cpp             | 2 +-
 ksim/monitors/filesystem/fsystemconfig.cpp  | 2 +-
 ksim/monitors/lm_sensors/sensorsconfig.cpp  | 2 +-
 ksim/monitors/net/netconfig.cpp             | 4 ++--
 ksim/monitors/snmp/browsedialog.cpp         | 2 +-
 ksim/monitors/snmp/browsedialogbase.ui      | 2 +-
 ksim/monitors/snmp/configpage.cpp           | 2 +-
 ksim/monitors/snmp/configpage.h             | 2 +-
 ksim/monitors/snmp/configwidget.ui          | 4 ++--
 ksim/monitors/snmp/proberesultdialog.cpp    | 2 +-
 ksim/monitors/snmp/proberesultdialogbase.ui | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'ksim/monitors')

diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp
index ecd19f5..e3e148c 100644
--- a/ksim/monitors/cpu/ksimcpu.cpp
+++ b/ksim/monitors/cpu/ksimcpu.cpp
@@ -30,7 +30,7 @@
 #include <tqglobal.h>
 #include <tqpushbutton.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <kaboutapplication.h>
 #include <kaboutdata.h>
diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp
index cb19b99..6aa54cd 100644
--- a/ksim/monitors/disk/ksimdisk.cpp
+++ b/ksim/monitors/disk/ksimdisk.cpp
@@ -33,7 +33,7 @@
 #include <kaboutdata.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kinputdialog.h>
 #include <tdeconfig.h>
 
diff --git a/ksim/monitors/filesystem/fsystemconfig.cpp b/ksim/monitors/filesystem/fsystemconfig.cpp
index 0987237..9d85bb0 100644
--- a/ksim/monitors/filesystem/fsystemconfig.cpp
+++ b/ksim/monitors/filesystem/fsystemconfig.cpp
@@ -23,7 +23,7 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kapplication.h>
 #include <knuminput.h>
 #include <kdebug.h>
diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp
index 873d6ac..4ecbe59 100644
--- a/ksim/monitors/lm_sensors/sensorsconfig.cpp
+++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp
@@ -23,7 +23,7 @@
 
 #include <klocale.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <knuminput.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp
index 6757977..a960574 100644
--- a/ksim/monitors/net/netconfig.cpp
+++ b/ksim/monitors/net/netconfig.cpp
@@ -21,12 +21,12 @@
 #include <tqlayout.h>
 #include <tqcursor.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <ksimpleconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 
diff --git a/ksim/monitors/snmp/browsedialog.cpp b/ksim/monitors/snmp/browsedialog.cpp
index 6480bf5..ec02173 100644
--- a/ksim/monitors/snmp/browsedialog.cpp
+++ b/ksim/monitors/snmp/browsedialog.cpp
@@ -21,7 +21,7 @@
 
 #include <tqlabel.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kguiitem.h>
 #include <klocale.h>
 #include <kpushbutton.h>
diff --git a/ksim/monitors/snmp/browsedialogbase.ui b/ksim/monitors/snmp/browsedialogbase.ui
index 6cc8f72..3f5057b 100644
--- a/ksim/monitors/snmp/browsedialogbase.ui
+++ b/ksim/monitors/snmp/browsedialogbase.ui
@@ -260,6 +260,6 @@
 <includehints>
     <includehint>kdialog.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp
index 1227af1..02ac2ba 100644
--- a/ksim/monitors/snmp/configpage.cpp
+++ b/ksim/monitors/snmp/configpage.cpp
@@ -29,7 +29,7 @@
 #include <tqpushbutton.h>
 
 #include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 
diff --git a/ksim/monitors/snmp/configpage.h b/ksim/monitors/snmp/configpage.h
index d7508ae..b0d1331 100644
--- a/ksim/monitors/snmp/configpage.h
+++ b/ksim/monitors/snmp/configpage.h
@@ -21,7 +21,7 @@
 #define CONFIGPAGE_H
 
 #include <pluginmodule.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "monitorconfig.h"
 #include "hostconfig.h"
diff --git a/ksim/monitors/snmp/configwidget.ui b/ksim/monitors/snmp/configwidget.ui
index 5c6ff93..0ae6457 100644
--- a/ksim/monitors/snmp/configwidget.ui
+++ b/ksim/monitors/snmp/configwidget.ui
@@ -209,7 +209,7 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/ksim/monitors/snmp/proberesultdialog.cpp b/ksim/monitors/snmp/proberesultdialog.cpp
index bed1e21..854b848 100644
--- a/ksim/monitors/snmp/proberesultdialog.cpp
+++ b/ksim/monitors/snmp/proberesultdialog.cpp
@@ -22,7 +22,7 @@
 #include <tqlabel.h>
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 using namespace KSim::Snmp;
 
diff --git a/ksim/monitors/snmp/proberesultdialogbase.ui b/ksim/monitors/snmp/proberesultdialogbase.ui
index 3b950b1..e81a9f3 100644
--- a/ksim/monitors/snmp/proberesultdialogbase.ui
+++ b/ksim/monitors/snmp/proberesultdialogbase.ui
@@ -119,6 +119,6 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
-- 
cgit v1.2.1