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/karbon_factory.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'karbon/karbon_factory.cc')

diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cc
index 32d5e2de..6dd94ed3 100644
--- a/karbon/karbon_factory.cc
+++ b/karbon/karbon_factory.cc
@@ -19,10 +19,10 @@
 
 
 #include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ktrader.h>
 #include <tdeparts/componentfactory.h>
-- 
cgit v1.2.1