summaryrefslogtreecommitdiffstats
path: root/khtml/xml
diff options
context:
space:
mode:
Diffstat (limited to 'khtml/xml')
-rw-r--r--khtml/xml/dom2_eventsimpl.cpp16
-rw-r--r--khtml/xml/dom2_eventsimpl.h8
-rw-r--r--khtml/xml/dom_docimpl.cpp10
-rw-r--r--khtml/xml/dom_nodeimpl.cpp8
-rw-r--r--khtml/xml/dom_restyler.cpp6
-rw-r--r--khtml/xml/dom_stringimpl.cpp6
-rw-r--r--khtml/xml/xml_tokenizer.cpp2
7 files changed, 28 insertions, 28 deletions
diff --git a/khtml/xml/dom2_eventsimpl.cpp b/khtml/xml/dom2_eventsimpl.cpp
index c648ed63e..1c13ab5ce 100644
--- a/khtml/xml/dom2_eventsimpl.cpp
+++ b/khtml/xml/dom2_eventsimpl.cpp
@@ -546,8 +546,8 @@ IDTranslator<unsigned, unsigned, unsigned>::Info virtKeyToQtKeyTable[] =
{KeyEventBaseImpl::DOM_VK_RIGHT, Qt::Key_Right},
{KeyEventBaseImpl::DOM_VK_UP, Qt::Key_Up},
{KeyEventBaseImpl::DOM_VK_DOWN, Qt::Key_Down},
- {KeyEventBaseImpl::DOM_VK_PAGE_DOWN, Qt::Key_Next},
- {KeyEventBaseImpl::DOM_VK_PAGE_UP, Qt::Key_Prior},
+ {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},
@@ -593,7 +593,7 @@ KeyEventBaseImpl::KeyEventBaseImpl(EventId id, bool canBubbleArg, bool cancelabl
// m_keyVal should contain the tqunicode value
// of the pressed key if available.
if (m_virtKeyVal == DOM_VK_UNDEFINED && !key->text().isEmpty())
- m_keyVal = key->text().tqunicode()[0];
+ m_keyVal = TQString(key->text()).tqunicode()[0];
// key->state returns enum ButtonState, which is ShiftButton, ControlButton and AltButton or'ed together.
m_modifier = key->state();
@@ -723,10 +723,10 @@ MAKE_TRANSLATOR(keyIdentifiersToVirtKeys, TQCString, unsigned, const char*, keyI
/** These are the modifiers we currently support */
static const IDTranslator<TQCString, unsigned, const char*>::Info keyModifiersToCodeTable[] = {
- {"Alt", Qt::AltButton},
- {"Control", Qt::ControlButton},
- {"Shift", Qt::ShiftButton},
- {"Meta", Qt::MetaButton},
+ {"Alt", TQt::AltButton},
+ {"Control", TQt::ControlButton},
+ {"Shift", TQt::ShiftButton},
+ {"Meta", TQt::MetaButton},
{0, 0}
};
@@ -842,7 +842,7 @@ bool TextEventImpl::isTextInputEvent() const
TextEventImpl::TextEventImpl(TQKeyEvent* key, DOM::AbstractViewImpl* view) :
KeyEventBaseImpl(KEYPRESS_EVENT, true, true, view, key)
{
- m_outputString = key->text();
+ m_outputString = TQString(key->text());
}
void TextEventImpl::initTextEvent(const DOMString &typeArg,
diff --git a/khtml/xml/dom2_eventsimpl.h b/khtml/xml/dom2_eventsimpl.h
index 1e7a37a16..fab2225e5 100644
--- a/khtml/xml/dom2_eventsimpl.h
+++ b/khtml/xml/dom2_eventsimpl.h
@@ -317,10 +317,10 @@ public:
unsigned long virtKeyVal,
unsigned long modifiers);
- bool ctrlKey() const { return m_modifier & Qt::ControlButton; }
- bool shiftKey() const { return m_modifier & Qt::ShiftButton; }
- bool altKey() const { return m_modifier & Qt::AltButton; }
- bool metaKey() const { return m_modifier & Qt::MetaButton; }
+ bool ctrlKey() const { return m_modifier & TQt::ControlButton; }
+ bool shiftKey() const { return m_modifier & TQt::ShiftButton; }
+ bool altKey() const { return m_modifier & TQt::AltButton; }
+ bool metaKey() const { return m_modifier & TQt::MetaButton; }
bool inputGenerated() const { return m_virtKeyVal == 0; }
unsigned long keyVal() const { return m_keyVal; }
diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp
index 347adb510..9de636704 100644
--- a/khtml/xml/dom_docimpl.cpp
+++ b/khtml/xml/dom_docimpl.cpp
@@ -308,7 +308,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
if ( v ) {
m_docLoader = new DocLoader(v->part(), this );
- setPaintDevice( m_view );
+ setPaintDevice( TQT_TQPAINTDEVICE(m_view) );
}
else
m_docLoader = new DocLoader( 0, this );
@@ -1231,7 +1231,7 @@ void DocumentImpl::attach()
assert(!attached());
if ( m_view )
- setPaintDevice( m_view );
+ setPaintDevice( TQT_TQPAINTDEVICE(m_view) );
if (!m_renderArena)
m_renderArena.reset(new RenderArena());
@@ -2143,7 +2143,7 @@ void DocumentImpl::recalcStyleSelector()
title = title.replace('&', "&&");
- if ( !m_availableSheets.contains( title ) )
+ if ( !m_availableSheets.tqcontains( title ) )
m_availableSheets.append( title );
}
}
@@ -2170,7 +2170,7 @@ void DocumentImpl::recalcStyleSelector()
// or we found the sheet we selected
if (sheetUsed.isEmpty() ||
(!canResetSheet && tokenizer()) ||
- m_availableSheets.contains(sheetUsed)) {
+ m_availableSheets.tqcontains(sheetUsed)) {
break;
}
@@ -2710,7 +2710,7 @@ NodeListImpl::Cache* DOM::DocumentImpl::acquireCachedNodeListInfo(
if (type != NodeListImpl::UNCACHEABLE) {
newInfo->ref(); //Add the cache's reference
- m_nodeListCache.replace(key.hash(), newInfo);
+ m_nodeListCache.tqreplace(key.hash(), newInfo);
}
return newInfo;
diff --git a/khtml/xml/dom_nodeimpl.cpp b/khtml/xml/dom_nodeimpl.cpp
index f38be728a..4da9b5c1f 100644
--- a/khtml/xml/dom_nodeimpl.cpp
+++ b/khtml/xml/dom_nodeimpl.cpp
@@ -520,9 +520,9 @@ void NodeImpl::dispatchMouseEvent(TQMouseEvent *_mouse, int overrideId, int over
default:
break;
}
- bool ctrlKey = (_mouse->state() & Qt::ControlButton);
- bool altKey = (_mouse->state() & Qt::AltButton);
- bool shiftKey = (_mouse->state() & Qt::ShiftButton);
+ bool ctrlKey = (_mouse->state() & TQt::ControlButton);
+ bool altKey = (_mouse->state() & TQt::AltButton);
+ bool shiftKey = (_mouse->state() & TQt::ShiftButton);
bool metaKey = false; // ### qt support?
EventImpl* const evt = new MouseEventImpl(evtId,true,cancelable,getDocument()->defaultView(),
@@ -2060,7 +2060,7 @@ bool RegisteredListenerList::stillContainsListener(const RegisteredEventListener
{
if (!listeners)
return false;
- return listeners->find(listener) != listeners->end();
+ return listeners->tqfind(listener) != listeners->end();
}
RegisteredListenerList::~RegisteredListenerList() {
diff --git a/khtml/xml/dom_restyler.cpp b/khtml/xml/dom_restyler.cpp
index 699a5ab59..0050c4a03 100644
--- a/khtml/xml/dom_restyler.cpp
+++ b/khtml/xml/dom_restyler.cpp
@@ -45,7 +45,7 @@ void DynamicDomRestyler::removeDependency(ElementImpl* subject, ElementImpl* dep
void DynamicDomRestyler::removeDependencies(ElementImpl* subject, StructuralDependencyType type)
{
- KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.tqfind(subject);
+ KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.find(subject);
if (!my_dependencies) return;
@@ -60,7 +60,7 @@ void DynamicDomRestyler::removeDependencies(ElementImpl* subject, StructuralDepe
void DynamicDomRestyler::resetDependencies(ElementImpl* subject)
{
- KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.tqfind(subject);
+ KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.find(subject);
if (!my_dependencies) return;
@@ -78,7 +78,7 @@ void DynamicDomRestyler::resetDependencies(ElementImpl* subject)
void DynamicDomRestyler::restyleDepedent(ElementImpl* dependency, StructuralDependencyType type)
{
assert(type < LastStructuralDependency);
- KMultiMap<ElementImpl>::List* dep = dependency_map[type].tqfind(dependency);
+ KMultiMap<ElementImpl>::List* dep = dependency_map[type].find(dependency);
if (!dep) return;
diff --git a/khtml/xml/dom_stringimpl.cpp b/khtml/xml/dom_stringimpl.cpp
index d4e568408..3f904ae76 100644
--- a/khtml/xml/dom_stringimpl.cpp
+++ b/khtml/xml/dom_stringimpl.cpp
@@ -281,12 +281,12 @@ khtml::Length* DOMStringImpl::toCoordsArray(int& len) const
TQString str(s, l);
for(unsigned int i=0; i < l; i++) {
TQChar cc = s[i];
- if (cc > '9' || (cc < '0' && cc != '-' && cc != '*' && cc != '.'))
+ if (cc > TQChar('9') || (cc < TQChar('0') && cc != '-' && cc != '*' && cc != '.'))
str[i] = ' ';
}
str = str.simplifyWhiteSpace();
- len = str.contains(' ') + 1;
+ len = str.tqcontains(' ') + 1;
khtml::Length* r = new khtml::Length[len];
int i = 0;
@@ -307,7 +307,7 @@ khtml::Length* DOMStringImpl::toLengthArray(int& len) const
TQString str(s, l);
str = str.simplifyWhiteSpace();
- len = str.contains(',') + 1;
+ len = str.tqcontains(',') + 1;
// If we have no commas, we have no array.
if( len == 1 )
diff --git a/khtml/xml/xml_tokenizer.cpp b/khtml/xml/xml_tokenizer.cpp
index a0f3f665c..37fc36f02 100644
--- a/khtml/xml/xml_tokenizer.cpp
+++ b/khtml/xml/xml_tokenizer.cpp
@@ -156,7 +156,7 @@ void XMLHandler::fixUpNSURI(TQString& uri, const TQString& qname)
TQXmlNamespaceSupport ns;
TQString localName, prefix;
ns.splitName(qname, prefix, localName);
- if (namespaceInfo.contains(prefix)) {
+ if (namespaceInfo.tqcontains(prefix)) {
uri = namespaceInfo[prefix].top();
}
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-26 15:55:19 +0000