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

---
 ksysguard/gui/KSGAppletSettings.cc                     | 2 +-
 ksysguard/gui/KSysGuardApplet.cc                       | 2 +-
 ksysguard/gui/SensorBrowser.h                          | 2 +-
 ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc  | 4 ++--
 ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc | 4 ++--
 ksysguard/gui/SensorDisplayLib/LogFile.cc              | 2 +-
 ksysguard/gui/SensorDisplayLib/ProcessController.cc    | 2 +-
 ksysguard/gui/SensorDisplayLib/ProcessList.h           | 2 +-
 ksysguard/gui/WorkSheet.cc                             | 2 +-
 ksysguard/gui/WorkSheetSettings.cc                     | 2 +-
 ksysguard/gui/Workspace.cc                             | 2 +-
 ksysguard/gui/ksgrd/HostConnector.cc                   | 2 +-
 ksysguard/gui/ksgrd/StyleSettings.cc                   | 2 +-
 ksysguard/gui/ksgrd/TimerSettings.cc                   | 2 +-
 ksysguard/gui/ksysguard.cc                             | 2 +-
 ksysguard/gui/ksysguard.h                              | 2 +-
 16 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'ksysguard')

diff --git a/ksysguard/gui/KSGAppletSettings.cc b/ksysguard/gui/KSGAppletSettings.cc
index b11416866..2e77eba58 100644
--- a/ksysguard/gui/KSGAppletSettings.cc
+++ b/ksysguard/gui/KSGAppletSettings.cc
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 #include <tqspinbox.h>
 
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <klocale.h>
 
 #include "KSGAppletSettings.h"
diff --git a/ksysguard/gui/KSysGuardApplet.cc b/ksysguard/gui/KSysGuardApplet.cc
index eba27669d..0da48768f 100644
--- a/ksysguard/gui/KSysGuardApplet.cc
+++ b/ksysguard/gui/KSysGuardApplet.cc
@@ -35,7 +35,7 @@
 #include <kmessagebox.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <ksgrd/SensorClient.h>
 #include <ksgrd/SensorManager.h>
diff --git a/ksysguard/gui/SensorBrowser.h b/ksysguard/gui/SensorBrowser.h
index 7545391ac..aec4f343d 100644
--- a/ksysguard/gui/SensorBrowser.h
+++ b/ksysguard/gui/SensorBrowser.h
@@ -26,7 +26,7 @@
 
 #include <tqdict.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <ksgrd/SensorClient.h>
 
 class TQMouseEvent;
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc
index c6ad058b3..a4a97ee4e 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc
@@ -21,11 +21,11 @@
 
 */
 
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kcolorbutton.h>
 #include <klineedit.h>
 #include <kinputdialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <knuminput.h>
 
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
index 0c0ee3b7d..3ba91aa9a 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
@@ -21,11 +21,11 @@
 
 */
 
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kcolorbutton.h>
 #include <kcolordialog.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <knuminput.h>
 
diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cc
index bae2d0e7c..a1ec685e8 100644
--- a/ksysguard/gui/SensorDisplayLib/LogFile.cc
+++ b/ksysguard/gui/SensorDisplayLib/LogFile.cc
@@ -27,7 +27,7 @@
 #include <tqfile.h>
 #include <tqlistbox.h>
 
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcolorbutton.h>
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cc
index c7cfa0ca7..2c31f15ac 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessController.cc
+++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cc
@@ -30,7 +30,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdialogbase.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 
 #include <ksgrd/SensorManager.h>
 
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.h b/ksysguard/gui/SensorDisplayLib/ProcessList.h
index db3f7637b..51ac510e2 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessList.h
+++ b/ksysguard/gui/SensorDisplayLib/ProcessList.h
@@ -32,7 +32,7 @@
 #include <tqwidget.h>
 
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "SensorClient.h"
 
diff --git a/ksysguard/gui/WorkSheet.cc b/ksysguard/gui/WorkSheet.cc
index 4ec416620..386b09505 100644
--- a/ksysguard/gui/WorkSheet.cc
+++ b/ksysguard/gui/WorkSheet.cc
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <SensorManager.h>
 
diff --git a/ksysguard/gui/WorkSheetSettings.cc b/ksysguard/gui/WorkSheetSettings.cc
index e2ba052ed..4174aa40f 100644
--- a/ksysguard/gui/WorkSheetSettings.cc
+++ b/ksysguard/gui/WorkSheetSettings.cc
@@ -21,7 +21,7 @@
 
 */
 
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <klineedit.h>
 #include <knuminput.h>
 #include <klocale.h>
diff --git a/ksysguard/gui/Workspace.cc b/ksysguard/gui/Workspace.cc
index 22b46269d..9cb0e56e0 100644
--- a/ksysguard/gui/Workspace.cc
+++ b/ksysguard/gui/Workspace.cc
@@ -31,7 +31,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 
 #include "WorkSheet.h"
 #include "WorkSheetSettings.h"
diff --git a/ksysguard/gui/ksgrd/HostConnector.cc b/ksysguard/gui/ksgrd/HostConnector.cc
index a4aba76c7..a025fcf4e 100644
--- a/ksysguard/gui/ksgrd/HostConnector.cc
+++ b/ksysguard/gui/ksgrd/HostConnector.cc
@@ -19,7 +19,7 @@
 */
 
 #include <kapplication.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kcombobox.h>
 #include <klocale.h>
 
diff --git a/ksysguard/gui/ksgrd/StyleSettings.cc b/ksysguard/gui/ksgrd/StyleSettings.cc
index a13e385b4..9c04ae059 100644
--- a/ksysguard/gui/ksgrd/StyleSettings.cc
+++ b/ksysguard/gui/ksgrd/StyleSettings.cc
@@ -30,7 +30,7 @@
 #include <tqspinbox.h>
 #include <tqtabwidget.h>
 
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kcolorbutton.h>
 #include <kcolordialog.h>
 #include <klocale.h>
diff --git a/ksysguard/gui/ksgrd/TimerSettings.cc b/ksysguard/gui/ksgrd/TimerSettings.cc
index 2a5e0d471..9384cb058 100644
--- a/ksysguard/gui/ksgrd/TimerSettings.cc
+++ b/ksysguard/gui/ksgrd/TimerSettings.cc
@@ -21,7 +21,7 @@
 
 */
 
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <klocale.h>
 
 #include <tqcheckbox.h>
diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc
index 0d138917a..e942e9548 100644
--- a/ksysguard/gui/ksysguard.cc
+++ b/ksysguard/gui/ksysguard.cc
@@ -35,7 +35,7 @@
 #include <unistd.h>
 
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <kdebug.h>
diff --git a/ksysguard/gui/ksysguard.h b/ksysguard/gui/ksysguard.h
index 50a4212e5..42f53484f 100644
--- a/ksysguard/gui/ksysguard.h
+++ b/ksysguard/gui/ksysguard.h
@@ -29,7 +29,7 @@
 #include <dcopclient.h>
 #include <dcopobject.h>
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <dnssd/servicebrowser.h>
 
 #include <ksgrd/SensorClient.h>
-- 
cgit v1.2.1