rename the following methods:

tqparent parent
tqmask mask


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

10 files changed, 20 insertions, 20 deletions

diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp
index e6acdbd..2585c7b 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.cpp
+++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp
@@ -56,9 +56,9 @@ ActionListItem::ActionListItem(TQListBox *listbox, const TQString &action, const
   setText(text);
 }
 
-ConfigDialog::ConfigDialog(TQWidget *tqparent, const char *name) : TQDialog(tqparent, name)
+ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent, name)
 {
-  topWidgetName = tqparent->tqtopLevelWidget()->name();
+  topWidgetName = parent->tqtopLevelWidget()->name();
   config = new KConfig("metabarrc");
   iconConfig = new KConfig(locate("data", "metabar/iconsrc"));
 
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.h b/konq-plugins/sidebar/metabar/src/configdialog.h
index 8417d15..4dc04f9 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.h
+++ b/konq-plugins/sidebar/metabar/src/configdialog.h
@@ -48,7 +48,7 @@ class ConfigDialog : public TQDialog
   TQ_OBJECT
   
   public:
-    ConfigDialog(TQWidget *tqparent = 0, const char *name = 0);
+    ConfigDialog(TQWidget *parent = 0, const char *name = 0);
     ~ConfigDialog();
     
   protected:
diff --git a/konq-plugins/sidebar/metabar/src/metabar.cpp b/konq-plugins/sidebar/metabar/src/metabar.cpp
index bc7d978..6a020f0 100644
--- a/konq-plugins/sidebar/metabar/src/metabar.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabar.cpp
@@ -7,8 +7,8 @@
 #include "metabar.h"
 #include "metabar.moc"
 
-Metabar::Metabar(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name):
-                   KonqSidebarPlugin(inst,tqparent,widgetParent,desktopName,name)
+Metabar::Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name):
+                   KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name)
 {
   KImageIO::registerFormats();
   KGlobal::locale()->insertCatalogue( "konqsidebar_metabar" );
diff --git a/konq-plugins/sidebar/metabar/src/metabar.h b/konq-plugins/sidebar/metabar/src/metabar.h
index bb2387b..530f687 100644
--- a/konq-plugins/sidebar/metabar/src/metabar.h
+++ b/konq-plugins/sidebar/metabar/src/metabar.h
@@ -16,7 +16,7 @@ class Metabar : public KonqSidebarPlugin
   TQ_OBJECT
     
   public:
-    Metabar(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name=0);
+    Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0);
     ~Metabar();
       
     virtual TQWidget *getWidget(){ return widget; }
diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
index d184f58..f7bc152 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 *tqparent, const char* name) : TQObject(tqparent, name), m_html(html)
+MetabarFunctions::MetabarFunctions(KHTMLPart *html, TQObject *parent, const char* name) : TQObject(parent, name), m_html(html)
 {
   timer = new TQTimer(this);
   connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animate()));
@@ -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 tqparent = static_cast<DOM::HTMLElement>(node.parentNode());
+    DOM::HTMLElement parent = static_cast<DOM::HTMLElement>(node.parentNode());
     
-    DOM::CSSStyleDeclaration style = tqparent.style();
+    DOM::CSSStyleDeclaration style = parent.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 tqparent = static_cast<DOM::HTMLElement>(node.parentNode());
+    DOM::HTMLElement parent = static_cast<DOM::HTMLElement>(node.parentNode());
     
-    DOM::CSSStyleDeclaration style = tqparent.style();
+    DOM::CSSStyleDeclaration style = parent.style();
     style.setProperty("display", "none", CSS_PRIORITY);
   }
 }
diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.h b/konq-plugins/sidebar/metabar/src/metabarfunctions.h
index 96742e5..71afce8 100644
--- a/konq-plugins/sidebar/metabar/src/metabarfunctions.h
+++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.h
@@ -35,7 +35,7 @@ class MetabarFunctions : public TQObject
   TQ_OBJECT
   
   public:
-    MetabarFunctions(KHTMLPart *html, TQObject *tqparent = 0, const char* name=0);
+    MetabarFunctions(KHTMLPart *html, TQObject *parent = 0, const char* name=0);
     ~MetabarFunctions();
     
     void toggle(DOM::DOMString item);
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 2b01a02..0439c98 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -73,7 +73,7 @@
 #define EVENT_TYPE DOM::DOMString("click")
 #define ACTIVATION 1
 
-MetabarWidget::MetabarWidget(TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
+MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(parent, name)
 {
   skip = false;
   loadComplete = false;
@@ -419,8 +419,8 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg
     for(uint i = 0; i < list.length(); i++){
       DOM::HTMLElement node = static_cast<DOM::HTMLElement>(list.item(i));
       if(!node.isNull()){   
-        DOM::HTMLElement tqparent = static_cast<DOM::HTMLElement>(node.parentNode());
-        DOM::CSSStyleDeclaration style = tqparent.style();
+        DOM::HTMLElement parent = static_cast<DOM::HTMLElement>(node.parentNode());
+        DOM::CSSStyleDeclaration style = parent.style();
         DOM::DOMString display = style.getPropertyValue("display");
         DOM::DOMString newDisplay = display == "none" ? "block" : "none";
         
@@ -436,8 +436,8 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg
       element.setAttribute("style", style);
     }
     
-    DOM::HTMLElement tqparent = static_cast<DOM::HTMLElement>(element.parentNode().parentNode());
-    functions->adjustSize(tqparent.id());
+    DOM::HTMLElement parent = static_cast<DOM::HTMLElement>(element.parentNode().parentNode());
+    functions->adjustSize(parent.id());
   }
   
   else if(protocol == "function"){
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h
index 4f6d21b..34d0015 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.h
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h
@@ -41,7 +41,7 @@ class MetabarWidget : public TQWidget
   TQ_OBJECT
     
   public:
-    MetabarWidget(TQWidget *tqparent = 0, const char* name=0);
+    MetabarWidget(TQWidget *parent = 0, const char* name=0);
     ~MetabarWidget();
     
     void setFileItems(const KFileItemList &items, bool check = true);
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
index 8ef445c..ef190f3 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
@@ -37,7 +37,7 @@
 #include <kstandarddirs.h>
 
 
-ServiceLoader::ServiceLoader(TQWidget *tqparent, const char *name) : TQObject(tqparent, name)
+ServiceLoader::ServiceLoader(TQWidget *parent, const char *name) : TQObject(parent, name)
 {  
   popups.setAutoDelete(true);
 }
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.h b/konq-plugins/sidebar/metabar/src/serviceloader.h
index 31f1366..c1f6433 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.h
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.h
@@ -41,7 +41,7 @@ class ServiceLoader : public TQObject
   TQ_OBJECT
 
   public:
-    ServiceLoader(TQWidget *tqparent, const char *name = 0);
+    ServiceLoader(TQWidget *parent, const char *name = 0);
     ~ServiceLoader();
     
     void  loadServices(const KFileItem item, DOM::DOMString &html, int &count);