Rename additional header files to avoid conflicts with KDE4

13 files changed, 20 insertions, 20 deletions

diff --git a/tderesources/scalix/scalixadmin/CMakeLists.txt b/tderesources/scalix/scalixadmin/CMakeLists.txt
index f13d11a83..b2e1be91c 100644
--- a/tderesources/scalix/scalixadmin/CMakeLists.txt
+++ b/tderesources/scalix/scalixadmin/CMakeLists.txt
@@ -28,6 +28,6 @@ tde_add_executable( scalixadmin AUTOMOC
     otherusermanager.cpp otheruserview.cpp otheruserpage.cpp ldapview.cpp
     ldapdialog.cpp delegatemanager.cpp delegateview.cpp delegatepage.cpp
     delegatedialog.cpp outofofficepage.cpp
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/tderesources/scalix/scalixadmin/delegatedialog.cpp b/tderesources/scalix/scalixadmin/delegatedialog.cpp
index 661f57430..8674ce70c 100644
--- a/tderesources/scalix/scalixadmin/delegatedialog.cpp
+++ b/tderesources/scalix/scalixadmin/delegatedialog.cpp
@@ -24,7 +24,7 @@
 #include <tqlineedit.h>
 #include <tqtoolbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "jobs.h"
 #include "ldapdialog.h"
diff --git a/tderesources/scalix/scalixadmin/delegatepage.cpp b/tderesources/scalix/scalixadmin/delegatepage.cpp
index 169ff0853..b4368f7d1 100644
--- a/tderesources/scalix/scalixadmin/delegatepage.cpp
+++ b/tderesources/scalix/scalixadmin/delegatepage.cpp
@@ -22,8 +22,8 @@
 #include <tqpushbutton.h>
 
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <unistd.h>
 
diff --git a/tderesources/scalix/scalixadmin/delegateview.cpp b/tderesources/scalix/scalixadmin/delegateview.cpp
index 440fb66fa..79b8cf335 100644
--- a/tderesources/scalix/scalixadmin/delegateview.cpp
+++ b/tderesources/scalix/scalixadmin/delegateview.cpp
@@ -18,7 +18,7 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "delegatemanager.h"
 
diff --git a/tderesources/scalix/scalixadmin/jobs.cpp b/tderesources/scalix/scalixadmin/jobs.cpp
index e7dd94457..e07b17cad 100644
--- a/tderesources/scalix/scalixadmin/jobs.cpp
+++ b/tderesources/scalix/scalixadmin/jobs.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <tdeio/scheduler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "jobs.h"
 
diff --git a/tderesources/scalix/scalixadmin/ldapdialog.cpp b/tderesources/scalix/scalixadmin/ldapdialog.cpp
index 6af08c4d7..609c472b0 100644
--- a/tderesources/scalix/scalixadmin/ldapdialog.cpp
+++ b/tderesources/scalix/scalixadmin/ldapdialog.cpp
@@ -18,7 +18,7 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "ldapview.h"
 
diff --git a/tderesources/scalix/scalixadmin/ldapview.cpp b/tderesources/scalix/scalixadmin/ldapview.cpp
index 0cdca1819..bc3059984 100644
--- a/tderesources/scalix/scalixadmin/ldapview.cpp
+++ b/tderesources/scalix/scalixadmin/ldapview.cpp
@@ -18,9 +18,9 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <kabc/ldapclient.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeabc/ldapclient.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "settings.h"
 
diff --git a/tderesources/scalix/scalixadmin/main.cpp b/tderesources/scalix/scalixadmin/main.cpp
index caaabcf41..6f162df9d 100644
--- a/tderesources/scalix/scalixadmin/main.cpp
+++ b/tderesources/scalix/scalixadmin/main.cpp
@@ -21,7 +21,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "mainwindow.h"
 
diff --git a/tderesources/scalix/scalixadmin/mainwindow.cpp b/tderesources/scalix/scalixadmin/mainwindow.cpp
index 5eb3d2a5c..1759076a3 100644
--- a/tderesources/scalix/scalixadmin/mainwindow.cpp
+++ b/tderesources/scalix/scalixadmin/mainwindow.cpp
@@ -20,10 +20,10 @@
 
 #include <tqvbox.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kjanuswidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "delegatepage.h"
 #include "otheruserpage.h"
diff --git a/tderesources/scalix/scalixadmin/otheruserpage.cpp b/tderesources/scalix/scalixadmin/otheruserpage.cpp
index 3aac47c9e..3cc220eab 100644
--- a/tderesources/scalix/scalixadmin/otheruserpage.cpp
+++ b/tderesources/scalix/scalixadmin/otheruserpage.cpp
@@ -25,8 +25,8 @@
 #include <dcopref.h>
 #include <kdcopservicestarter.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <unistd.h>
 
diff --git a/tderesources/scalix/scalixadmin/otheruserview.cpp b/tderesources/scalix/scalixadmin/otheruserview.cpp
index 06e69d41c..e8aa13bc4 100644
--- a/tderesources/scalix/scalixadmin/otheruserview.cpp
+++ b/tderesources/scalix/scalixadmin/otheruserview.cpp
@@ -18,7 +18,7 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "otherusermanager.h"
 
diff --git a/tderesources/scalix/scalixadmin/outofofficepage.cpp b/tderesources/scalix/scalixadmin/outofofficepage.cpp
index 4e34a9144..e807379ab 100644
--- a/tderesources/scalix/scalixadmin/outofofficepage.cpp
+++ b/tderesources/scalix/scalixadmin/outofofficepage.cpp
@@ -25,8 +25,8 @@
 #include <tqradiobutton.h>
 #include <tqtextedit.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "jobs.h"
 #include "settings.h"
diff --git a/tderesources/scalix/scalixadmin/passwordpage.cpp b/tderesources/scalix/scalixadmin/passwordpage.cpp
index 9bdc13776..4a13b700f 100644
--- a/tderesources/scalix/scalixadmin/passwordpage.cpp
+++ b/tderesources/scalix/scalixadmin/passwordpage.cpp
@@ -25,8 +25,8 @@
 #include <tqpushbutton.h>
 
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstringhandler.h>
 #include <tdewallet.h>