diff options
Diffstat (limited to 'klinkstatus/src/parser')
-rw-r--r-- | klinkstatus/src/parser/htmlparser.cpp | 6 | ||||
-rw-r--r-- | klinkstatus/src/parser/node.cpp | 2 | ||||
-rw-r--r-- | klinkstatus/src/parser/node.h | 8 | ||||
-rw-r--r-- | klinkstatus/src/parser/node_impl.h | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/klinkstatus/src/parser/htmlparser.cpp b/klinkstatus/src/parser/htmlparser.cpp index 8c653c89..02cce0be 100644 --- a/klinkstatus/src/parser/htmlparser.cpp +++ b/klinkstatus/src/parser/htmlparser.cpp @@ -202,7 +202,7 @@ void HtmlParser::parseNodesOfTypeMETA() NodeMETA* node = new NodeMETA(aux[i]); nodes_.push_back(node); - if(!is_content_type_set_ && node->atributoHTTP_ETQUIV().lower() == TQString("Content-Type").lower()) { + if(!is_content_type_set_ && node->atributoHTTP_EQUIV().lower() == TQString("Content-Type").lower()) { is_content_type_set_ = true; node_META_content_type_.setNode(aux[i]); } @@ -218,7 +218,7 @@ TQString HtmlParser::findCharsetInMetaElement(TQString const& html) { NodeMETA node(metaTags[i]); - if(node.atributoHTTP_ETQUIV().lower() == TQString("Content-Type").lower()) { + if(node.atributoHTTP_EQUIV().lower() == TQString("Content-Type").lower()) { return node.charset(); } } @@ -383,7 +383,7 @@ void HtmlParser::mostra() const #endif kdDebug(23100) << nm->url() << endl - << nm->atributoHTTP_ETQUIV() << endl + << nm->atributoHTTP_EQUIV() << endl << nm->atributoNAME() << endl << nm->atributoCONTENT() << endl; } diff --git a/klinkstatus/src/parser/node.cpp b/klinkstatus/src/parser/node.cpp index 0b083761..7f6e12e4 100644 --- a/klinkstatus/src/parser/node.cpp +++ b/klinkstatus/src/parser/node.cpp @@ -166,7 +166,7 @@ void NodeLink::parseLinkLabel() void NodeMETA::parseAttributeURL() { if(attribute_http_equiv_.isEmpty()) - parseAttributeHTTP_ETQUIV(); + parseAttributeHTTP_EQUIV(); if(upperCase(attribute_http_equiv_) == "REFRESH") { diff --git a/klinkstatus/src/parser/node.h b/klinkstatus/src/parser/node.h index 31937508..5f959501 100644 --- a/klinkstatus/src/parser/node.h +++ b/klinkstatus/src/parser/node.h @@ -166,7 +166,7 @@ public: virtual TQString const& url() const; virtual const TQString& linkLabel() const; virtual bool isLink() const; - TQString const& atributoHTTP_ETQUIV() const; + TQString const& atributoHTTP_EQUIV() const; TQString const& atributoNAME() const; TQString const& atributoCONTENT() const; TQString charset() const; @@ -176,13 +176,13 @@ public: private: /** - Procura se existem os atributos HTTP-ETQUIV=Refresh e URL=... + Procura se existem os atributos HTTP-EQUIV=Refresh e URL=... Se existir considera o content do atributo URL como um link. - ex: <META HTTP-ETQUIV=Refresh CONTENT="10; URL=http://www.htmlhelp.com/"> + ex: <META HTTP-EQUIV=Refresh CONTENT="10; URL=http://www.htmlhelp.com/"> */ void parseAttributeURL(); - void parseAttributeHTTP_ETQUIV(); + void parseAttributeHTTP_EQUIV(); void parseAttributeNAME(); void parseAttributeCONTENT(); diff --git a/klinkstatus/src/parser/node_impl.h b/klinkstatus/src/parser/node_impl.h index 658d66f6..ab94bb43 100644 --- a/klinkstatus/src/parser/node_impl.h +++ b/klinkstatus/src/parser/node_impl.h @@ -214,7 +214,7 @@ inline bool NodeMETA::isLink() const return false; } -inline TQString const& NodeMETA::atributoHTTP_ETQUIV() const +inline TQString const& NodeMETA::atributoHTTP_EQUIV() const { return attribute_http_equiv_; } @@ -237,16 +237,16 @@ inline bool NodeMETA::isRedirection() const inline void NodeMETA::parse() { - parseAttributeHTTP_ETQUIV(); + parseAttributeHTTP_EQUIV(); parseAttributeNAME(); parseAttributeCONTENT(); parseAttributeURL(); } -inline void NodeMETA::parseAttributeHTTP_ETQUIV() +inline void NodeMETA::parseAttributeHTTP_EQUIV() { - attribute_http_equiv_ = getAttribute("HTTP-ETQUIV="); + attribute_http_equiv_ = getAttribute("HTTP-EQUIV="); } inline void NodeMETA::parseAttributeNAME() |