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

61 files changed, 149 insertions, 149 deletions

diff --git a/umbrello/umbrello/codegenerators/adawriter.cpp b/umbrello/umbrello/codegenerators/adawriter.cpp
index 6dc6e4e7..ec2bf59a 100644
--- a/umbrello/umbrello/codegenerators/adawriter.cpp
+++ b/umbrello/umbrello/codegenerators/adawriter.cpp
@@ -298,8 +298,8 @@ void AdaWriter::writeClass(UMLClassifier *c) {
         ada << "tagged ";
     } else {
         // FIXME: Multiple inheritance is not yet supported
-        UMLClassifier* tqparent = superclasses.first();
-        ada << "new " << className(tqparent, false) << " with ";
+        UMLClassifier* parent = superclasses.first();
+        ada << "new " << className(parent, false) << " with ";
     }
     ada << "private;" << m_endl << m_endl;
     ada << getIndent() << "type " << name << "_Ptr is access all " << name << "'Class;" << m_endl << m_endl;
@@ -363,8 +363,8 @@ void AdaWriter::writeClass(UMLClassifier *c) {
         ada << "tagged ";
     } else {
         // FIXME: Multiple inheritance is not yet supported
-        UMLClassifier* tqparent = superclasses.first();
-        ada << "new " << className(tqparent, false) << " with ";
+        UMLClassifier* parent = superclasses.first();
+        ada << "new " << className(parent, false) << " with ";
     }
     ada << "record" << m_endl;
     m_indentLevel++;
