summaryrefslogtreecommitdiffstats
path: root/libtdeedu/tdeeduui
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:17:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:17:07 -0600
commitfb758f679005d3eb923888302ade9b6e4dda15bb (patch)
tree60658c27bd33523266b992b1e50774ca76b965a1 /libtdeedu/tdeeduui
parent9f2c757e1a1694373c11427a00502c2ff4c2d403 (diff)
downloadtdeedu-fb758f679005d3eb923888302ade9b6e4dda15bb.tar.gz
tdeedu-fb758f679005d3eb923888302ade9b6e4dda15bb.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'libtdeedu/tdeeduui')
-rw-r--r--libtdeedu/tdeeduui/tdeeduglossary.cpp4
-rw-r--r--libtdeedu/tdeeduui/tdeeduglossary.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/libtdeedu/tdeeduui/tdeeduglossary.cpp b/libtdeedu/tdeeduui/tdeeduglossary.cpp
index 6b3c2843..7c935f7c 100644
--- a/libtdeedu/tdeeduui/tdeeduglossary.cpp
+++ b/libtdeedu/tdeeduui/tdeeduglossary.cpp
@@ -12,8 +12,8 @@
#include <kdebug.h>
#include <klocale.h>
#include <kiconloader.h>
-#include <khtml_part.h>
-#include <khtmlview.h>
+#include <tdehtml_part.h>
+#include <tdehtmlview.h>
#include <kglobal.h>
#include <klistview.h>
#include <klistviewsearchline.h>
diff --git a/libtdeedu/tdeeduui/tdeeduglossary.h b/libtdeedu/tdeeduui/tdeeduglossary.h
index c77b2135..43b5fd92 100644
--- a/libtdeedu/tdeeduui/tdeeduglossary.h
+++ b/libtdeedu/tdeeduui/tdeeduglossary.h
@@ -16,7 +16,7 @@
***************************************************************************/
-#include <khtml_part.h>
+#include <tdehtml_part.h>
#include <kdialogbase.h>
class TQChar;