1 files changed, 10 insertions, 10 deletions

diff --git a/umbrello/umbrello/codeclassfield.cpp b/umbrello/umbrello/codeclassfield.cpp
index 0a108a18..2e242664 100644
--- a/umbrello/umbrello/codeclassfield.cpp
+++ b/umbrello/umbrello/codeclassfield.cpp
@@ -82,8 +82,8 @@ CodeClassField::~CodeClassField ( ) {
 void CodeClassField::setParentUMLObject (UMLObject * obj) {
     UMLRole *role = dynamic_cast<UMLRole*>(obj);
     if(role) {
-        UMLAssociation * tqparentAssoc = role->getParentAssociation();
-        Uml::Association_Type atype = tqparentAssoc->getAssocType();
+        UMLAssociation * parentAssoc = role->getParentAssociation();
+        Uml::Association_Type atype = parentAssoc->getAssocType();
         m_parentIsAttribute = false;
 
         if ( atype == Uml::at_Association || atype == Uml::at_Association_Self)
@@ -103,7 +103,7 @@ void CodeClassField::setParentUMLObject (UMLObject * obj) {
 
 TQString CodeClassField::getTypeName ( ) {
 
-    if (tqparentIsAttribute())
+    if (parentIsAttribute())
     {
         UMLAttribute * at = (UMLAttribute*) getParentObject();
         return at->getTypeName();
@@ -121,7 +121,7 @@ TQString CodeClassField::getTypeName ( ) {
 // of objects (as per specification of associations)
 TQString CodeClassField::getListObjectType() {
     TQString type = TQString ("");
-    if (!tqparentIsAttribute())
+    if (!parentIsAttribute())
     {
         UMLRole * role = dynamic_cast<UMLRole*>(getParentObject());
         type = getUMLObjectName(role->getObject());
@@ -133,7 +133,7 @@ TQString CodeClassField::getListObjectType() {
  * Get the value of m_isAbstract
  * @return the value of m_isAbstract
  */
-bool CodeClassField::tqparentIsAttribute ( ) {
+bool CodeClassField::parentIsAttribute ( ) {
     return m_parentIsAttribute;
     //  return (m_classFieldType == Attribute) ? true : false;
 }
@@ -323,7 +323,7 @@ void CodeClassField::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) {
 }
 
 int CodeClassField::minimumListOccurances( ) {
-    if (!tqparentIsAttribute())
+    if (!parentIsAttribute())
     {
         UMLRole * role = dynamic_cast<UMLRole*>(getParentObject());
         TQString multi = role->getMultiplicity();
@@ -340,7 +340,7 @@ int CodeClassField::minimumListOccurances( ) {
 }
 
 int CodeClassField::maximumListOccurances( ) {
-    if (!tqparentIsAttribute())
+    if (!parentIsAttribute())
     {
         UMLRole * role = dynamic_cast<UMLRole*>(getParentObject());
         TQString multi = role->getMultiplicity();
@@ -444,7 +444,7 @@ void CodeClassField::initAccessorMethods()
 
     // add in the add,remove and list methods for things which are role based.
     // (and only used if the role specifies a 'list' type object
-    if (!tqparentIsAttribute()) {
+    if (!parentIsAttribute()) {
 
         if(!findMethodByType(CodeAccessorMethod::ADD))
         {
@@ -485,7 +485,7 @@ void CodeClassField::updateContent()
     // I suppose this could be supported under individual accessor method synctotqparent
     // calls, but its going to happen again and again for many languages. Why not a catch
     // all here? -b.t.
-    if (tqparentIsAttribute())
+    if (parentIsAttribute())
     {
         for ( CodeAccessorMethod *method = m_methodVector.first(); method;
                 method = m_methodVector.next() )
@@ -576,7 +576,7 @@ bool CodeClassField::fieldIsSingleValue ( )
 {
     // For the time being, all attributes ARE single values (yes,
     // I know this isnt always true, but we have to start somewhere.)
-    if(tqparentIsAttribute())
+    if(parentIsAttribute())
         return true;
 
     UMLRole * role = dynamic_cast<UMLRole*>(getParentObject());