From fccf6d244a4d60c3138afa81266e22ac65adddbc Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:20:21 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 libtdeedu/extdate/extdatepicker.cpp   | 2 +-
 libtdeedu/extdate/extdatetbl.cpp      | 2 +-
 libtdeedu/extdate/testwidget.h        | 2 +-
 libtdeedu/tdeeduui/tdeeduglossary.cpp | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'libtdeedu')

diff --git a/libtdeedu/extdate/extdatepicker.cpp b/libtdeedu/extdate/extdatepicker.cpp
index e0953ef3..720ab775 100644
--- a/libtdeedu/extdate/extdatepicker.cpp
+++ b/libtdeedu/extdate/extdatepicker.cpp
@@ -29,7 +29,7 @@
 #include <kdialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kdebug.h>
 #include <knotifyclient.h>
 
diff --git a/libtdeedu/extdate/extdatetbl.cpp b/libtdeedu/extdate/extdatetbl.cpp
index eb9f9a51..3957b73f 100644
--- a/libtdeedu/extdate/extdatetbl.cpp
+++ b/libtdeedu/extdate/extdatetbl.cpp
@@ -46,7 +46,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <knotifyclient.h>
-#include "kpopupmenu.h"
+#include "tdepopupmenu.h"
 #include <tqpainter.h>
 #include <tqdict.h>
 #include <assert.h>
diff --git a/libtdeedu/extdate/testwidget.h b/libtdeedu/extdate/testwidget.h
index 82118881..cc4bc2db 100644
--- a/libtdeedu/extdate/testwidget.h
+++ b/libtdeedu/extdate/testwidget.h
@@ -18,7 +18,7 @@
 #ifndef TESTWIDGET_H
 #define TESTWIDGET_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class KDatePicker;
 class KLineEdit;
diff --git a/libtdeedu/tdeeduui/tdeeduglossary.cpp b/libtdeedu/tdeeduui/tdeeduglossary.cpp
index b0caca67..2ea46848 100644
--- a/libtdeedu/tdeeduui/tdeeduglossary.cpp
+++ b/libtdeedu/tdeeduui/tdeeduglossary.cpp
@@ -15,10 +15,10 @@
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
 #include <kglobal.h>
-#include <klistview.h>
-#include <klistviewsearchline.h>
+#include <tdelistview.h>
+#include <tdelistviewsearchline.h>
 #include <kstandarddirs.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 
 #include <tqfile.h>
 #include <tqlabel.h>
-- 
cgit v1.2.1