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

---
 cmdline/main.cpp         | 2 +-
 src/groupconfigdlg.cpp   | 2 +-
 src/ldapmgr.cpp          | 8 ++++----
 src/ldapmgr.h            | 2 +-
 src/serviceconfigdlg.cpp | 2 +-
 src/userconfigdlg.cpp    | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cmdline/main.cpp b/cmdline/main.cpp
index 182af38..65364b0 100644
--- a/cmdline/main.cpp
+++ b/cmdline/main.cpp
@@ -26,7 +26,7 @@
 #include <pwd.h>
 
 #include <tdeapplication.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <tdecmdlineargs.h>
 #include <kuniqueapplication.h>
 #include <tdeaboutdata.h>
diff --git a/src/groupconfigdlg.cpp b/src/groupconfigdlg.cpp
index 977ac32..38e2850 100644
--- a/src/groupconfigdlg.cpp
+++ b/src/groupconfigdlg.cpp
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <ktextedit.h>
 #include <knuminput.h>
diff --git a/src/ldapmgr.cpp b/src/ldapmgr.cpp
index 716c88b..5da7169 100644
--- a/src/ldapmgr.cpp
+++ b/src/ldapmgr.cpp
@@ -21,11 +21,11 @@
 #include <tqlayout.h>
 #include <tqapplication.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeparts/genericfactory.h>
 #include <ksimpleconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 #include <tdelistview.h>
@@ -36,7 +36,7 @@
 #include <tqheader.h>
 #include <ksimpleconfig.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 #include <kiconloader.h>
 
diff --git a/src/ldapmgr.h b/src/ldapmgr.h
index 62f5c1f..bb3e407 100644
--- a/src/ldapmgr.h
+++ b/src/ldapmgr.h
@@ -26,7 +26,7 @@
 #include <kpushbutton.h>
 #include <tdelistview.h>
 #include <tdefileitem.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqpushbutton.h>
 #include <tqcombobox.h>
 
diff --git a/src/serviceconfigdlg.cpp b/src/serviceconfigdlg.cpp
index 4e29b61..f649988 100644
--- a/src/serviceconfigdlg.cpp
+++ b/src/serviceconfigdlg.cpp
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <ktextedit.h>
 #include <knuminput.h>
diff --git a/src/userconfigdlg.cpp b/src/userconfigdlg.cpp
index 57af8c4..0eabcaa 100644
--- a/src/userconfigdlg.cpp
+++ b/src/userconfigdlg.cpp
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <ktextedit.h>
 #include <knuminput.h>