summaryrefslogtreecommitdiffstats
path: root/tdehtml/xml
diff options
context:
space:
mode:
Diffstat (limited to 'tdehtml/xml')
-rw-r--r--tdehtml/xml/dom2_eventsimpl.cpp92
-rw-r--r--tdehtml/xml/dom_docimpl.cpp8
-rw-r--r--tdehtml/xml/dom_docimpl.h2
-rw-r--r--tdehtml/xml/dom_nodeimpl.cpp10
-rw-r--r--tdehtml/xml/dom_stringimpl.h2
-rw-r--r--tdehtml/xml/xml_tokenizer.h2
6 files changed, 58 insertions, 58 deletions
diff --git a/tdehtml/xml/dom2_eventsimpl.cpp b/tdehtml/xml/dom2_eventsimpl.cpp
index e6af64184..1ee36c82d 100644
--- a/tdehtml/xml/dom2_eventsimpl.cpp
+++ b/tdehtml/xml/dom2_eventsimpl.cpp
@@ -526,52 +526,52 @@ private:
/* Mapping between special Qt keycodes and virtual DOM codes */
IDTranslator<unsigned, unsigned, unsigned>::Info virtKeyToQtKeyTable[] =
{
- {KeyEventBaseImpl::DOM_VK_BACK_SPACE, Qt::Key_Backspace},
- {KeyEventBaseImpl::DOM_VK_ENTER, Qt::Key_Enter},
- {KeyEventBaseImpl::DOM_VK_ENTER, Qt::Key_Return},
- {KeyEventBaseImpl::DOM_VK_NUM_LOCK, Qt::Key_NumLock},
- {KeyEventBaseImpl::DOM_VK_RIGHT_ALT, Qt::Key_Alt},
- {KeyEventBaseImpl::DOM_VK_LEFT_CONTROL, Qt::Key_Control},
- {KeyEventBaseImpl::DOM_VK_LEFT_SHIFT, Qt::Key_Shift},
- {KeyEventBaseImpl::DOM_VK_META, Qt::Key_Meta},
- {KeyEventBaseImpl::DOM_VK_CAPS_LOCK, Qt::Key_CapsLock},
- {KeyEventBaseImpl::DOM_VK_DELETE, Qt::Key_Delete},
- {KeyEventBaseImpl::DOM_VK_END, Qt::Key_End},
- {KeyEventBaseImpl::DOM_VK_ESCAPE, Qt::Key_Escape},
- {KeyEventBaseImpl::DOM_VK_HOME, Qt::Key_Home},
- {KeyEventBaseImpl::DOM_VK_PAUSE, Qt::Key_Pause},
- {KeyEventBaseImpl::DOM_VK_PRINTSCREEN, Qt::Key_Print},
- {KeyEventBaseImpl::DOM_VK_SCROLL_LOCK, Qt::Key_ScrollLock},
- {KeyEventBaseImpl::DOM_VK_LEFT, Qt::Key_Left},
- {KeyEventBaseImpl::DOM_VK_RIGHT, Qt::Key_Right},
- {KeyEventBaseImpl::DOM_VK_UP, Qt::Key_Up},
- {KeyEventBaseImpl::DOM_VK_DOWN, Qt::Key_Down},
+ {KeyEventBaseImpl::DOM_VK_BACK_SPACE, TQt::Key_Backspace},
+ {KeyEventBaseImpl::DOM_VK_ENTER, TQt::Key_Enter},
+ {KeyEventBaseImpl::DOM_VK_ENTER, TQt::Key_Return},
+ {KeyEventBaseImpl::DOM_VK_NUM_LOCK, TQt::Key_NumLock},
+ {KeyEventBaseImpl::DOM_VK_RIGHT_ALT, TQt::Key_Alt},
+ {KeyEventBaseImpl::DOM_VK_LEFT_CONTROL, TQt::Key_Control},
+ {KeyEventBaseImpl::DOM_VK_LEFT_SHIFT, TQt::Key_Shift},
+ {KeyEventBaseImpl::DOM_VK_META, TQt::Key_Meta},
+ {KeyEventBaseImpl::DOM_VK_CAPS_LOCK, TQt::Key_CapsLock},
+ {KeyEventBaseImpl::DOM_VK_DELETE, TQt::Key_Delete},
+ {KeyEventBaseImpl::DOM_VK_END, TQt::Key_End},
+ {KeyEventBaseImpl::DOM_VK_ESCAPE, TQt::Key_Escape},
+ {KeyEventBaseImpl::DOM_VK_HOME, TQt::Key_Home},
+ {KeyEventBaseImpl::DOM_VK_PAUSE, TQt::Key_Pause},
+ {KeyEventBaseImpl::DOM_VK_PRINTSCREEN, TQt::Key_Print},
+ {KeyEventBaseImpl::DOM_VK_SCROLL_LOCK, TQt::Key_ScrollLock},
+ {KeyEventBaseImpl::DOM_VK_LEFT, TQt::Key_Left},
+ {KeyEventBaseImpl::DOM_VK_RIGHT, TQt::Key_Right},
+ {KeyEventBaseImpl::DOM_VK_UP, TQt::Key_Up},
+ {KeyEventBaseImpl::DOM_VK_DOWN, TQt::Key_Down},
{KeyEventBaseImpl::DOM_VK_PAGE_DOWN, TQt::Key_Next},
{KeyEventBaseImpl::DOM_VK_PAGE_UP, TQt::Key_Prior},
- {KeyEventBaseImpl::DOM_VK_F1, Qt::Key_F1},
- {KeyEventBaseImpl::DOM_VK_F2, Qt::Key_F2},
- {KeyEventBaseImpl::DOM_VK_F3, Qt::Key_F3},
- {KeyEventBaseImpl::DOM_VK_F4, Qt::Key_F4},
- {KeyEventBaseImpl::DOM_VK_F5, Qt::Key_F5},
- {KeyEventBaseImpl::DOM_VK_F6, Qt::Key_F6},
- {KeyEventBaseImpl::DOM_VK_F7, Qt::Key_F7},
- {KeyEventBaseImpl::DOM_VK_F8, Qt::Key_F8},
- {KeyEventBaseImpl::DOM_VK_F9, Qt::Key_F9},
- {KeyEventBaseImpl::DOM_VK_F10, Qt::Key_F10},
- {KeyEventBaseImpl::DOM_VK_F11, Qt::Key_F11},
- {KeyEventBaseImpl::DOM_VK_F12, Qt::Key_F12},
- {KeyEventBaseImpl::DOM_VK_F13, Qt::Key_F13},
- {KeyEventBaseImpl::DOM_VK_F14, Qt::Key_F14},
- {KeyEventBaseImpl::DOM_VK_F15, Qt::Key_F15},
- {KeyEventBaseImpl::DOM_VK_F16, Qt::Key_F16},
- {KeyEventBaseImpl::DOM_VK_F17, Qt::Key_F17},
- {KeyEventBaseImpl::DOM_VK_F18, Qt::Key_F18},
- {KeyEventBaseImpl::DOM_VK_F19, Qt::Key_F19},
- {KeyEventBaseImpl::DOM_VK_F20, Qt::Key_F20},
- {KeyEventBaseImpl::DOM_VK_F21, Qt::Key_F21},
- {KeyEventBaseImpl::DOM_VK_F22, Qt::Key_F22},
- {KeyEventBaseImpl::DOM_VK_F23, Qt::Key_F23},
- {KeyEventBaseImpl::DOM_VK_F24, Qt::Key_F24},
+ {KeyEventBaseImpl::DOM_VK_F1, TQt::Key_F1},
+ {KeyEventBaseImpl::DOM_VK_F2, TQt::Key_F2},
+ {KeyEventBaseImpl::DOM_VK_F3, TQt::Key_F3},
+ {KeyEventBaseImpl::DOM_VK_F4, TQt::Key_F4},
+ {KeyEventBaseImpl::DOM_VK_F5, TQt::Key_F5},
+ {KeyEventBaseImpl::DOM_VK_F6, TQt::Key_F6},
+ {KeyEventBaseImpl::DOM_VK_F7, TQt::Key_F7},
+ {KeyEventBaseImpl::DOM_VK_F8, TQt::Key_F8},
+ {KeyEventBaseImpl::DOM_VK_F9, TQt::Key_F9},
+ {KeyEventBaseImpl::DOM_VK_F10, TQt::Key_F10},
+ {KeyEventBaseImpl::DOM_VK_F11, TQt::Key_F11},
+ {KeyEventBaseImpl::DOM_VK_F12, TQt::Key_F12},
+ {KeyEventBaseImpl::DOM_VK_F13, TQt::Key_F13},
+ {KeyEventBaseImpl::DOM_VK_F14, TQt::Key_F14},
+ {KeyEventBaseImpl::DOM_VK_F15, TQt::Key_F15},
+ {KeyEventBaseImpl::DOM_VK_F16, TQt::Key_F16},
+ {KeyEventBaseImpl::DOM_VK_F17, TQt::Key_F17},
+ {KeyEventBaseImpl::DOM_VK_F18, TQt::Key_F18},
+ {KeyEventBaseImpl::DOM_VK_F19, TQt::Key_F19},
+ {KeyEventBaseImpl::DOM_VK_F20, TQt::Key_F20},
+ {KeyEventBaseImpl::DOM_VK_F21, TQt::Key_F21},
+ {KeyEventBaseImpl::DOM_VK_F22, TQt::Key_F22},
+ {KeyEventBaseImpl::DOM_VK_F23, TQt::Key_F23},
+ {KeyEventBaseImpl::DOM_VK_F24, TQt::Key_F24},
{0, 0}
};
@@ -657,8 +657,8 @@ void KeyEventBaseImpl::buildQKeyEvent() const
}
//Neuter F keys as well.
- if (key >= Qt::Key_F1 && key <= Qt::Key_F35)
- key = Qt::Key_ScrollLock;
+ if (key >= TQt::Key_F1 && key <= TQt::Key_F35)
+ key = TQt::Key_ScrollLock;
m_keyEvent = new TQKeyEvent(id() == KEYUP_EVENT ? TQEvent::KeyRelease : TQEvent::KeyPress,
key, ascii, modifiers, text);
diff --git a/tdehtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp
index b896d05a3..245585d74 100644
--- a/tdehtml/xml/dom_docimpl.cpp
+++ b/tdehtml/xml/dom_docimpl.cpp
@@ -299,7 +299,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *
m_paintDeviceMetrics = 0;
m_paintDevice = 0;
m_decoderMibEnum = 0;
- m_textColor = Qt::black;
+ m_textColor = TQt::black;
m_view = v;
m_renderArena.reset();
@@ -308,7 +308,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *
if ( v ) {
m_docLoader = new DocLoader(v->part(), this );
- setPaintDevice( TQT_TQPAINTDEVICE(m_view) );
+ setPaintDevice( m_view );
}
else
m_docLoader = new DocLoader( 0, this );
@@ -1231,7 +1231,7 @@ void DocumentImpl::attach()
assert(!attached());
if ( m_view )
- setPaintDevice( TQT_TQPAINTDEVICE(m_view) );
+ setPaintDevice( m_view );
if (!m_renderArena)
m_renderArena.reset(new RenderArena());
@@ -1334,7 +1334,7 @@ void DocumentImpl::open( bool clearEventListeners )
m_tokenizer = createTokenizer();
m_decoderMibEnum = 0;
- connect(m_tokenizer,TQT_SIGNAL(finishedParsing()),this,TQT_SIGNAL(finishedParsing()));
+ connect(m_tokenizer,TQ_SIGNAL(finishedParsing()),this,TQ_SIGNAL(finishedParsing()));
m_tokenizer->begin();
}
diff --git a/tdehtml/xml/dom_docimpl.h b/tdehtml/xml/dom_docimpl.h
index bcdc9500c..fc78a89b3 100644
--- a/tdehtml/xml/dom_docimpl.h
+++ b/tdehtml/xml/dom_docimpl.h
@@ -184,7 +184,7 @@ private:
*/
class DocumentImpl : public TQObject, private tdehtml::CachedObjectClient, public NodeBaseImpl
{
- Q_OBJECT
+ TQ_OBJECT
public:
DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v);
~DocumentImpl();
diff --git a/tdehtml/xml/dom_nodeimpl.cpp b/tdehtml/xml/dom_nodeimpl.cpp
index 7e2e1bc5f..c8525fbcc 100644
--- a/tdehtml/xml/dom_nodeimpl.cpp
+++ b/tdehtml/xml/dom_nodeimpl.cpp
@@ -47,7 +47,7 @@
// from tdehtml_caret_p.h
namespace tdehtml {
-void /*KDE_NO_EXPORT*/ mapDOMPosToRenderPos(DOM::NodeImpl *node, long offset,
+void /*TDE_NO_EXPORT*/ mapDOMPosToRenderPos(DOM::NodeImpl *node, long offset,
tdehtml::RenderObject *&r, long &r_ofs, bool &outside, bool &outsideEnd);
}
@@ -508,13 +508,13 @@ void NodeImpl::dispatchMouseEvent(TQMouseEvent *_mouse, int overrideId, int over
int button = -1;
switch (_mouse->button()) {
- case Qt::LeftButton:
+ case TQt::LeftButton:
button = 0;
break;
- case Qt::MidButton:
+ case TQt::MidButton:
button = 1;
break;
- case Qt::RightButton:
+ case TQt::RightButton:
button = 2;
break;
default:
@@ -1659,7 +1659,7 @@ NodeImpl *NodeListImpl::item( unsigned long index ) const
bool usedCache = false;
if (m_cache->current.node) {
//Compute distance from the requested index to the cache node
- long cacheDist = QABS(long(index) - long(m_cache->position));
+ long cacheDist = TQABS(long(index) - long(m_cache->position));
if (cacheDist < (long)index) { //Closer to the cached position
usedCache = true;
diff --git a/tdehtml/xml/dom_stringimpl.h b/tdehtml/xml/dom_stringimpl.h
index c8f5ce7d8..09c746336 100644
--- a/tdehtml/xml/dom_stringimpl.h
+++ b/tdehtml/xml/dom_stringimpl.h
@@ -81,7 +81,7 @@ public:
const TQChar &operator [] (int pos) { return s[pos]; }
bool containsOnlyWhitespace() const;
- // ignores trailing garbage, unlike QString
+ // ignores trailing garbage, unlike TQString
int toInt(bool* ok = 0) const;
tdehtml::Length* toLengthArray(int& len) const;
diff --git a/tdehtml/xml/xml_tokenizer.h b/tdehtml/xml/xml_tokenizer.h
index f89e5eb2f..d6b4dbe02 100644
--- a/tdehtml/xml/xml_tokenizer.h
+++ b/tdehtml/xml/xml_tokenizer.h
@@ -118,7 +118,7 @@ private:
class Tokenizer : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
virtual void begin() = 0;
// script output must be prepended, while new data
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 13:46:57 +0000