diff --git a/umbrello/umbrello/codegenerators/codegenfactory.h b/umbrello/umbrello/codegenerators/codegenfactory.h
index 0930f43d..27a0f293 100644
--- a/umbrello/umbrello/codegenerators/codegenfactory.h
+++ b/umbrello/umbrello/codegenerators/codegenfactory.h
@@ -46,7 +46,7 @@ namespace CodeGenFactory {
      * Create a CodeOperation belonging to the given ClassifierCodeDocument.
      * Only applies to the advanced generators.
      *
-     * @param cd    the tqparent ClassifierCodeDocument.
+     * @param cd    the parent ClassifierCodeDocument.
      * @param op    the related UMLOperation
      * @return  CodeOperation which is specific to the current language
      */
@@ -57,8 +57,8 @@ namespace CodeGenFactory {
      * ClassifierCodeDocument.
      * Only applies to the advanced generators.
      *
-     * @param cd         the tqparent ClassifierCodeDocument
-     * @param at         attribute which is tqparent of this class field
+     * @param cd         the parent ClassifierCodeDocument
+     * @param at         attribute which is parent of this class field
      * @return  CodeClassField which is specific to the current language
      */
     CodeClassField * newCodeClassField (ClassifierCodeDocument *cd, UMLAttribute * at);
@@ -68,8 +68,8 @@ namespace CodeGenFactory {
      * ClassifierCodeDocument.
      * Only applies to the advanced generators.
      *
-     * @param cd         the tqparent ClassifierCodeDocument
-     * @param role       association role which is tqparent of this class field
+     * @param cd         the parent ClassifierCodeDocument
+     * @param role       association role which is parent of this class field
      * @return  CodeClassField which is specific to the current language
      */
     CodeClassField * newCodeClassField(ClassifierCodeDocument *cd, UMLRole *role);
@@ -78,8 +78,8 @@ namespace CodeGenFactory {
      * Create a CodeAccessorMethod object belonging to the given ClassifierCodeDocument.
      * Only applies to the advanced generators.
      *
-     * @param cd         the tqparent ClassifierCodeDocument
-     * @param cf         CodeClassField which is tqparent of this object
+     * @param cd         the parent ClassifierCodeDocument
+     * @param cf         CodeClassField which is parent of this object
      * @param type       CodeAccessorMethod::AccessorType to create
      *
      * @return  CodeAccessorMethod which is specific to the current language
@@ -93,8 +93,8 @@ namespace CodeGenFactory {
      * ClassifierCodeDocument.
      * Only applies to the advanced generators.
      *
-     * @param cd         the tqparent ClassifierCodeDocument
-     * @param cf         CodeClassField which is tqparent of this object
+     * @param cd         the parent ClassifierCodeDocument
+     * @param cf         CodeClassField which is parent of this object
      *
      * @return  CodeClassFieldDeclarationBlock which is specific to the current language
      */
@@ -105,7 +105,7 @@ namespace CodeGenFactory {
      * Create a new CodeComment object belonging to the given CodeDocument.
      * Only applies to the advanced generators.
      *
-     * @param cd         the tqparent CodeDocument
+     * @param cd         the parent CodeDocument
      * @return      CodeBlockWithComments
      */
     CodeComment * newCodeComment (CodeDocument *cd);
diff --git a/umbrello/umbrello/codegenerators/codegenpolicyext.h b/umbrello/umbrello/codegenerators/codegenpolicyext.h
index ea792388..29e358a1 100644
--- a/umbrello/umbrello/codegenerators/codegenpolicyext.h
+++ b/umbrello/umbrello/codegenerators/codegenpolicyext.h
@@ -36,7 +36,7 @@ public:
      * Create a new dialog interface for this object.
      * @return dialog object
      */
-    virtual CodeGenerationPolicyPage * createPage(TQWidget *tqparent = 0, const char *name = 0) = 0;
+    virtual CodeGenerationPolicyPage * createPage(TQWidget *parent = 0, const char *name = 0) = 0;
 
     /**
      * set the defaults from a config file for this code generator from the passed KConfig pointer.
diff --git a/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp b/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp
index bdba3604..4742cd6d 100644
--- a/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp
@@ -86,7 +86,7 @@ TQString CPPCodeClassField::getInitialValue() {
         if (at) {
             return fixInitialStringDeclValue(at->getInitialValue(), getTypeName());
         } else {
-            kError() << "CPPCodeClassField::getInitialValue: tqparent object is not a UMLAttribute"
+            kError() << "CPPCodeClassField::getInitialValue: parent object is not a UMLAttribute"
             << endl;
             return "";
         }
diff --git a/umbrello/umbrello/codegenerators/cppcodecomment.cpp b/umbrello/umbrello/codegenerators/cppcodecomment.cpp
index dada5357..ecb100bd 100644
--- a/umbrello/umbrello/codegenerators/cppcodecomment.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodecomment.cpp
@@ -53,7 +53,7 @@ CPPCodeComment::~CPPCodeComment ( ) { }
 void CPPCodeComment::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) {
     TQDomElement blockElement = doc.createElement( "cppcodecomment" );
     setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may
-    // just use tqparent TextBlock method
+    // just use parent TextBlock method
     root.appendChild( blockElement );
 }
 
diff --git a/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp b/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp
index c8e68f4c..ba303284 100644
--- a/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp
@@ -53,7 +53,7 @@ CPPCodeDocumentation::~CPPCodeDocumentation ( ) { }
 void CPPCodeDocumentation::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) {
     TQDomElement blockElement = doc.createElement( "cppcodedocumentation" );
     setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may
-    // just use tqparent TextBlock method
+    // just use parent TextBlock method
     root.appendChild( blockElement );
 }
 
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp
index 563a86ee..1051b6c6 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp
@@ -28,8 +28,8 @@
 #include <kmessagebox.h>
 
 
-CPPCodeGenerationForm::CPPCodeGenerationForm( TQWidget *tqparent, const char *name )
-        : CPPCodeGenerationFormBase (tqparent,name)
+CPPCodeGenerationForm::CPPCodeGenerationForm( TQWidget *parent, const char *name )
+        : CPPCodeGenerationFormBase (parent,name)
 {
     init();
 
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationform.h b/umbrello/umbrello/codegenerators/cppcodegenerationform.h
index 7a98ef91..aebaa5d5 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationform.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationform.h
@@ -31,7 +31,7 @@ public:
     /**
      * std ctor
      */
-    explicit CPPCodeGenerationForm (TQWidget *tqparent=0, const char *name=0);
+    explicit CPPCodeGenerationForm (TQWidget *parent=0, const char *name=0);
 
     /**
      * std dtor
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
index d14d92b9..8aec0351 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
@@ -359,8 +359,8 @@ void CPPCodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSign
  * Create a new dialog interface for this object.
  * @return dialog object
  */
-CodeGenerationPolicyPage * CPPCodeGenerationPolicy::createPage ( TQWidget *tqparent, const char *name ) {
-    return new CPPCodeGenerationPolicyPage ( tqparent, name, this );
+CodeGenerationPolicyPage * CPPCodeGenerationPolicy::createPage ( TQWidget *parent, const char *name ) {
+    return new CPPCodeGenerationPolicyPage ( parent, name, this );
 }
 
 void CPPCodeGenerationPolicy::init() {
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
index 949b451c..5788a2fe 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
@@ -193,7 +193,7 @@ public:
      * Create a new dialog interface for this object.
      * @return dialog object
      */
-    CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0);
+    CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0);
 
 protected:
 
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp
index a008daab..60d37bac 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp
@@ -26,8 +26,8 @@
 #include "cppcodegenerationformbase.h"
 #include "../uml.h"
 
-CPPCodeGenerationPolicyPage::CPPCodeGenerationPolicyPage( TQWidget *tqparent, const char *name, CPPCodeGenerationPolicy * policy )
-  : CodeGenerationPolicyPage(tqparent, name, policy)
+CPPCodeGenerationPolicyPage::CPPCodeGenerationPolicyPage( TQWidget *parent, const char *name, CPPCodeGenerationPolicy * policy )
+  : CodeGenerationPolicyPage(parent, name, policy)
 {
     CodeGenerationPolicy *common = UMLApp::app()->getCommonPolicy();
     form = new CPPCodeGenerationForm(this);
@@ -59,31 +59,31 @@ void CPPCodeGenerationPolicyPage::apply()
     CodeGenerationPolicy *common = UMLApp::app()->getCommonPolicy();
 
     // now do our cpp-specific configs
-    CPPCodeGenerationPolicy * tqparent = (CPPCodeGenerationPolicy*) m_parentPolicy;
+    CPPCodeGenerationPolicy * parent = (CPPCodeGenerationPolicy*) m_parentPolicy;
 
     // block signals so that we don't generate too many sync signals for child code
     // documents
-    tqparent->blockSignals(true);
+    parent->blockSignals(true);
 
     common->setCommentStyle((CodeGenerationPolicy::CommentStyle ) form->m_SelectCommentStyle->currentItem());
     common->setAutoGenerateConstructors(form->getGenerateEmptyConstructors());
-    tqparent->setAutoGenerateAccessors(form->getGenerateAccessorMethods());
+    parent->setAutoGenerateAccessors(form->getGenerateAccessorMethods());
 
-    tqparent->setDestructorsAreVirtual(form->getVirtualDestructors());
-    tqparent->setPackageIsNamespace(form->getPackageIsANamespace());
-    tqparent->setAccessorsAreInline(form->getAccessorsAreInline());
-    tqparent->setOperationsAreInline(form->getOperationsAreInline());
-    tqparent->setAccessorsArePublic(form->getAccessorsArePublic());
+    parent->setDestructorsAreVirtual(form->getVirtualDestructors());
+    parent->setPackageIsNamespace(form->getPackageIsANamespace());
+    parent->setAccessorsAreInline(form->getAccessorsAreInline());
+    parent->setOperationsAreInline(form->getOperationsAreInline());
+    parent->setAccessorsArePublic(form->getAccessorsArePublic());
 
-    tqparent->setStringClassName(form->m_stringClassHCombo->currentText());
-    tqparent->setStringClassNameInclude(form->m_stringIncludeFileHistoryCombo->currentText());
-    tqparent->setStringIncludeIsGlobal(form->m_globalStringCheckBox->isChecked());
+    parent->setStringClassName(form->m_stringClassHCombo->currentText());
+    parent->setStringClassNameInclude(form->m_stringIncludeFileHistoryCombo->currentText());
+    parent->setStringIncludeIsGlobal(form->m_globalStringCheckBox->isChecked());
 
-    tqparent->setVectorClassName(form->m_listClassHCombo->currentText());
-    tqparent->setVectorClassNameInclude(form->m_listIncludeFileHistoryCombo->currentText());
-    tqparent->setVectorIncludeIsGlobal(form->m_globalListCheckBox->isChecked());
+    parent->setVectorClassName(form->m_listClassHCombo->currentText());
+    parent->setVectorClassNameInclude(form->m_listIncludeFileHistoryCombo->currentText());
+    parent->setVectorIncludeIsGlobal(form->m_globalListCheckBox->isChecked());
 
-    tqparent->blockSignals(false);
+    parent->blockSignals(false);
 
     // now send out modified code content signal
     common->emitModifiedCodeContentSig();
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h
index 6e32c62d..a918acfb 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h
@@ -31,7 +31,7 @@ class CPPCodeGenerationPolicyPage : public CodeGenerationPolicyPage {
   TQ_OBJECT
 public:
 
-    explicit CPPCodeGenerationPolicyPage (TQWidget *tqparent=0, const char *name=0, CPPCodeGenerationPolicy * policy = 0);
+    explicit CPPCodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, CPPCodeGenerationPolicy * policy = 0);
 
     virtual ~CPPCodeGenerationPolicyPage();
 
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerator.cpp b/umbrello/umbrello/codegenerators/cppcodegenerator.cpp
index b5571d02..b5c12dd6 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerator.cpp
@@ -120,14 +120,14 @@ bool CPPCodeGenerator::removeHeaderCodeDocument ( CPPHeaderCodeDocument * remove
 
 // In the C++ version, we need to make both source and header files as well
 // as the makefile available.
-CodeViewerDialog * CPPCodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, CodeDocument *doc,
+CodeViewerDialog * CPPCodeGenerator::getCodeViewerDialog ( TQWidget* parent, CodeDocument *doc,
         Settings::CodeViewerState state)
 {
 
     ClassifierCodeDocument * cdoc = dynamic_cast<ClassifierCodeDocument*>(doc);
     if(!cdoc)
         // bah..not a classcode document?? then just use vanilla version
-        return CodeGenerator::getCodeViewerDialog(tqparent,doc,state);
+        return CodeGenerator::getCodeViewerDialog(parent,doc,state);
     else {
         // build with passed (source) code document
         CodeViewerDialog *dialog;
@@ -138,11 +138,11 @@ CodeViewerDialog * CPPCodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, C
         if(hdoc)
         {
             // if we have a header document..build with that
-            dialog = new CodeViewerDialog(tqparent, hdoc, state);
+            dialog = new CodeViewerDialog(parent, hdoc, state);
             dialog->addCodeDocument(doc);
         } else
             // shouldn't happen, but lets try to gracefully deliver something.
-            dialog = new CodeViewerDialog(tqparent, doc, state);
+            dialog = new CodeViewerDialog(parent, doc, state);
 
         // add in makefile if available and desired
         if(getCreateProjectMakefile())
@@ -178,8 +178,8 @@ void CPPCodeGenerator::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) {
 }
 
 /**
- * Force a synchronize of this code generator, and its present contents, to that of the tqparent UMLDocument.
- * Need to override tqparent method because we have header documents to consider too.
+ * Force a synchronize of this code generator, and its present contents, to that of the parent UMLDocument.
+ * Need to override parent method because we have header documents to consider too.
  */
 void CPPCodeGenerator::syncCodeToDocument ( ) {
 
@@ -347,7 +347,7 @@ void CPPCodeGenerator::initAttributes ( )
 
     UMLApp::app()->setPolicyExt ( new CPPCodeGenerationPolicy(UMLApp::app()->getConfig()) );
 
-    // load Classifier documents from tqparent document
+    // load Classifier documents from parent document
     //initFromParentDocument();
 }
 
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerator.h b/umbrello/umbrello/codegenerators/cppcodegenerator.h
index 90b0c3f2..5d73f881 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerator.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerator.h
@@ -89,7 +89,7 @@ public:
 
     /** Get the editing dialog for this code document
      */
-    virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc,
+    virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc,
             Settings::CodeViewerState state);
 
     /**
@@ -158,7 +158,7 @@ public slots:
     virtual void checkRemoveUMLObject (UMLObject * obj);
 
     /**
-     * Force a synchronize of this code generator, and its present contents, to that of the tqparent UMLDocument.
+     * Force a synchronize of this code generator, and its present contents, to that of the parent UMLDocument.
      * "UserGenerated" code will be preserved, but Autogenerated contents will be updated/replaced
      * or removed as is apppropriate.
      */
diff --git a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h
index 84fc128a..7277ea87 100644
--- a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h
@@ -61,7 +61,7 @@ protected:
 
 private:
 
-    void init (CPPHeaderCodeDocument * tqparent, const TQString &comment);
+    void init (CPPHeaderCodeDocument * parent, const TQString &comment);
 
 };
 
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp
index 55edd167..3f15d05b 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp
@@ -21,8 +21,8 @@
 // Constructors/Destructors
 //
 
-CPPHeaderCodeClassFieldDeclarationBlock::CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * tqparent )
-        : CodeClassFieldDeclarationBlock ( tqparent )
+CPPHeaderCodeClassFieldDeclarationBlock::CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * parent )
+        : CodeClassFieldDeclarationBlock ( parent )
 {
     setOverallIndentationLevel(1);
     updateContent();
@@ -41,8 +41,8 @@ CPPHeaderCodeClassFieldDeclarationBlock::~CPPHeaderCodeClassFieldDeclarationBloc
  */
 void CPPHeaderCodeClassFieldDeclarationBlock::updateContent( )
 {
-    UMLObject *umltqparent = CodeClassFieldDeclarationBlock::getParentObject();
-    if (umltqparent == NULL) {
+    UMLObject *umlparent = CodeClassFieldDeclarationBlock::getParentObject();
+    if (umlparent == NULL) {
         return;
     }
 
@@ -50,7 +50,7 @@ void CPPHeaderCodeClassFieldDeclarationBlock::updateContent( )
     CPPCodeClassField * hcppcf = dynamic_cast<CPPCodeClassField*>(cf);
 
     // Set the comment
-    TQString notes = umltqparent->getDoc();
+    TQString notes = umlparent->getDoc();
     getComment()->setText(notes);
     if(notes.isEmpty())
         getComment()->setWriteOutText(false);
@@ -59,7 +59,7 @@ void CPPHeaderCodeClassFieldDeclarationBlock::updateContent( )
 
 
     // Set the body
-    TQString staticValue = umltqparent->getStatic() ? "static " : "";
+    TQString staticValue = umlparent->getStatic() ? "static " : "";
     TQString typeName = hcppcf->getTypeName();
     TQString fieldName = hcppcf->getFieldName();
 
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h
index dc3a4c29..d4e28bb9 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h
@@ -32,7 +32,7 @@ public:
     /**
      * Constructor
      */
-    CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * tqparent );
+    CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * parent );
 
     /**
      * Empty Destructor
@@ -41,7 +41,7 @@ public:
 
 protected:
 
-    // this will be called by syncToParent whenever the tqparent object is "modified"
+    // this will be called by syncToParent whenever the parent object is "modified"
     void updateContent ( );
 
 private:
diff --git a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp
index c725439f..9da4c6aa 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp
@@ -206,7 +206,7 @@ void CPPHeaderCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & root)
                                             {
                                                 CPPHeaderClassDeclarationBlock * block = getClassDecl();
                                                 block->loadFromXMI(element);
-                                                // normally this would be populated by the following syncTotqparent
+                                                // normally this would be populated by the following syncToparent
                                                 // call, but we cant wait for it, so lets just do it now.
                                                 namespaceBlock = getHierarchicalCodeBlock("namespace", "Namespace", 0);
 
@@ -326,7 +326,7 @@ void CPPHeaderCodeDocument::saveToXMI ( TQDomDocument & doc, TQDomElement & root
 */
 
 // This method will cause the class to rebuild its text representation.
-// based on the tqparent classifier object.
+// based on the parent classifier object.
 // For any situation in which this is called, we are either building the code
 // document up, or replacing/regenerating the existing auto-generated parts. As
 // such, we will want to insert everything we resonablely will want
@@ -334,7 +334,7 @@ void CPPHeaderCodeDocument::saveToXMI ( TQDomDocument & doc, TQDomElement & root
 // comments) to appear or not, as needed.
 void CPPHeaderCodeDocument::updateContent( )
 {
-    // Gather info on the various fields and tqparent objects of this class...
+    // Gather info on the various fields and parent objects of this class...
     UMLClassifier * c = getParentClassifier();
     CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt();
     CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe);
@@ -800,7 +800,7 @@ void CPPHeaderCodeDocument::updateContent( )
 
     // Operations
     //
-    // nothing to do here.. "updateOperations" in tqparent class puts things
+    // nothing to do here.. "updateOperations" in parent class puts things
     // in the right place using the "addCodeOperation" method we defined in this class
 
     // FINISH up with hash def block close
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp b/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp
index 37951553..471c7734 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp
+++ b/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp
@@ -26,8 +26,8 @@
 //
 
 CPPHeaderCodeOperation::CPPHeaderCodeOperation
- ( CPPHeaderCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment )
-        : CodeOperation (doc, tqparent, body, comment)
+ ( CPPHeaderCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment )
+        : CodeOperation (doc, parent, body, comment)
 {
     // lets not go with the default comment and instead use
     // full-blown cpp documentation object instead
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp
index 2e55e92a..016249e5 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp
@@ -20,8 +20,8 @@
 // Constructors/Destructors
 //
 
-CPPSourceCodeClassFieldDeclarationBlock::CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * tqparent )
-        : CodeClassFieldDeclarationBlock ( tqparent )
+CPPSourceCodeClassFieldDeclarationBlock::CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * parent )
+        : CodeClassFieldDeclarationBlock ( parent )
 {
     setOverallIndentationLevel(1);
     updateContent();
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h
index 00b6135f..46183b70 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h
@@ -32,7 +32,7 @@ public:
     /**
      * Constructor
      */
-    CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * tqparent );
+    CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * parent );
 
     /**
      * Empty Destructor
@@ -41,7 +41,7 @@ public:
 
 protected:
 
-    // this will be called by syncToParent whenever the tqparent object is "modified"
+    // this will be called by syncToParent whenever the parent object is "modified"
     void updateContent ( );
 
 private:
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp b/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp
index 53ee06f7..57bf4637 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp
@@ -106,7 +106,7 @@ void CPPSourceCodeDocument::resetTextBlocks()
 }
 
 // This method will cause the class to rebuild its text representation.
-// based on the tqparent classifier object.
+// based on the parent classifier object.
 // For any situation in which this is called, we are either building the code
 // document up, or replacing/regenerating the existing auto-generated parts. As
 // such, we will want to insert everything we reasonably will want
@@ -115,7 +115,7 @@ void CPPSourceCodeDocument::resetTextBlocks()
 void CPPSourceCodeDocument::updateContent( )
 {
 
-    // Gather info on the various fields and tqparent objects of this class...
+    // Gather info on the various fields and parent objects of this class...
     //UMLClassifier * c = getParentClassifier();
     CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt();
     CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe);
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp
index 9409b207..61b1950e 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp
@@ -25,8 +25,8 @@
 // Constructors/Destructors
 //
 
-CPPSourceCodeOperation::CPPSourceCodeOperation ( CPPSourceCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment )
-        : CodeOperation (doc, tqparent, body, comment)
+CPPSourceCodeOperation::CPPSourceCodeOperation ( CPPSourceCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment )
+        : CodeOperation (doc, parent, body, comment)
 {
     // lets not go with the default comment and instead use
     // full-blown cpp documentation object instead
diff --git a/umbrello/umbrello/codegenerators/csharpwriter.cpp b/umbrello/umbrello/codegenerators/csharpwriter.cpp
index 884661b5..180ba176 100644
--- a/umbrello/umbrello/codegenerators/csharpwriter.cpp
+++ b/umbrello/umbrello/codegenerators/csharpwriter.cpp
@@ -405,7 +405,7 @@ void CSharpWriter::writeOverridesRecursive(UMLClassifierList *superclasses, TQTe
 
             opabstract.clear();
         }
-        // Recurse to tqparent superclasses
+        // Recurse to parent superclasses
         UMLClassifierList superRecursive = obj->getSuperClasses();
         UMLClassifierList *superRecursivePtr =& superRecursive;
         if (superRecursivePtr->count() > 0) {
@@ -433,7 +433,7 @@ void CSharpWriter::writeRealizationsRecursive(UMLClassifier *currentClass, UMLAs
         writeOperations(opreal,cs,false,false,true);
         cs << m_container_indent << m_indentation << "#endregion" << m_endl << m_endl;
 
-        // Recurse to tqparent realizations
+        // Recurse to parent realizations
         UMLAssociationList parentReal = real->getRealizations();
         if (!parentReal.isEmpty()) {
             writeRealizationsRecursive(real, &parentReal, cs);
@@ -493,7 +493,7 @@ void CSharpWriter::writeOperations(UMLOperationList opList,
                 if (op->getStatic()) cs << "static ";
             }
             else {
-                // method overriding an abstract tqparent
+                // method overriding an abstract parent
                 cs << op->getVisibility().toString() << " override ";
                 if (op->getStatic()) cs << "static ";
             }
diff --git a/umbrello/umbrello/codegenerators/csharpwriter.h b/umbrello/umbrello/codegenerators/csharpwriter.h
index 6cf4d3f6..322ce06c 100644
--- a/umbrello/umbrello/codegenerators/csharpwriter.h
+++ b/umbrello/umbrello/codegenerators/csharpwriter.h
@@ -80,7 +80,7 @@ private:
     int m_unnamedRoles;
 
     /**
-      * write realizations of a class and recurse to tqparent classes
+      * write realizations of a class and recurse to parent classes
 
       * @param currentClass class to start with
       * @param realizations realizations of this class
diff --git a/umbrello/umbrello/codegenerators/idlwriter.cpp b/umbrello/umbrello/codegenerators/idlwriter.cpp
index 1d517fbb..efb49dc9 100644
--- a/umbrello/umbrello/codegenerators/idlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/idlwriter.cpp
@@ -275,13 +275,13 @@ void IDLWriter::writeClass(UMLClassifier *c) {
     UMLClassifierList superclasses = c->getSuperClasses();
     if (! superclasses.isEmpty()) {
         idl << " : ";
-        UMLClassifier *tqparent = superclasses.first();
+        UMLClassifier *parent = superclasses.first();
         int n_parents = superclasses.count();
         while (n_parents--) {
-            idl << tqparent->getFullyQualifiedName("::");
+            idl << parent->getFullyQualifiedName("::");
             if (n_parents)
                 idl << ", ";
-            tqparent = superclasses.next();
+            parent = superclasses.next();
         }
     }
     idl << " {" << m_endl << m_endl;
diff --git a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h
index 0c1709ba..19a743d5 100644
--- a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h
@@ -60,7 +60,7 @@ protected:
 
 private:
 
-    void init (JavaClassifierCodeDocument * tqparent, const TQString &comment);
+    void init (JavaClassifierCodeDocument * parent, const TQString &comment);
 
 };
 
diff --git a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
index 877111e1..1587c265 100644
--- a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
@@ -326,7 +326,7 @@ void JavaClassifierCodeDocument::resetTextBlocks()
 }
 
 // This method will cause the class to rebuild its text representation.
-// based on the tqparent classifier object.
+// based on the parent classifier object.
 // For any situation in which this is called, we are either building the code
 // document up, or replacing/regenerating the existing auto-generated parts. As
 // such, we will want to insert everything we resonablely will want
@@ -334,7 +334,7 @@ void JavaClassifierCodeDocument::resetTextBlocks()
 // comments) to appear or not, as needed.
 void JavaClassifierCodeDocument::updateContent( )
 {
-    // Gather info on the various fields and tqparent objects of this class...
+    // Gather info on the various fields and parent objects of this class...
     UMLClassifier * c = getParentClassifier();
     CodeGenerationPolicy * commonPolicy = UMLApp::app()->getCommonPolicy();
     CodeGenPolicyExt * pe = UMLApp::app()->getPolicyExt();
diff --git a/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp
index c0b08396..6c883952 100644
--- a/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp
+++ b/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp
@@ -159,7 +159,7 @@ void JavaCodeAccessorMethod::updateMethodDeclaration()
             break;
         default:
         case CodeGenerationPolicy::FromParent:
-            // do nothing..already have taken tqparent value
+            // do nothing..already have taken parent value
             break;
         }
 
diff --git a/umbrello/umbrello/codegenerators/javacodeclassfield.cpp b/umbrello/umbrello/codegenerators/javacodeclassfield.cpp
index c3ebb9e2..0777cf1d 100644
--- a/umbrello/umbrello/codegenerators/javacodeclassfield.cpp
+++ b/umbrello/umbrello/codegenerators/javacodeclassfield.cpp
@@ -84,7 +84,7 @@ TQString JavaCodeClassField::getInitialValue() {
         if (at) {
             return fixInitialStringDeclValue(at->getInitialValue(), getTypeName());
         } else {
-            kError() << "JavaodeClassField::getInitialValue: tqparent object is not a UMLAttribute"
+            kError() << "JavaodeClassField::getInitialValue: parent object is not a UMLAttribute"
             << endl;
             return "";
         }
diff --git a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp
index 520f5611..5507c314 100644
--- a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp
@@ -27,8 +27,8 @@
 // Constructors/Destructors
 //
 
-JavaCodeClassFieldDeclarationBlock::JavaCodeClassFieldDeclarationBlock ( CodeClassField * tqparent )
-        : CodeClassFieldDeclarationBlock ( tqparent )
+JavaCodeClassFieldDeclarationBlock::JavaCodeClassFieldDeclarationBlock ( CodeClassField * parent )
+        : CodeClassFieldDeclarationBlock ( parent )
 {
     setOverallIndentationLevel(1);
     updateContent();
@@ -77,7 +77,7 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( )
             break;
         default:
         case CodeGenerationPolicy::FromParent:
-            // do nothing here... will leave as from tqparent object
+            // do nothing here... will leave as from parent object
             break;
         }
     }
@@ -101,7 +101,7 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( )
         } else {
 
             // FIX?: IF a constructor method exists in the classifiercodedoc
-            // of the tqparent Object, then we can use that instead (if its empty).
+            // of the parent Object, then we can use that instead (if its empty).
             if(cf->fieldIsSingleValue())
             {
                 if(!typeName.isEmpty())
diff --git a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h
index d7f3c2f5..869954cf 100644
--- a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h
@@ -32,7 +32,7 @@ public:
     /**
      * Constructor
      */
-    JavaCodeClassFieldDeclarationBlock ( CodeClassField * tqparent );
+    JavaCodeClassFieldDeclarationBlock ( CodeClassField * parent );
 
     /**
      * Empty Destructor
@@ -41,7 +41,7 @@ public:
 
 protected:
 
-    // this will be called by syncToParent whenever the tqparent object is "modified"
+    // this will be called by syncToParent whenever the parent object is "modified"
     void updateContent ( );
 
 private:
diff --git a/umbrello/umbrello/codegenerators/javacodedocumentation.cpp b/umbrello/umbrello/codegenerators/javacodedocumentation.cpp
index a04a3cd1..2eeff46a 100644
--- a/umbrello/umbrello/codegenerators/javacodedocumentation.cpp
+++ b/umbrello/umbrello/codegenerators/javacodedocumentation.cpp
@@ -54,7 +54,7 @@ JavaCodeDocumentation::~JavaCodeDocumentation ( ) { }
 void JavaCodeDocumentation::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) {
     TQDomElement blockElement = doc.createElement( "javacodedocumentation" );
     setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may
-    // just use tqparent TextBlock method
+    // just use parent TextBlock method
     root.appendChild( blockElement );
 }
 
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp
index aeee86e0..6225485f 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp
@@ -174,8 +174,8 @@ void JavaCodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSig
  * Create a new dialog interface for this object.
  * @return dialog object
  */
-CodeGenerationPolicyPage * JavaCodeGenerationPolicy::createPage ( TQWidget *tqparent, const char *name ) {
-    return new JavaCodeGenerationPolicyPage ( tqparent, name, this );
+CodeGenerationPolicyPage * JavaCodeGenerationPolicy::createPage ( TQWidget *parent, const char *name ) {
+    return new JavaCodeGenerationPolicyPage ( parent, name, this );
 }
 
 void JavaCodeGenerationPolicy::init() {
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
index cb9171f4..8f95c1c8 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
@@ -97,7 +97,7 @@ public:
      * Create a new dialog interface for this object.
      * @return dialog object
      */
-    CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0);
+    CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0);
 
 protected:
 
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp
index c802024a..c7bfbf0b 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp
@@ -26,8 +26,8 @@
 #include "javacodegenerationformbase.h"
 #include "../uml.h"
 
-JavaCodeGenerationPolicyPage::JavaCodeGenerationPolicyPage( TQWidget *tqparent, const char *name, JavaCodeGenerationPolicy * policy )
-  : CodeGenerationPolicyPage(tqparent, name, policy)
+JavaCodeGenerationPolicyPage::JavaCodeGenerationPolicyPage( TQWidget *parent, const char *name, JavaCodeGenerationPolicy * policy )
+  : CodeGenerationPolicyPage(parent, name, policy)
 {
     CodeGenerationPolicy *commonPolicy = UMLApp::app()->getCommonPolicy();
     form = new JavaCodeGenerationFormBase(this);
@@ -54,7 +54,7 @@ JavaCodeGenerationPolicyPage::~JavaCodeGenerationPolicyPage()
 void JavaCodeGenerationPolicyPage::apply()
 {
     CodeGenerationPolicy *commonPolicy = UMLApp::app()->getCommonPolicy();
-    JavaCodeGenerationPolicy * tqparent = (JavaCodeGenerationPolicy*) m_parentPolicy;
+    JavaCodeGenerationPolicy * parent = (JavaCodeGenerationPolicy*) m_parentPolicy;
 
     // block signals so we don't cause too many update content calls to code documents
     commonPolicy->blockSignals(true);
@@ -63,8 +63,8 @@ void JavaCodeGenerationPolicyPage::apply()
     commonPolicy->setAttributeAccessorScope((CodeGenerationPolicy::ScopePolicy) (form->m_accessorScopeCB->currentItem()+200));
     commonPolicy->setAssociationFieldScope((CodeGenerationPolicy::ScopePolicy) (form->m_assocFieldScopeCB->currentItem()+200));
     commonPolicy->setAutoGenerateConstructors(form->m_generateConstructors->isChecked());
-    tqparent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked());
-    tqparent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked());
+    parent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked());
+    parent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked());
 
     /**
      * @todo unclean - CreateANTBuildFile attribute should be in java policy
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h
index 2ace585e..8236e1a2 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h
@@ -31,7 +31,7 @@ class JavaCodeGenerationPolicyPage : public CodeGenerationPolicyPage {
   TQ_OBJECT
 public:
 
-    explicit JavaCodeGenerationPolicyPage (TQWidget *tqparent=0, const char *name=0, JavaCodeGenerationPolicy * policy = 0);
+    explicit JavaCodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, JavaCodeGenerationPolicy * policy = 0);
 
     virtual ~JavaCodeGenerationPolicyPage();
 
diff --git a/umbrello/umbrello/codegenerators/javacodegenerator.cpp b/umbrello/umbrello/codegenerators/javacodegenerator.cpp
index d51a7b3c..0f78a0fb 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/javacodegenerator.cpp
@@ -79,10 +79,10 @@ bool JavaCodeGenerator::getCreateANTBuildFile ( ) {
 }
 
 // In the Java version, we make the ANT build file also available.
-CodeViewerDialog * JavaCodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, CodeDocument *doc,
+CodeViewerDialog * JavaCodeGenerator::getCodeViewerDialog ( TQWidget* parent, CodeDocument *doc,
         Settings::CodeViewerState state)
 {
-    CodeViewerDialog *dialog = new CodeViewerDialog(tqparent, doc, state);
+    CodeViewerDialog *dialog = new CodeViewerDialog(parent, doc, state);
     if(getCreateANTBuildFile())
         dialog->addCodeDocument(findCodeDocumentByID("ANTDOC"));
     return dialog;
@@ -143,7 +143,7 @@ CodeDocument * JavaCodeGenerator::newClassifierCodeDocument ( UMLClassifier * c)
 }
 
 void JavaCodeGenerator::init() {
-    // load Classifier documents from tqparent document
+    // load Classifier documents from parent document
     //initFromParentDocument();
 
     // add in an ANT document
diff --git a/umbrello/umbrello/codegenerators/javacodegenerator.h b/umbrello/umbrello/codegenerators/javacodegenerator.h
index c9fc49e7..24ab718a 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerator.h
+++ b/umbrello/umbrello/codegenerators/javacodegenerator.h
@@ -92,7 +92,7 @@ public:
 
     /** Get the editing dialog for this code document
      */
-    virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc,
+    virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc,
             Settings::CodeViewerState state);
 
     // Other methods
diff --git a/umbrello/umbrello/codegenerators/javacodeoperation.cpp b/umbrello/umbrello/codegenerators/javacodeoperation.cpp
index 54b34f46..c7e7d162 100644
--- a/umbrello/umbrello/codegenerators/javacodeoperation.cpp
+++ b/umbrello/umbrello/codegenerators/javacodeoperation.cpp
@@ -25,8 +25,8 @@
 //
 
 JavaCodeOperation::JavaCodeOperation
- ( JavaClassifierCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment )
-        : CodeOperation (doc, tqparent, body, comment)
+ ( JavaClassifierCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment )
+        : CodeOperation (doc, parent, body, comment)
 {
     // lets not go with the default comment and instead use
     // full-blown java documentation object instead
@@ -81,7 +81,7 @@ void JavaCodeOperation::updateMethodDeclaration()
         maybeStatic = "static ";
     TQString startText = strVis + ' ' + maybeStatic + returnType + methodName + " (" + paramStr + ')';
 
-    // IF the tqparent is an interface, our operations look different
+    // IF the parent is an interface, our operations look different
     // e.g. they have no body
     if(isInterface) {
         startText += ';';
diff --git a/umbrello/umbrello/codegenerators/pascalwriter.cpp b/umbrello/umbrello/codegenerators/pascalwriter.cpp
index 8d11b893..0f3c32ef 100644
--- a/umbrello/umbrello/codegenerators/pascalwriter.cpp
+++ b/umbrello/umbrello/codegenerators/pascalwriter.cpp
@@ -244,8 +244,8 @@ void PascalWriter::writeClass(UMLClassifier *c) {
     pas << getIndent() << classname << " = object";
     if (!superclasses.isEmpty()) {
         // FIXME: Multiple inheritance is not yet supported
-        UMLClassifier* tqparent = superclasses.first();
-        pas << "(" << qualifiedName(tqparent) << ")";
+        UMLClassifier* parent = superclasses.first();
+        pas << "(" << qualifiedName(parent) << ")";
     }
     pas << m_endl;
 
diff --git a/umbrello/umbrello/codegenerators/php5writer.cpp b/umbrello/umbrello/codegenerators/php5writer.cpp
index e0fe4828..10146b6c 100644
--- a/umbrello/umbrello/codegenerators/php5writer.cpp
+++ b/umbrello/umbrello/codegenerators/php5writer.cpp
@@ -1776,7 +1776,7 @@ static const char *php5words[] =
         "ncurses_killchar",
         "ncurses_longname",
         "ncurses_mouseinterval",
-        "ncurses_mousetqmask",
+        "ncurses_mousemask",
         "ncurses_move",
         "ncurses_mvaddch",
         "ncurses_mvaddchnstr",
diff --git a/umbrello/umbrello/codegenerators/phpwriter.cpp b/umbrello/umbrello/codegenerators/phpwriter.cpp
index b3c8a43e..4116020d 100644
--- a/umbrello/umbrello/codegenerators/phpwriter.cpp
+++ b/umbrello/umbrello/codegenerators/phpwriter.cpp
@@ -1772,7 +1772,7 @@ static const char *words[] =
         "ncurses_killchar",
         "ncurses_longname",
         "ncurses_mouseinterval",
-        "ncurses_mousetqmask",
+        "ncurses_mousemask",
         "ncurses_move",
         "ncurses_mvaddch",
         "ncurses_mvaddchnstr",
diff --git a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h
index 327516a3..d181fc65 100644
--- a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h
@@ -68,7 +68,7 @@ protected:
 
 private:
 
-    void init (RubyClassifierCodeDocument * tqparent, const TQString &comment);
+    void init (RubyClassifierCodeDocument * parent, const TQString &comment);
 
 };
 
diff --git a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
index 6f5b881d..22fa56fc 100644
--- a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
@@ -355,7 +355,7 @@ void RubyClassifierCodeDocument::resetTextBlocks()
 }
 
 // This method will cause the class to rebuild its text representation.
-// based on the tqparent classifier object.
+// based on the parent classifier object.
 // For any situation in which this is called, we are either building the code
 // document up, or replacing/regenerating the existing auto-generated parts. As
 // such, we will want to insert everything we resonablely will want
@@ -363,7 +363,7 @@ void RubyClassifierCodeDocument::resetTextBlocks()
 // comments) to appear or not, as needed.
 void RubyClassifierCodeDocument::updateContent( )
 {
-    // Gather info on the various fields and tqparent objects of this class...
+    // Gather info on the various fields and parent objects of this class...
     UMLClassifier * c = getParentClassifier();
     RubyCodeGenerator * gen = dynamic_cast<RubyCodeGenerator*>(UMLApp::app()->getGenerator());
 
diff --git a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp
index a3f4d26f..43986061 100644
--- a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp
@@ -168,7 +168,7 @@ void RubyCodeAccessorMethod::updateMethodDeclaration()
             break;
         default:
         case CodeGenerationPolicy::FromParent:
-            // do nothing..already have taken tqparent value
+            // do nothing..already have taken parent value
             break;
         }
 
diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp b/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp
index 793db6ed..b3b723b9 100644
--- a/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp
@@ -86,7 +86,7 @@ TQString RubyCodeClassField::getInitialValue() {
         if (at) {
             return fixInitialStringDeclValue(at->getInitialValue(), getTypeName());
         } else {
-            kError() << "RubyodeClassField::getInitialValue: tqparent object is not a UMLAttribute"
+            kError() << "RubyodeClassField::getInitialValue: parent object is not a UMLAttribute"
             << endl;
             return "";
         }
diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp
index da8eb00e..e99ca774 100644
--- a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp
@@ -22,8 +22,8 @@
 // Constructors/Destructors
 //
 
-RubyCodeClassFieldDeclarationBlock::RubyCodeClassFieldDeclarationBlock ( CodeClassField * tqparent )
-        : CodeClassFieldDeclarationBlock ( tqparent )
+RubyCodeClassFieldDeclarationBlock::RubyCodeClassFieldDeclarationBlock ( CodeClassField * parent )
+        : CodeClassFieldDeclarationBlock ( parent )
 {
     setOverallIndentationLevel(1);
     updateContent();
@@ -71,7 +71,7 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( )
             break;
         default:
         case CodeGenerationPolicy::FromParent:
-            // do nothing here... will leave as from tqparent object
+            // do nothing here... will leave as from parent object
             break;
         }
     }
@@ -95,7 +95,7 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( )
         } else {
 
             // FIX?: IF a constructor method exists in the classifiercodedoc
-            // of the tqparent Object, then we can use that instead (if its empty).
+            // of the parent Object, then we can use that instead (if its empty).
             if(cf->fieldIsSingleValue())
             {
                 if(!typeName.isEmpty())
diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h
index 1dd6b342..493f768c 100644
--- a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h
@@ -36,7 +36,7 @@ public:
     /**
      * Constructor
      */
-    RubyCodeClassFieldDeclarationBlock ( CodeClassField * tqparent );
+    RubyCodeClassFieldDeclarationBlock ( CodeClassField * parent );
 
     /**
      * Empty Destructor
@@ -45,7 +45,7 @@ public:
 
 protected:
 
-    // this will be called by syncToParent whenever the tqparent object is "modified"
+    // this will be called by syncToParent whenever the parent object is "modified"
     void updateContent ( );
 
 private:
diff --git a/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp b/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp
index 9afee3f1..776e0c1e 100644
--- a/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp
@@ -57,7 +57,7 @@ RubyCodeDocumentation::~RubyCodeDocumentation ( ) { }
 void RubyCodeDocumentation::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) {
     TQDomElement blockElement = doc.createElement( "rubycodedocumentation" );
     setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may
-    // just use tqparent TextBlock method
+    // just use parent TextBlock method
     root.appendChild( blockElement );
 }
 
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp
index 62df797d..8e58fdf0 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp
@@ -156,8 +156,8 @@ void RubyCodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSig
  * Create a new dialog interface for this object.
  * @return dialog object
  */
-CodeGenerationPolicyPage * RubyCodeGenerationPolicy::createPage ( TQWidget *tqparent, const char *name ) {
-    return new RubyCodeGenerationPolicyPage ( tqparent, name, this );
+CodeGenerationPolicyPage * RubyCodeGenerationPolicy::createPage ( TQWidget *parent, const char *name ) {
+    return new RubyCodeGenerationPolicyPage ( parent, name, this );
 }
 
 void RubyCodeGenerationPolicy::init() {
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
index 459e80d0..542f3166 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
@@ -99,7 +99,7 @@ public:
      * Create a new dialog interface for this object.
      * @return dialog object
      */
-    CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0);
+    CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0);
 
 protected:
 
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp
index c6153448..5c890b4f 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp
@@ -30,8 +30,8 @@
 #include "../codegenerationpolicy.h"
 #include "../uml.h"
 
-RubyCodeGenerationPolicyPage::RubyCodeGenerationPolicyPage( TQWidget *tqparent, const char *name, RubyCodeGenerationPolicy * policy )
-  : CodeGenerationPolicyPage(tqparent, name, policy)
+RubyCodeGenerationPolicyPage::RubyCodeGenerationPolicyPage( TQWidget *parent, const char *name, RubyCodeGenerationPolicy * policy )
+  : CodeGenerationPolicyPage(parent, name, policy)
 {
     CodeGenerationPolicy *common = UMLApp::app()->getCommonPolicy();
     form = new RubyCodeGenerationFormBase(this);
@@ -52,19 +52,19 @@ void RubyCodeGenerationPolicyPage::apply()
     CodeGenerationPolicy *common = UMLApp::app()->getCommonPolicy();
 
     // now do our ruby-specific configs
-    RubyCodeGenerationPolicy * tqparent = (RubyCodeGenerationPolicy*) m_parentPolicy;
+    RubyCodeGenerationPolicy * parent = (RubyCodeGenerationPolicy*) m_parentPolicy;
 
     // block signals so we don't cause too many update content calls to code documents
-    tqparent->blockSignals(true);
+    parent->blockSignals(true);
 
     common->setCommentStyle((CodeGenerationPolicy::CommentStyle) form->m_SelectCommentStyle->currentItem());
     common->setAttributeAccessorScope((CodeGenerationPolicy::ScopePolicy) (form->m_accessorScopeCB->currentItem()+200));
     common->setAssociationFieldScope((CodeGenerationPolicy::ScopePolicy) (form->m_assocFieldScopeCB->currentItem()+200));
     common->setAutoGenerateConstructors(form->m_generateConstructors->isChecked());
-    tqparent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked());
-    tqparent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked());
+    parent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked());
+    parent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked());
 
-    tqparent->blockSignals(false);
+    parent->blockSignals(false);
 
     // now send out modified code content signal
     common->emitModifiedCodeContentSig();
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h
index c994dff8..fc29fc3f 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h
@@ -34,7 +34,7 @@ class RubyCodeGenerationPolicyPage : public CodeGenerationPolicyPage {
   TQ_OBJECT
 public:
 
-    explicit RubyCodeGenerationPolicyPage (TQWidget *tqparent=0, const char *name=0, RubyCodeGenerationPolicy * policy = 0);
+    explicit RubyCodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, RubyCodeGenerationPolicy * policy = 0);
 
     virtual ~RubyCodeGenerationPolicyPage();
 
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
index 65b2af15..0cd9176f 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
@@ -59,10 +59,10 @@ Uml::Programming_Language RubyCodeGenerator::getLanguage() {
 }
 
 // In the Java version, we make the ANT build file also available.
-CodeViewerDialog * RubyCodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, CodeDocument *doc,
+CodeViewerDialog * RubyCodeGenerator::getCodeViewerDialog ( TQWidget* parent, CodeDocument *doc,
         Settings::CodeViewerState state)
 {
-    CodeViewerDialog *dialog = new CodeViewerDialog(tqparent, doc, state);
+    CodeViewerDialog *dialog = new CodeViewerDialog(parent, doc, state);
     return dialog;
 }
 
@@ -127,7 +127,7 @@ CodeDocument * RubyCodeGenerator::newClassifierCodeDocument ( UMLClassifier * c)
 /* These initializations are done in CodeGenFactory::createObject()
 void RubyCodeGenerator::initFields() {
     UMLApp::app()->setPolicyExt ( new RubyCodeGenerationPolicy(UMLApp::app()->getConfig()) );
-    // load Classifier documents from tqparent document
+    // load Classifier documents from parent document
     initFromParentDocument();
 }
  */
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerator.h b/umbrello/umbrello/codegenerators/rubycodegenerator.h
index 4be5e7e8..035daa86 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerator.h
+++ b/umbrello/umbrello/codegenerators/rubycodegenerator.h
@@ -77,7 +77,7 @@ public:
 
     /** Get the editing dialog for this code document
      */
-    virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc,
+    virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc,
             Settings::CodeViewerState state);
 
     // Other methods
