From fdae4846a8e55e968778da28ec92a7e12ea0176a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 20:57:06 -0600 Subject: [PATCH] Rename kiobuffer and KHTML --- acinclude.m4 | 4 +- filters/kword/html/export/ExportCss.cc | 2 +- filters/kword/html/import/Makefile.am | 2 +- filters/kword/html/import/htmlimport.cpp | 2 +- filters/kword/html/import/tdehtmlreader.cpp | 64 ++++++++++----------- filters/kword/html/import/tdehtmlreader.h | 12 ++-- filters/kword/html/status.html | 4 +- 7 files changed, 45 insertions(+), 45 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index c7e88f2b1..fad5d0112 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2066,7 +2066,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") @@ -2087,7 +2087,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/filters/kword/html/export/ExportCss.cc b/filters/kword/html/export/ExportCss.cc index 7af3dcdff..faacff642 100644 --- a/filters/kword/html/export/ExportCss.cc +++ b/filters/kword/html/export/ExportCss.cc @@ -428,7 +428,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin, } } - // TODO: Konqueror/KHTML does not support "text-shadow" + // TODO: Konqueror/TDEHTML does not support "text-shadow" if (!force && ( layoutOrigin.shadowDirection == layout.shadowDirection ) && ( layoutOrigin.shadowDistance == layout.shadowDistance ) ) diff --git a/filters/kword/html/import/Makefile.am b/filters/kword/html/import/Makefile.am index 692815815..fadc109e9 100644 --- a/filters/kword/html/import/Makefile.am +++ b/filters/kword/html/import/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -I$(srcdir) $(KOFFICE_INCLUDES) $(KOTEXT_INCLUDES) $(all_includes) libhtmlimport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -libhtmlimport_la_LIBADD = $(LIB_KHTML) $(KOFFICE_LIBS) $(LIB_KOTEXT) +libhtmlimport_la_LIBADD = $(LIB_TDEHTML) $(KOFFICE_LIBS) $(LIB_KOTEXT) ####### Files diff --git a/filters/kword/html/import/htmlimport.cpp b/filters/kword/html/import/htmlimport.cpp index f5d9d08cf..164a914c4 100644 --- a/filters/kword/html/import/htmlimport.cpp +++ b/filters/kword/html/import/htmlimport.cpp @@ -46,7 +46,7 @@ KoFilter::ConversionStatus HTMLImport::convert( const TQCString& from, const TQC KoStore *k= KoStore::createStore(m_chain->outputFile(), KoStore::Write, "application/x-kword"); KWDWriter *w= new KWDWriter(k); - KHTMLReader h(w); + TDEHTMLReader h(w); KURL url; url.setPath(m_chain->inputFile()); bool b= h.filter(url); diff --git a/filters/kword/html/import/tdehtmlreader.cpp b/filters/kword/html/import/tdehtmlreader.cpp index 06aa69eaf..de5f7177c 100644 --- a/filters/kword/html/import/tdehtmlreader.cpp +++ b/filters/kword/html/import/tdehtmlreader.cpp @@ -32,9 +32,9 @@ #include #include -KHTMLReader::KHTMLReader(KWDWriter *w) +TDEHTMLReader::TDEHTMLReader(KWDWriter *w) { - _html=new KHTMLPart(); + _html=new TDEHTMLPart(); _writer=w; _it_worked=false; } @@ -44,9 +44,9 @@ void tqt_enter_modal( TQWidget *widget ); void tqt_leave_modal( TQWidget *widget ); -bool KHTMLReader::filter(KURL url) +bool TDEHTMLReader::filter(KURL url) { - kdDebug(30503) << "KHTMLReader::filter" << endl; + kdDebug(30503) << "TDEHTMLReader::filter" << endl; TQObject::connect(_html,TQT_SIGNAL(completed()),this,TQT_SLOT(completed())); _state.clear(); @@ -72,7 +72,7 @@ bool KHTMLReader::filter(KURL url) return _it_worked; } -HTMLReader_state *KHTMLReader::state() +HTMLReader_state *TDEHTMLReader::state() { if (_state.count() == 0) { @@ -87,7 +87,7 @@ HTMLReader_state *KHTMLReader::state() return _state.top(); } -HTMLReader_state *KHTMLReader::pushNewState() +HTMLReader_state *TDEHTMLReader::pushNewState() { HTMLReader_state *s=new HTMLReader_state; s->frameset=state()->frameset; @@ -101,7 +101,7 @@ HTMLReader_state *KHTMLReader::pushNewState() } -void KHTMLReader::popState() +void TDEHTMLReader::popState() { kdDebug(30503) << "Entering popState" << endl; @@ -127,22 +127,22 @@ void KHTMLReader::popState() delete(s); } -void KHTMLReader::startNewLayout(bool startNewFormat) +void TDEHTMLReader::startNewLayout(bool startNewFormat) { TQDomElement layout; startNewLayout(startNewFormat,layout); } -void KHTMLReader::startNewLayout(bool startNewFormat, TQDomElement layout) +void TDEHTMLReader::startNewLayout(bool startNewFormat, TQDomElement layout) { kdDebug() << "entering startNewLayout" << endl; startNewParagraph(startNewFormat,true); state()->layout=_writer->setLayout(state()->paragraph,layout); } -void KHTMLReader::completed() +void TDEHTMLReader::completed() { - kdDebug(30503) << "KHTMLReader::completed" << endl; + kdDebug(30503) << "TDEHTMLReader::completed" << endl; tqApp->exit_loop(); DOM::Document doc=_html->document(); // FIXME parse too DOM::NodeList list=doc.getElementsByTagName("body"); @@ -170,7 +170,7 @@ void KHTMLReader::completed() } -void KHTMLReader::parseNode(DOM::Node node) +void TDEHTMLReader::parseNode(DOM::Node node) { kdDebug(30503) << "Entering parseNode" << endl; // check if this is a text node. @@ -207,7 +207,7 @@ void KHTMLReader::parseNode(DOM::Node node) popState(); } -void KHTMLReader::parse_head(DOM::Element e) +void TDEHTMLReader::parse_head(DOM::Element e) { for (DOM::Element items=e.firstChild();!items.isNull();items=items.nextSibling()) { if (items.tagName().string().lower() == "title") { @@ -242,7 +242,7 @@ void KHTMLReader::parse_head(DOM::Element e) } -bool KHTMLReader::parseTag(DOM::Element e) +bool TDEHTMLReader::parseTag(DOM::Element e) { kdDebug(30503) << "Entering parseTag for " << e.tagName().lower() << endl; if (e.tagName().lower()=="a") { return parse_a(e); } @@ -283,7 +283,7 @@ bool KHTMLReader::parseTag(DOM::Element e) return true; } -void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewlayout) +void TDEHTMLReader::startNewParagraph(bool startnewformat, bool startnewlayout) { kdDebug() << "Entering startNewParagraph" << endl; @@ -325,7 +325,7 @@ void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewlayout) } } -KHTMLReader::~KHTMLReader(){ +TDEHTMLReader::~TDEHTMLReader(){ delete _html; } @@ -339,9 +339,9 @@ KHTMLReader::~KHTMLReader(){ //============================================================== -bool KHTMLReader::parse_CommonAttributes(DOM::Element e) +bool TDEHTMLReader::parse_CommonAttributes(DOM::Element e) { - kdDebug(30503) << "entering KHTMLReader::parse_CommonAttributes" << endl; + kdDebug(30503) << "entering TDEHTMLReader::parse_CommonAttributes" << endl; kdDebug(30503) << "tagName is " << e.tagName().string() << endl; TQString s=e.getAttribute("align").string(); if (!s.isEmpty()) @@ -364,7 +364,7 @@ bool KHTMLReader::parse_CommonAttributes(DOM::Element e) return true; } -bool KHTMLReader::parse_a(DOM::Element e) { +bool TDEHTMLReader::parse_a(DOM::Element e) { TQString url = e.getAttribute("href").string(); if (!url.isEmpty()) { @@ -381,7 +381,7 @@ bool KHTMLReader::parse_a(DOM::Element e) { return true; /* stop parsing recursively */ } -bool KHTMLReader::parse_p(DOM::Element e) +bool TDEHTMLReader::parse_p(DOM::Element e) { // For every starting paragraph, a line break has to be inserted. // exception: the first paragraph, e.g. if the starts with a

