From 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:55:37 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 ksysguard/gui/KSGAppletSettings.cc                     | 2 +-
 ksysguard/gui/KSysGuardApplet.cc                       | 4 ++--
 ksysguard/gui/SensorBrowser.cc                         | 4 ++--
 ksysguard/gui/SensorDisplayLib/DancingBars.cc          | 2 +-
 ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc  | 2 +-
 ksysguard/gui/SensorDisplayLib/DummyDisplay.cc         | 2 +-
 ksysguard/gui/SensorDisplayLib/FancyPlotter.cc         | 4 ++--
 ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc | 2 +-
 ksysguard/gui/SensorDisplayLib/ListView.cc             | 6 +++---
 ksysguard/gui/SensorDisplayLib/ListViewSettings.cc     | 2 +-
 ksysguard/gui/SensorDisplayLib/LogFile.cc              | 2 +-
 ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc   | 2 +-
 ksysguard/gui/SensorDisplayLib/ProcessController.cc    | 4 ++--
 ksysguard/gui/SensorDisplayLib/ProcessList.cc          | 6 +++---
 ksysguard/gui/SensorDisplayLib/ReniceDlg.cc            | 2 +-
 ksysguard/gui/SensorDisplayLib/SensorDisplay.cc        | 4 ++--
 ksysguard/gui/SensorDisplayLib/SensorLogger.cc         | 2 +-
 ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc      | 2 +-
 ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc | 2 +-
 ksysguard/gui/SensorDisplayLib/SignalPlotter.cc        | 2 +-
 ksysguard/gui/WorkSheet.cc                             | 4 ++--
 ksysguard/gui/WorkSheetSettings.cc                     | 2 +-
 ksysguard/gui/Workspace.cc                             | 4 ++--
 ksysguard/gui/ksgrd/HostConnector.cc                   | 2 +-
 ksysguard/gui/ksgrd/SensorAgent.cc                     | 2 +-
 ksysguard/gui/ksgrd/SensorManager.cc                   | 2 +-
 ksysguard/gui/ksgrd/SensorSocketAgent.cc               | 2 +-
 ksysguard/gui/ksgrd/StyleEngine.cc                     | 2 +-
 ksysguard/gui/ksgrd/StyleSettings.cc                   | 2 +-
 ksysguard/gui/ksgrd/TimerSettings.cc                   | 2 +-
 ksysguard/gui/ksysguard.cc                             | 8 ++++----
 31 files changed, 45 insertions(+), 45 deletions(-)

(limited to 'ksysguard')

diff --git a/ksysguard/gui/KSGAppletSettings.cc b/ksysguard/gui/KSGAppletSettings.cc
index 2e77eba58..01b2e0b1a 100644
--- a/ksysguard/gui/KSGAppletSettings.cc
+++ b/ksysguard/gui/KSGAppletSettings.cc
@@ -23,7 +23,7 @@
 #include <tqspinbox.h>
 
 #include <tdeaccelmanager.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "KSGAppletSettings.h"
 
diff --git a/ksysguard/gui/KSysGuardApplet.cc b/ksysguard/gui/KSysGuardApplet.cc
index 0da48768f..ae31d4a60 100644
--- a/ksysguard/gui/KSysGuardApplet.cc
+++ b/ksysguard/gui/KSysGuardApplet.cc
@@ -31,8 +31,8 @@
 #include <tqtooltip.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <tdepopupmenu.h>
diff --git a/ksysguard/gui/SensorBrowser.cc b/ksysguard/gui/SensorBrowser.cc
index b0c898e16..801091d98 100644
--- a/ksysguard/gui/SensorBrowser.cc
+++ b/ksysguard/gui/SensorBrowser.cc
@@ -27,8 +27,8 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ksgrd/SensorManager.h>
 
 #include "SensorBrowser.h"
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.cc b/ksysguard/gui/SensorDisplayLib/DancingBars.cc
index 3917fc86b..5b09addc0 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBars.cc
+++ b/ksysguard/gui/SensorDisplayLib/DancingBars.cc
@@ -30,7 +30,7 @@
 #include <tqtooltip.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knumvalidator.h>
 #include <ksgrd/SensorManager.h>
 #include <ksgrd/StyleEngine.h>
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc
index a4a97ee4e..ee03f9e94 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc
@@ -26,7 +26,7 @@
 #include <klineedit.h>
 #include <kinputdialog.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include <tqcheckbox.h>
