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

---
 ksvg/impl/SVGCircleElementImpl.cc      | 2 +-
 ksvg/impl/SVGEllipseElementImpl.cc     | 2 +-
 ksvg/impl/SVGLineElementImpl.cc        | 2 +-
 ksvg/impl/SVGPathElementImpl.cc        | 2 +-
 ksvg/impl/SVGPatternElementImpl.cc     | 2 +-
 ksvg/impl/SVGRectElementImpl.cc        | 2 +-
 ksvg/impl/SVGTestsImpl.cc              | 4 ++--
 ksvg/impl/SVGTextContentElementImpl.cc | 2 +-
 ksvg/impl/SVGTextPathElementImpl.cc    | 2 +-
 ksvg/impl/SVGWindowImpl.cc             | 4 ++--
 10 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'ksvg/impl')

diff --git a/ksvg/impl/SVGCircleElementImpl.cc b/ksvg/impl/SVGCircleElementImpl.cc
index b6246d1a..7ad3f13a 100644
--- a/ksvg/impl/SVGCircleElementImpl.cc
+++ b/ksvg/impl/SVGCircleElementImpl.cc
@@ -19,7 +19,7 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "CanvasItem.h"
 #include "KSVGCanvas.h"
diff --git a/ksvg/impl/SVGEllipseElementImpl.cc b/ksvg/impl/SVGEllipseElementImpl.cc
index 9908941a..76b050a5 100644
--- a/ksvg/impl/SVGEllipseElementImpl.cc
+++ b/ksvg/impl/SVGEllipseElementImpl.cc
@@ -19,7 +19,7 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "CanvasItem.h"
 #include "KSVGCanvas.h"
diff --git a/ksvg/impl/SVGLineElementImpl.cc b/ksvg/impl/SVGLineElementImpl.cc
index 7e13f46c..2db23950 100644
--- a/ksvg/impl/SVGLineElementImpl.cc
+++ b/ksvg/impl/SVGLineElementImpl.cc
@@ -19,7 +19,7 @@
 */
 
 #include <math.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <kdebug.h>
 
diff --git a/ksvg/impl/SVGPathElementImpl.cc b/ksvg/impl/SVGPathElementImpl.cc
index 506ad01a..93ddc6ad 100644
--- a/ksvg/impl/SVGPathElementImpl.cc
+++ b/ksvg/impl/SVGPathElementImpl.cc
@@ -22,7 +22,7 @@
 #include <cfloat>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "SVGRectImpl.h"
 #include "SVGPaintImpl.h"
diff --git a/ksvg/impl/SVGPatternElementImpl.cc b/ksvg/impl/SVGPatternElementImpl.cc
index 1b088240..37825869 100644
--- a/ksvg/impl/SVGPatternElementImpl.cc
+++ b/ksvg/impl/SVGPatternElementImpl.cc
@@ -19,7 +19,7 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "SVGPatternElement.h"
 #include "SVGPatternElementImpl.h"
diff --git a/ksvg/impl/SVGRectElementImpl.cc b/ksvg/impl/SVGRectElementImpl.cc
index 3dad7cbf..b1e4dfba 100644
--- a/ksvg/impl/SVGRectElementImpl.cc
+++ b/ksvg/impl/SVGRectElementImpl.cc
@@ -19,7 +19,7 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "SVGRectImpl.h"
 #include "SVGDocumentImpl.h"
diff --git a/ksvg/impl/SVGTestsImpl.cc b/ksvg/impl/SVGTestsImpl.cc
index 4ead2a8c..e2154b7b 100644
--- a/ksvg/impl/SVGTestsImpl.cc
+++ b/ksvg/impl/SVGTestsImpl.cc
@@ -18,8 +18,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 #include "SVGTestsImpl.h"
 #include "SVGStringListImpl.h"
diff --git a/ksvg/impl/SVGTextContentElementImpl.cc b/ksvg/impl/SVGTextContentElementImpl.cc
index 302b54b7..4af6c7d0 100644
--- a/ksvg/impl/SVGTextContentElementImpl.cc
+++ b/ksvg/impl/SVGTextContentElementImpl.cc
@@ -19,7 +19,7 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "Glyph.h"
 
diff --git a/ksvg/impl/SVGTextPathElementImpl.cc b/ksvg/impl/SVGTextPathElementImpl.cc
index 78c272f8..8634155b 100644
--- a/ksvg/impl/SVGTextPathElementImpl.cc
+++ b/ksvg/impl/SVGTextPathElementImpl.cc
@@ -19,7 +19,7 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "Glyph.h"
 
diff --git a/ksvg/impl/SVGWindowImpl.cc b/ksvg/impl/SVGWindowImpl.cc
index 476185f1..c0e459c8 100644
--- a/ksvg/impl/SVGWindowImpl.cc
+++ b/ksvg/impl/SVGWindowImpl.cc
@@ -29,9 +29,9 @@
 #include <tqstylesheet.h>
 
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace KSVG;
 
-- 
cgit v1.2.3