rename the following methods:

tqparent parent
tqmask mask


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

54 files changed, 143 insertions, 143 deletions

diff --git a/umbrello/umbrello/dialogs/assocgenpage.cpp b/umbrello/umbrello/dialogs/assocgenpage.cpp
index 07c9e3af..b093cae0 100644
--- a/umbrello/umbrello/dialogs/assocgenpage.cpp
+++ b/umbrello/umbrello/dialogs/assocgenpage.cpp
@@ -25,8 +25,8 @@
 #include "../association.h"
 #include "../dialog_utils.h"
 
-AssocGenPage::AssocGenPage (UMLDoc *d, TQWidget *tqparent, AssociationWidget *assoc)
-        : TQWidget(tqparent)
+AssocGenPage::AssocGenPage (UMLDoc *d, TQWidget *parent, AssociationWidget *assoc)
+        : TQWidget(parent)
 {
 
     m_pAssociationWidget = assoc;
diff --git a/umbrello/umbrello/dialogs/assocgenpage.h b/umbrello/umbrello/dialogs/assocgenpage.h
index 06c32c05..6d6ffcdf 100644
--- a/umbrello/umbrello/dialogs/assocgenpage.h
+++ b/umbrello/umbrello/dialogs/assocgenpage.h
@@ -49,10 +49,10 @@ public:
      *  Sets up the AssocGenPage.
      *
      *  @param  d       The UMLDoc which controls controls object creation.
-     *  @param  tqparent  The tqparent to the AssocGenPage.
+     *  @param  parent  The parent to the AssocGenPage.
      *  @param  a       The AssociationWidget to display the properties of.
      */
-    AssocGenPage(UMLDoc *d, TQWidget *tqparent, AssociationWidget *a);
+    AssocGenPage(UMLDoc *d, TQWidget *parent, AssociationWidget *a);
 
     /**
      *  Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/assocpage.cpp b/umbrello/umbrello/dialogs/assocpage.cpp
index 425f01fe..ec95f619 100644
--- a/umbrello/umbrello/dialogs/assocpage.cpp
+++ b/umbrello/umbrello/dialogs/assocpage.cpp
@@ -14,7 +14,7 @@
 #include <klocale.h>
 #include "assocpropdlg.h"
 
-AssocPage::AssocPage(TQWidget *tqparent, UMLView * v, UMLObject * o) : TQWidget(tqparent) {
+AssocPage::AssocPage(TQWidget *parent, UMLView * v, UMLObject * o) : TQWidget(parent) {
     m_pObject = o;
     m_pView = v;
     int margin = fontMetrics().height();
diff --git a/umbrello/umbrello/dialogs/assocpage.h b/umbrello/umbrello/dialogs/assocpage.h
index 469dd35d..dbb0eec8 100644
--- a/umbrello/umbrello/dialogs/assocpage.h
+++ b/umbrello/umbrello/dialogs/assocpage.h
@@ -45,11 +45,11 @@ public:
     /**
      *  Constructs an instance of AssocPage.
      *
-     *  @param  tqparent  The tqparent of the page
+     *  @param  parent  The parent of the page
      *  @param  v       The view the UMLObject being represented.
      *  @param  o       The UMLObject being represented
      */
-    AssocPage(TQWidget *tqparent, UMLView * v, UMLObject * o);
+    AssocPage(TQWidget *parent, UMLView * v, UMLObject * o);
 
     /**
      *  Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/assocpropdlg.cpp b/umbrello/umbrello/dialogs/assocpropdlg.cpp
index cf4f5b21..1d5b9c77 100644
--- a/umbrello/umbrello/dialogs/assocpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/assocpropdlg.cpp
@@ -35,14 +35,14 @@
 #include "../umlview.h"
 
 
-AssocPropDlg::AssocPropDlg (TQWidget *tqparent, AssociationWidget * assocWidget, int pageNum)
+AssocPropDlg::AssocPropDlg (TQWidget *parent, AssociationWidget * assocWidget, int pageNum)
         : KDialogBase(IconList, i18n("Association Properties"), Ok | Apply | Cancel | Help,
-                      Ok, tqparent, "_ASSOCPROPDLG_", true, true)
+                      Ok, parent, "_ASSOCPROPDLG_", true, true)
 {
     init();
     m_pAssoc = assocWidget;
 
-    m_pDoc = ((UMLApp *)tqparent) -> getDocument(); // needed?
+    m_pDoc = ((UMLApp *)parent) -> getDocument(); // needed?
 
     setupPages(assocWidget);
     showPage(pageNum);
diff --git a/umbrello/umbrello/dialogs/assocpropdlg.h b/umbrello/umbrello/dialogs/assocpropdlg.h
index 359add61..10fe344b 100644
--- a/umbrello/umbrello/dialogs/assocpropdlg.h
+++ b/umbrello/umbrello/dialogs/assocpropdlg.h
@@ -36,12 +36,12 @@ public:
 
     /**
      *  Sets up a Association Properties Dialog.
-     *  @param  tqparent  The tqparent of the AssocPropDlg
+     *  @param  parent  The parent of the AssocPropDlg
      *  @param  a       The Association Widget to display properties of.
      *  @param  pageNum The page to show first.
      */
 
-    AssocPropDlg(TQWidget *tqparent, AssociationWidget *a, int pageNum = 0);
+    AssocPropDlg(TQWidget *parent, AssociationWidget *a, int pageNum = 0);
 
     /**
      *  Standard deconstructor
diff --git a/umbrello/umbrello/dialogs/assocrolepage.cpp b/umbrello/umbrello/dialogs/assocrolepage.cpp
index f603abee..a44a5f05 100644
--- a/umbrello/umbrello/dialogs/assocrolepage.cpp
+++ b/umbrello/umbrello/dialogs/assocrolepage.cpp
@@ -23,8 +23,8 @@
 // local includes
 #include "../dialog_utils.h"
 
-AssocRolePage::AssocRolePage (UMLDoc *d, TQWidget *tqparent, AssociationWidget *assoc)
-        : TQWidget(tqparent)
+AssocRolePage::AssocRolePage (UMLDoc *d, TQWidget *parent, AssociationWidget *assoc)
+        : TQWidget(parent)
 {
 
     m_pAssociationWidget = assoc;
diff --git a/umbrello/umbrello/dialogs/assocrolepage.h b/umbrello/umbrello/dialogs/assocrolepage.h
index ada69b4f..beede96e 100644
--- a/umbrello/umbrello/dialogs/assocrolepage.h
+++ b/umbrello/umbrello/dialogs/assocrolepage.h
@@ -45,10 +45,10 @@ public:
      *  Sets up the AssocRolePage.
      *
      *  @param  d       The UMLDoc which controls controls object creation.
-     *  @param  tqparent  The tqparent to the AssocRolePage.
+     *  @param  parent  The parent to the AssocRolePage.
      *  @param  a       The AssociationWidget to display the properties of.
      */
-    AssocRolePage(UMLDoc *d, TQWidget *tqparent, AssociationWidget *a);
+    AssocRolePage(UMLDoc *d, TQWidget *parent, AssociationWidget *a);
 
     /**
      *  Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/classgenpage.cpp b/umbrello/umbrello/dialogs/classgenpage.cpp
index 7757b2d8..d633b6ae 100644
--- a/umbrello/umbrello/dialogs/classgenpage.cpp
+++ b/umbrello/umbrello/dialogs/classgenpage.cpp
@@ -38,7 +38,7 @@
 #include "../umlview.h"
 #include "../stereotype.h"
 
-ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, UMLObject* o) : TQWidget(tqparent) {
+ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLObject* o) : TQWidget(parent) {
     m_pWidget = 0;
     m_pObject = 0;
     m_pInstanceWidget = 0;
@@ -236,7 +236,7 @@ ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, UMLObject* o) : TQWidg
     //////////
 }
 
-ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, ObjectWidget* o) : TQWidget(tqparent) {
+ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, ObjectWidget* o) : TQWidget(parent) {
     m_pObject = 0;
     m_pInstanceWidget = 0;
     m_pWidget = o;
@@ -301,7 +301,7 @@ ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, ObjectWidget* o) : TQW
         connect( m_pDrawActorCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotActorToggled( bool ) ) );
 }
 
-ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, UMLWidget* widget) : TQWidget(tqparent) {
+ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLWidget* widget) : TQWidget(parent) {
     m_pWidget = 0;
     m_pObject = 0;
     m_pInstanceWidget = widget;
diff --git a/umbrello/umbrello/dialogs/classgenpage.h b/umbrello/umbrello/dialogs/classgenpage.h
index d6d06a50..fed32a2d 100644
--- a/umbrello/umbrello/dialogs/classgenpage.h
+++ b/umbrello/umbrello/dialogs/classgenpage.h
@@ -45,29 +45,29 @@ public:
      *  Sets up the ClassGenPage.
      *
      *  @param  d       The UMLDoc which controls controls object creation.
-     *  @param  tqparent  The tqparent to the ClassGenPage.
+     *  @param  parent  The parent to the ClassGenPage.
      *  @param  o       The UMLObject to display the properties of.
      */
-    ClassGenPage(UMLDoc *d, TQWidget *tqparent, UMLObject * o);
+    ClassGenPage(UMLDoc *d, TQWidget *parent, UMLObject * o);
 
     /**
      *  Sets up the ClassGenPage for an ObjectWidget
      *
      *  @param  d       The UMLDoc which controls controls object creation.
-     *  @param  tqparent  The tqparent to the ClassGenPage.
+     *  @param  parent  The parent to the ClassGenPage.
      *  @param  o       The ObjectWidget to display the properties of.
      */
-    ClassGenPage(UMLDoc *d, TQWidget *tqparent, ObjectWidget * o);
+    ClassGenPage(UMLDoc *d, TQWidget *parent, ObjectWidget * o);
 
     /**
      *  Sets up the ClassGenPage for a UMLWidget instance (used
      *  for component instances on deployment diagrams)
      *
      *  @param  d       The UMLDoc which controls controls object creation.
-     *  @param  tqparent  The tqparent to the ClassGenPage.
+     *  @param  parent  The parent to the ClassGenPage.
      *  @param  widget  The UMLWidget to display the properties of.
      */
-    ClassGenPage(UMLDoc* d, TQWidget* tqparent, UMLWidget* widget);
+    ClassGenPage(UMLDoc* d, TQWidget* parent, UMLWidget* widget);
 
     /**
      *  Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp
index df0efb41..a96cb645 100644
--- a/umbrello/umbrello/dialogs/classifierlistpage.cpp
+++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp
@@ -29,8 +29,8 @@
 
 using namespace Uml;
 
-ClassifierListPage::ClassifierListPage(TQWidget* tqparent, UMLClassifier* classifier,
-                                       UMLDoc* doc, Uml::Object_Type type) : TQWidget(tqparent) {
+ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifier,
+                                       UMLDoc* doc, Uml::Object_Type type) : TQWidget(parent) {
     m_itemType = type;
     TQString typeName("");
     TQString newItemType("");
diff --git a/umbrello/umbrello/dialogs/classifierlistpage.h b/umbrello/umbrello/dialogs/classifierlistpage.h
index 7f0e298f..2675fd35 100644
--- a/umbrello/umbrello/dialogs/classifierlistpage.h
+++ b/umbrello/umbrello/dialogs/classifierlistpage.h
@@ -43,12 +43,12 @@ public:
     /**
      *  Sets up the ClassifierListPage
      *
-     *  @param tqparent   The tqparent to the ClassAttPage.
+     *  @param parent   The parent to the ClassAttPage.
      *  @param classifier       The Concept to display the properties of.
      *      @param doc The UMLDoc document
      *      @param type The type of listItem this handles
      */
-    ClassifierListPage(TQWidget* tqparent, UMLClassifier* classifier, UMLDoc* doc, Uml::Object_Type type);
+    ClassifierListPage(TQWidget* parent, UMLClassifier* classifier, UMLDoc* doc, Uml::Object_Type type);
 
     /**
      *  Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/classpropdlg.cpp b/umbrello/umbrello/dialogs/classpropdlg.cpp
index 1b744ca0..169de20e 100644
--- a/umbrello/umbrello/dialogs/classpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/classpropdlg.cpp
@@ -33,9 +33,9 @@
 #include "../uml.h"
 #include "../umlview.h"
 
-ClassPropDlg::ClassPropDlg(TQWidget *tqparent, UMLObject * c, int pageNum, bool assoc)
+ClassPropDlg::ClassPropDlg(TQWidget *parent, UMLObject * c, int pageNum, bool assoc)
         : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
-              Ok, tqparent, "_CLASSDLG_", true, true) {
+              Ok, parent, "_CLASSDLG_", true, true) {
     m_pWidget = 0;
     m_pGenPage = 0;
     m_pAttPage = 0;
@@ -52,9 +52,9 @@ ClassPropDlg::ClassPropDlg(TQWidget *tqparent, UMLObject * c, int pageNum, bool
     showPage(pageNum);
 }
 
-ClassPropDlg::ClassPropDlg(TQWidget *tqparent, ObjectWidget * o)
+ClassPropDlg::ClassPropDlg(TQWidget *parent, ObjectWidget * o)
         : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
-              Ok, tqparent, "_CLASSDLG_", true, true) {
+              Ok, parent, "_CLASSDLG_", true, true) {
     m_pWidget = o;
     m_pGenPage = 0;
     m_pAttPage = 0;
@@ -82,9 +82,9 @@ ClassPropDlg::ClassPropDlg(TQWidget *tqparent, ObjectWidget * o)
     setMinimumSize(340,420);
 }
 
-ClassPropDlg::ClassPropDlg(TQWidget *tqparent, UMLWidget * w)
+ClassPropDlg::ClassPropDlg(TQWidget *parent, UMLWidget * w)
         : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
-              Ok, tqparent, "_CLASSDLG_", true, true) {
+              Ok, parent, "_CLASSDLG_", true, true) {
     m_pWidget = w;
     m_pGenPage = 0;
     m_pAttPage = 0;
@@ -95,7 +95,7 @@ ClassPropDlg::ClassPropDlg(TQWidget *tqparent, UMLWidget * w)
     m_pOptionsPage = 0;
     m_Type = pt_Widget;
     m_pObject = w -> getUMLObject();
-    m_pDoc = ((UMLApp *)tqparent) -> getDocument();
+    m_pDoc = ((UMLApp *)parent) -> getDocument();
 
     if (w->getBaseType() == Uml::wt_Class
             || w->getBaseType() == Uml::wt_Interface
diff --git a/umbrello/umbrello/dialogs/classpropdlg.h b/umbrello/umbrello/dialogs/classpropdlg.h
index afb89f46..8078f372 100644
--- a/umbrello/umbrello/dialogs/classpropdlg.h
+++ b/umbrello/umbrello/dialogs/classpropdlg.h
@@ -45,28 +45,28 @@ public:
     /**
      *  Sets up a ClassPropDlg.
      *
-     *  @param  tqparent  The tqparent of the ClassPropDlg
+     *  @param  parent  The parent of the ClassPropDlg
      *  @param  c       The UMLObject to display properties of.
      *  @param  pageNum The page to show first.
      *  @param assoc    Determines whether to display associations
      */
-    ClassPropDlg(TQWidget *tqparent, UMLObject *c, int pageNum = 0, bool assoc = false);
+    ClassPropDlg(TQWidget *parent, UMLObject *c, int pageNum = 0, bool assoc = false);
 
     /**
      *  Sets up a ClassPropDlg.
      *
-     *  @param  tqparent  The tqparent of the ClassPropDlg
+     *  @param  parent  The parent of the ClassPropDlg
      *  @param  o       The ObjectWidget to display properties of.
      */
-    ClassPropDlg(TQWidget *tqparent, ObjectWidget * o);
+    ClassPropDlg(TQWidget *parent, ObjectWidget * o);
 
     /**
      *  Sets up a ClassPropDlg.
      *
-     *  @param  tqparent  The tqparent of the ClassPropDlg
+     *  @param  parent  The parent of the ClassPropDlg
      *  @param  o       The UMLWidget to display properties of.
      */
-    ClassPropDlg(TQWidget *tqparent, UMLWidget * o);
+    ClassPropDlg(TQWidget *parent, UMLWidget * o);
 
 
     /**
diff --git a/umbrello/umbrello/dialogs/classwizard.cpp b/umbrello/umbrello/dialogs/classwizard.cpp
index 1cabe1b2..c49e418f 100644
--- a/umbrello/umbrello/dialogs/classwizard.cpp
+++ b/umbrello/umbrello/dialogs/classwizard.cpp
@@ -26,7 +26,7 @@
 #include "../umlclassifierlistitemlist.h"
 #include "../classifierlistitem.h"
 
-ClassWizard::ClassWizard( UMLDoc * pDoc ) : KWizard( (TQWidget*)pDoc -> tqparent(), "_CLASSWIZARD_", true) {
+ClassWizard::ClassWizard( UMLDoc * pDoc ) : KWizard( (TQWidget*)pDoc -> parent(), "_CLASSWIZARD_", true) {
     m_pDoc = pDoc;
     //create a unique class to start with
     UMLObject * pTemp = 0;
diff --git a/umbrello/umbrello/dialogs/codeeditor.cpp b/umbrello/umbrello/dialogs/codeeditor.cpp
index 4f9f03a8..33fb743b 100644
--- a/umbrello/umbrello/dialogs/codeeditor.cpp
+++ b/umbrello/umbrello/dialogs/codeeditor.cpp
@@ -55,16 +55,16 @@
 #include "umlroledialog.h"
 #include "umloperationdialog.h"
 
-CodeEditor::CodeEditor ( const TQString & text, const TQString & context, CodeViewerDialog * tqparent, const char * name , CodeDocument * doc)
-        : TQTextEdit ( text, context, tqparent, name)
+CodeEditor::CodeEditor ( const TQString & text, const TQString & context, CodeViewerDialog * parent, const char * name , CodeDocument * doc)
+        : TQTextEdit ( text, context, parent, name)
 {
-    init(tqparent, doc);
+    init(parent, doc);
 }
 
-CodeEditor::CodeEditor ( CodeViewerDialog * tqparent, const char* name, CodeDocument * doc )
-        : TQTextEdit ( tqparent, name )
+CodeEditor::CodeEditor ( CodeViewerDialog * parent, const char* name, CodeDocument * doc )
+        : TQTextEdit ( parent, name )
 {
-    init(tqparent, doc);
+    init(parent, doc);
 }
 
 /*
@@ -129,7 +129,7 @@ void CodeEditor::doubleClicked(int para, int pos)
 
 }
 
-// allow us to edit, as appropriate, the tqparent UMLObject of the
+// allow us to edit, as appropriate, the parent UMLObject of the
 // given text block.
 void CodeEditor::editTextBlock(TextBlock * tBlock, int para) {
 
@@ -168,7 +168,7 @@ void CodeEditor::editTextBlock(TextBlock * tBlock, int para) {
                 }
                 else
                 {
-                    kError()<<" CodeViewerDlg ERROR: UNKNOWN tqparent for textBlock"<<endl;
+                    kError()<<" CodeViewerDlg ERROR: UNKNOWN parent for textBlock"<<endl;
                 }
 
             }
@@ -223,7 +223,7 @@ void CodeEditor::loadFromDocument ()
 
 }
 
-void CodeEditor::insert (const TQString & text, TextBlock * tqparent, bool editable, const TQColor & fgcolor, const TQColor & bgcolor, UMLObject * umlobj, const TQString & displayName, int startLine)
+void CodeEditor::insert (const TQString & text, TextBlock * parent, bool editable, const TQColor & fgcolor, const TQColor & bgcolor, UMLObject * umlobj, const TQString & displayName, int startLine)
 {
 
     // set some params
@@ -253,18 +253,18 @@ void CodeEditor::insert (const TQString & text, TextBlock * tqparent, bool edita
             setParagraphBackgroundColor(para,bgcolor);
 
     // record paragraph information
-    // Did we already start recording info for this tqparent object?
+    // Did we already start recording info for this parent object?
     TextBlockInfo * tbinfo;
-    if(m_tbInfoMap->contains(tqparent))
-        tbinfo = (*m_tbInfoMap)[tqparent];
+    if(m_tbInfoMap->contains(parent))
+        tbinfo = (*m_tbInfoMap)[parent];
     else {
         tbinfo = new TextBlockInfo();
         tbinfo->displayName = displayName;
-        tbinfo->isCodeAccessorMethod = dynamic_cast<CodeAccessorMethod*>(tqparent) ? true : false;
-        m_tbInfoMap->insert(tqparent,tbinfo);
+        tbinfo->isCodeAccessorMethod = dynamic_cast<CodeAccessorMethod*>(parent) ? true : false;
+        m_tbInfoMap->insert(parent,tbinfo);
     }
 
-    // set a tqparent, if its not already set
+    // set a parent, if its not already set
     if(umlobj && !tbinfo->getParent())
     {
         tbinfo->displayName = displayName;
@@ -272,13 +272,13 @@ void CodeEditor::insert (const TQString & text, TextBlock * tqparent, bool edita
         tbinfo->isClickable = textBlockIsClickable(umlobj);
     }
 
-    // now mark all lines that we just inserted as belonging to the tqparent
+    // now mark all lines that we just inserted as belonging to the parent
     for(int para=startLine;para<=endLine;para++)
-        m_textBlockList.insert(para,tqparent);
+        m_textBlockList.insert(para,parent);
 
     // lastly, update the para info
-    // start position is relative to the FIRST tqparent position
-    int start = startLine - m_textBlockList.findRef(tqparent);
+    // start position is relative to the FIRST parent position
+    int start = startLine - m_textBlockList.findRef(parent);
     int size = endLine-startLine;
 
     // create the object that records this particular "paragraph"
@@ -293,7 +293,7 @@ void CodeEditor::insert (const TQString & text, TextBlock * tqparent, bool edita
     {
         // now we have to fix the 'start' value for all the para
         // info blocks that coorspond to textblocks that we inserted
-        // inside of. This means tqparent tblock paragraph locations
+        // inside of. This means parent tblock paragraph locations
         // that are greater than zero in that type of textblock
 
         int increase = size + 1;
@@ -353,7 +353,7 @@ void CodeEditor::appendText(TextBlockList * items)
             appendText(cb);
         /*
                         // no! shouldn't be any 'naked' comments floating about. Always
-                        // are assocated with a tqparent code block
+                        // are assocated with a parent code block
                         else if ( (cm = dynamic_cast<CodeComment*>(tb)) )
                                 appendText(cm);
         */
@@ -363,7 +363,7 @@ void CodeEditor::appendText(TextBlockList * items)
 
 }
 
