Rename additional header files to avoid conflicts with KDE4

13 files changed, 15 insertions, 15 deletions

diff --git a/kopete/libkopete/ui/addressbooklinkwidget.cpp b/kopete/libkopete/ui/addressbooklinkwidget.cpp
index 31e04a52..2aa7df67 100644
--- a/kopete/libkopete/ui/addressbooklinkwidget.cpp
+++ b/kopete/libkopete/ui/addressbooklinkwidget.cpp
@@ -23,7 +23,7 @@
 
 #include <tqapplication.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 #include <kiconloader.h>
diff --git a/kopete/libkopete/ui/addressbooklinkwidget.h b/kopete/libkopete/ui/addressbooklinkwidget.h
index 09574193..0ff4a651 100644
--- a/kopete/libkopete/ui/addressbooklinkwidget.h
+++ b/kopete/libkopete/ui/addressbooklinkwidget.h
@@ -24,7 +24,7 @@
 #ifndef ADDRESSBOOKLINKWIDGET_H
 #define ADDRESSBOOKLINKWIDGET_H
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
 #include "addressbooklinkwidget_base.h"
 
diff --git a/kopete/libkopete/ui/addressbookselectordialog.cpp b/kopete/libkopete/ui/addressbookselectordialog.cpp
index 44f42e2a..e75e7bc9 100644
--- a/kopete/libkopete/ui/addressbookselectordialog.cpp
+++ b/kopete/libkopete/ui/addressbookselectordialog.cpp
@@ -22,7 +22,7 @@
 #include <tqdialog.h>
 #include <tqlistview.h>
 #include <tqvbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 namespace Kopete
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp
index 9e03292b..8a0f08b5 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.cpp
+++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp
@@ -28,7 +28,7 @@
 #include <tqcheckbox.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include <tdeversion.h>
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.h b/kopete/libkopete/ui/addressbookselectorwidget.h
index af4b1834..09eb406d 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.h
+++ b/kopete/libkopete/ui/addressbookselectorwidget.h
@@ -28,7 +28,7 @@
 #define AddressBookSelectorWidget_H
 
 #include <kdialogbase.h>
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
 
 #include <kdemacros.h>
 #include "kopete_export.h"
diff --git a/kopete/libkopete/ui/addresseeitem.cpp b/kopete/libkopete/ui/addresseeitem.cpp
index 724f277c..3065abe8 100644
--- a/kopete/libkopete/ui/addresseeitem.cpp
+++ b/kopete/libkopete/ui/addresseeitem.cpp
@@ -22,7 +22,7 @@
 #include <tqgroupbox.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "addresseeitem.h"
diff --git a/kopete/libkopete/ui/addresseeitem.h b/kopete/libkopete/ui/addresseeitem.h
index e0d8de53..6962d109 100644
--- a/kopete/libkopete/ui/addresseeitem.h
+++ b/kopete/libkopete/ui/addresseeitem.h
@@ -27,7 +27,7 @@
 #include <klineedit.h>
 #include <tdelistview.h>
 
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
 
 /**
   @short Special ListViewItem
diff --git a/kopete/libkopete/ui/contactaddednotifydialog.cpp b/kopete/libkopete/ui/contactaddednotifydialog.cpp
index 5b5e1e55..b0fdd43a 100644
--- a/kopete/libkopete/ui/contactaddednotifydialog.cpp
+++ b/kopete/libkopete/ui/contactaddednotifydialog.cpp
@@ -23,13 +23,13 @@
 #include <tqstylesheet.h>
 #include <tqapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
 #include "kopetegroup.h"
 #include "kopeteaccount.h"
diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
index 524d6bed..25aa6140 100644
--- a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
+++ b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
@@ -19,10 +19,10 @@
 
 #include <klineedit.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 //#include "kopetetransfermanager.h"
 #include "fileconfirmbase.h"
diff --git a/kopete/libkopete/ui/kopetelistview.cpp b/kopete/libkopete/ui/kopetelistview.cpp
index 44b2a8d9..a81714f3 100644
--- a/kopete/libkopete/ui/kopetelistview.cpp
+++ b/kopete/libkopete/ui/kopetelistview.cpp
@@ -23,7 +23,7 @@
 #include "kopeteprefs.h"
 
 #include <tqapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/kopete/libkopete/ui/kopetestdaction.cpp b/kopete/libkopete/ui/kopetestdaction.cpp
index 5a589293..b10450d4 100644
--- a/kopete/libkopete/ui/kopetestdaction.cpp
+++ b/kopete/libkopete/ui/kopetestdaction.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <kguiitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksettings/dialog.h>
 #include <kstdaction.h>
 #include <kstdguiitem.h>
diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp
index 856e421e..cec17bf7 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget.cpp
+++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp
@@ -28,7 +28,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include <tdeversion.h>
diff --git a/kopete/libkopete/ui/userinfodialog.cpp b/kopete/libkopete/ui/userinfodialog.cpp
index 8c0b2765..909c38c9 100644
--- a/kopete/libkopete/ui/userinfodialog.cpp
+++ b/kopete/libkopete/ui/userinfodialog.cpp
@@ -22,7 +22,7 @@
 #include <ktextbrowser.h>
 #include <tdeapplication.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqlabel.h>