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

---
 libtdeedu/extdate/extcalendarsystem.cpp          | 4 ++--
 libtdeedu/extdate/extcalendarsystemgregorian.cpp | 2 +-
 libtdeedu/extdate/extdatepicker.cpp              | 2 +-
 libtdeedu/extdate/extdatetime.cpp                | 4 ++--
 libtdeedu/tdeeduplot/kplotaxis.cpp               | 2 +-
 libtdeedu/tdeeduui/tdeeduglossary.cpp            | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'libtdeedu')

diff --git a/libtdeedu/extdate/extcalendarsystem.cpp b/libtdeedu/extdate/extcalendarsystem.cpp
index 98bf1818..79679e38 100644
--- a/libtdeedu/extdate/extcalendarsystem.cpp
+++ b/libtdeedu/extdate/extcalendarsystem.cpp
@@ -27,10 +27,10 @@
 // systems.
 // Also default gregorian and factory classes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "extcalendarsystem.h"
-#include "klocale.h"
+#include "tdelocale.h"
 
 class ExtCalendarSystemPrivate
 {
diff --git a/libtdeedu/extdate/extcalendarsystemgregorian.cpp b/libtdeedu/extdate/extcalendarsystemgregorian.cpp
index c37b7c6d..469d0151 100644
--- a/libtdeedu/extdate/extcalendarsystemgregorian.cpp
+++ b/libtdeedu/extdate/extcalendarsystemgregorian.cpp
@@ -27,7 +27,7 @@
 // Just a schema.
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "extcalendarsystemgregorian.h"
diff --git a/libtdeedu/extdate/extdatepicker.cpp b/libtdeedu/extdate/extdatepicker.cpp
index 720ab775..5a6d13f6 100644
--- a/libtdeedu/extdate/extdatepicker.cpp
+++ b/libtdeedu/extdate/extdatepicker.cpp
@@ -27,7 +27,7 @@
 #include <tqpopupmenu.h>
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdetoolbar.h>
 #include <kdebug.h>
diff --git a/libtdeedu/extdate/extdatetime.cpp b/libtdeedu/extdate/extdatetime.cpp
index 3efcfdbd..5d92ebd6 100644
--- a/libtdeedu/extdate/extdatetime.cpp
+++ b/libtdeedu/extdate/extdatetime.cpp
@@ -16,8 +16,8 @@
 #include "extdatetime.h"
 #include <tqregexp.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <assert.h>
 #include <time.h>
diff --git a/libtdeedu/tdeeduplot/kplotaxis.cpp b/libtdeedu/tdeeduplot/kplotaxis.cpp
index 69af4673..ca1b0e0e 100644
--- a/libtdeedu/tdeeduplot/kplotaxis.cpp
+++ b/libtdeedu/tdeeduplot/kplotaxis.cpp
@@ -17,7 +17,7 @@
 
 #include <tqpainter.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kplotaxis.h"
 
 KPlotAxis::KPlotAxis() : m_visible(true), m_labelFieldWidth(0), m_labelFmt('g'),
diff --git a/libtdeedu/tdeeduui/tdeeduglossary.cpp b/libtdeedu/tdeeduui/tdeeduglossary.cpp
index 2ea46848..50443f2f 100644
--- a/libtdeedu/tdeeduui/tdeeduglossary.cpp
+++ b/libtdeedu/tdeeduui/tdeeduglossary.cpp
@@ -10,11 +10,11 @@
 #include "tdeeduglossary.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdelistview.h>
 #include <tdelistviewsearchline.h>
 #include <kstandarddirs.h>
-- 
cgit v1.2.1