From 63f984a752aa6a6a73e3af795b05a5a042833eff Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:48:17 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 karbon/dockers/vcolordocker.cc     | 2 +-
 karbon/dockers/vdocumentdocker.cc  | 4 ++--
 karbon/dockers/vstrokedocker.cc    | 2 +-
 karbon/dockers/vstyledocker.cc     | 2 +-
 karbon/dockers/vtransformdocker.cc | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'karbon/dockers')

diff --git a/karbon/dockers/vcolordocker.cc b/karbon/dockers/vcolordocker.cc
index c6453575..328f4f3f 100644
--- a/karbon/dockers/vcolordocker.cc
+++ b/karbon/dockers/vcolordocker.cc
@@ -27,7 +27,7 @@
 #include <tqevent.h>
 #include <tqptrlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <KoMainWindow.h>
 
 #include "karbon_part.h"
diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc
index 6272cc2b..dc676a85 100644
--- a/karbon/dockers/vdocumentdocker.cc
+++ b/karbon/dockers/vdocumentdocker.cc
@@ -29,8 +29,8 @@
 #include <tqlabel.h>
 #include <tqcursor.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <KoMainWindow.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/karbon/dockers/vstrokedocker.cc b/karbon/dockers/vstrokedocker.cc
index f30b3042..13fe44c1 100644
--- a/karbon/dockers/vstrokedocker.cc
+++ b/karbon/dockers/vstrokedocker.cc
@@ -26,7 +26,7 @@
 #include <tqtooltip.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <KoMainWindow.h>
 
 #include "KoUnitWidgets.h"
diff --git a/karbon/dockers/vstyledocker.cc b/karbon/dockers/vstyledocker.cc
index 5bf60993..9f3d12e6 100644
--- a/karbon/dockers/vstyledocker.cc
+++ b/karbon/dockers/vstyledocker.cc
@@ -25,7 +25,7 @@
 #include <tqhbuttongroup.h>
 #include <tqtoolbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <KoMainWindow.h>
 #include <KoFilterManager.h>
diff --git a/karbon/dockers/vtransformdocker.cc b/karbon/dockers/vtransformdocker.cc
index 7e93577b..69c9a87c 100644
--- a/karbon/dockers/vtransformdocker.cc
+++ b/karbon/dockers/vtransformdocker.cc
@@ -24,7 +24,7 @@
 #include <tqwmatrix.h>
 #include <tqtooltip.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <KoMainWindow.h>
 #include <KoRect.h>
 #include <KoUnitWidgets.h>
-- 
cgit v1.2.1