diff --git a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc
index 42267af42..13696c502 100644
--- a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc
+++ b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc
@@ -21,7 +21,7 @@
 
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksgrd/SensorManager.h>
 
 #include <tqwhatsthis.h>
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc
index 220df65b9..22894afea 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc
@@ -26,8 +26,8 @@
 #include <tqtooltip.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <ksgrd/SensorManager.h>
 #include <ksgrd/StyleEngine.h>
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
index 3ba91aa9a..ef53bab75 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
@@ -26,7 +26,7 @@
 #include <kcolordialog.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include <tqcheckbox.h>
diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cc b/ksysguard/gui/SensorDisplayLib/ListView.cc
index d11826177..5b748e9c0 100644
--- a/ksysguard/gui/SensorDisplayLib/ListView.cc
+++ b/ksysguard/gui/SensorDisplayLib/ListView.cc
@@ -30,9 +30,9 @@
 
 #include <kcolorbutton.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ksgrd/SensorManager.h>
 #include <ksgrd/StyleEngine.h>
 
diff --git a/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc b/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc
index 81a9b2d41..e8e8ca336 100644
--- a/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc
@@ -20,7 +20,7 @@
 #include "ListViewSettings.h"
 #include "ListViewSettingsWidget.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ListViewSettings::ListViewSettings( TQWidget *parent, const char *name )
     : KDialogBase( parent, name, true, i18n( "List View Settings" ),
diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cc
index a1ec685e8..a8b22569d 100644
--- a/ksysguard/gui/SensorDisplayLib/LogFile.cc
+++ b/ksysguard/gui/SensorDisplayLib/LogFile.cc
@@ -29,7 +29,7 @@
 
 #include <tdefontdialog.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcolorbutton.h>
 
 #include <ksgrd/StyleEngine.h>
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc
index 436c8540f..903369889 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc
@@ -20,7 +20,7 @@
 #include "MultiMeterSettings.h"
 #include "MultiMeterSettingsWidget.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 MultiMeterSettings::MultiMeterSettings( TQWidget *parent, const char *name )
     : KDialogBase( parent, name, true, i18n( "Multimeter Settings" ),
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cc
index 3f2bcd107..8daaeacf7 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessController.cc
+++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cc
@@ -27,8 +27,8 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdialogbase.h>
 #include <tdelistviewsearchline.h>
 
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc
index d151486e5..c8ced256a 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc
+++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc
@@ -41,9 +41,9 @@
 #include <tqpopupmenu.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "ProcessController.h"
 #include "ProcessList.h"
diff --git a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc
index dfd535883..e226314d8 100644
--- a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc
+++ b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc
@@ -22,7 +22,7 @@
 
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include "ReniceDlg.moc"
diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
index 7e05c9fd2..4dfff7957 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
@@ -31,8 +31,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <kservice.h>
 
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc
index e0483f295..88083fca1 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc
@@ -20,7 +20,7 @@
 
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <ksgrd/SensorManager.h>
 #include <ksgrd/StyleEngine.h>
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc
index a6f686db3..422c6a835 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc
@@ -22,7 +22,7 @@
 
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 SensorLoggerDlg::SensorLoggerDlg( TQWidget *parent, const char *name )
     : KDialogBase( parent, name, true, i18n( "Sensor Logger" ),
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc
index 2935242fd..e029d9149 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc
@@ -20,7 +20,7 @@
 #include "SensorLoggerSettings.h"
 #include "SensorLoggerSettingsWidget.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 SensorLoggerSettings::SensorLoggerSettings( TQWidget *parent, const char *name )
     : KDialogBase( parent, name, true, i18n( "Sensor Logger Settings" ),
diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc
index 3d4d9c6f6..bcb0b821b 100644
--- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc
+++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc
@@ -28,7 +28,7 @@
 #include <tqpixmap.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <ksgrd/StyleEngine.h>
 
diff --git a/ksysguard/gui/WorkSheet.cc b/ksysguard/gui/WorkSheet.cc
index 386b09505..d465a998d 100644
--- a/ksysguard/gui/WorkSheet.cc
+++ b/ksysguard/gui/WorkSheet.cc
@@ -28,8 +28,8 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 
 #include <SensorManager.h>
diff --git a/ksysguard/gui/WorkSheetSettings.cc b/ksysguard/gui/WorkSheetSettings.cc
index 4174aa40f..703be57d5 100644
--- a/ksysguard/gui/WorkSheetSettings.cc
+++ b/ksysguard/gui/WorkSheetSettings.cc
@@ -24,7 +24,7 @@
 #include <tdeaccelmanager.h>
 #include <klineedit.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
diff --git a/ksysguard/gui/Workspace.cc b/ksysguard/gui/Workspace.cc
index 9cb0e56e0..c5e622248 100644
--- a/ksysguard/gui/Workspace.cc
+++ b/ksysguard/gui/Workspace.cc
@@ -28,8 +28,8 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeaccelmanager.h>
 
diff --git a/ksysguard/gui/ksgrd/HostConnector.cc b/ksysguard/gui/ksgrd/HostConnector.cc
index 146e1b3ee..b6e85b795 100644
--- a/ksysguard/gui/ksgrd/HostConnector.cc
+++ b/ksysguard/gui/ksgrd/HostConnector.cc
@@ -21,7 +21,7 @@
 #include <tdeapplication.h>
 #include <tdeaccelmanager.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqbuttongroup.h>
 #include <tqlabel.h>
diff --git a/ksysguard/gui/ksgrd/SensorAgent.cc b/ksysguard/gui/ksgrd/SensorAgent.cc
index 5fcb14a9c..7f9615985 100644
--- a/ksysguard/gui/ksgrd/SensorAgent.cc
+++ b/ksysguard/gui/ksgrd/SensorAgent.cc
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpassdlg.h> 
 
 #include "SensorClient.h"
diff --git a/ksysguard/gui/ksgrd/SensorManager.cc b/ksysguard/gui/ksgrd/SensorManager.cc
index c22197faf..7794d9c10 100644
--- a/ksysguard/gui/ksgrd/SensorManager.cc
+++ b/ksysguard/gui/ksgrd/SensorManager.cc
@@ -29,7 +29,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "HostConnector.h"
 #include "SensorShellAgent.h"
diff --git a/ksysguard/gui/ksgrd/SensorSocketAgent.cc b/ksysguard/gui/ksgrd/SensorSocketAgent.cc
index 6289e4405..30c0cc7e9 100644
--- a/ksysguard/gui/ksgrd/SensorSocketAgent.cc
+++ b/ksysguard/gui/ksgrd/SensorSocketAgent.cc
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpassdlg.h> 
 
 #include "SensorClient.h"
diff --git a/ksysguard/gui/ksgrd/StyleEngine.cc b/ksysguard/gui/ksgrd/StyleEngine.cc
index 3d4bb6c81..ce3e3bd6b 100644
--- a/ksysguard/gui/ksgrd/StyleEngine.cc
+++ b/ksysguard/gui/ksgrd/StyleEngine.cc
@@ -26,7 +26,7 @@
 #include <tqspinbox.h>
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "StyleSettings.h"
 
diff --git a/ksysguard/gui/ksgrd/StyleSettings.cc b/ksysguard/gui/ksgrd/StyleSettings.cc
index 9c04ae059..b84d3e407 100644
--- a/ksysguard/gui/ksgrd/StyleSettings.cc
+++ b/ksysguard/gui/ksgrd/StyleSettings.cc
@@ -33,7 +33,7 @@
 #include <tdeaccelmanager.h>
 #include <kcolorbutton.h>
 #include <kcolordialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "StyleSettings.h"
 
diff --git a/ksysguard/gui/ksgrd/TimerSettings.cc b/ksysguard/gui/ksgrd/TimerSettings.cc
index 9384cb058..43e73ab90 100644
--- a/ksysguard/gui/ksgrd/TimerSettings.cc
+++ b/ksysguard/gui/ksgrd/TimerSettings.cc
@@ -22,7 +22,7 @@
 */
 
 #include <tdeaccelmanager.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc
index 4b5b688d2..0e8f810e1 100644
--- a/ksysguard/gui/ksysguard.cc
+++ b/ksysguard/gui/ksysguard.cc
@@ -40,10 +40,10 @@
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ksgrd/SensorAgent.h>
 #include <ksgrd/SensorManager.h>
 #include <ksgrd/StyleEngine.h>
-- 
cgit v1.2.3