-void CodeEditor::appendText (CodeComment * comment, TextBlock * tqparent, UMLObject * umlObj , const TQString & componentName)
+void CodeEditor::appendText (CodeComment * comment, TextBlock * parent, UMLObject * umlObj , const TQString & componentName)
 {
 
     if(!comment->getWriteOutText() && !m_showHiddenBlocks)
@@ -376,7 +376,7 @@ void CodeEditor::appendText (CodeComment * comment, TextBlock * tqparent, UMLObj
     TQString indent = comment->getIndentationString();
     TQString text = comment->toString(); // use comment formatting, NOT formatMultiLineText(comment->toString(), indent, "\n");
     if(!StringIsBlank(text))
-        insert(text,tqparent,true,getState().fontColor, bgcolor, umlObj, componentName);
+        insert(text,parent,true,getState().fontColor, bgcolor, umlObj, componentName);
 
 }
 
@@ -462,7 +462,7 @@ void CodeEditor::appendText (CodeMethodBlock * mb) {
 
     TQString componentName = TQString("<b>parentless method\?</b>");
 
-    // ugly, but we need to know if there is a tqparent object here.
+    // ugly, but we need to know if there is a parent object here.
     CodeOperation * op = dynamic_cast<CodeOperation*>(mb);
     CodeAccessorMethod * accessor = dynamic_cast<CodeAccessorMethod*>(mb);
     UMLObject * parentObj = 0;
@@ -798,7 +798,7 @@ void CodeEditor::init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc )
 
     setFont( getState().font );
 
-    // set name of tqparent doc
+    // set name of parent doc
     ClassifierCodeDocument * cdoc = dynamic_cast<ClassifierCodeDocument*>(m_parentDoc);
     if(cdoc)
         parentDocName = cdoc->getParentClassifier()->getName();
@@ -860,7 +860,7 @@ void CodeEditor::updateTextBlockFromText (TextBlock * block) {
         //cerr<<"UPDATE GOT CONTENT:["<<content.latin1()<<"] to block:"<<block<<endl;
         block->setText(content);
 
-        // if a tqparent for the block, try to set its documentation
+        // if a parent for the block, try to set its documentation
         // as long as its NOT an accessor codeblock.
         if(parentObj && !info->isCodeAccessorMethod)
             parentObj->setDoc(content);
diff --git a/umbrello/umbrello/dialogs/codeeditor.h b/umbrello/umbrello/dialogs/codeeditor.h
index 5f72fc7a..d5c42d1f 100644
--- a/umbrello/umbrello/dialogs/codeeditor.h
+++ b/umbrello/umbrello/dialogs/codeeditor.h
@@ -46,8 +46,8 @@ class CodeEditor : public TQTextEdit
   TQ_OBJECT
 public:
 
-    explicit CodeEditor ( const TQString & text, const TQString & context = TQString(), CodeViewerDialog * tqparent = 0, const char * name = 0 , CodeDocument * doc = 0);
-    explicit CodeEditor ( CodeViewerDialog * tqparent, const char* name = 0, CodeDocument * doc = 0);
+    explicit CodeEditor ( const TQString & text, const TQString & context = TQString(), CodeViewerDialog * parent = 0, const char * name = 0 , CodeDocument * doc = 0);
+    explicit CodeEditor ( CodeViewerDialog * parent, const char* name = 0, CodeDocument * doc = 0);
     ~CodeEditor ();
 
     // return code viewer state
@@ -63,7 +63,7 @@ protected:
     void appendText (CodeClassFieldDeclarationBlock * db );
     void appendText (TextBlockList * items);
     void appendText (CodeMethodBlock * mb);
-    void appendText (CodeComment * comment, TextBlock * tqparent, UMLObject * umlObj = 0, const TQString & compName="");
+    void appendText (CodeComment * comment, TextBlock * parent, UMLObject * umlObj = 0, const TQString & compName="");
     void appendText (CodeBlockWithComments * cb );
 
     // Rebuild our view of the document. Happens whenever we change
@@ -83,7 +83,7 @@ protected:
     // and 'return' events.
     void keyPressEvent ( TQKeyEvent * e );
 
-    // (re) load the tqparent code document into the editor
+    // (re) load the parent code document into the editor
     void loadFromDocument();
 
     // specialized popup menu for our tool
@@ -111,7 +111,7 @@ private:
     TextBlockList m_textBlockList;
 
     // main insert routine. Will append if startline is not supplied.
-    void insert (const TQString & text, TextBlock * tqparent, bool isEditable = false,
+    void insert (const TQString & text, TextBlock * parent, bool isEditable = false,
                  const TQColor & fgcolor = TQColor("black"), const TQColor & bgcolor = TQColor("white"),
                  UMLObject * umlobj = 0, const TQString & displayName = "", int startLine = -1);
 
diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp
index ab54eb3d..a5ce2f57 100644
--- a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp
+++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp
@@ -37,8 +37,8 @@
 #include <tqlistview.h>
 #include <tqbuttongroup.h>
 
-CodeGenerationOptionsPage::CodeGenerationOptionsPage(TQWidget *tqparent)
-  : CodeGenerationOptionsBase(tqparent)
+CodeGenerationOptionsPage::CodeGenerationOptionsPage(TQWidget *parent)
+  : CodeGenerationOptionsBase(parent)
 {
     init();
 }
@@ -154,7 +154,7 @@ void CodeGenerationOptionsPage::apply() {
         m_parentPolicy->setIndentationAmount(m_SelectIndentationNumber->value());
 
         // emit in THIS order.. the first signal triggers any sub-class to do its apply
-        // slot, THEN, once we are all updated, we may sync the tqparent generator's code
+        // slot, THEN, once we are all updated, we may sync the parent generator's code
         // documents
         emit applyClicked();
         emit syncCodeDocumentsToParent();
diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.h b/umbrello/umbrello/dialogs/codegenerationoptionspage.h
index f444254e..15ac05b4 100644
--- a/umbrello/umbrello/dialogs/codegenerationoptionspage.h
+++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.h
@@ -41,7 +41,7 @@ class CodeGenerationOptionsPage : public CodeGenerationOptionsBase  {
     Q_OBJECT
   TQ_OBJECT
 public:
-    CodeGenerationOptionsPage(TQWidget *tqparent=0);
+    CodeGenerationOptionsPage(TQWidget *parent=0);
     ~CodeGenerationOptionsPage();
     void setDefaults();
     TQString getCodeGenerationLanguage();
diff --git a/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp b/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp
index 0cdd5e08..0e488e75 100644
--- a/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp
+++ b/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp
@@ -29,8 +29,8 @@
 /** This is the page which comes up IF there is no special options for the
  * code generator.
  */
-CodeGenerationPolicyPage::CodeGenerationPolicyPage( TQWidget *tqparent, const char *name, CodeGenPolicyExt * policy )
-        :CodeGenerationPolicyBase(tqparent,name)
+CodeGenerationPolicyPage::CodeGenerationPolicyPage( TQWidget *parent, const char *name, CodeGenPolicyExt * policy )
+        :CodeGenerationPolicyBase(parent,name)
 {
     m_parentPolicy = policy;
 }
diff --git a/umbrello/umbrello/dialogs/codegenerationpolicypage.h b/umbrello/umbrello/dialogs/codegenerationpolicypage.h
index 54723dd3..6325a91e 100644
--- a/umbrello/umbrello/dialogs/codegenerationpolicypage.h
+++ b/umbrello/umbrello/dialogs/codegenerationpolicypage.h
@@ -33,7 +33,7 @@ class CodeGenerationPolicyPage : public CodeGenerationPolicyBase  {
     Q_OBJECT
   TQ_OBJECT
 public:
-    explicit CodeGenerationPolicyPage (TQWidget *tqparent=0, const char *name=0, CodeGenPolicyExt * policy = 0);
+    explicit CodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, CodeGenPolicyExt * policy = 0);
 
     virtual ~CodeGenerationPolicyPage();
 
diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.cpp b/umbrello/umbrello/dialogs/codegenerationwizard.cpp
index 3859d519..30ab5817 100644
--- a/umbrello/umbrello/dialogs/codegenerationwizard.cpp
+++ b/umbrello/umbrello/dialogs/codegenerationwizard.cpp
@@ -165,7 +165,7 @@ void CodeGenerationWizard::showPage(TQWidget *page) {
                 TQDir dir;
                 if(!dir.mkdir(info.filePath()))
                 {
-                    KMessageBox::sorry(this,i18n("The folder could not be created.\nPlease make sure you have write access to its tqparent folder or select another, valid, folder."),
+                    KMessageBox::sorry(this,i18n("The folder could not be created.\nPlease make sure you have write access to its parent folder or select another, valid, folder."),
                                        i18n("Error Creating Folder"));
                     return;
                 }
diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.cpp b/umbrello/umbrello/dialogs/codeviewerdialog.cpp
index ef0091fe..3f11adb3 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialog.cpp
+++ b/umbrello/umbrello/dialogs/codeviewerdialog.cpp
@@ -30,10 +30,10 @@
 #include "../classifiercodedocument.h"
 #include "codeeditor.h"
 
-CodeViewerDialog::CodeViewerDialog ( TQWidget* tqparent, CodeDocument * doc,
+CodeViewerDialog::CodeViewerDialog ( TQWidget* parent, CodeDocument * doc,
                                      Settings::CodeViewerState state,
                                      const char* name, bool modal, WFlags fl )
-        : CodeViewerDialogBase ( tqparent, name, modal, fl )
+        : CodeViewerDialogBase ( parent, name, modal, fl )
 
 {
     m_state = state;
diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.h b/umbrello/umbrello/dialogs/codeviewerdialog.h
index 2228dfae..eef90445 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialog.h
+++ b/umbrello/umbrello/dialogs/codeviewerdialog.h
@@ -45,7 +45,7 @@ class CodeViewerDialog : public CodeViewerDialogBase
   TQ_OBJECT
 public:
 
-    CodeViewerDialog ( TQWidget* tqparent, CodeDocument * doc, Settings::CodeViewerState state,
+    CodeViewerDialog ( TQWidget* parent, CodeDocument * doc, Settings::CodeViewerState state,
                        const char* name = 0, bool modal = false, WFlags fl = 0 );
     ~CodeViewerDialog ();
 
diff --git a/umbrello/umbrello/dialogs/codevieweroptionspage.cpp b/umbrello/umbrello/dialogs/codevieweroptionspage.cpp
index 3950d682..f4715b0d 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionspage.cpp
+++ b/umbrello/umbrello/dialogs/codevieweroptionspage.cpp
@@ -26,8 +26,8 @@
 #include <kcolorbutton.h>
 
 
-CodeViewerOptionsPage::CodeViewerOptionsPage( Settings::CodeViewerState options, TQWidget *tqparent, const char *name )
-        :CodeViewerOptionsBase(tqparent,name)
+CodeViewerOptionsPage::CodeViewerOptionsPage( Settings::CodeViewerState options, TQWidget *parent, const char *name )
+        :CodeViewerOptionsBase(parent,name)
 {
     init (options);
 }
diff --git a/umbrello/umbrello/dialogs/codevieweroptionspage.h b/umbrello/umbrello/dialogs/codevieweroptionspage.h
index f5a21736..1e1b4eea 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionspage.h
+++ b/umbrello/umbrello/dialogs/codevieweroptionspage.h
@@ -30,7 +30,7 @@ class CodeViewerOptionsPage : public CodeViewerOptionsBase  {
     Q_OBJECT
   TQ_OBJECT
 public:
-    CodeViewerOptionsPage (Settings::CodeViewerState options, TQWidget *tqparent, const char *name=0);
+    CodeViewerOptionsPage (Settings::CodeViewerState options, TQWidget *parent, const char *name=0);
     ~CodeViewerOptionsPage();
 
     Settings::CodeViewerState getOptions();
diff --git a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp
index 9732bbaf..3da163b7 100644
--- a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp
+++ b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp
@@ -29,10 +29,10 @@
 /** This is the page which comes up IF there is no special options for the
  * code generator.
  */
-DefaultCodeGenPolicyPage::DefaultCodeGenPolicyPage ( TQWidget *tqparent, const char *name, CodeGenPolicyExt * policy )
-        :CodeGenerationPolicyPage(tqparent,name,policy)
+DefaultCodeGenPolicyPage::DefaultCodeGenPolicyPage ( TQWidget *parent, const char *name, CodeGenPolicyExt * policy )
+        :CodeGenerationPolicyPage(parent,name,policy)
 {
-    textLabel = new TQLabel(tqparent,"textLabel");
+    textLabel = new TQLabel(parent,"textLabel");
     textLabel->setText(tr2i18n("<p align=\"center\">No Options Available.</p>"));
 }
 
diff --git a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h
index 2bbf169c..bbc1c85a 100644
--- a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h
+++ b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h
@@ -28,7 +28,7 @@ class DefaultCodeGenPolicyPage : public CodeGenerationPolicyPage
 
 public:
 
-    explicit DefaultCodeGenPolicyPage( TQWidget* tqparent = 0, const char* name = 0, CodeGenPolicyExt * policy =0);
+    explicit DefaultCodeGenPolicyPage( TQWidget* parent = 0, const char* name = 0, CodeGenPolicyExt * policy =0);
 
     ~DefaultCodeGenPolicyPage();
 
diff --git a/umbrello/umbrello/dialogs/diagramprintpage.cpp b/umbrello/umbrello/dialogs/diagramprintpage.cpp
index cff98397..34176e3a 100644
--- a/umbrello/umbrello/dialogs/diagramprintpage.cpp
+++ b/umbrello/umbrello/dialogs/diagramprintpage.cpp
@@ -30,7 +30,7 @@
 #include "../umlnamespace.h"
 
 
-DiagramPrintPage::DiagramPrintPage(TQWidget * tqparent, UMLDoc * m_pDoc) : KPrintDialogPage(tqparent), m_pDoc(m_pDoc) {
+DiagramPrintPage::DiagramPrintPage(TQWidget * parent, UMLDoc * m_pDoc) : KPrintDialogPage(parent), m_pDoc(m_pDoc) {
     int margin = fontMetrics().height();
     setTitle(i18n("&Diagrams"));
     TQHBoxLayout * mainLayout = new TQHBoxLayout(this);
diff --git a/umbrello/umbrello/dialogs/diagramprintpage.h b/umbrello/umbrello/dialogs/diagramprintpage.h
index 94e1deb5..b7980ca0 100644
--- a/umbrello/umbrello/dialogs/diagramprintpage.h
+++ b/umbrello/umbrello/dialogs/diagramprintpage.h
@@ -41,10 +41,10 @@ public:
     /**
      *  Constructs the diagram print page.
      *
-     *  @param tqparent The tqparent to the page.
+     *  @param parent The parent to the page.
      *  @param doc      The @ref UMLDoc class instance being used.
      */
-    DiagramPrintPage(TQWidget * tqparent, UMLDoc *doc);
+    DiagramPrintPage(TQWidget * parent, UMLDoc *doc);
 
     /**
      *  Stnadard deconstructor.
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
index fa1e6d60..443ad9e2 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
+++ b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
@@ -25,12 +25,12 @@
 #include "../umlviewimageexportermodel.h"
 
 ExportAllViewsDialog::ExportAllViewsDialog(
-        TQWidget* tqparent /* = 0 */,
+        TQWidget* parent /* = 0 */,
         const char* name /* = 0 */,
         bool modal /* = false */,
         WFlags fl /* = 0*/,
         const TQString &defaultMimeType /*= "image/png"*/)
-  : ExportAllViewsDialogBase(tqparent,name, modal,fl) {
+  : ExportAllViewsDialogBase(parent,name, modal,fl) {
     // create and initialize m_imageType
     m_imageType = new KFileFilterCombo(this, "m_imageType");
     m_imageType->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth()));
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.h b/umbrello/umbrello/dialogs/exportallviewsdialog.h
index 3b28037c..69a4135d 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialog.h
+++ b/umbrello/umbrello/dialogs/exportallviewsdialog.h
@@ -35,7 +35,7 @@ public:
     /**
      * Constructor for UMLViewImageExporterModel.
      *
-     * @param tqparent The tqparent of the dialog.
+     * @param parent The parent of the dialog.
      * @param name The internal name.
      * @param modal If modal is true the dialog will block input to other the windows
      *              in the application until it's closed.
@@ -44,7 +44,7 @@ public:
      *
      * @see TQDialog::TQDialog
      */
-    explicit ExportAllViewsDialog(TQWidget* tqparent = 0, const char* name = 0,
+    explicit ExportAllViewsDialog(TQWidget* parent = 0, const char* name = 0,
                          bool modal = false, WFlags fl = 0,
                          const TQString& defaultMimeType = "image/png");
 
diff --git a/umbrello/umbrello/dialogs/notedialog.cpp b/umbrello/umbrello/dialogs/notedialog.cpp
index 420b425e..effb585d 100644
--- a/umbrello/umbrello/dialogs/notedialog.cpp
+++ b/umbrello/umbrello/dialogs/notedialog.cpp
@@ -22,7 +22,7 @@
 #include <kmessagebox.h>
 
 
-NoteDialog::NoteDialog( TQWidget * tqparent, NoteWidget * pNote ) : KDialogBase(Plain, i18n("Note Documentation"), Help | Ok | Cancel , Ok, tqparent, "_NOTEDIALOG_", true, true) {
+NoteDialog::NoteDialog( TQWidget * parent, NoteWidget * pNote ) : KDialogBase(Plain, i18n("Note Documentation"), Help | Ok | Cancel , Ok, parent, "_NOTEDIALOG_", true, true) {
     m_pNoteWidget = pNote;
     int margin = fontMetrics().height();
 
diff --git a/umbrello/umbrello/dialogs/notedialog.h b/umbrello/umbrello/dialogs/notedialog.h
index 6f6e2fd2..ed42319f 100644
--- a/umbrello/umbrello/dialogs/notedialog.h
+++ b/umbrello/umbrello/dialogs/notedialog.h
@@ -33,7 +33,7 @@ public:
     /**
      *  Constructs an NoteDialog.
      */
-    NoteDialog( TQWidget * tqparent, NoteWidget * pNote );
+    NoteDialog( TQWidget * parent, NoteWidget * pNote );
 
     /**
      *  Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/overwritedialogue.cpp b/umbrello/umbrello/dialogs/overwritedialogue.cpp
index c7661ced..9088b794 100644
--- a/umbrello/umbrello/dialogs/overwritedialogue.cpp
+++ b/umbrello/umbrello/dialogs/overwritedialogue.cpp
@@ -23,8 +23,8 @@
 OverwriteDialogue::OverwriteDialogue(
         const TQString& fileName,
         const TQString& outputDirectory,
-        bool applyToAllRemaining, TQWidget* tqparent, const char* name) :
-KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes, tqparent, name) {
+        bool applyToAllRemaining, TQWidget* parent, const char* name) :
+KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes, parent, name) {
 
     TQVBoxLayout* tqlayout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
 
diff --git a/umbrello/umbrello/dialogs/overwritedialogue.h b/umbrello/umbrello/dialogs/overwritedialogue.h
index f67d7673..fb85e967 100644
--- a/umbrello/umbrello/dialogs/overwritedialogue.h
+++ b/umbrello/umbrello/dialogs/overwritedialogue.h
@@ -36,7 +36,7 @@ public:
      * constructor sets up the dialog, adding checkbox and label
      */
     OverwriteDialogue(const TQString& fileName, const TQString& outputDirectory,
-                      bool applyToAllRemaining, TQWidget* tqparent=0, const char* name=0);
+                      bool applyToAllRemaining, TQWidget* parent=0, const char* name=0);
 
     /**
      * destrictor doesn't do anything
diff --git a/umbrello/umbrello/dialogs/parmpropdlg.cpp b/umbrello/umbrello/dialogs/parmpropdlg.cpp
index ce5b5590..38a75292 100644
--- a/umbrello/umbrello/dialogs/parmpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/parmpropdlg.cpp
@@ -31,8 +31,8 @@
 
 #include "parmpropdlg.moc"
 
-ParmPropDlg::ParmPropDlg(TQWidget * tqparent, UMLDoc * doc, UMLAttribute * a)
-        : KDialogBase(Plain, i18n("Parameter Properties"), Help | Ok | Cancel , Ok, tqparent, "_PARMPROPDLG_", true, true)
+ParmPropDlg::ParmPropDlg(TQWidget * parent, UMLDoc * doc, UMLAttribute * a)
+        : KDialogBase(Plain, i18n("Parameter Properties"), Help | Ok | Cancel , Ok, parent, "_PARMPROPDLG_", true, true)
 {
     m_pUmldoc = doc;
     m_pAtt = a;
@@ -127,9 +127,9 @@ ParmPropDlg::ParmPropDlg(TQWidget * tqparent, UMLDoc * doc, UMLAttribute * a)
 //    m_pTypeCB->setAutoCompletion(false);
 
     //add template parameters
-    UMLClassifier *pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->tqparent()->tqparent() );
+    UMLClassifier *pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->parent()->parent() );
     if (pConcept == NULL) {
-        kError() << "ParmPropDlg: grandtqparent of " << m_pAtt->getName()
+        kError() << "ParmPropDlg: grandparent of " << m_pAtt->getName()
         << " is not a UMLClassifier" << endl;
     } else {
         UMLTemplateList tmplParams( pConcept->getTemplateList() );
@@ -219,9 +219,9 @@ void ParmPropDlg::slotOk() {
         m_pAtt->setParmKind( getParmKind() );
         m_pAtt->setStereotype( m_pStereoTypeCB->currentText() );
         TQString typeName = m_pTypeCB->currentText();
-        UMLClassifier * pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->tqparent()->tqparent() );
+        UMLClassifier * pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->parent()->parent() );
         if (pConcept == NULL) {
-            kError() << "ParmPropDlg::slotOk: grandtqparent of " << m_pAtt->getName()
+            kError() << "ParmPropDlg::slotOk: grandparent of " << m_pAtt->getName()
             << " is not a UMLClassifier" << endl;
         } else {
             UMLTemplate *tmplParam = pConcept->findTemplate(typeName);
diff --git a/umbrello/umbrello/dialogs/parmpropdlg.h b/umbrello/umbrello/dialogs/parmpropdlg.h
index 8beca582..0164277d 100644
--- a/umbrello/umbrello/dialogs/parmpropdlg.h
+++ b/umbrello/umbrello/dialogs/parmpropdlg.h
@@ -29,7 +29,7 @@ class UMLDoc;
 /**
  * Displays a dialog box that displays properties of a paramater.
  * You need to make sure that @ref UMLDoc is made to be the
- * tqparent.
+ * parent.
  *
  * @short A properties dialog box for a parameter.
  * @author Paul Hensgen <phensgen@techie.com>
@@ -42,10 +42,10 @@ public:
     /**
      * Constructs a ParmPropDlg.
      *
-     * @param tqparent    The tqparent of the dialog.
+     * @param parent    The parent of the dialog.
      * @param a The parameter to represent.
      */
-    ParmPropDlg(TQWidget * tqparent, UMLDoc * doc, UMLAttribute * a);
+    ParmPropDlg(TQWidget * parent, UMLDoc * doc, UMLAttribute * a);
 
     /**
      * Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.cpp b/umbrello/umbrello/dialogs/pkgcontentspage.cpp
index 6d9473c7..a5b742b1 100644
--- a/umbrello/umbrello/dialogs/pkgcontentspage.cpp
+++ b/umbrello/umbrello/dialogs/pkgcontentspage.cpp
@@ -17,8 +17,8 @@
 #include "../umldoc.h"
 #include "classpropdlg.h"
 
-PkgContentsPage::PkgContentsPage(TQWidget *tqparent, UMLPackage *pkg)
-        : TQWidget(tqparent)
+PkgContentsPage::PkgContentsPage(TQWidget *parent, UMLPackage *pkg)
+        : TQWidget(parent)
 {
     m_pPackage = pkg;
     int margin = fontMetrics().height();
diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.h b/umbrello/umbrello/dialogs/pkgcontentspage.h
index ef6faff1..65db8d8f 100644
--- a/umbrello/umbrello/dialogs/pkgcontentspage.h
+++ b/umbrello/umbrello/dialogs/pkgcontentspage.h
@@ -32,10 +32,10 @@ public:
     /**
      * Constructs an instance of PkgContentsPage.
      *
-     * @param tqparent    The tqparent of the page.
+     * @param parent    The parent of the page.
      * @param pkg               The UMLPackage being represented.
      */
-    PkgContentsPage(TQWidget *tqparent, UMLPackage *pkg);
+    PkgContentsPage(TQWidget *parent, UMLPackage *pkg);
 
     /**
      * Standard destructor.
diff --git a/umbrello/umbrello/dialogs/selectopdlg.cpp b/umbrello/umbrello/dialogs/selectopdlg.cpp
index e49ea6d9..1c175752 100644
--- a/umbrello/umbrello/dialogs/selectopdlg.cpp
+++ b/umbrello/umbrello/dialogs/selectopdlg.cpp
@@ -26,10 +26,10 @@
 #include "../umlview.h"
 #include "../dialog_utils.h"
 
-SelectOpDlg::SelectOpDlg(UMLView * tqparent, UMLClassifier * c)
-        : KDialogBase(Plain, i18n("Select Operation"), Ok | Cancel , Ok, tqparent, "_SELOPDLG_", true, true)
+SelectOpDlg::SelectOpDlg(UMLView * parent, UMLClassifier * c)
+        : KDialogBase(Plain, i18n("Select Operation"), Ok | Cancel , Ok, parent, "_SELOPDLG_", true, true)
 {
-    m_pView = tqparent;
+    m_pView = parent;
     TQVBoxLayout * topLayout = new TQVBoxLayout(plainPage());
 
     m_pOpGB = new TQGroupBox(i18n("Select Operation"), plainPage());
diff --git a/umbrello/umbrello/dialogs/selectopdlg.h b/umbrello/umbrello/dialogs/selectopdlg.h
index 3c12b1b1..be8a38ad 100644
--- a/umbrello/umbrello/dialogs/selectopdlg.h
+++ b/umbrello/umbrello/dialogs/selectopdlg.h
@@ -44,10 +44,10 @@ public:
     /**
      *  Constructs a SelectOpDlg instance.
      *
-     *  @param  tqparent  The tqparent to this instance.
+     *  @param  parent  The parent to this instance.
      *  @param  c       The concept to get the operations from.
      */
-    SelectOpDlg(UMLView * tqparent, UMLClassifier * c);
+    SelectOpDlg(UMLView * parent, UMLClassifier * c);
 
     /**
      *  Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp
index a227572d..b5cddff5 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.cpp
+++ b/umbrello/umbrello/dialogs/settingsdlg.cpp
@@ -26,9 +26,9 @@
 #include "codevieweroptionspage.h"
 #include "../dialog_utils.h"
 
-SettingsDlg::SettingsDlg( TQWidget * tqparent, Settings::OptionState *state )
+SettingsDlg::SettingsDlg( TQWidget * parent, Settings::OptionState *state )
         : KDialogBase( IconList, i18n("Umbrello Setup"),
-               Help | Default | Apply | Ok | Cancel, Ok, tqparent, 0, true, true ) {
+               Help | Default | Apply | Ok | Cancel, Ok, parent, 0, true, true ) {
     m_bChangesApplied = false;
     m_pOptionState = state;
     setHelp( "umbrello/index.html", TQString() );
diff --git a/umbrello/umbrello/dialogs/settingsdlg.h b/umbrello/umbrello/dialogs/settingsdlg.h
index a01696c8..228ac654 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.h
+++ b/umbrello/umbrello/dialogs/settingsdlg.h
@@ -46,7 +46,7 @@ class SettingsDlg : public KDialogBase {
   TQ_OBJECT
 
 public:
-    SettingsDlg(TQWidget * tqparent, Settings::OptionState *state);
+    SettingsDlg(TQWidget * parent, Settings::OptionState *state);
     ~SettingsDlg();
 
     //public methods
diff --git a/umbrello/umbrello/dialogs/umlattributedialog.cpp b/umbrello/umbrello/dialogs/umlattributedialog.cpp
index af59de17..d6ea57ce 100644
--- a/umbrello/umbrello/dialogs/umlattributedialog.cpp
+++ b/umbrello/umbrello/dialogs/umlattributedialog.cpp
@@ -157,7 +157,7 @@ bool UMLAttributeDialog::apply() {
         m_pNameLE->setText( m_pAttribute->getName() );
         return false;
     }
-    UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pAttribute->tqparent() );
+    UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pAttribute->parent() );
     UMLObject *o = pConcept->findChildObject(name);
     if (o && o != m_pAttribute) {
         KMessageBox::error(this, i18n("The attribute name you have chosen is already being used in this operation."),
diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
index ba111405..55a47857 100644
--- a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
+++ b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
@@ -186,7 +186,7 @@ bool UMLEntityAttributeDialog::apply() {
         m_pNameLE->setText( m_pEntityAttribute->getName() );
         return false;
     }
-    UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pEntityAttribute->tqparent() );
+    UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pEntityAttribute->parent() );
     UMLObject *o = pConcept->findChildObject(name);
     if (o && o != m_pEntityAttribute) {
         KMessageBox::error(this, i18n("The entity attribute name you have chosen is already being used in this operation."),
diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp
index 7edb1e35..e8216b99 100644
--- a/umbrello/umbrello/dialogs/umloperationdialog.cpp
+++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp
@@ -46,8 +46,8 @@
 #include "../stereotype.h"
 #include "../uniqueid.h"
 
-UMLOperationDialog::UMLOperationDialog( TQWidget * tqparent, UMLOperation * pOperation )
-        : KDialogBase( Plain, i18n("Operation Properties"), Help | Ok | Cancel , Ok, tqparent, "_UMLOPERATIONDLG_", true, true) {
+UMLOperationDialog::UMLOperationDialog( TQWidget * parent, UMLOperation * pOperation )
+        : KDialogBase( Plain, i18n("Operation Properties"), Help | Ok | Cancel , Ok, parent, "_UMLOPERATIONDLG_", true, true) {
     m_pOperation = pOperation;
     m_doc = UMLApp::app()->getDocument();
     m_pMenu = 0;
@@ -162,7 +162,7 @@ void UMLOperationDialog::setupDialog() {
     m_pRtypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
 
     // add template parameters
-    UMLClassifier *classifier = dynamic_cast<UMLClassifier*>(m_pOperation->tqparent());
+    UMLClassifier *classifier = dynamic_cast<UMLClassifier*>(m_pOperation->parent());
     if (classifier) {
         UMLClassifierListItemList tmplParams( classifier->getFilteredList(Uml::ot_Template) );
         for (UMLClassifierListItem *li = tmplParams.first(); li; li = tmplParams.next())
@@ -459,7 +459,7 @@ bool UMLOperationDialog::apply()
         return false;
     }
 
-    UMLClassifier *classifier = dynamic_cast<UMLClassifier*>( m_pOperation->tqparent() );
+    UMLClassifier *classifier = dynamic_cast<UMLClassifier*>( m_pOperation->parent() );
     if( classifier != 0L &&
             classifier->checkOperationSignature(name, m_pOperation->getParmList(), m_pOperation) )
     {
diff --git a/umbrello/umbrello/dialogs/umloperationdialog.h b/umbrello/umbrello/dialogs/umloperationdialog.h
index 2f67bfe2..7a932554 100644
--- a/umbrello/umbrello/dialogs/umloperationdialog.h
+++ b/umbrello/umbrello/dialogs/umloperationdialog.h
@@ -43,7 +43,7 @@ public:
     /**
     *   Constructor
     */
-    UMLOperationDialog( TQWidget * tqparent, UMLOperation * pOperation );
+    UMLOperationDialog( TQWidget * parent, UMLOperation * pOperation );
 
     /**
     *   Deconstructor
diff --git a/umbrello/umbrello/dialogs/umlroledialog.cpp b/umbrello/umbrello/dialogs/umlroledialog.cpp
index 00f2bd1a..607ac759 100644
--- a/umbrello/umbrello/dialogs/umlroledialog.cpp
+++ b/umbrello/umbrello/dialogs/umlroledialog.cpp
@@ -21,8 +21,8 @@
 #include "../umlrole.h"
 #include "umlroleproperties.h"
 
-UMLRoleDialog::UMLRoleDialog( TQWidget * tqparent, UMLRole * pRole )
-        : KDialogBase( Plain, i18n("Role Properties"), Help | Ok | Cancel , Ok, tqparent, "_UMLROLEDLG_", true, true)
+UMLRoleDialog::UMLRoleDialog( TQWidget * parent, UMLRole * pRole )
+        : KDialogBase( Plain, i18n("Role Properties"), Help | Ok | Cancel , Ok, parent, "_UMLROLEDLG_", true, true)
 {
     m_pRole = pRole;
     setupDialog();
diff --git a/umbrello/umbrello/dialogs/umlroledialog.h b/umbrello/umbrello/dialogs/umlroledialog.h
index 0b41060d..c429e2e4 100644
--- a/umbrello/umbrello/dialogs/umlroledialog.h
+++ b/umbrello/umbrello/dialogs/umlroledialog.h
@@ -30,7 +30,7 @@ public:
     /**
     *   Constructor
     */
-    UMLRoleDialog( TQWidget * tqparent, UMLRole * pRole );
+    UMLRoleDialog( TQWidget * parent, UMLRole * pRole );
 
     /**
     *   Deconstructor
diff --git a/umbrello/umbrello/dialogs/umlroleproperties.cpp b/umbrello/umbrello/dialogs/umlroleproperties.cpp
index 481eafb3..fe2e2f5f 100644
--- a/umbrello/umbrello/dialogs/umlroleproperties.cpp
+++ b/umbrello/umbrello/dialogs/umlroleproperties.cpp
@@ -21,8 +21,8 @@
 #include <kdebug.h>
 
 
-UMLRoleProperties::UMLRoleProperties ( TQWidget *tqparent, UMLRole *role)
-        : UMLRolePropertiesBase (tqparent)
+UMLRoleProperties::UMLRoleProperties ( TQWidget *parent, UMLRole *role)
+        : UMLRolePropertiesBase (parent)
 {
 
     m_pRole = role;
diff --git a/umbrello/umbrello/dialogs/umlroleproperties.h b/umbrello/umbrello/dialogs/umlroleproperties.h
index cd3cb005..f52eaf4d 100644
--- a/umbrello/umbrello/dialogs/umlroleproperties.h
+++ b/umbrello/umbrello/dialogs/umlroleproperties.h
@@ -30,10 +30,10 @@ public:
     /**
      *  Sets up the UMLRoleProperties.
      *
-     *  @param  tqparent  The tqparent widget to the UMLRoleProperties.
+     *  @param  parent  The parent widget to the UMLRoleProperties.
      *  @param  role    The UMLRole to display the properties of.
      */
-    UMLRoleProperties( TQWidget *tqparent, UMLRole *role);
+    UMLRoleProperties( TQWidget *parent, UMLRole *role);
 
     /**
      *  Standard deconstructor.
@@ -48,7 +48,7 @@ public:
 
 protected:
 
-    // the tqparent role object
+    // the parent role object
     UMLRole * m_pRole;
 
 private:
diff --git a/umbrello/umbrello/dialogs/umltemplatedialog.cpp b/umbrello/umbrello/dialogs/umltemplatedialog.cpp
index 20183e3a..6075fbe4 100644
--- a/umbrello/umbrello/dialogs/umltemplatedialog.cpp
+++ b/umbrello/umbrello/dialogs/umltemplatedialog.cpp
@@ -131,7 +131,7 @@ bool UMLTemplateDialog::apply() {
         return false;
     }
 
-    UMLClassifier * pClass = dynamic_cast<UMLClassifier *>( m_pTemplate->tqparent() );
+    UMLClassifier * pClass = dynamic_cast<UMLClassifier *>( m_pTemplate->parent() );
     if (pClass) {
         UMLObject *o = pClass->findChildObject(name);
         if (o && o != m_pTemplate) {
diff --git a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
index a330ad30..824d708f 100644
--- a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
+++ b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
@@ -87,12 +87,12 @@ void UMLWidgetColorPage::init()
 UMLWidgetColorPage::~UMLWidgetColorPage() {}
 
 void UMLWidgetColorPage::slotLineButtonClicked() {
-    //  UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> tqparent() );
+    //  UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> parent() );
     m_pLineColorB -> setColor( Settings::getOptionState().uiState.lineColor );
 }
 
 void UMLWidgetColorPage::slotFillButtonClicked() {
-    //  UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> tqparent() );
+    //  UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> parent() );
     m_pFillColorB -> setColor( Settings::getOptionState().uiState.fillColor );
 }