Rename additional header files to avoid conflicts with KDE4

23 files changed, 29 insertions, 29 deletions

diff --git a/kuser/Makefile.am b/kuser/Makefile.am
index 6b1222a..af78434 100644
--- a/kuser/Makefile.am
+++ b/kuser/Makefile.am
@@ -14,7 +14,7 @@ kuser_SOURCES	=	\
 	kuser.cpp kgroup.cpp main.cpp mainView.cpp \
 	propdlg.cpp misc.cpp pwddlg.cpp \
 	addUser.cpp editDefaults.cpp \
-	kglobal.cpp sid.cpp\
+	tdeglobal.cpp sid.cpp\
 	kuserfiles.cpp kgroupfiles.cpp kuserldap.cpp kgroupldap.cpp \
 	kusersystem.cpp kgroupsystem.cpp selectconn.cpp\
 	sha1.cpp kuserprefs.kcfgc \
diff --git a/kuser/addUser.cpp b/kuser/addUser.cpp
index 24181b9..06f716a 100644
--- a/kuser/addUser.cpp
+++ b/kuser/addUser.cpp
@@ -35,7 +35,7 @@
 #include "misc.h"
 
 #include "addUser.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 addUser::addUser( KU::KUser *AUser, bool useprivategroup,
   TQWidget *parent, const char *name ) :
