Rename additional header files to avoid conflicts with KDE4

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>

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>

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>
 

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>
 

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>

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>