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

---
 ksysv/IOCore.cpp            | 2 +-
 ksysv/OldView.cpp           | 6 +++---
 ksysv/PreferencesDialog.cpp | 4 ++--
 ksysv/Properties.cpp        | 2 +-
 ksysv/RunlevelAuthIcon.cpp  | 2 +-
 ksysv/ServiceDlg.cpp        | 2 +-
 ksysv/TopWidget.cpp         | 8 ++++----
 ksysv/configwizard.ui       | 2 +-
 ksysv/ksv_conf.cpp          | 4 ++--
 ksysv/ksv_core.cpp          | 6 +++---
 ksysv/ksvdraglist.cpp       | 4 ++--
 ksysv/lookandfeelconfig.ui  | 2 +-
 ksysv/main.cpp              | 4 ++--
 ksysv/miscconfig.ui         | 2 +-
 ksysv/pathconfig.ui         | 2 +-
 ksysv/trash.cpp             | 4 ++--
 16 files changed, 28 insertions(+), 28 deletions(-)

(limited to 'ksysv')

diff --git a/ksysv/IOCore.cpp b/ksysv/IOCore.cpp
index 2ca3f34..0520706 100644
--- a/ksysv/IOCore.cpp
+++ b/ksysv/IOCore.cpp
@@ -25,7 +25,7 @@
 
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimemagic.h>
 #include <kservice.h>
 #include <kuserprofile.h>
diff --git a/ksysv/OldView.cpp b/ksysv/OldView.cpp
index fc99e4a..7adc21c 100644
--- a/ksysv/OldView.cpp
+++ b/ksysv/OldView.cpp
@@ -48,9 +48,9 @@
 #include <kstandarddirs.h>
 #include <kcursor.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <tdeaboutdata.h>
 #include <kdialog.h>
 #include <kdirwatch.h>
diff --git a/ksysv/PreferencesDialog.cpp b/ksysv/PreferencesDialog.cpp
index 524510e..8189924 100644
--- a/ksysv/PreferencesDialog.cpp
+++ b/ksysv/PreferencesDialog.cpp
@@ -11,12 +11,12 @@
 #include <tqcheckbox.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kiconloader.h>
 #include <kcolorbutton.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "ksv_conf.h"
 // #include "ksvcolorconfig.h"
diff --git a/ksysv/Properties.cpp b/ksysv/Properties.cpp
index aee06bf..6b7b378 100644
--- a/ksysv/Properties.cpp
+++ b/ksysv/Properties.cpp
@@ -10,7 +10,7 @@
 #include <tqpushbutton.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kiconloader.h>
 
diff --git a/ksysv/RunlevelAuthIcon.cpp b/ksysv/RunlevelAuthIcon.cpp
index bac5b30..6199e16 100644
--- a/ksysv/RunlevelAuthIcon.cpp
+++ b/ksysv/RunlevelAuthIcon.cpp
@@ -8,7 +8,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "ksv_core.h"
 #include "RunlevelAuthIcon.h"
diff --git a/ksysv/ServiceDlg.cpp b/ksysv/ServiceDlg.cpp
index 64fec66..4721cb6 100644
--- a/ksysv/ServiceDlg.cpp
+++ b/ksysv/ServiceDlg.cpp
@@ -19,7 +19,7 @@
 #include <tqstring.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kbuttonbox.h>
 
 #include "ksvdraglist.h"
diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp
index 1479af6..6ca4157 100644
--- a/ksysv/TopWidget.cpp
+++ b/ksysv/TopWidget.cpp
@@ -54,16 +54,16 @@
 #include <kresolver.h>
 #include <tdetoolbar.h>
 #include <kkeydialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kcompletion.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <khelpmenu.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdestdaccel.h>
 #include <kedittoolbar.h>
 #include <kiconloader.h>
diff --git a/ksysv/configwizard.ui b/ksysv/configwizard.ui
index 2594b01..ce58190 100644
--- a/ksysv/configwizard.ui
+++ b/ksysv/configwizard.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI>
 <class>ConfigWizard</class>
 <author>Peter Putzer</author>
-<include location="global">klocale.h</include>
+<include location="global">tdelocale.h</include>
 <pixmapfunction>DesktopIcon</pixmapfunction>
 <widget>
     <class>TQWizard</class>
diff --git a/ksysv/ksv_conf.cpp b/ksysv/ksv_conf.cpp
index 1c07d2a..dfe13fd 100644
--- a/ksysv/ksv_conf.cpp
+++ b/ksysv/ksv_conf.cpp
@@ -14,8 +14,8 @@
 // KSysV Config Object
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <tdemainwindow.h>
 #include <tdeconfig.h>
 
diff --git a/ksysv/ksv_core.cpp b/ksysv/ksv_core.cpp
index 547dd7c..caf0dfe 100644
--- a/ksysv/ksv_core.cpp
+++ b/ksysv/ksv_core.cpp
@@ -16,10 +16,10 @@
 #include <tqstylesheet.h>
 
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kcompletion.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 #include "ksv_conf.h"
 #include "ksvdraglist.h"
diff --git a/ksysv/ksvdraglist.cpp b/ksysv/ksvdraglist.cpp
index d9b2e95..4401a01 100644
--- a/ksysv/ksvdraglist.cpp
+++ b/ksysv/ksvdraglist.cpp
@@ -46,8 +46,8 @@
 
 #include <tdeapplication.h>
 #include <tdepopupmenu.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kdltooltip.h"
diff --git a/ksysv/lookandfeelconfig.ui b/ksysv/lookandfeelconfig.ui
index 9a902a5..1deec4b 100644
--- a/ksysv/lookandfeelconfig.ui
+++ b/ksysv/lookandfeelconfig.ui
@@ -488,7 +488,7 @@
     <tabstop>mChangedSelected</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">klocale.h</include>
+    <include location="global" impldecl="in declaration">tdelocale.h</include>
 </includes>
 <Q_SLOTS>
     <slot access="protected">chooseNumberFont()</slot>
diff --git a/ksysv/main.cpp b/ksysv/main.cpp
index e67e3f7..f7e4df2 100644
--- a/ksysv/main.cpp
+++ b/ksysv/main.cpp
@@ -18,8 +18,8 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "ksvapplication.h"
diff --git a/ksysv/miscconfig.ui b/ksysv/miscconfig.ui
index ca19113..3ee6b0f 100644
--- a/ksysv/miscconfig.ui
+++ b/ksysv/miscconfig.ui
@@ -177,7 +177,7 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">klocale.h</include>
+    <include location="global" impldecl="in declaration">tdelocale.h</include>
 </includes>
 <Q_SLOTS>
     <slot access="protected">slotChanged()</slot>
diff --git a/ksysv/pathconfig.ui b/ksysv/pathconfig.ui
index 78ed2c2..6f2a263 100644
--- a/ksysv/pathconfig.ui
+++ b/ksysv/pathconfig.ui
@@ -278,7 +278,7 @@
     <tabstop>mBrowseRunlevel</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">klocale.h</include>
+    <include location="global" impldecl="in declaration">tdelocale.h</include>
     <include location="global" impldecl="in declaration">kdialog.h</include>
 </includes>
 <Q_SLOTS>
diff --git a/ksysv/trash.cpp b/ksysv/trash.cpp
index 5ec4d7d..dcd4a88 100644
--- a/ksysv/trash.cpp
+++ b/ksysv/trash.cpp
@@ -20,8 +20,8 @@
 
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "ksvdraglist.h"
-- 
cgit v1.2.1