rename the following methods:

tqparent parent
tqmask mask


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

8 files changed, 29 insertions, 29 deletions

diff --git a/quanta/components/framewizard/framewizard.cpp b/quanta/components/framewizard/framewizard.cpp
index 0eabb061..7a2223fe 100644
--- a/quanta/components/framewizard/framewizard.cpp
+++ b/quanta/components/framewizard/framewizard.cpp
@@ -28,7 +28,7 @@
 static const TQString info1=i18n("You must select an area."),
                      info2=i18n("Before editing a frame you must save the file.");
 
-FrameWizard::FrameWizard(TQWidget *tqparent, const char *name) : FrameWizardS(tqparent, name),
+FrameWizard::FrameWizard(TQWidget *parent, const char *name) : FrameWizardS(parent, name),
 m_hasSelected(false),m_saved(false)
 {
   m_hasSelected = false;
diff --git a/quanta/components/framewizard/framewizard.h b/quanta/components/framewizard/framewizard.h
index 177c6c6b..906319c8 100644
--- a/quanta/components/framewizard/framewizard.h
+++ b/quanta/components/framewizard/framewizard.h
@@ -36,7 +36,7 @@ class FrameWizard : public FrameWizardS
     TQString m_currSA;
 
   public:
-    FrameWizard( TQWidget* tqparent=0, const char *name=0);
+    FrameWizard( TQWidget* parent=0, const char *name=0);
     ~FrameWizard();
 
   private slots:
diff --git a/quanta/components/framewizard/selectablearea.cpp b/quanta/components/framewizard/selectablearea.cpp
index 40f76ae2..80c7aa00 100644
--- a/quanta/components/framewizard/selectablearea.cpp
+++ b/quanta/components/framewizard/selectablearea.cpp
@@ -20,7 +20,7 @@
 //#include <kdebug.h>
 #include "fwglobal.h"
 
-SelectableArea::SelectableArea(TQWidget *tqparent, const char *name ) : KHTMLPart(tqparent,name) {
+SelectableArea::SelectableArea(TQWidget *parent, const char *name ) : KHTMLPart(parent,name) {
   view()->setFrameShape(TQFrame::NoFrame);
   view()->setMinimumSize(TQSize(1,1));
   view()->installEventFilter(this);
diff --git a/quanta/components/framewizard/selectablearea.h b/quanta/components/framewizard/selectablearea.h
index 3df3200a..ffdd9c20 100644
--- a/quanta/components/framewizard/selectablearea.h
+++ b/quanta/components/framewizard/selectablearea.h
@@ -32,7 +32,7 @@ class SelectableArea : public KHTMLPart  {
   TQ_OBJECT
 
    public :
-     SelectableArea(TQWidget *tqparent=0, const char *name=0);
+     SelectableArea(TQWidget *parent=0, const char *name=0);
      ~SelectableArea();
      TQString idLabel() const { return m_idLabel; }
      void setIdLabel(const TQString &i) { m_idLabel = i; }
diff --git a/quanta/components/framewizard/treenode.cpp b/quanta/components/framewizard/treenode.cpp
index 592d33d5..2faaf3d6 100644
--- a/quanta/components/framewizard/treenode.cpp
+++ b/quanta/components/framewizard/treenode.cpp
@@ -114,13 +114,13 @@ TQString tree::addChildNode(const TQString &l){
 }
 
 bool tree::insertChildNode(const TQString &l){
-  TQString tqparent = findNode(l)->parentLabel();
-  int pos=findNode( tqparent )->childPosition( findNode(l) );
+  TQString parent = findNode(l)->parentLabel();
+  int pos=findNode( parent )->childPosition( findNode(l) );
   ++nodeId;
-  treeNode *newNode = new treeNode(TQString::number(nodeId,10),tqparent);
+  treeNode *newNode = new treeNode(TQString::number(nodeId,10),parent);
   newNode->atts()->setAttribute( "src",findNode(l)->atts()->src() );
   m_nodeList.insert(TQString::number(nodeId,10),newNode);
-  return findNode( tqparent )->insertChild(pos,newNode);
+  return findNode( parent )->insertChild(pos,newNode);
 }
 
 void tree::reset(){
diff --git a/quanta/components/framewizard/treenode.h b/quanta/components/framewizard/treenode.h
index 428a381f..c96d9b17 100644
--- a/quanta/components/framewizard/treenode.h
+++ b/quanta/components/framewizard/treenode.h
@@ -77,7 +77,7 @@ class tree{
       treeNode* root() const { return m_root; }
       TQString addChildNode(const TQString &l);
       bool insertChildNode(const TQString &L);
-      void removeChildNode(const TQString &pl,const TQString &l,bool autoDelete);//tqparent node,child node
+      void removeChildNode(const TQString &pl,const TQString &l,bool autoDelete);//parent node,child node
       treeNode* findNode(const TQString &L);
       areaAttribute* findAreaAttribute(const TQString &l){ return findNode(l)->atts(); };
       void reset();
diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp
index 215bdf63..e822d7e0 100644
--- a/quanta/components/framewizard/visualframeeditor.cpp
+++ b/quanta/components/framewizard/visualframeeditor.cpp
@@ -32,7 +32,7 @@ TQMap<TQString, TQValueList< int > > SIZES;
 static int splitterIdNumber = 0;
 
 
-VisualFrameEditor::VisualFrameEditor(TQWidget * tqparent, const char * name) : TQHBox(tqparent,name){
+VisualFrameEditor::VisualFrameEditor(TQWidget * parent, const char * name) : TQHBox(parent,name){
   m_internalTree = new tree;
   m_internalTree->root()->atts()->setGeometry(TQRect(0,0,510,422));
   m_firstInsertedSA = 0L;
@@ -136,21 +136,21 @@ TQStringList VisualFrameEditor::convertAsterisks(const TQString &s,int d){
   return list;
 }
 
-void VisualFrameEditor::buildInternalTree(const TQString &tqparent){
+void VisualFrameEditor::buildInternalTree(const TQString &parent){
   TQString line = m_existingStructure.first();
   if(line.contains("<frameset")) {
     if(line.contains("rows")) {
-      split(tqparent,(line.contains(",")+1),HORIZONTAL);
+      split(parent,(line.contains(",")+1),HORIZONTAL);
 
       TQRegExp pattern("rows\\s*=\"([\\s\\d%,\\*]*)\"");
       pattern.search(line);
 
-      TQRect dummy=m_internalTree->findNode(tqparent)->atts()->tqgeometry();
+      TQRect dummy=m_internalTree->findNode(parent)->atts()->tqgeometry();
       TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.height());
 
       int dummyDimension=dummy.height()-cancelledPixels(line.contains(",")+1);
 
-      TQPtrList<treeNode> list=m_internalTree->findNode(tqparent)->tqchildrenList();
+      TQPtrList<treeNode> list=m_internalTree->findNode(parent)->tqchildrenList();
       TQPtrListIterator<treeNode> it( list );
       treeNode *node;
       while ( (node = it.current()) != 0 ) {
@@ -167,16 +167,16 @@ void VisualFrameEditor::buildInternalTree(const TQString &tqparent){
     }
     else
     if(line.contains("cols")) {
-      split(tqparent,(line.contains(",")+1),VERTICAL);
+      split(parent,(line.contains(",")+1),VERTICAL);
       TQRegExp pattern("cols\\s*=\"([\\s\\d%,\\*]*)\"");
       pattern.search(line);
 
-      TQRect dummy=m_internalTree->findNode(tqparent)->atts()->tqgeometry();
+      TQRect dummy=m_internalTree->findNode(parent)->atts()->tqgeometry();
       TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.width());
 
       int dummyDimension=dummy.width()-cancelledPixels(line.contains(",")+1);
 
-      TQPtrList<treeNode> list=m_internalTree->findNode(tqparent)->tqchildrenList();
+      TQPtrList<treeNode> list=m_internalTree->findNode(parent)->tqchildrenList();
       TQPtrListIterator<treeNode> it( list );
       treeNode *node;
       while ( (node = it.current()) != 0 ) {
@@ -193,10 +193,10 @@ void VisualFrameEditor::buildInternalTree(const TQString &tqparent){
     }
 
     m_existingStructure.pop_front();
-    m_internalTree->findNode(tqparent)->firstChild();
-    while(m_internalTree->findNode(tqparent)->currentChild()) {
-      buildInternalTree(m_internalTree->findNode(tqparent)->currentChild()->label());
-      m_internalTree->findNode(tqparent)->nextChild();
+    m_internalTree->findNode(parent)->firstChild();
+    while(m_internalTree->findNode(parent)->currentChild()) {
+      buildInternalTree(m_internalTree->findNode(parent)->currentChild()->label());
+      m_internalTree->findNode(parent)->nextChild();
     }
   }
   else {
@@ -221,7 +221,7 @@ void VisualFrameEditor::buildInternalTree(const TQString &tqparent){
       attributeMap[ pattern.cap(1).section( TQRegExp("=\\s*\"") ,0,0) ] = pattern.cap(1).section(TQRegExp("=\\s*\""),1,1).remove("\"");
       if ( pos >= 0 ) pos += pattern.matchedLength();
     }
-    m_internalTree->findNode(tqparent)->atts()->setAllAttributes(attributeMap);
+    m_internalTree->findNode(parent)->atts()->setAllAttributes(attributeMap);
     m_existingStructure.pop_front();
   }
 }
@@ -283,10 +283,10 @@ void VisualFrameEditor::removeNode(const TQString &l){
   }
 }
 
-void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* tqparent){
+void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){
   if(n->hasChildren()) {
     TQString splitterName("splitter"+TQString::number(++splitterIdNumber,10));
-    TQSplitter *splitter = new TQSplitter(tqparent,splitterName.ascii());
+    TQSplitter *splitter = new TQSplitter(parent,splitterName.ascii());
     if(SIZES.contains(splitterName)) splitter->setSizes( SIZES[splitterName] );
     switch( n->splitType() ){
       case VERTICAL : splitter->setOrientation(Qt::Horizontal);break;
@@ -300,8 +300,8 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* tqparent){
     }
   }
   else {
-    SelectableArea *sa=new SelectableArea(tqparent,n->label().ascii());
-    if(tqparent->isA(TQSPLITTER_OBJECT_NAME_STRING)) dynamic_cast<TQSplitter *>(tqparent)->setResizeMode(sa->view(),TQSplitter::KeepSize );
+    SelectableArea *sa=new SelectableArea(parent,n->label().ascii());
+    if(parent->isA(TQSPLITTER_OBJECT_NAME_STRING)) dynamic_cast<TQSplitter *>(parent)->setResizeMode(sa->view(),TQSplitter::KeepSize );
     else
     if(!m_firstInsertedSA) m_firstInsertedSA = sa;
     sa->view()->setGeometry(n->atts()->tqgeometry());
diff --git a/quanta/components/framewizard/visualframeeditor.h b/quanta/components/framewizard/visualframeeditor.h
index c3b28b7b..c7338128 100644
--- a/quanta/components/framewizard/visualframeeditor.h
+++ b/quanta/components/framewizard/visualframeeditor.h
@@ -37,9 +37,9 @@ class VisualFrameEditor : public TQHBox  {
       TQStringList m_existingStructure;
       MarkupLanguage m_markupLanguage;
 
-      void buildInternalTree(const TQString &tqparent);
+      void buildInternalTree(const TQString &parent);
       void setGeometries(const TQString &l);
-      void drawGUI(treeNode *n, TQWidget* tqparent);
+      void drawGUI(treeNode *n, TQWidget* parent);
       TQStringList convertAsterisks(const TQString &s, int d);
 
       TQString createFrameTag(areaAttribute *a);
@@ -48,7 +48,7 @@ class VisualFrameEditor : public TQHBox  {
       void createStructure(treeNode* n);
 
    public:
-      VisualFrameEditor( TQWidget * tqparent = 0, const char * name = 0);
+      VisualFrameEditor( TQWidget * parent = 0, const char * name = 0);
       ~VisualFrameEditor();
       void draw() { tqrepaint(); }
       void loadExistingStructure(const TQStringList &list);