TQt4 port kdewebdev

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237029 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 32 insertions, 32 deletions

diff --git a/quanta/parts/kafka/kafkahtmlpart.cpp b/quanta/parts/kafka/kafkahtmlpart.cpp
index bcbc7611..4dfe3f7d 100644
--- a/quanta/parts/kafka/kafkahtmlpart.cpp
+++ b/quanta/parts/kafka/kafkahtmlpart.cpp
@@ -83,9 +83,9 @@ public:
 #endif
 };
 
-KafkaWidget::KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument *part,
+KafkaWidget::KafkaWidget(TQWidget *tqparent, TQWidget *widgetParent, KafkaDocument *part,
                          const char *name)
-        : KHTMLPart(widgetParent, name, parent, name),
+        : KHTMLPart(widgetParent, name, TQT_TQOBJECT(tqparent), name),
         w(part)
 {
     m_contextPopupMenu = new TQPopupMenu();
@@ -205,10 +205,10 @@ void KafkaWidget::insertText(DOM::Node node, const TQString &text, int position)
     else if(position == 0)
     {
         DOM::Text textNode = document().createTextNode(text);
-        DOM::Node parent = node.parentNode();
-//FIXME: Andras: safety checks, as parent  can be null. Maybe it just hides the error...
-        if (!parent.isNull())
-          parent.insertBefore(textNode, node);
+        DOM::Node tqparent = node.parentNode();
+//FIXME: Andras: safety checks, as tqparent  can be null. Maybe it just hides the error...
+        if (!tqparent.isNull())
+          tqparent.insertBefore(textNode, node);
         else
           node.appendChild(textNode);
         m_currentNode = textNode;
@@ -223,15 +223,15 @@ void KafkaWidget::insertText(DOM::Node node, const TQString &text, int position)
     else if(position == 3 || (position == 1 && (focus == kNodeAttrs::singleNodeAndItself)))
     {
         DOM::Text textNode = document().createTextNode(text);
-        DOM::Node parent = node.parentNode();
-//FIXME: Andras: safety checks, as parent and node.nextSibling can be null. Maybe it just hides the error...
+        DOM::Node tqparent = node.parentNode();
+//FIXME: Andras: safety checks, as tqparent and node.nextSibling can be null. Maybe it just hides the error...
 //Also it seems that position can be 3 and node is "body". See bug 112733.
-        if (node.nodeName().string().lower() != "body" && !parent.isNull())
+        if (node.nodeName().string().lower() != "body" && !tqparent.isNull())
         {
           if (!node.nextSibling().isNull())
-            parent.insertBefore(textNode, node.nextSibling());
+            tqparent.insertBefore(textNode, node.nextSibling());
           else
-            parent.insertBefore(textNode, node);
+            tqparent.insertBefore(textNode, node);
         }
         else
           node.appendChild(textNode);
@@ -308,7 +308,7 @@ void KafkaWidget::keyReturn(bool specialPressed)
     //WARNING : HTML-specific function
     DOM::Node text, text2, pDomNode, pDomNode2, brDomNode, brDomNode2, tmp, PNode, emptyText;
     int focus;
-    //	QTag *qTag;
+    //	TQTag *qTag;
     bool childOfP;
     //kNodeAttrs *props;
 
@@ -506,7 +506,7 @@ bool KafkaWidget::eventFilter(TQObject *, TQEvent *event)
     
     if(event->type() == TQEvent::KeyPress)
     {
-        TQKeyEvent *keyevent = static_cast<TQKeyEvent *>(event);
+        TQKeyEvent *keyevent = TQT_TQKEYEVENT(event);
 
         //Create a new NodeModifsSet where the changes will be logged.
         m_modifs = new NodeModifsSet();
@@ -655,7 +655,7 @@ bool KafkaWidget::eventFilter(TQObject *, TQEvent *event)
                 kdDebug(25001) << "KafkaWidget::eventFilter() Text - " <<
                 keyevent->text() << endl;
 #endif
-                //if(( keyevent->state() & Qt::ShiftButton) || ( keyevent->state() == Qt::NoButton))
+                //if(( keyevent->state() & TQt::ShiftButton) || ( keyevent->state() == Qt::NoButton))
                 if( keyevent->text().length() &&
                         ( !( keyevent->state() & ControlButton ) &&
                           !( keyevent->state() & AltButton ) &&
@@ -947,7 +947,7 @@ void KafkaWidget::keyDelete()
 #endif
 
                 _nodeParent = _nodeNext.parentNode();
-                //If this empty text contains the cursor, change node to its parent.
+                //If this empty text contains the cursor, change node to its tqparent.
                 if(_nodeNext == _node && _nodeParent.firstChild() == _nodeNext &&
                         _nodeNext.nextSibling().isNull())
                 {
@@ -964,7 +964,7 @@ void KafkaWidget::keyDelete()
         //Else if the current Node is a BLOCK which can be entered/leaved e.g. H1
         else if(attrs->chCurFoc() == kNodeAttrs::blockNode)
         {
-            //First look if it is one of _node's parent
+            //First look if it is one of _node's tqparent
             isParent = false;
             temp = _node;
             while(!temp.isNull())
@@ -1034,12 +1034,12 @@ void KafkaWidget::keyDelete()
             }
             else if(isParent && !nextIsBlock)
             {
-                if(kafkaCommon::parentSupports(toplevelBlock, startNode2, endNode2,
+                if(kafkaCommon::tqparentSupports(toplevelBlock, startNode2, endNode2,
                                                w->getCurrentDoc()->defaultDTD()))
                     moveDomNodes(toplevelBlock, startNode2, endNode2, DOM::Node(), false);
                 else
                 {
-                    if(kafkaCommon::parentSupports(commonParent, startNode, endNode,
+                    if(kafkaCommon::tqparentSupports(commonParent, startNode, endNode,
                                                    w->getCurrentDoc()->defaultDTD()))
                         moveDomNodes(commonParent, startNode, endNode, childOfCommonParent2,
                                      true);
@@ -1051,13 +1051,13 @@ void KafkaWidget::keyDelete()
             }
             else if(isParent && nextIsBlock)
             {
-                if(kafkaCommon::parentSupports(toplevelBlock, startNode2, endNode2,
+                if(kafkaCommon::tqparentSupports(toplevelBlock, startNode2, endNode2,
                                                w->getCurrentDoc()->defaultDTD()))
                     moveDomNodes(toplevelBlock, startNode2, endNode2, DOM::Node(), false);
                 else
                 {
-                    if(kafkaCommon::parentSupports(commonParent, startNode, endNode,
-                                                   w->getCurrentDoc()->defaultDTD()) && kafkaCommon::parentSupports(
+                    if(kafkaCommon::tqparentSupports(commonParent, startNode, endNode,
+                                                   w->getCurrentDoc()->defaultDTD()) && kafkaCommon::tqparentSupports(
                                 commonParent, startNode2, endNode2, w->getCurrentDoc()->defaultDTD()))
                     {
                         moveDomNodes(commonParent, startNode, endNode, childOfCommonParent,
@@ -1073,7 +1073,7 @@ void KafkaWidget::keyDelete()
             }
             else if(!isParent && nextIsBlock)
             {
-                if(kafkaCommon::parentSupports(commonParent, startNode2, endNode2,
+                if(kafkaCommon::tqparentSupports(commonParent, startNode2, endNode2,
                                                w->getCurrentDoc()->defaultDTD()))
                     moveDomNodes(commonParent, startNode2, endNode2, childOfCommonParent2, true);
                 else
@@ -1127,7 +1127,7 @@ void KafkaWidget::keyDelete()
 #endif
 
             _nodeParent = _nodeNext.parentNode();
-            //If this block is used to define the cursor pos, change node to its parent.
+            //If this block is used to define the cursor pos, change node to its tqparent.
             if(_nodeNext == _node && _nodeParent.firstChild() == _nodeNext &&
                     _nodeNext.nextSibling().isNull())
             {
@@ -1392,7 +1392,7 @@ void KafkaWidget::keyBackspace()
         //Else if the current Node if a BLOCK which can be entered/leaved e.g. H1, P
         else if(attrs->chCurFoc() == kNodeAttrs::blockNode)
         {
-            //First look if it is one of _node's parent
+            //First look if it is one of _node's tqparent
             isParent = false;
             temp = _node;
             while(!temp.isNull())
@@ -1460,13 +1460,13 @@ void KafkaWidget::keyBackspace()
             }
             else if(isParent && !prevIsBlock)
             {
-                if(kafkaCommon::parentSupports(toplevelBlock2, startNode, endNode,
+                if(kafkaCommon::tqparentSupports(toplevelBlock2, startNode, endNode,
                                                w->getCurrentDoc()->defaultDTD()))
                     moveDomNodes(toplevelBlock2, startNode, endNode, toplevelBlock2.firstChild(),
                                  true);
                 else
                 {
-                    if(kafkaCommon::parentSupports(commonParent, startNode2, endNode2,
+                    if(kafkaCommon::tqparentSupports(commonParent, startNode2, endNode2,
                                                    w->getCurrentDoc()->defaultDTD()))
                         moveDomNodes(commonParent, startNode2, endNode2,
                                      childOfCommonParent2, true);
@@ -1478,14 +1478,14 @@ void KafkaWidget::keyBackspace()
             }
             else if(isParent && prevIsBlock)
             {
-                if(kafkaCommon::parentSupports(toplevelBlock2, startNode, endNode,
+                if(kafkaCommon::tqparentSupports(toplevelBlock2, startNode, endNode,
                                                w->getCurrentDoc()->defaultDTD()))
                     moveDomNodes(toplevelBlock2, startNode, endNode, toplevelBlock2.firstChild(),
                                  true);
                 else
                 {
-                    if(kafkaCommon::parentSupports(commonParent, startNode, endNode,
-                                                   w->getCurrentDoc()->defaultDTD()) && kafkaCommon::parentSupports(
+                    if(kafkaCommon::tqparentSupports(commonParent, startNode, endNode,
+                                                   w->getCurrentDoc()->defaultDTD()) && kafkaCommon::tqparentSupports(
                                 commonParent, startNode2, endNode2, w->getCurrentDoc()->defaultDTD()))
                     {
                         moveDomNodes(commonParent, startNode, endNode, childOfCommonParent,
@@ -1501,7 +1501,7 @@ void KafkaWidget::keyBackspace()
             }
             else if(!isParent && prevIsBlock)
             {
-                if(kafkaCommon::parentSupports(commonParent, startNode, endNode,
+                if(kafkaCommon::tqparentSupports(commonParent, startNode, endNode,
                                                w->getCurrentDoc()->defaultDTD()))
                     moveDomNodes(commonParent, startNode, endNode, childOfCommonParent, false);
                 else
@@ -2039,9 +2039,9 @@ void KafkaWidget::khtmlMouseMoveEvent(khtml::MouseMoveEvent *event)
       return;
     }
     if(mouseNode.nodeType() == DOM::Node::TEXT_NODE)
-      view()->setCursor(Qt::ibeamCursor);
+      view()->setCursor(TQt::ibeamCursor);
     else
-      view()->setCursor(Qt::arrowCursor);
+      view()->setCursor(TQt::arrowCursor);
 
     KHTMLPart::khtmlMouseMoveEvent(event);
 }