TQt4 port kdeaddons

This enables compilation under both Qt3 and Qt4


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

1 files changed, 13 insertions, 13 deletions

diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
index 1aaf9e8..d184f58 100644
--- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
@@ -32,7 +32,7 @@
 #define RESIZE_SPEED 5
 #define RESIZE_STEP 2
 
-MetabarFunctions::MetabarFunctions(KHTMLPart *html, TQObject *parent, const char* name) : TQObject(parent, name), m_html(html)
+MetabarFunctions::MetabarFunctions(KHTMLPart *html, TQObject *tqparent, const char* name) : TQObject(tqparent, name), m_html(html)
 {
   timer = new TQTimer(this);
   connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animate()));
@@ -81,7 +81,7 @@ void MetabarFunctions::toggle(DOM::DOMString item)
   DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item));
   
   if(!node.isNull()){
-    DOM::NodeList children = node.childNodes();
+    DOM::NodeList tqchildren = node.childNodes();
     DOM::CSSStyleDeclaration style = node.style();
     DOM::DOMString expanded = node.getAttribute("expanded");
     
@@ -106,7 +106,7 @@ void MetabarFunctions::toggle(DOM::DOMString item)
       }
     }
     else{
-      style.setProperty("height", TQString("%1px").arg(height), CSS_PRIORITY);
+      style.setProperty("height", TQString("%1px").tqarg(height), CSS_PRIORITY);
     }
   }
 }
@@ -117,7 +117,7 @@ void MetabarFunctions::adjustSize(DOM::DOMString item)
   DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item));
   
   if(!node.isNull()){
-    DOM::NodeList children = node.childNodes();
+    DOM::NodeList tqchildren = node.childNodes();
     DOM::CSSStyleDeclaration style = node.style();
     DOM::DOMString expanded = node.getAttribute("expanded");
     
@@ -137,7 +137,7 @@ void MetabarFunctions::adjustSize(DOM::DOMString item)
         }
       }
       else{
-        style.setProperty("height", TQString("%1px").arg(height), CSS_PRIORITY);
+        style.setProperty("height", TQString("%1px").tqarg(height), CSS_PRIORITY);
       }
     }
   }
@@ -176,7 +176,7 @@ void MetabarFunctions::animate()
       }
       
       int change = currentHeight < height ? changeValue : -changeValue;
-      style.setProperty("height", TQString("%1px").arg(currentHeight + change), CSS_PRIORITY);
+      style.setProperty("height", TQString("%1px").tqarg(currentHeight + change), CSS_PRIORITY);
       doc.updateRendering();
     }
   }
@@ -187,9 +187,9 @@ void MetabarFunctions::show(DOM::DOMString item)
   DOM::HTMLDocument doc = m_html->htmlDocument();
   DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item));
   if(!node.isNull()){
-    DOM::HTMLElement parent = static_cast<DOM::HTMLElement>(node.parentNode());
+    DOM::HTMLElement tqparent = static_cast<DOM::HTMLElement>(node.parentNode());
     
-    DOM::CSSStyleDeclaration style = parent.style();
+    DOM::CSSStyleDeclaration style = tqparent.style();
     style.setProperty("display", "block", CSS_PRIORITY);
   }
 }
@@ -199,9 +199,9 @@ void MetabarFunctions::hide(DOM::DOMString item)
   DOM::HTMLDocument doc = m_html->htmlDocument();
   DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item));
   if(!node.isNull()){
-    DOM::HTMLElement parent = static_cast<DOM::HTMLElement>(node.parentNode());
+    DOM::HTMLElement tqparent = static_cast<DOM::HTMLElement>(node.parentNode());
     
-    DOM::CSSStyleDeclaration style = parent.style();
+    DOM::CSSStyleDeclaration style = tqparent.style();
     style.setProperty("display", "none", CSS_PRIORITY);
   }
 }
@@ -209,9 +209,9 @@ void MetabarFunctions::hide(DOM::DOMString item)
 int MetabarFunctions::getHeight(DOM::HTMLElement &element)
 {
   int height = 0;
-  DOM::NodeList children = element.childNodes();
-  for(uint i = 0; i < children.length(); i++){
-    DOM::HTMLElement node = static_cast<DOM::HTMLElement>(children.item(i));
+  DOM::NodeList tqchildren = element.childNodes();
+  for(uint i = 0; i < tqchildren.length(); i++){
+    DOM::HTMLElement node = static_cast<DOM::HTMLElement>(tqchildren.item(i));
     DOM::CSSStyleDeclaration style = node.style();
     
     DOM::DOMString css_height = style.getPropertyValue("height");