summaryrefslogtreecommitdiffstats
path: root/tdehtml/xml
diff options
context:
space:
mode:
Diffstat (limited to 'tdehtml/xml')
-rw-r--r--tdehtml/xml/dom2_eventsimpl.cpp18
-rw-r--r--tdehtml/xml/dom2_eventsimpl.h12
-rw-r--r--tdehtml/xml/dom2_rangeimpl.cpp2
-rw-r--r--tdehtml/xml/dom_docimpl.cpp30
-rw-r--r--tdehtml/xml/dom_docimpl.h14
-rw-r--r--tdehtml/xml/dom_elementimpl.cpp4
-rw-r--r--tdehtml/xml/dom_nodeimpl.cpp6
-rw-r--r--tdehtml/xml/dom_nodeimpl.h6
-rw-r--r--tdehtml/xml/xml_tokenizer.cpp4
-rw-r--r--tdehtml/xml/xml_tokenizer.h10
10 files changed, 53 insertions, 53 deletions
diff --git a/tdehtml/xml/dom2_eventsimpl.cpp b/tdehtml/xml/dom2_eventsimpl.cpp
index c0bb10f9a..e6af64184 100644
--- a/tdehtml/xml/dom2_eventsimpl.cpp
+++ b/tdehtml/xml/dom2_eventsimpl.cpp
@@ -179,11 +179,11 @@ EventImpl::EventId EventImpl::typeToId(DOMString type)
else if ( type == "keypress" )
return KEYPRESS_EVENT;
else if ( type == "readystatechange" )
- return KHTML_READYSTATECHANGE_EVENT;
+ return TDEHTML_READYSTATECHANGE_EVENT;
else if ( type == "dblclick" )
- return KHTML_ECMA_DBLCLICK_EVENT;
+ return TDEHTML_ECMA_DBLCLICK_EVENT;
- // ignore: KHTML_CLICK_EVENT
+ // ignore: TDEHTML_CLICK_EVENT
return UNKNOWN_EVENT;
}
@@ -254,15 +254,15 @@ DOMString EventImpl::idToType(EventImpl::EventId id)
return "keypress"; //DOM3 ev. suggests textInput, but it's better for compat this way
//tdehtml extensions
- case KHTML_ECMA_DBLCLICK_EVENT:
+ case TDEHTML_ECMA_DBLCLICK_EVENT:
return "dblclick";
- case KHTML_ECMA_CLICK_EVENT:
+ case TDEHTML_ECMA_CLICK_EVENT:
return "click";
- case KHTML_DRAGDROP_EVENT:
+ case TDEHTML_DRAGDROP_EVENT:
return "tdehtml_dragdrop";
- case KHTML_MOVE_EVENT:
+ case TDEHTML_MOVE_EVENT:
return "tdehtml_move";
- case KHTML_READYSTATECHANGE_EVENT:
+ case TDEHTML_READYSTATECHANGE_EVENT:
return "readystatechange";
default:
@@ -454,7 +454,7 @@ void MouseEventImpl::initMouseEvent(const DOMString &typeArg,
m_clientY = clientYArg;
m_pageX = clientXArg;
m_pageY = clientYArg;
- KHTMLView* v;
+ TDEHTMLView* v;
if ( view() && view()->document() && ( v = view()->document()->view() ) ) {
m_pageX += v->contentsX();
m_pageY += v->contentsY();
diff --git a/tdehtml/xml/dom2_eventsimpl.h b/tdehtml/xml/dom2_eventsimpl.h
index 5d99afbbe..0f48fa605 100644
--- a/tdehtml/xml/dom2_eventsimpl.h
+++ b/tdehtml/xml/dom2_eventsimpl.h
@@ -28,7 +28,7 @@
#include "dom/dom2_events.h"
#include "xml/dom2_viewsimpl.h"
-class KHTMLPart;
+class TDEHTMLPart;
class TQMouseEvent;
namespace DOM {
@@ -81,12 +81,12 @@ public:
KEYUP_EVENT,
KEYPRESS_EVENT, //Mostly corresponds to DOM3 textInput event.
// tdehtml events (not part of DOM)
- KHTML_ECMA_DBLCLICK_EVENT, // for html ondblclick
- KHTML_ECMA_CLICK_EVENT, // for html onclick
- KHTML_DRAGDROP_EVENT,
- KHTML_MOVE_EVENT,
+ TDEHTML_ECMA_DBLCLICK_EVENT, // for html ondblclick
+ TDEHTML_ECMA_CLICK_EVENT, // for html onclick
+ TDEHTML_DRAGDROP_EVENT,
+ TDEHTML_MOVE_EVENT,
// XMLHttpRequest events
- KHTML_READYSTATECHANGE_EVENT
+ TDEHTML_READYSTATECHANGE_EVENT
};
EventImpl();
diff --git a/tdehtml/xml/dom2_rangeimpl.cpp b/tdehtml/xml/dom2_rangeimpl.cpp
index b160ce23f..c7b19de5c 100644
--- a/tdehtml/xml/dom2_rangeimpl.cpp
+++ b/tdehtml/xml/dom2_rangeimpl.cpp
@@ -1139,7 +1139,7 @@ DOMString RangeImpl::toHTML( int &exceptioncode )
text = DOMString("<html xmlns=\"http://www.w3.org/1999/xhtml\">\n"
"<head>\n"
"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n"
- "<meta name=\"Generator\" content=\"KHTML, the KDE Web Page Viewer\" />\n"
+ "<meta name=\"Generator\" content=\"TDEHTML, the KDE Web Page Viewer\" />\n"
"</head>\n") +
text +
"</html>";
diff --git a/tdehtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp
index 5614dbf2e..854d7b3e3 100644
--- a/tdehtml/xml/dom_docimpl.cpp
+++ b/tdehtml/xml/dom_docimpl.cpp
@@ -200,12 +200,12 @@ CSSStyleSheetImpl *DOMImplementationImpl::createCSSStyleSheet(DOMStringImpl* /*t
return sheet;
}
-DocumentImpl *DOMImplementationImpl::createDocument( KHTMLView *v )
+DocumentImpl *DOMImplementationImpl::createDocument( TDEHTMLView *v )
{
return new DocumentImpl(this, v);
}
-HTMLDocumentImpl *DOMImplementationImpl::createHTMLDocument( KHTMLView *v )
+HTMLDocumentImpl *DOMImplementationImpl::createHTMLDocument( TDEHTMLView *v )
{
return new HTMLDocumentImpl(this, v);
}
@@ -288,8 +288,8 @@ ElementMappingCache::ItemInfo* ElementMappingCache::get(const TQString& id)
static KStaticDeleter< TQPtrList<DocumentImpl> > s_changedDocumentsDeleter;
TQPtrList<DocumentImpl> * DocumentImpl::changedDocuments;
-// KHTMLView might be 0
-DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
+// TDEHTMLView might be 0
+DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v)
: NodeBaseImpl( 0 ), m_domtree_version(0), m_counterDict(257),
m_imageLoadEventTimer(0)
{
@@ -304,7 +304,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
m_view = v;
m_renderArena.reset();
- KHTMLFactory::ref();
+ TDEHTMLFactory::ref();
if ( v ) {
m_docLoader = new DocLoader(v->part(), this );
@@ -459,7 +459,7 @@ DocumentImpl::~DocumentImpl()
m_renderArena.reset();
- KHTMLFactory::deref();
+ TDEHTMLFactory::deref();
}
@@ -1132,7 +1132,7 @@ void DocumentImpl::recalcStyle( StyleChange change )
fontDef.italic = f.italic();
fontDef.weight = f.weight();
if (m_view) {
- const KHTMLSettings *settings = m_view->part()->settings();
+ const TDEHTMLSettings *settings = m_view->part()->settings();
TQString stdfont = settings->stdFontName();
if ( !stdfont.isEmpty() )
fontDef.family = stdfont;
@@ -1317,7 +1317,7 @@ void DocumentImpl::open( bool clearEventListeners )
delete m_tokenizer;
m_tokenizer = 0;
- KHTMLView* view = m_view;
+ TDEHTMLView* view = m_view;
bool was_attached = attached();
if ( was_attached )
detach();
@@ -1662,7 +1662,7 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
{
assert(!equiv.isNull() && !content.isNull());
- KHTMLView *v = getDocument()->view();
+ TDEHTMLView *v = getDocument()->view();
if(strcasecmp(equiv, "refresh") == 0 && v && v->part()->metaRefreshEnabled())
{
@@ -2336,12 +2336,12 @@ void DocumentImpl::notifyBeforeNodeRemoval(NodeImpl *n)
bool DocumentImpl::isURLAllowed(const TQString& url) const
{
- KHTMLPart *thisPart = part();
+ TDEHTMLPart *thisPart = part();
KURL newURL(completeURL(url));
newURL.setRef(TQString::null);
- if (KHTMLFactory::defaultHTMLSettings()->isAdFiltered( newURL.url() ))
+ if (TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered( newURL.url() ))
return false;
// Prohibit non-file URLs if we are asked to.
@@ -2355,7 +2355,7 @@ bool DocumentImpl::isURLAllowed(const TQString& url) const
// We allow one level of self-reference because some sites depend on that.
// But we don't allow more than one.
bool foundSelfReference = false;
- for (KHTMLPart *part = thisPart; part; part = part->parentPart()) {
+ for (TDEHTMLPart *part = thisPart; part; part = part->parentPart()) {
KURL partURL = part->url();
partURL.setRef(TQString::null);
if (partURL == newURL) {
@@ -2619,7 +2619,7 @@ void DocumentImpl::setDecoderCodec(const TQTextCodec *codec)
ElementImpl *DocumentImpl::ownerElement() const
{
- KHTMLPart *childPart = part();
+ TDEHTMLPart *childPart = part();
if (!childPart)
return 0;
ChildFrame *childFrame = childPart->d->m_frame;
@@ -2675,9 +2675,9 @@ DOMString DocumentImpl::toString() const
}
-KHTMLPart* DOM::DocumentImpl::part() const
+TDEHTMLPart* DOM::DocumentImpl::part() const
{
- // ### TODO: make this independent from a KHTMLView one day.
+ // ### TODO: make this independent from a TDEHTMLView one day.
return view() ? view()->part() : 0;
}
diff --git a/tdehtml/xml/dom_docimpl.h b/tdehtml/xml/dom_docimpl.h
index 18b164643..9cacfd9f5 100644
--- a/tdehtml/xml/dom_docimpl.h
+++ b/tdehtml/xml/dom_docimpl.h
@@ -47,7 +47,7 @@
class TQPaintDevice;
class TQTextCodec;
class TQPaintDeviceMetrics;
-class KHTMLView;
+class TDEHTMLView;
namespace tdehtml {
class Tokenizer;
@@ -115,8 +115,8 @@ public:
HTMLDocumentImpl* createHTMLDocument( const DOMString& title);
// Other methods (not part of DOM)
- DocumentImpl *createDocument( KHTMLView *v = 0 );
- HTMLDocumentImpl *createHTMLDocument( KHTMLView *v = 0 );
+ DocumentImpl *createDocument( TDEHTMLView *v = 0 );
+ HTMLDocumentImpl *createHTMLDocument( TDEHTMLView *v = 0 );
// Returns the static instance of this class - only one instance of this class should
// ever be present, and is used as a factory method for creating DocumentImpl objects
@@ -184,7 +184,7 @@ class DocumentImpl : public TQObject, private tdehtml::CachedObjectClient, publi
{
Q_OBJECT
public:
- DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v);
+ DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v);
~DocumentImpl();
// DOM methods & attributes for Document
@@ -281,8 +281,8 @@ public:
// Set the state the document should restore to
void setRestoreState( const TQStringList &s) { m_state = s; }
- KHTMLView *view() const { return m_view; }
- KHTMLPart* part() const;
+ TDEHTMLView *view() const { return m_view; }
+ TDEHTMLPart* part() const;
RangeImpl *createRange();
@@ -550,7 +550,7 @@ signals:
protected:
tdehtml::CSSStyleSelector *m_styleSelector;
- KHTMLView *m_view;
+ TDEHTMLView *m_view;
TQStringList m_state;
tdehtml::DocLoader *m_docLoader;
diff --git a/tdehtml/xml/dom_elementimpl.cpp b/tdehtml/xml/dom_elementimpl.cpp
index 75ed41dfc..3941154d7 100644
--- a/tdehtml/xml/dom_elementimpl.cpp
+++ b/tdehtml/xml/dom_elementimpl.cpp
@@ -896,8 +896,8 @@ void ElementImpl::setContentEditable(bool enabled) {
// FIXME: reset caret if it is in this node or a child
}/*end if*/
// FIXME: use addCSSProperty when I get permission to move it here
-// kdDebug(6000) << "CSS_PROP__KHTML_USER_INPUT: "<< value << endl;
- styleRules()->setProperty(CSS_PROP__KHTML_USER_INPUT, value, false, true);
+// kdDebug(6000) << "CSS_PROP__TDEHTML_USER_INPUT: "<< value << endl;
+ styleRules()->setProperty(CSS_PROP__TDEHTML_USER_INPUT, value, false, true);
setChanged();
}
diff --git a/tdehtml/xml/dom_nodeimpl.cpp b/tdehtml/xml/dom_nodeimpl.cpp
index 251cb1444..ac8ca630e 100644
--- a/tdehtml/xml/dom_nodeimpl.cpp
+++ b/tdehtml/xml/dom_nodeimpl.cpp
@@ -337,7 +337,7 @@ void NodeImpl::dispatchEvent(EventImpl *evt, int &exceptioncode, bool tempEvent)
evt->setTarget(this);
// Since event handling code could cause this object to be deleted, grab a reference to the view now
- KHTMLView *view = getDocument()->view();
+ TDEHTMLView *view = getDocument()->view();
dispatchGenericEvent( evt, exceptioncode );
@@ -610,8 +610,8 @@ void NodeImpl::handleLocalEvents(EventImpl *evt, bool useCapture)
// * use me->qEvent(), it's not available when using initMouseEvent/dispatchEvent
// So we currently store a bool in MouseEventImpl. If anyone needs to trigger
// dblclicks from the DOM API, we'll need a timer here (well in the doc).
- if ( ( !me->isDoubleClick() && current.id == EventImpl::KHTML_ECMA_CLICK_EVENT) ||
- ( me->isDoubleClick() && current.id == EventImpl::KHTML_ECMA_DBLCLICK_EVENT) )
+ if ( ( !me->isDoubleClick() && current.id == EventImpl::TDEHTML_ECMA_CLICK_EVENT) ||
+ ( me->isDoubleClick() && current.id == EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT) )
current.listener->handleEvent(ev);
}
}
diff --git a/tdehtml/xml/dom_nodeimpl.h b/tdehtml/xml/dom_nodeimpl.h
index c01e69c0a..457a05787 100644
--- a/tdehtml/xml/dom_nodeimpl.h
+++ b/tdehtml/xml/dom_nodeimpl.h
@@ -37,7 +37,7 @@
class TQPainter;
template <class type> class TQPtrList;
template <class type> class TQValueList;
-class KHTMLView;
+class TDEHTMLView;
class TQRect;
class TQMouseEvent;
class TQKeyEvent;
@@ -283,7 +283,7 @@ public:
void dispatchUIEvent(int _id, int detail = 0);
void dispatchSubtreeModifiedEvent();
// return true if defaultPrevented (i.e. event should be swallowed)
- // this matches the logic in KHTMLView.
+ // this matches the logic in TDEHTMLView.
bool dispatchKeyEvent(TQKeyEvent *key, bool keypress);
void handleLocalEvents(EventImpl *evt, bool useCapture);
@@ -351,7 +351,7 @@ public:
/**
* Attaches this node to the rendering tree. This calculates the style to be applied to the node and creates an
* appropriate RenderObject which will be inserted into the tree (except when the style has display: none). This
- * makes the node visible in the KHTMLView.
+ * makes the node visible in the TDEHTMLView.
*/
virtual void attach();
diff --git a/tdehtml/xml/xml_tokenizer.cpp b/tdehtml/xml/xml_tokenizer.cpp
index ff4a33a99..44f90673f 100644
--- a/tdehtml/xml/xml_tokenizer.cpp
+++ b/tdehtml/xml/xml_tokenizer.cpp
@@ -91,7 +91,7 @@ void XMLIncrementalSource::setFinished( bool finished )
m_finished = finished;
}
-XMLHandler::XMLHandler(DocumentImpl *_doc, KHTMLView *_view)
+XMLHandler::XMLHandler(DocumentImpl *_doc, TDEHTMLView *_view)
: errorLine(0)
{
m_doc = _doc;
@@ -390,7 +390,7 @@ bool XMLHandler::unparsedEntityDecl(const TQString &/*name*/, const TQString &/*
//------------------------------------------------------------------------------
-XMLTokenizer::XMLTokenizer(DOM::DocumentImpl *_doc, KHTMLView *_view)
+XMLTokenizer::XMLTokenizer(DOM::DocumentImpl *_doc, TDEHTMLView *_view)
: m_handler(_doc,_view)
{
m_doc = _doc;
diff --git a/tdehtml/xml/xml_tokenizer.h b/tdehtml/xml/xml_tokenizer.h
index 49a9c970d..f89e5eb2f 100644
--- a/tdehtml/xml/xml_tokenizer.h
+++ b/tdehtml/xml/xml_tokenizer.h
@@ -31,7 +31,7 @@
#include "misc/loader_client.h"
#include "misc/stringit.h"
-class KHTMLView;
+class TDEHTMLView;
namespace tdehtml {
class CachedObject;
@@ -51,7 +51,7 @@ namespace tdehtml {
class XMLHandler : public TQXmlDefaultHandler
{
public:
- XMLHandler(DOM::DocumentImpl *_doc, KHTMLView *_view);
+ XMLHandler(DOM::DocumentImpl *_doc, TDEHTMLView *_view);
virtual ~XMLHandler();
// return the error protocol if parsing failed
@@ -101,7 +101,7 @@ private:
private:
TQString errorProt;
DOM::DocumentImpl *m_doc;
- KHTMLView *m_view;
+ TDEHTMLView *m_view;
TQPtrStack<DOM::NodeImpl> m_nodes;
DOM::NodeImpl *m_rootNode;
@@ -162,7 +162,7 @@ private:
class XMLTokenizer : public Tokenizer, public tdehtml::CachedObjectClient
{
public:
- XMLTokenizer(DOM::DocumentImpl *, KHTMLView * = 0);
+ XMLTokenizer(DOM::DocumentImpl *, TDEHTMLView * = 0);
virtual ~XMLTokenizer();
virtual void begin();
virtual void write( const TokenizerString &str, bool );
@@ -178,7 +178,7 @@ public:
protected:
DOM::DocumentImpl *m_doc;
- KHTMLView *m_view;
+ TDEHTMLView *m_view;
void executeScripts();
void addScripts(DOM::NodeImpl *n);
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-04 22:00:05 +0000