diff --git a/umbrello/umbrello/codegenerators/rubycodeoperation.cpp b/umbrello/umbrello/codegenerators/rubycodeoperation.cpp
index 5a360838..7354281b 100644
--- a/umbrello/umbrello/codegenerators/rubycodeoperation.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeoperation.cpp
@@ -32,8 +32,8 @@
 // Constructors/Destructors
 //
 
-RubyCodeOperation::RubyCodeOperation ( RubyClassifierCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment )
-        : CodeOperation (doc, tqparent, body, comment)
+RubyCodeOperation::RubyCodeOperation ( RubyClassifierCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment )
+        : CodeOperation (doc, parent, body, comment)
 {
     // lets not go with the default comment and instead use
     // full-blown ruby documentation object instead
diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
index a3bb17df..6b7ac992 100644
--- a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
@@ -258,7 +258,7 @@ void SimpleCodeGenerator::writeCodeToFile ( UMLClassifierList & concepts) {
 
 void SimpleCodeGenerator::initFields ( UMLDoc * parentDoc ) {
 
-    // load Classifier documents from tqparent document
+    // load Classifier documents from parent document
     // initFromParentDocument();
 
     m_fileMap.clear();
@@ -282,7 +282,7 @@ void SimpleCodeGenerator::syncCodeToDocument() {
 }
 
 
-// override tqparent method
+// override parent method
 void SimpleCodeGenerator::initFromParentDocument( )
 {
     // Do nothing
diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.h b/umbrello/umbrello/codegenerators/simplecodegenerator.h
index 301dc780..c27e02ff 100644
--- a/umbrello/umbrello/codegenerators/simplecodegenerator.h
+++ b/umbrello/umbrello/codegenerators/simplecodegenerator.h
@@ -89,7 +89,7 @@ protected:
      */
     TQMap<UMLPackage*,TQString> m_fileMap;
 
-    // the tqparent document
+    // the parent document
     UMLDoc *m_doc;
 
     /**
@@ -105,7 +105,7 @@ protected:
     int m_indentLevel;
     TQString m_endl;
 
-    // override tqparent method..we need special handling
+    // override parent method..we need special handling
     void initFromParentDocument( );
 
 private:
diff --git a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h
index adbe39b7..46342658 100644
--- a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h
+++ b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h
@@ -82,7 +82,7 @@ private:
 
     UMLAttributeList m_attList;
     TQString m_nodeName;
-    void init (CodeDocument * tqparent, const TQString &nodeName, const TQString &comment);
+    void init (CodeDocument * parent, const TQString &nodeName, const TQString &comment);
 
 };
 
diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
index 39b530bb..f2bf7a66 100644
--- a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
+++ b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
@@ -690,13 +690,13 @@ void XMLSchemaWriter::writeAssociationRoleDecl( UMLClassifier *c, const TQString
     // class (err. node) is inherit from it with a "concrete" element. Therefore,
     // in this manner, we need a group node for abstract classes to lay out the child
     // element choices so that the child, concrete class may be plugged into whatever spot
-    // it tqparent could go. The tradeoff is that "group" nodes may not be extended, so the
+    // it parent could go. The tradeoff is that "group" nodes may not be extended, so the
     // choices that you lay out here are it (e.g. no more nodes may inherit" from this group)
     //
     // The flipside for concrete classes is that we want to use them as elements in our document.
     // Unfortunately, about all you can do with complexTypes in terms of inheritance, is to
     // use these as the basis for a new node type. This is NOT full inheritence because the new
-    // class (err. element node) wont be able to go into the document where it tqparent went without
+    // class (err. element node) wont be able to go into the document where it parent went without
     // you heavily editing the schema.
     //
     // Therefore, IF a group is abstract, but has no inheriting sub-classes, there are no choices, and its nigh