diff --git a/kuser/delUser.cpp b/kuser/delUser.cpp
index b1ee7e0..800c88c 100644
--- a/kuser/delUser.cpp
+++ b/kuser/delUser.cpp
@@ -22,7 +22,7 @@
 #include <tqvbox.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 delUser::delUser(KU::KUser *AUser, TQWidget *parent, const char *name) 
  : KDialogBase( parent, name, true, i18n("Delete User"),
diff --git a/kuser/editDefaults.cpp b/kuser/editDefaults.cpp
index 5b4b7c8..7b77f4f 100644
--- a/kuser/editDefaults.cpp
+++ b/kuser/editDefaults.cpp
@@ -22,12 +22,12 @@
 
 #include <ktabwidget.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 #include <knuminput.h>
 #include <kpushbutton.h>
-#include <kabc/ldapconfigwidget.h>
-#include <kabc/ldapurl.h>
+#include <tdeabc/ldapconfigwidget.h>
+#include <tdeabc/ldapurl.h>
 
 #include "editDefaults.h"
 #include "generalsettings.h"
diff --git a/kuser/editDefaults.h b/kuser/editDefaults.h
index 0c39f67..90d37e7 100644
--- a/kuser/editDefaults.h
+++ b/kuser/editDefaults.h
@@ -24,7 +24,7 @@
 #include <tqmemarray.h>
 #include <tdeconfigdialog.h>
 #include <kprogress.h>
-#include <kabc/ldif.h>
+#include <tdeabc/ldif.h>
 #include "ldapsamba.h"
 
 class LdapSamba;
diff --git a/kuser/editGroup.cpp b/kuser/editGroup.cpp
index 7f0ff15..c9ca5a3 100644
--- a/kuser/editGroup.cpp
+++ b/kuser/editGroup.cpp
@@ -26,10 +26,10 @@
 #include <tqwhatsthis.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kglobal_.h"
 #include "editGroup.h"
diff --git a/kuser/kgroupfiles.cpp b/kuser/kgroupfiles.cpp
index 8285d02..b827a89 100644
--- a/kuser/kgroupfiles.cpp
+++ b/kuser/kgroupfiles.cpp
@@ -36,7 +36,7 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kglobal_.h"
 #include "kgroupfiles.h"
diff --git a/kuser/kgroupldap.cpp b/kuser/kgroupldap.cpp
index 80e6cf8..2419c23 100644
--- a/kuser/kgroupldap.cpp
+++ b/kuser/kgroupldap.cpp
@@ -20,7 +20,7 @@
 #include <tqdir.h>
 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kglobal_.h"
 #include "kgroupldap.h"
diff --git a/kuser/kgroupldap.h b/kuser/kgroupldap.h
index 6695619..120eed1 100644
--- a/kuser/kgroupldap.h
+++ b/kuser/kgroupldap.h
@@ -26,8 +26,8 @@
 #include <tqptrlist.h>
 
 #include <kprogress.h>
-#include <kabc/ldapurl.h>
-#include <kabc/ldif.h>
+#include <tdeabc/ldapurl.h>
+#include <tdeabc/ldif.h>
 #include <tdeio/job.h>
 
 #include "kgroup.h"
diff --git a/kuser/kgroupsystem.cpp b/kuser/kgroupsystem.cpp
index f30176f..63473ab 100644
--- a/kuser/kgroupsystem.cpp
+++ b/kuser/kgroupsystem.cpp
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kglobal_.h"
 #include "kgroupsystem.h"
diff --git a/kuser/kuser.cpp b/kuser/kuser.cpp
index c1abe52..d0d7f4d 100644
--- a/kuser/kuser.cpp
+++ b/kuser/kuser.cpp
@@ -38,7 +38,7 @@
 #include "kuser.h"
 #include "misc.h"
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
diff --git a/kuser/kuserfiles.cpp b/kuser/kuserfiles.cpp
index 5ccfe58..4cf59c8 100644
--- a/kuser/kuserfiles.cpp
+++ b/kuser/kuserfiles.cpp
@@ -41,7 +41,7 @@
 #include "kuserfiles.h"
 #include "misc.h"
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include "editDefaults.h"
 
diff --git a/kuser/kuserldap.cpp b/kuser/kuserldap.cpp
index c274031..e6378d8 100644
--- a/kuser/kuserldap.cpp
+++ b/kuser/kuserldap.cpp
@@ -20,7 +20,7 @@
 
 #include <kdebug.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/tdentlm.h>
 
 #include "kglobal_.h"
diff --git a/kuser/kuserldap.h b/kuser/kuserldap.h
index e39c131..445cfb7 100644
--- a/kuser/kuserldap.h
+++ b/kuser/kuserldap.h
@@ -26,8 +26,8 @@
 #include <tqptrlist.h>
 
 #include <kprogress.h>
-#include <kabc/ldapurl.h>
-#include <kabc/ldif.h>
+#include <tdeabc/ldapurl.h>
+#include <tdeabc/ldif.h>
 #include <tdeio/job.h>
 
 #include "kuser.h"
diff --git a/kuser/kusersystem.cpp b/kuser/kusersystem.cpp
index 8c67fcb..89a0c7d 100644
--- a/kuser/kusersystem.cpp
+++ b/kuser/kusersystem.cpp
@@ -27,7 +27,7 @@
 
 #include <tqstring.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include "kglobal_.h"
diff --git a/kuser/main.cpp b/kuser/main.cpp
index 56c3d92..af623ce 100644
--- a/kuser/main.cpp
+++ b/kuser/main.cpp
@@ -23,7 +23,7 @@
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
diff --git a/kuser/mainView.cpp b/kuser/mainView.cpp
index fc2d32a..eae6ef8 100644
--- a/kuser/mainView.cpp
+++ b/kuser/mainView.cpp
@@ -28,7 +28,7 @@
 #include <kinputdialog.h>
 #include <tdetoolbar.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include "misc.h"
diff --git a/kuser/mainWidget.cpp b/kuser/mainWidget.cpp
index fd46949..a306a6d 100644
--- a/kuser/mainWidget.cpp
+++ b/kuser/mainWidget.cpp
@@ -24,7 +24,7 @@
 #include <tdetoolbar.h>
 #include <kiconloader.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdaction.h>
 
 #include <kdebug.h>
diff --git a/kuser/misc.cpp b/kuser/misc.cpp
index c16f563..84ffa81 100644
--- a/kuser/misc.cpp
+++ b/kuser/misc.cpp
@@ -30,7 +30,7 @@
 #endif
 #include <tqfile.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "misc.h"
 #include "kglobal_.h"
diff --git a/kuser/misc.h b/kuser/misc.h
index c3672b3..4f5ca9a 100644
--- a/kuser/misc.h
+++ b/kuser/misc.h
@@ -23,7 +23,7 @@
 
 #include <sys/time.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tqstring.h>
 #include <tqwidget.h>
diff --git a/kuser/propdlg.cpp b/kuser/propdlg.cpp
index 8ce7e6a..3e82282 100644
--- a/kuser/propdlg.cpp
+++ b/kuser/propdlg.cpp
@@ -28,7 +28,7 @@
 #include <tqfile.h>
 
 #include <kseparator.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include <tqvalidator.h>
diff --git a/kuser/pwddlg.cpp b/kuser/pwddlg.cpp
index 631c860..0989afc 100644
--- a/kuser/pwddlg.cpp
+++ b/kuser/pwddlg.cpp
@@ -20,7 +20,7 @@
 
 #include <tqgrid.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "pwddlg.h"
 #include "misc.h"
diff --git a/kuser/selectconn.cpp b/kuser/selectconn.cpp
index be98981..30066f0 100644
--- a/kuser/selectconn.cpp
+++ b/kuser/selectconn.cpp
@@ -25,8 +25,8 @@
 
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 
 #include "kglobal_.h"