Rename kiobuffer and KHTML

9 files changed, 14 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 073a166..ca5d131 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -598,7 +598,7 @@ Jake Maciejewski.
 
 2006-08-04  Robby Stephenson  <robby@periapsis.org>
 
-	* Changed HTML export to use libxml2 instead of KHTML for parsing. That should fix the "all text on one line" problem.
+	* Changed HTML export to use libxml2 instead of TDEHTML for parsing. That should fix the "all text on one line" problem.
 	* Bumped minimum libxml2 verstion to 2.6.0 or greater.
 
 2006-07-30  Robby Stephenson  <robby@periapsis.org>
@@ -2367,7 +2367,7 @@ Jake Maciejewski.
 2002-08-27  Robby Stephenson  <robby@periapsis.org>
 
         * Added two new XSLT files
-        * Added printing support using KHTML
+        * Added printing support using TDEHTML
         * Added RPM spec file to automake
 
 2002-02-21  Robby Stephenson  <robby@radiojodi.com>
diff --git a/acinclude.m4 b/acinclude.m4
index f303912..e220906 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2080,7 +2080,7 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
    AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
@@ -2101,7 +2101,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
    AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
diff --git a/cmake b/cmake
-Subproject 9a217903f9fa35ca12213a6e9ee3d2cb87d1131
+Subproject 274366fb8b90704586d7beef216b765cc0688b0
diff --git a/src/Makefile.am b/src/Makefile.am
index ce732e0..0330da0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,7 @@ tellico_LDADD = ./core/libcore.a ./cite/libcite.a ./fetch/libfetch.a \
 	./newstuff/libnewstuff.a ./translators/pilotdb/libpilotdb.a \
 	./translators/pilotdb/libflatfile/liblibflatfile.a ./gui/libgui.a \
 	./translators/pilotdb/libpalm/liblibpalm.a ./rtf2html/librtf2html.a \
-	./commands/libcommands.a -lexslt $(LIB_KFILE) $(LIB_KHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) \
+	./commands/libcommands.a -lexslt $(LIB_KFILE) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) \
 	$(LIBSOCKET) $(LIBXSLT_LIBS) $(TAGLIB_LIBS) $(KCDDB_LIBS) $(YAZ_LIBS) $(LIB_KIO) \
 	$(LIB_KABC) $(KCAL_LIBS) $(LDADD_LIBBTPARSE) $(LIB_KNEWSTUFF) $(EXEMPI_LIBS) \
 	$(POPPLER_LIBS) $(LDADD_LIBBARCODE) $(LIBXML_LIBS)
diff --git a/src/entryview.cpp b/src/entryview.cpp
index ddbdfb8..c60df4f 100644
--- a/src/entryview.cpp
+++ b/src/entryview.cpp
@@ -40,7 +40,7 @@
 
 using Tellico::EntryView;
 
-EntryView::EntryView(TQWidget* parent_, const char* name_) : KHTMLPart(parent_, name_),
+EntryView::EntryView(TQWidget* parent_, const char* name_) : TDEHTMLPart(parent_, name_),
     m_entry(0), m_handler(0), m_run(0), m_tempFile(0), m_useGradientImages(true), m_checkCommonFile(true) {
   setJScriptEnabled(false);
   setJavaEnabled(false);
diff --git a/src/entryview.h b/src/entryview.h
index f105545..2ddc7e7 100644
--- a/src/entryview.h
+++ b/src/entryview.h
@@ -31,7 +31,7 @@ namespace Tellico {
 /**
  * @author Robby Stephenson
  */
-class EntryView : public KHTMLPart {
+class EntryView : public TDEHTMLPart {
 Q_OBJECT
   
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 0b45dd3..72924aa 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1695,7 +1695,7 @@ void MainWindow::slotHideReportDialog() {
 }
 
 void MainWindow::doPrint(const TQString& html_) {
-  KHTMLPart w ;
+  TDEHTMLPart w ;
   w.setJScriptEnabled(false);
   w.setJavaEnabled(false);
   w.setMetaRefreshEnabled(false);
@@ -1706,8 +1706,8 @@ void MainWindow::doPrint(const TQString& html_) {
 
 // the problem with doing my own layout is that the text gets truncated, both at the
 // top and at the bottom. Even adding the overlap parameter, there were problems.
-// KHTMLView takes care of that with a truncatedAt() parameter, but that's hidden in
-// the tdehtml::render_root class. So for now, just use the KHTMLView::print() method.
+// TDEHTMLView takes care of that with a truncatedAt() parameter, but that's hidden in
+// the tdehtml::render_root class. So for now, just use the TDEHTMLView::print() method.
 #if 1
   w.view()->print();
 #else
@@ -1721,7 +1721,7 @@ void MainWindow::doPrint(const TQString& html_) {
     TQPainter *p = new TQPainter;
     p->begin(printer);
 
-    // mostly taken from KHTMLView::print()
+    // mostly taken from TDEHTMLView::print()
     TQString headerLeft = TDEGlobal::locale()->formatDate(TQDate::currentDate(), false);
     TQString headerRight = Data::Document::self()->URL().prettyURL();
     TQString footerMid;
diff --git a/src/reportdialog.cpp b/src/reportdialog.cpp
index 70fc249..d95afb4 100644
--- a/src/reportdialog.cpp
+++ b/src/reportdialog.cpp
@@ -94,7 +94,7 @@ ReportDialog::ReportDialog(TQWidget* parent_, const char* name_/*=0*/)
   hlay->addWidget(pb3);
   connect(pb3, TQT_SIGNAL(clicked()), TQT_SLOT(slotPrint()));
 
-  m_HTMLPart = new KHTMLPart(mainWidget);
+  m_HTMLPart = new TDEHTMLPart(mainWidget);
   m_HTMLPart->setJScriptEnabled(false);
   m_HTMLPart->setJavaEnabled(false);
   m_HTMLPart->setMetaRefreshEnabled(false);
diff --git a/src/reportdialog.h b/src/reportdialog.h
index c6225ce..d089b06 100644
--- a/src/reportdialog.h
+++ b/src/reportdialog.h
@@ -16,7 +16,7 @@
 
 #include <kdialogbase.h>
 
-class KHTMLPart;
+class TDEHTMLPart;
 
 namespace Tellico {
   namespace Export {
@@ -55,7 +55,7 @@ private slots:
   void slotSaveAs();
 
 private:
-  KHTMLPart* m_HTMLPart;
+  TDEHTMLPart* m_HTMLPart;
   GUI::ComboBox* m_templateCombo;
   Export::HTMLExporter* m_exporter;
   TQString m_xsltFile;