. @@ -393,7 +393,7 @@ bool KHTMLReader::parse_p(DOM::Element e) return true; } -bool KHTMLReader::parse_hr(DOM::Element /*e*/) +bool TDEHTMLReader::parse_hr(DOM::Element /*e*/) { startNewParagraph(); _writer->createHR(state()->paragraph); @@ -401,7 +401,7 @@ bool KHTMLReader::parse_hr(DOM::Element /*e*/) return true; } -bool KHTMLReader::parse_br(DOM::Element /*e*/) +bool TDEHTMLReader::parse_br(DOM::Element /*e*/) { startNewParagraph(false,false); //keep the current format and layout return false; // a BR tag has no childs. @@ -466,7 +466,7 @@ static const TQColor parsecolor(const TQString& colorstring) return colorstring; } -void KHTMLReader::parseStyle(DOM::Element e) +void TDEHTMLReader::parseStyle(DOM::Element e) { // styles are broken broken broken broken broken broken. //FIXME: wait until getComputedStyle is more than @@ -529,7 +529,7 @@ void KHTMLReader::parseStyle(DOM::Element e) */ } -bool KHTMLReader::parse_table(DOM::Element e) +bool TDEHTMLReader::parse_table(DOM::Element e) { if(_writer->isInTable()) { // We are already inside of a table. Tables in tables are not supported @@ -545,7 +545,7 @@ bool KHTMLReader::parse_table(DOM::Element e) DOM::Element table_body=e.firstChild(); if(table_body.isNull()) { // If the table_body is empty, we don't continue cause else - // KHTML will throw a DOM::DOMException if we try to access + // TDEHTML will throw a DOM::DOMException if we try to access // the null element. return true; } @@ -612,13 +612,13 @@ bool KHTMLReader::parse_table(DOM::Element e) return false; // we do our own recursion } -bool KHTMLReader::parse_img(DOM::Element /*e*/) +bool TDEHTMLReader::parse_img(DOM::Element /*e*/) { //TQRect e=e.getRect(); return true; } -bool KHTMLReader::parse_pre(DOM::Element e) +bool TDEHTMLReader::parse_pre(DOM::Element e) { #if 0 // see Bug #74601 (normal): kword doesn't recognize PRE-tags in HTML //pushNewState(); @@ -644,12 +644,12 @@ bool KHTMLReader::parse_pre(DOM::Element e) #endif } -bool KHTMLReader::parse_ol(DOM::Element e) +bool TDEHTMLReader::parse_ol(DOM::Element e) { return parse_ul(e); } -bool KHTMLReader::parse_font(DOM::Element e) +bool TDEHTMLReader::parse_font(DOM::Element e) { kdDebug(30503) << "Entering parse_font" << endl; // fixme don't hardcode 12 font size ... @@ -676,10 +676,10 @@ bool KHTMLReader::parse_font(DOM::Element e) return true; } -bool KHTMLReader::parse_ul(DOM::Element e) +bool TDEHTMLReader::parse_ul(DOM::Element e) { // Parse the tag ul and all its subnodes. Take special care for the li tag. - kdDebug(30503) << "Entering KHTMLReader::parse_ul" << endl; + kdDebug(30503) << "Entering TDEHTMLReader::parse_ul" << endl; kdDebug(30503) << "_writer->getText(state()->paragraph)=" << _writer->getText(state()->paragraph) << endl; _list_depth++; if (e.firstChild().nodeName().string().lower() == "#text") // e.g.

    this is indented
  • first listitem
@@ -711,7 +711,7 @@ bool KHTMLReader::parse_ul(DOM::Element e) parseNode(items); } _list_depth--; - kdDebug(30503) << "Leaving KHTMLReader::parse_ul" << endl; + kdDebug(30503) << "Leaving TDEHTMLReader::parse_ul" << endl; return false; } diff --git a/filters/kword/html/import/tdehtmlreader.h b/filters/kword/html/import/tdehtmlreader.h index bee84c606..e2682d0e3 100644 --- a/filters/kword/html/import/tdehtmlreader.h +++ b/filters/kword/html/import/tdehtmlreader.h @@ -16,8 +16,8 @@ * * ***************************************************************************/ -#ifndef KHTMLREADER_H -#define KHTMLREADER_H +#ifndef TDEHTMLREADER_H +#define TDEHTMLREADER_H #include // fixme speedup compile time by moving these into the cpp file. #include @@ -43,14 +43,14 @@ struct HTMLReader_state { bool in_pre_mode; // keep formatting as is. }; -class KHTMLReader: public TQObject { +class TDEHTMLReader: public TQObject { Q_OBJECT public: - KHTMLReader(KWDWriter *writer); - ~KHTMLReader(); + TDEHTMLReader(KWDWriter *writer); + ~TDEHTMLReader(); bool filter(KURL url); @@ -73,7 +73,7 @@ private: void stateSetParagraph(TQDomElement p);*/ TQPtrStack _state; - KHTMLPart *_html; + TDEHTMLPart *_html; KWDWriter *_writer; void startNewLayout(bool startNewFormat=false); diff --git a/filters/kword/html/status.html b/filters/kword/html/status.html index 96fdfb1fa..2a98f0ea6 100644 --- a/filters/kword/html/status.html +++ b/filters/kword/html/status.html @@ -73,7 +73,7 @@ 20 Apr 2001 New (single pass) HTML filter
07 May 2001 Removing code of the old import filter
09 May 2001 Removing code of the former two pass filter system
- 10 Sep 2001 Rewrite using KHTML as html parser, support (simple) tables
+ 10 Sep 2001 Rewrite using TDEHTML as html parser, support (simple) tables
@@ -91,7 +91,7 @@ HTML 4.01
XHTML 1.0
Cascaded Style Sheets Level 2 (CSS2)
- KHTML Documentation
+ TDEHTML Documentation