summaryrefslogtreecommitdiffstats
path: root/tdehtml/html
diff options
context:
space:
mode:
Diffstat (limited to 'tdehtml/html')
-rw-r--r--tdehtml/html/Platform.h15
-rw-r--r--tdehtml/html/dtd.cpp2
-rw-r--r--tdehtml/html/html_baseimpl.cpp4
-rw-r--r--tdehtml/html/html_documentimpl.cpp18
-rw-r--r--tdehtml/html/html_documentimpl.h2
-rw-r--r--tdehtml/html/html_formimpl.cpp26
-rw-r--r--tdehtml/html/html_inlineimpl.cpp8
-rw-r--r--tdehtml/html/html_miscimpl.cpp1
-rw-r--r--tdehtml/html/html_objectimpl.cpp6
-rw-r--r--tdehtml/html/html_objectimpl.h2
10 files changed, 32 insertions, 52 deletions
diff --git a/tdehtml/html/Platform.h b/tdehtml/html/Platform.h
index f47d28bb2..69c354915 100644
--- a/tdehtml/html/Platform.h
+++ b/tdehtml/html/Platform.h
@@ -149,11 +149,6 @@
/* Compiler */
-/* COMPILER(CWP) */
-#if defined(__MWERKS__)
-#define WTF_COMPILER_CWP 1
-#endif
-
/* COMPILER(MSVC) */
#if defined(_MSC_VER)
#define WTF_COMPILER_MSVC 1
@@ -169,12 +164,6 @@
#define WTF_COMPILER_SUNPRO 1
#endif
-/* COMPILER(BORLAND) */
-/* not really fully supported - is this relevant any more? */
-#if defined(__BORLANDC__)
-#define WTF_COMPILER_BORLAND 1
-#endif
-
/* COMPILER(CYGWIN) */
/* not really fully supported - is this relevant any more? */
#if defined(__CYGWIN__)
@@ -193,9 +182,7 @@
/* for Unicode, KDE uses Qt, everything else uses ICU */
#if PLATFORM(KDE) || PLATFORM(QT)
-#define WTF_USE_QT4_UNICODE 1
-#elif PLATFORM(SYMBIAN)
-#define WTF_USE_SYMBIAN_UNICODE 1
+#define WTF_USE_QT3_UNICODE 1
#else
#define WTF_USE_ICU_UNICODE 1
#endif
diff --git a/tdehtml/html/dtd.cpp b/tdehtml/html/dtd.cpp
index d3ea86d51..c2285e112 100644
--- a/tdehtml/html/dtd.cpp
+++ b/tdehtml/html/dtd.cpp
@@ -45,7 +45,7 @@ using namespace DOM;
// 9 body frameset
// 10 html
-const unsigned short KDE_NO_EXPORT DOM::tagPriority[] = {
+const unsigned short TDE_NO_EXPORT DOM::tagPriority[] = {
0, // 0
1, // ID_A == 1
1, // ID_ABBR
diff --git a/tdehtml/html/html_baseimpl.cpp b/tdehtml/html/html_baseimpl.cpp
index 16ca7a23b..e8150a387 100644
--- a/tdehtml/html/html_baseimpl.cpp
+++ b/tdehtml/html/html_baseimpl.cpp
@@ -414,7 +414,7 @@ DocumentImpl* HTMLFrameElementImpl::contentDocument() const
RenderPart* render = static_cast<RenderPart*>( m_render );
- if(render->widget() && ::tqqt_cast<TDEHTMLView*>( render->widget()) )
+ if(render->widget() && ::tqt_cast<TDEHTMLView*>( render->widget()) )
return static_cast<TDEHTMLView*>( render->widget() )->part()->xmlDocImpl();
return 0;
@@ -426,7 +426,7 @@ TDEHTMLPart* HTMLFrameElementImpl::contentPart() const
RenderPart* render = static_cast<RenderPart*>( m_render );
- if(render->widget() && ::tqqt_cast<TDEHTMLView*>( render->widget()) )
+ if(render->widget() && ::tqt_cast<TDEHTMLView*>( render->widget()) )
return static_cast<TDEHTMLView*>( render->widget() )->part();
return 0;
diff --git a/tdehtml/html/html_documentimpl.cpp b/tdehtml/html/html_documentimpl.cpp
index 52ada7a7b..346af3d08 100644
--- a/tdehtml/html/html_documentimpl.cpp
+++ b/tdehtml/html/html_documentimpl.cpp
@@ -78,13 +78,13 @@ HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, TDEHT
m_doAutoFill = false;
/* dynamic history stuff to be fixed later (pfeiffer)
- connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( removed( const TQString& )),
- TQT_SLOT( slotHistoryChanged() ));
+ connect( TDEHTMLFactory::vLinks(), TQ_SIGNAL( removed( const TQString& )),
+ TQ_SLOT( slotHistoryChanged() ));
*/
- connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( inserted( const TQString& ) ),
- TQT_SLOT( slotHistoryChanged() ));
- connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( cleared()),
- TQT_SLOT( slotHistoryChanged() ));
+ connect( TDEHTMLFactory::vLinks(), TQ_SIGNAL( inserted( const TQString& ) ),
+ TQ_SLOT( slotHistoryChanged() ));
+ connect( TDEHTMLFactory::vLinks(), TQ_SIGNAL( cleared()),
+ TQ_SLOT( slotHistoryChanged() ));
}
HTMLDocumentImpl::~HTMLDocumentImpl()
@@ -117,7 +117,7 @@ DOMString HTMLDocumentImpl::cookie() const
TQByteArray params, reply;
TQDataStream stream(params, IO_WriteOnly);
stream << URL().url() << windowId;
- if (!kapp->dcopClient()->call("kcookiejar", "kcookiejar",
+ if (!tdeApp->dcopClient()->call("kcookiejar", "kcookiejar",
"findDOMCookies(TQString,long int)", params,
replyType, reply))
{
@@ -151,12 +151,12 @@ void HTMLDocumentImpl::setCookie( const DOMString & value )
fake_header.append(value.string().latin1());
fake_header.append("\n");
stream << URL().url() << fake_header << windowId;
- if (!kapp->dcopClient()->send("kcookiejar", "kcookiejar",
+ if (!tdeApp->dcopClient()->send("kcookiejar", "kcookiejar",
"addCookies(TQString,TQCString,long int)", params))
{
// Maybe it wasn't running (e.g. we're opening local html files)
TDEApplication::startServiceByDesktopName( "kcookiejar");
- if (!kapp->dcopClient()->send("kcookiejar", "kcookiejar",
+ if (!tdeApp->dcopClient()->send("kcookiejar", "kcookiejar",
"addCookies(TQString,TQCString,long int)", params))
kdWarning(6010) << "Can't communicate with cookiejar!" << endl;
}
diff --git a/tdehtml/html/html_documentimpl.h b/tdehtml/html/html_documentimpl.h
index 92f163076..f7191f31a 100644
--- a/tdehtml/html/html_documentimpl.h
+++ b/tdehtml/html/html_documentimpl.h
@@ -43,7 +43,7 @@ namespace DOM {
class HTMLDocumentImpl : public DOM::DocumentImpl
{
- Q_OBJECT
+ TQ_OBJECT
public:
HTMLDocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v = 0);
~HTMLDocumentImpl();
diff --git a/tdehtml/html/html_formimpl.cpp b/tdehtml/html/html_formimpl.cpp
index 5dc44ad04..f87260ffe 100644
--- a/tdehtml/html/html_formimpl.cpp
+++ b/tdehtml/html/html_formimpl.cpp
@@ -957,14 +957,14 @@ bool HTMLGenericFormElementImpl::isFocusable() const
return false;
TQWidget* widget = static_cast<RenderWidget*>(m_render)->widget();
- return widget && widget->focusPolicy() >= TQ_TabFocus;
+ return widget && widget->focusPolicy() >= TQWidget::TabFocus;
}
class FocusHandleWidget : public TQWidget
{
public:
void focusNextPrev(bool n) {
- if (!focusNextPrevChild(n) && inherits(TQTEXTEDIT_OBJECT_NAME_STRING))
+ if (!focusNextPrevChild(n) && inherits("TQTextEdit"))
TQWidget::focusNextPrevChild(n);
}
};
@@ -1018,19 +1018,13 @@ void HTMLGenericFormElementImpl::defaultEventHandler(EventImpl *evt)
// handle tabbing out, either from a single or repeated key event.
if ( evt->id() == EventImpl::KEYPRESS_EVENT && evt->isKeyRelatedEvent() ) {
TQKeyEvent* const k = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent();
- if ( k && (k->key() == Qt::Key_Tab || k->key() == TQt::Key_BackTab) ) {
+ if ( k && (k->key() == TQt::Key_Tab || k->key() == TQt::Key_BackTab) ) {
TQWidget* const widget = static_cast<RenderWidget*>(m_render)->widget();
-#ifdef USE_QT4
+ TQFocusEvent::setReason( k->key() == TQt::Key_Tab ? TQFocusEvent::Tab : TQFocusEvent::Backtab );
if (widget)
static_cast<FocusHandleWidget *>(widget)
- ->focusNextPrev(k->key() == Qt::Key_Tab);
-#else // USE_QT4
- TQFocusEvent::setReason( k->key() == Qt::Key_Tab ? TQFocusEvent::Tab : TQFocusEvent::Backtab );
- if (widget)
- static_cast<FocusHandleWidget *>(widget)
- ->focusNextPrev(k->key() == Qt::Key_Tab);
+ ->focusNextPrev(k->key() == TQt::Key_Tab);
TQFocusEvent::resetReason();
-#endif // USE_QT4
evt->setDefaultHandled();
}
}
@@ -1125,7 +1119,7 @@ void HTMLButtonElementImpl::defaultEventHandler(EventImpl *evt)
bool act = (evt->id() == EventImpl::DOMACTIVATE_EVENT);
if (!act && evt->id()==EventImpl::KEYUP_EVENT && evt->isKeyRelatedEvent()) {
TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent();
- if (ke && active() && (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Space))
+ if (ke && active() && (ke->key() == TQt::Key_Return || ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Space))
act = true;
}
if (act)
@@ -1149,7 +1143,7 @@ void HTMLButtonElementImpl::activate()
void HTMLButtonElementImpl::click()
{
- TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),Qt::LeftButton, 0);
+ TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),TQt::LeftButton, 0);
dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1);
}
@@ -1365,7 +1359,7 @@ void HTMLInputElementImpl::select( )
void HTMLInputElementImpl::click()
{
- TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),Qt::LeftButton, 0);
+ TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),TQt::LeftButton, 0);
dispatchMouseEvent(&me,0, 1);
dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1);
}
@@ -1807,7 +1801,7 @@ void HTMLInputElementImpl::defaultEventHandler(EventImpl *evt)
bool act = (evt->id() == EventImpl::DOMACTIVATE_EVENT);
if (!act && evt->id() == EventImpl::KEYUP_EVENT && evt->isKeyRelatedEvent()) {
TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent();
- if (ke && active() && (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Space))
+ if (ke && active() && (ke->key() == TQt::Key_Return || ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Space))
act = true;
}
if (act)
@@ -1923,7 +1917,7 @@ void HTMLLabelElementImpl::defaultEventHandler(EventImpl *evt)
else if ( evt->isKeyRelatedEvent() && ( evt->id() == EventImpl::KEYUP_EVENT ||
evt->id() == EventImpl::KEYPRESS_EVENT ) ) {
TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent();
- if (ke && active() && (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Space))
+ if (ke && active() && (ke->key() == TQt::Key_Return || ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Space))
act = true;
}
diff --git a/tdehtml/html/html_inlineimpl.cpp b/tdehtml/html/html_inlineimpl.cpp
index f403a2385..1416ca3f4 100644
--- a/tdehtml/html/html_inlineimpl.cpp
+++ b/tdehtml/html/html_inlineimpl.cpp
@@ -132,11 +132,11 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
state |= TQt::MetaButton;
if ( e->button() == 0 )
- button = Qt::LeftButton;
+ button = TQt::LeftButton;
else if ( e->button() == 1 )
- button = Qt::MidButton;
+ button = TQt::MidButton;
else if ( e->button() == 2 )
- button = Qt::RightButton;
+ button = TQt::RightButton;
}
else if ( k )
{
@@ -166,7 +166,7 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
void HTMLAnchorElementImpl::click()
{
- TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),Qt::LeftButton, 0);
+ TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),TQt::LeftButton, 0);
dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1);
}
diff --git a/tdehtml/html/html_miscimpl.cpp b/tdehtml/html/html_miscimpl.cpp
index 58804bff5..5b8d4ef4b 100644
--- a/tdehtml/html/html_miscimpl.cpp
+++ b/tdehtml/html/html_miscimpl.cpp
@@ -64,7 +64,6 @@ struct CollectionCache: public NodeListImpl::Cache
virtual void clear(DocumentImpl* doc)
{
Cache::clear(doc);
- //qDeletaAll here in Qt4
nameCache.clear();
}
};
diff --git a/tdehtml/html/html_objectimpl.cpp b/tdehtml/html/html_objectimpl.cpp
index f2cf8c1db..8c530af61 100644
--- a/tdehtml/html/html_objectimpl.cpp
+++ b/tdehtml/html/html_objectimpl.cpp
@@ -136,7 +136,7 @@ void HTMLObjectBaseElementImpl::recalcStyle( StyleChange ch )
void HTMLObjectBaseElementImpl::renderAlternative()
{
if ( m_renderAlternative ) return;
- TQTimer::singleShot( 0, this, TQT_SLOT( slotRenderAlternative() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotRenderAlternative() ) );
}
void HTMLObjectBaseElementImpl::slotRenderAlternative()
@@ -267,7 +267,7 @@ void HTMLAppletElementImpl::attach()
{
TDEHTMLView* w = getDocument()->view();
-#ifndef Q_WS_QWS // FIXME?
+#ifndef TQ_WS_QWS // FIXME?
DOMString codeBase = getAttribute( ATTR_CODEBASE );
DOMString code = getAttribute( ATTR_CODE );
if ( !codeBase.isEmpty() )
@@ -422,7 +422,7 @@ DocumentImpl* HTMLObjectElementImpl::contentDocument() const
if ( !m_render ) return 0;
if ( !m_render->isWidget() ) return 0;
TQWidget* widget = static_cast<RenderWidget*>( m_render )->widget();
- if( widget && ::tqqt_cast<TDEHTMLView*>( widget ) )
+ if( widget && ::tqt_cast<TDEHTMLView*>( widget ) )
return static_cast<TDEHTMLView*>( widget )->part()->xmlDocImpl();
return 0;
}
diff --git a/tdehtml/html/html_objectimpl.h b/tdehtml/html/html_objectimpl.h
index d10e66356..2818330e0 100644
--- a/tdehtml/html/html_objectimpl.h
+++ b/tdehtml/html/html_objectimpl.h
@@ -38,7 +38,7 @@ class DOMStringImpl;
class HTMLObjectBaseElementImpl : public TQObject, public HTMLElementImpl
{
- Q_OBJECT
+ TQ_OBJECT
public:
HTMLObjectBaseElementImpl(DocumentImpl *doc);
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-17 03:35:56 +0000