Rename additional header files to avoid conflicts with KDE4

14 files changed, 20 insertions, 20 deletions

diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp
index 50e767321..e1d48db56 100644
--- a/kaddressbook/printing/detailledstyle.cpp
+++ b/kaddressbook/printing/detailledstyle.cpp
@@ -28,9 +28,9 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <tdefontcombo.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqpainter.h>
diff --git a/kaddressbook/printing/detailledstyle.h b/kaddressbook/printing/detailledstyle.h
index e8600e56f..c68568aa1 100644
--- a/kaddressbook/printing/detailledstyle.h
+++ b/kaddressbook/printing/detailledstyle.h
@@ -24,7 +24,7 @@
 #ifndef DETAILLEDSTYLE_H
 #define DETAILLEDSTYLE_H
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
 #include "printstyle.h"
 #include "kabentrypainter.h"
diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp
index 0bf45386b..d973f810c 100644
--- a/kaddressbook/printing/kabentrypainter.cpp
+++ b/kaddressbook/printing/kabentrypainter.cpp
@@ -26,8 +26,8 @@
 #include <tqpainter.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 #include <kprinter.h>
 #include <kurl.h>
diff --git a/kaddressbook/printing/kabentrypainter.h b/kaddressbook/printing/kabentrypainter.h
index 6936128fb..f8fea4912 100644
--- a/kaddressbook/printing/kabentrypainter.h
+++ b/kaddressbook/printing/kabentrypainter.h
@@ -24,7 +24,7 @@
 #ifndef KABENTRYPAINTER_H
 #define KABENTRYPAINTER_H
 
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
 
 #include <tqcolor.h>
 #include <tqfont.h>
diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp
index b17db1454..aa718dfd0 100644
--- a/kaddressbook/printing/mikesstyle.cpp
+++ b/kaddressbook/printing/mikesstyle.cpp
@@ -25,11 +25,11 @@
 #include <tqpaintdevicemetrics.h>
 #include <tqpainter.h>
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kprinter.h>
 #include <kprogress.h>
 
diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp
index 1ee71a8c1..9ee8fe4a6 100644
--- a/kaddressbook/printing/printingwizard.cpp
+++ b/kaddressbook/printing/printingwizard.cpp
@@ -31,12 +31,12 @@
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 
-#include <kabc/addresseelist.h>
+#include <tdeabc/addresseelist.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprinter.h>
 
 // including the styles
diff --git a/kaddressbook/printing/printingwizard.h b/kaddressbook/printing/printingwizard.h
index 73d96bb28..359b746fe 100644
--- a/kaddressbook/printing/printingwizard.h
+++ b/kaddressbook/printing/printingwizard.h
@@ -31,7 +31,7 @@
 #include <kwizard.h>
 
 #include "common/filter.h"
-#include "kabc/addressbook.h"
+#include "tdeabc/addressbook.h"
 #include "printstyle.h"
 
 #include "selectionpage.h"
diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp
index 59ad2304c..459cfbee1 100644
--- a/kaddressbook/printing/printprogress.cpp
+++ b/kaddressbook/printing/printprogress.cpp
@@ -28,7 +28,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "printprogress.h"
 
diff --git a/kaddressbook/printing/printsortmode.cpp b/kaddressbook/printing/printsortmode.cpp
index 685a47ac0..3e1af4203 100644
--- a/kaddressbook/printing/printsortmode.cpp
+++ b/kaddressbook/printing/printsortmode.cpp
@@ -21,7 +21,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <kabc/field.h>
+#include <tdeabc/field.h>
 
 #include "printsortmode.h"
 
diff --git a/kaddressbook/printing/printsortmode.h b/kaddressbook/printing/printsortmode.h
index d8ec920df..a764e6c74 100644
--- a/kaddressbook/printing/printsortmode.h
+++ b/kaddressbook/printing/printsortmode.h
@@ -28,7 +28,7 @@
 
 #if KDE_IS_VERSION(3,3,91)
 
-#include <kabc/sortmode.h>
+#include <tdeabc/sortmode.h>
 
 class PrintSortMode : public KABC::SortMode
 {
diff --git a/kaddressbook/printing/printstyle.h b/kaddressbook/printing/printstyle.h
index 65fea06a7..2c5ef51b5 100644
--- a/kaddressbook/printing/printstyle.h
+++ b/kaddressbook/printing/printstyle.h
@@ -28,7 +28,7 @@
 #include <tqstringlist.h>
 #include <tqpixmap.h>
 
-#include <kabc/field.h>
+#include <tdeabc/field.h>
 
 namespace KABPrinting {
 
diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp
index c77c00d90..39b1c4a8e 100644
--- a/kaddressbook/printing/selectionpage.cpp
+++ b/kaddressbook/printing/selectionpage.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqbuttongroup.h>
 #include <tqcombobox.h>
diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp
index c3fdc1e0d..0b67897d2 100644
--- a/kaddressbook/printing/stylepage.cpp
+++ b/kaddressbook/printing/stylepage.cpp
@@ -30,7 +30,7 @@
 
 #include <kcombobox.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "stylepage.h"
 
diff --git a/kaddressbook/printing/stylepage.h b/kaddressbook/printing/stylepage.h
index 8f664271d..46fbc2d6e 100644
--- a/kaddressbook/printing/stylepage.h
+++ b/kaddressbook/printing/stylepage.h
@@ -27,8 +27,8 @@
 
 #include <tqwidget.h>
 
-#include <kabc/addressbook.h>
-#include <kabc/field.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/field.h>
 
 class TQLabel;
 class TQPixmap;