TQt4 convert kdesdk

This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
author: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2011-06-12 01:36:19 +0000
committer: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2011-06-12 01:36:19 +0000
commit: 99a2774ca6f1cab334de5d43fe36fc44ae889a4c (patch)
tree: eff34cf0762227f6baf2a93e8fef48d4bed2651c /umbrello/umbrello/codegenerators
parent: 1c104292188541106338d4940b0f04beeb4301a0 (diff)
download: tdesdk-99a2774c.tar.gz
tdesdk-99a2774c.zip
121 files changed, 738 insertions, 684 deletions
diff --git a/umbrello/umbrello/codegenerators/adawriter.cpp b/umbrello/umbrello/codegenerators/adawriter.cpp
index ec2bf59a..475be180 100644
--- a/umbrello/umbrello/codegenerators/adawriter.cpp
+++ b/umbrello/umbrello/codegenerators/adawriter.cpp
@@ -124,7 +124,7 @@ void AdaWriter::computeAssocTypeAndRole(UMLClassifier *c,
         return;
     const TQString multi = a->getMulti(Uml::B);
     bool hasNonUnityMultiplicity = (!multi.isEmpty() && multi != "1");
-    hasNonUnityMultiplicity &= !multi.contains(TQRegExp("^1 *\\.\\. *1$"));
+    hasNonUnityMultiplicity &= !multi.tqcontains(TQRegExp("^1 *\\.\\. *1$"));
     roleName = cleanName(a->getRoleName(Uml::B));
     if (roleName.isEmpty())
         roleName = cleanName(a->getName());
@@ -154,7 +154,7 @@ void AdaWriter::writeClass(UMLClassifier *c) {
     const bool isClass = !c->isInterface();
     TQString classname = cleanName(c->getName());
     TQString fileName = packageName(c).lower();
-    fileName.replace('.', '-');
+    fileName.tqreplace('.', '-');
 
     //find an appropriate name for our file
     fileName = overwritableName(c, fileName, ".ads");
@@ -176,8 +176,8 @@ void AdaWriter::writeClass(UMLClassifier *c) {
     TQString str;
     str = getHeadingFile(".ads");
     if (!str.isEmpty()) {
-        str.replace(TQRegExp("%filename%"), fileName);
-        str.replace(TQRegExp("%filepath%"), file.name());
+        str.tqreplace(TQRegExp("%filename%"), fileName);
+        str.tqreplace(TQRegExp("%filepath%"), file.name());
         ada << str << endl;
     }
 
@@ -298,8 +298,8 @@ void AdaWriter::writeClass(UMLClassifier *c) {
         ada << "tagged ";
     } else {
         // FIXME: Multiple inheritance is not yet supported
-        UMLClassifier* parent = superclasses.first();
-        ada << "new " << className(parent, false) << " with ";
+        UMLClassifier* tqparent = superclasses.first();
+        ada << "new " << className(tqparent, 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* parent = superclasses.first();
-        ada << "new " << className(parent, false) << " with ";
+        UMLClassifier* tqparent = superclasses.first();
+        ada << "new " << className(tqparent, false) << " with ";
     }
     ada << "record" << m_endl;
     m_indentLevel++;
@@ -483,9 +483,9 @@ void AdaWriter::writeOperation(UMLOperation *op, TQTextStream &ada, bool is_comm
     ada << cleanName(op->getName()) << " ";
     if (! (op->getStatic() && atl.count() == 0))
         ada << "(";
-    UMLClassifier *parentClassifier = static_cast<UMLClassifier*>(op->getUMLPackage());
+    UMLClassifier *tqparentClassifier = static_cast<UMLClassifier*>(op->getUMLPackage());
     if (! op->getStatic()) {
-        ada << "Self : access " << className(parentClassifier);
+        ada << "Self : access " << className(tqparentClassifier);
         if (atl.count())
             ada << ";" << m_endl;
     }
diff --git a/umbrello/umbrello/codegenerators/adawriter.h b/umbrello/umbrello/codegenerators/adawriter.h
index 779fc7d5..09e2e543 100644
--- a/umbrello/umbrello/codegenerators/adawriter.h
+++ b/umbrello/umbrello/codegenerators/adawriter.h
@@ -32,6 +32,7 @@ class UMLOperation;
   */
 class AdaWriter : public SimpleCodeGenerator {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     /**
diff --git a/umbrello/umbrello/codegenerators/aswriter.cpp b/umbrello/umbrello/codegenerators/aswriter.cpp
index e973a55e..e99559f2 100644
--- a/umbrello/umbrello/codegenerators/aswriter.cpp
+++ b/umbrello/umbrello/codegenerators/aswriter.cpp
@@ -67,8 +67,8 @@ void ASWriter::writeClass(UMLClassifier *c)
     str = getHeadingFile(".as");
     if(!str.isEmpty())
     {
-        str.replace(TQRegExp("%filename%"),fileName+".as");
-        str.replace(TQRegExp("%filepath%"),fileas.name());
+        str.tqreplace(TQRegExp("%filename%"),fileName+".as");
+        str.tqreplace(TQRegExp("%filepath%"),fileas.name());
         as << str << m_endl;
     }
 
@@ -602,7 +602,7 @@ const TQStringList ASWriter::reservedKeywords() const {
         << "or"
         << "ord"
         << "_parent"
-        << "parentNode"
+        << "tqparentNode"
         << "parseFloat"
         << "parseInt"
         << "parseXML"
diff --git a/umbrello/umbrello/codegenerators/aswriter.h b/umbrello/umbrello/codegenerators/aswriter.h
index 75399f13..8156a04b 100644
--- a/umbrello/umbrello/codegenerators/aswriter.h
+++ b/umbrello/umbrello/codegenerators/aswriter.h
@@ -28,6 +28,7 @@
   */
 class ASWriter : public SimpleCodeGenerator {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     ASWriter();
diff --git a/umbrello/umbrello/codegenerators/codegenfactory.cpp b/umbrello/umbrello/codegenerators/codegenfactory.cpp
index 00401653..471d8f4c 100644
--- a/umbrello/umbrello/codegenerators/codegenfactory.cpp
+++ b/umbrello/umbrello/codegenerators/codegenfactory.cpp
@@ -161,7 +161,7 @@ CodeGenerator* createObject(Uml::Programming_Language pl)  {
                 obj = new RubyWriter();
             break;
         case Uml::pl_SQL:
-            obj = new SQLWriter();
+            obj = new STQLWriter();
             break;
         case Uml::pl_Tcl:
             obj = new TclWriter();
diff --git a/umbrello/umbrello/codegenerators/codegenfactory.h b/umbrello/umbrello/codegenerators/codegenfactory.h
index 27a0f293..0930f43d 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 parent ClassifierCodeDocument.
+     * @param cd    the tqparent 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 parent ClassifierCodeDocument
-     * @param at         attribute which is parent of this class field
+     * @param cd         the tqparent ClassifierCodeDocument
+     * @param at         attribute which is tqparent 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 parent ClassifierCodeDocument
-     * @param role       association role which is parent of this class field
+     * @param cd         the tqparent ClassifierCodeDocument
+     * @param role       association role which is tqparent 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 parent ClassifierCodeDocument
-     * @param cf         CodeClassField which is parent of this object
+     * @param cd         the tqparent ClassifierCodeDocument
+     * @param cf         CodeClassField which is tqparent 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 parent ClassifierCodeDocument
-     * @param cf         CodeClassField which is parent of this object
+     * @param cd         the tqparent ClassifierCodeDocument
+     * @param cf         CodeClassField which is tqparent 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 parent CodeDocument
+     * @param cd         the tqparent CodeDocument
      * @return      CodeBlockWithComments
      */
     CodeComment * newCodeComment (CodeDocument *cd);
diff --git a/umbrello/umbrello/codegenerators/codegenpolicyext.h b/umbrello/umbrello/codegenerators/codegenpolicyext.h
index 29e358a1..ea792388 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 *parent = 0, const char *name = 0) = 0;
+    virtual CodeGenerationPolicyPage * createPage(TQWidget *tqparent = 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 4742cd6d..7c8f0ff3 100644
--- a/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp
@@ -33,14 +33,14 @@
 // Constructors/Destructors
 //
 
-CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role)
-        : CodeClassField(parentDoc, role)
+CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role)
+        : CodeClassField(tqparentDoc, role)
 {
 
 }
 
-CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib)
-        : CodeClassField(parentDoc, attrib)
+CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib)
+        : CodeClassField(tqparentDoc, attrib)
 {
 
 }
@@ -55,7 +55,7 @@ CPPCodeClassField::~CPPCodeClassField ( ) { }
 //
 
 TQString CPPCodeClassField::getFieldName() {
-    if (parentIsAttribute())
+    if (tqparentIsAttribute())
     {
         UMLAttribute * at = (UMLAttribute*) getParentObject();
         return cleanName(at->getName());
@@ -65,7 +65,7 @@ TQString CPPCodeClassField::getFieldName() {
         UMLRole * role = (UMLRole*) getParentObject();
         TQString roleName = role->getName();
         if(fieldIsSingleValue()) {
-            return roleName.replace(0, 1, roleName.left(1).lower());
+            return roleName.tqreplace(0, 1, roleName.left(1).lower());
         } else {
             return roleName.lower() + "Vector";
         }
@@ -80,13 +80,13 @@ TQString CPPCodeClassField::getListFieldClassName () {
 
 TQString CPPCodeClassField::getInitialValue() {
 
-    if (parentIsAttribute())
+    if (tqparentIsAttribute())
     {
         UMLAttribute * at = dynamic_cast<UMLAttribute*>( getParentObject() );
         if (at) {
             return fixInitialStringDeclValue(at->getInitialValue(), getTypeName());
         } else {
-            kError() << "CPPCodeClassField::getInitialValue: parent object is not a UMLAttribute"
+            kError() << "CPPCodeClassField::getInitialValue: tqparent object is not a UMLAttribute"
             << endl;
             return "";
         }
diff --git a/umbrello/umbrello/codegenerators/cppcodeclassfield.h b/umbrello/umbrello/codegenerators/cppcodeclassfield.h
index 929e5178..0b714b16 100644
--- a/umbrello/umbrello/codegenerators/cppcodeclassfield.h
+++ b/umbrello/umbrello/codegenerators/cppcodeclassfield.h
@@ -28,6 +28,7 @@ class ClassifierCodeDocument;
 class CPPCodeClassField : public CodeClassField
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
@@ -36,8 +37,8 @@ public:
     /**
      * Constructors
      */
-    CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role);
-    CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib);
+    CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role);
+    CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib);
 
     /**
      * Empty Destructor
@@ -47,7 +48,7 @@ public:
     TQString getFieldType();
     TQString getFieldName();
     TQString getInitialValue();
-    /** get the name of the class which holds lists, e.g. "QPtrlist" or
+    /** get the name of the class which holds lists, e.g. "TQPtrlist" or
      * "Vector" or "List" and so on.
      */
     TQString getListFieldClassName();
diff --git a/umbrello/umbrello/codegenerators/cppcodecomment.cpp b/umbrello/umbrello/codegenerators/cppcodecomment.cpp
index d0e386c0..dada5357 100644
--- a/umbrello/umbrello/codegenerators/cppcodecomment.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodecomment.cpp
@@ -53,12 +53,12 @@ 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 parent TextBlock method
+    // just use tqparent TextBlock method
     root.appendChild( blockElement );
 }
 
 /**
- * @return      QString
+ * @return      TQString
  */
 TQString CPPCodeComment::toString ( )
 {
diff --git a/umbrello/umbrello/codegenerators/cppcodecomment.h b/umbrello/umbrello/codegenerators/cppcodecomment.h
index 28fb4004..4d7e7e6e 100644
--- a/umbrello/umbrello/codegenerators/cppcodecomment.h
+++ b/umbrello/umbrello/codegenerators/cppcodecomment.h
@@ -31,6 +31,7 @@
 class CPPCodeComment : virtual public CodeComment
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
@@ -59,7 +60,7 @@ public:
     virtual void saveToXMI ( TQDomDocument & doc, TQDomElement & root );
 
     /**
-     * @return  QString
+     * @return  TQString
      */
     TQString toString ( );
 
diff --git a/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp b/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp
index 6328fd3b..c8e68f4c 100644
--- a/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp
@@ -53,12 +53,12 @@ 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 parent TextBlock method
+    // just use tqparent TextBlock method
     root.appendChild( blockElement );
 }
 
 /**
- * @return      QString
+ * @return      TQString
  */
 TQString CPPCodeDocumentation::toString ( )
 {
diff --git a/umbrello/umbrello/codegenerators/cppcodedocumentation.h b/umbrello/umbrello/codegenerators/cppcodedocumentation.h
index 505fc8bb..b5ec87df 100644
--- a/umbrello/umbrello/codegenerators/cppcodedocumentation.h
+++ b/umbrello/umbrello/codegenerators/cppcodedocumentation.h
@@ -61,7 +61,7 @@ public:
     virtual void saveToXMI ( TQDomDocument & doc, TQDomElement & root );
 
     /**
-     * @return  QString
+     * @return  TQString
      */
     TQString toString ( );
 
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp
index f5d8ec42..563a86ee 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp
@@ -28,8 +28,8 @@
 #include <kmessagebox.h>
 
 
-CPPCodeGenerationForm::CPPCodeGenerationForm( TQWidget *parent, const char *name )
-        : CPPCodeGenerationFormBase (parent,name)
+CPPCodeGenerationForm::CPPCodeGenerationForm( TQWidget *tqparent, const char *name )
+        : CPPCodeGenerationFormBase (tqparent,name)
 {
     init();
 
@@ -70,8 +70,8 @@ CPPCodeGenerationForm::~CPPCodeGenerationForm()
 
 void CPPCodeGenerationForm::browseClicked()
 {
-    TQString button = sender()->name();
-    TQString file = KFileDialog::getOpenFileName( TQString::null, "*.h", this, "Get Header File");
+    TQString button = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name();
+    TQString file = KFileDialog::getOpenFileName( TQString(), "*.h", this, "Get Header File");
 
     if(file.isEmpty())
         return;
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationform.h b/umbrello/umbrello/codegenerators/cppcodegenerationform.h
index 5c35760c..7a98ef91 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationform.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationform.h
@@ -25,12 +25,13 @@ class TQCheckListItem;
 
 class CPPCodeGenerationForm : public CPPCodeGenerationFormBase {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     /**
      * std ctor
      */
-    explicit CPPCodeGenerationForm (TQWidget *parent=0, const char *name=0);
+    explicit CPPCodeGenerationForm (TQWidget *tqparent=0, const char *name=0);
 
     /**
      * std dtor
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
index 2599ae35..455d4a2e 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>CPPCodeGenerationFormBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CPPCodeGenerationFormBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -12,11 +12,11 @@
             <height>549</height>
         </rect>
     </property>
-    <widget class="QGroupBox">
+    <widget class="TQGroupBox">
         <property name="name">
             <cstring>groupBox1</cstring>
         </property>
-        <property name="geometry">
+        <property name="tqgeometry">
             <rect>
                 <x>11</x>
                 <y>44</y>
@@ -39,15 +39,15 @@
             <property name="name">
                 <cstring>unnamed</cstring>
             </property>
-            <widget class="QLayoutWidget" row="0" column="0">
+            <widget class="TQLayoutWidget" row="0" column="0">
                 <property name="name">
-                    <cstring>layout4</cstring>
+                    <cstring>tqlayout4</cstring>
                 </property>
                 <grid>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QComboBox" row="0" column="1">
+                    <widget class="TQComboBox" row="0" column="1">
                         <item>
                             <property name="text">
                                 <string>Slash-Slash (//)</string>
@@ -62,7 +62,7 @@
                             <cstring>m_SelectCommentStyle</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>textLabel1</cstring>
                         </property>
@@ -74,11 +74,11 @@
             </widget>
         </grid>
     </widget>
-    <widget class="QLabel">
+    <widget class="TQLabel">
         <property name="name">
             <cstring>textLabel1_2</cstring>
         </property>
-        <property name="geometry">
+        <property name="tqgeometry">
             <rect>
                 <x>11</x>
                 <y>11</y>
@@ -98,11 +98,11 @@
             <string>&lt;p align="center"&gt;C++ Code Generation&lt;/p&gt;</string>
         </property>
     </widget>
-    <widget class="QTabWidget">
+    <widget class="TQTabWidget">
         <property name="name">
             <cstring>tabWidget2</cstring>
         </property>
-        <property name="geometry">
+        <property name="tqgeometry">
             <rect>
                 <x>10</x>
                 <y>120</y>
@@ -110,7 +110,7 @@
                 <height>305</height>
             </rect>
         </property>
-        <widget class="QWidget">
+        <widget class="TQWidget">
             <property name="name">
                 <cstring>tab</cstring>
             </property>
@@ -121,14 +121,14 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QListView">
+                <widget class="TQListView">
                     <property name="name">
                         <cstring>GeneralOptionsListView</cstring>
                     </property>
                 </widget>
             </vbox>
         </widget>
-        <widget class="QWidget">
+        <widget class="TQWidget">
             <property name="name">
                 <cstring>tab</cstring>
             </property>
@@ -149,14 +149,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>410</width>
                             <height>113</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel2_2_2_2</cstring>
                     </property>
@@ -164,9 +164,9 @@
                         <string>Use following for classes in generated code:</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="1" column="0">
+                <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>layout17</cstring>
+                        <cstring>tqlayout17</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -203,7 +203,7 @@
                                 </stringlist>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>textLabel1_3_2_2_2</cstring>
                             </property>
@@ -211,7 +211,7 @@
                                 <string>&lt;b&gt;Variable&lt;/b&gt;</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="2" column="4" rowspan="1" colspan="2">
+                        <widget class="TQPushButton" row="2" column="4" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>m_browseStringButton</cstring>
                             </property>
@@ -223,7 +223,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>32</width>
                                     <height>32767</height>
@@ -233,7 +233,7 @@
                                 <string>...</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="2" column="7">
+                        <widget class="TQCheckBox" row="2" column="7">
                             <property name="name">
                                 <cstring>m_globalStringCheckBox</cstring>
                             </property>
@@ -285,7 +285,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -302,14 +302,14 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>stringClassTextLabel</cstring>
                             </property>
@@ -325,7 +325,7 @@
                                 <string>&lt;p align="center"&gt;String&lt;/p&gt;</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>listClassTextLabel</cstring>
                             </property>
@@ -366,7 +366,7 @@
                                 </stringlist>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="5" rowspan="1" colspan="3">
+                        <widget class="TQLabel" row="0" column="5" rowspan="1" colspan="3">
                             <property name="name">
                                 <cstring>textLabel4_2_2_2</cstring>
                             </property>
@@ -399,7 +399,7 @@
                                 </stringlist>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="1" column="7">
+                        <widget class="TQCheckBox" row="1" column="7">
                             <property name="name">
                                 <cstring>m_globalListCheckBox</cstring>
                             </property>
@@ -410,7 +410,7 @@
                                 <bool>true</bool>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="2">
+                        <widget class="TQLabel" row="0" column="2">
                             <property name="name">
                                 <cstring>textLabel3_2_2</cstring>
                             </property>
@@ -418,7 +418,7 @@
                                 <string>Class name</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="1" column="4" rowspan="1" colspan="2">
+                        <widget class="TQPushButton" row="1" column="4" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>m_browseListButton</cstring>
                             </property>
@@ -430,7 +430,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>32</width>
                                     <height>32767</height>
@@ -440,7 +440,7 @@
                                 <string>...</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="3" rowspan="1" colspan="2">
+                        <widget class="TQLabel" row="0" column="3" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>textLabel5_2_2_2</cstring>
                             </property>
@@ -470,10 +470,10 @@
         <slot>browseClicked()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>browseClicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
index 8aec0351..8fa473cb 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
@@ -224,40 +224,40 @@ void CPPCodeGenerationPolicy::setVectorIncludeIsGlobal(bool value) {
 TQString CPPCodeGenerationPolicy::getVectorMethodAppend(const TQString & variableName, const TQString & itemClassName) {
     TQString value = m_vectorMethodAppendBase;
     if(!variableName.isEmpty())
-        value.replace(TQRegExp("%VARNAME%"),variableName);
-    value.replace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName);
+        value.tqreplace(TQRegExp("%VARNAME%"),variableName);
+    value.tqreplace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName);
     if(!itemClassName.isEmpty())
-        value.replace(TQRegExp("%ITEMCLASS%"),itemClassName);
+        value.tqreplace(TQRegExp("%ITEMCLASS%"),itemClassName);
     return value;
 }
 
 TQString CPPCodeGenerationPolicy::getVectorMethodRemove(const TQString & variableName, const TQString & itemClassName) {
     TQString value = m_vectorMethodRemoveBase;
     if(!variableName.isEmpty())
-        value.replace(TQRegExp("%VARNAME%"),variableName);
-    value.replace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName);
+        value.tqreplace(TQRegExp("%VARNAME%"),variableName);
+    value.tqreplace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName);
     if(!itemClassName.isEmpty())
-        value.replace(TQRegExp("%ITEMCLASS%"),itemClassName);
+        value.tqreplace(TQRegExp("%ITEMCLASS%"),itemClassName);
     return value;
 }
 
 TQString CPPCodeGenerationPolicy::getVectorMethodInit(const TQString & variableName, const TQString & itemClassName) {
     TQString value = m_vectorMethodInitBase;
     if(!variableName.isEmpty())
-        value.replace(TQRegExp("%VARNAME%"),variableName);
-    value.replace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName);
+        value.tqreplace(TQRegExp("%VARNAME%"),variableName);
+    value.tqreplace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName);
     if(!itemClassName.isEmpty())
-        value.replace(TQRegExp("%ITEMCLASS%"),itemClassName);
+        value.tqreplace(TQRegExp("%ITEMCLASS%"),itemClassName);
     return value;
 }
 
 TQString CPPCodeGenerationPolicy::getObjectMethodInit(const TQString & variableName, const TQString & itemClassName) {
     TQString value = m_objectMethodInitBase;
     if(!variableName.isEmpty())
-        value.replace(TQRegExp("%VARNAME%"),variableName);
-    value.replace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName);
+        value.tqreplace(TQRegExp("%VARNAME%"),variableName);
+    value.tqreplace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName);
     if(!itemClassName.isEmpty())
-        value.replace(TQRegExp("%ITEMCLASS%"),itemClassName);
+        value.tqreplace(TQRegExp("%ITEMCLASS%"),itemClassName);
     return value;
 }
 
@@ -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 *parent, const char *name ) {
-    return new CPPCodeGenerationPolicyPage ( parent, name, this );
+CodeGenerationPolicyPage * CPPCodeGenerationPolicy::createPage ( TQWidget *tqparent, const char *name ) {
+    return new CPPCodeGenerationPolicyPage ( tqparent, name, this );
 }
 
 void CPPCodeGenerationPolicy::init() {
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
index 69d3490f..949b451c 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
@@ -27,6 +27,7 @@ class CodeGenerationPolicyPage;
 class CPPCodeGenerationPolicy : public CodeGenPolicyExt
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     static const bool DEFAULT_AUTO_GEN_EMPTY_CONSTRUCTORS;
@@ -192,7 +193,7 @@ public:
      * Create a new dialog interface for this object.
      * @return dialog object
      */
-    CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0);
+    CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0);
 
 protected:
 
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp
index 60d37bac..a008daab 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 *parent, const char *name, CPPCodeGenerationPolicy * policy )
-  : CodeGenerationPolicyPage(parent, name, policy)
+CPPCodeGenerationPolicyPage::CPPCodeGenerationPolicyPage( TQWidget *tqparent, const char *name, CPPCodeGenerationPolicy * policy )
+  : CodeGenerationPolicyPage(tqparent, 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 * parent = (CPPCodeGenerationPolicy*) m_parentPolicy;
+    CPPCodeGenerationPolicy * tqparent = (CPPCodeGenerationPolicy*) m_parentPolicy;
 
     // block signals so that we don't generate too many sync signals for child code
     // documents
-    parent->blockSignals(true);
+    tqparent->blockSignals(true);
 
     common->setCommentStyle((CodeGenerationPolicy::CommentStyle ) form->m_SelectCommentStyle->currentItem());
     common->setAutoGenerateConstructors(form->getGenerateEmptyConstructors());
-    parent->setAutoGenerateAccessors(form->getGenerateAccessorMethods());
+    tqparent->setAutoGenerateAccessors(form->getGenerateAccessorMethods());
 
-    parent->setDestructorsAreVirtual(form->getVirtualDestructors());
-    parent->setPackageIsNamespace(form->getPackageIsANamespace());
-    parent->setAccessorsAreInline(form->getAccessorsAreInline());
-    parent->setOperationsAreInline(form->getOperationsAreInline());
-    parent->setAccessorsArePublic(form->getAccessorsArePublic());
+    tqparent->setDestructorsAreVirtual(form->getVirtualDestructors());
+    tqparent->setPackageIsNamespace(form->getPackageIsANamespace());
+    tqparent->setAccessorsAreInline(form->getAccessorsAreInline());
+    tqparent->setOperationsAreInline(form->getOperationsAreInline());
+    tqparent->setAccessorsArePublic(form->getAccessorsArePublic());
 
-    parent->setStringClassName(form->m_stringClassHCombo->currentText());
-    parent->setStringClassNameInclude(form->m_stringIncludeFileHistoryCombo->currentText());
-    parent->setStringIncludeIsGlobal(form->m_globalStringCheckBox->isChecked());
+    tqparent->setStringClassName(form->m_stringClassHCombo->currentText());
+    tqparent->setStringClassNameInclude(form->m_stringIncludeFileHistoryCombo->currentText());
+    tqparent->setStringIncludeIsGlobal(form->m_globalStringCheckBox->isChecked());
 
-    parent->setVectorClassName(form->m_listClassHCombo->currentText());
-    parent->setVectorClassNameInclude(form->m_listIncludeFileHistoryCombo->currentText());
-    parent->setVectorIncludeIsGlobal(form->m_globalListCheckBox->isChecked());
+    tqparent->setVectorClassName(form->m_listClassHCombo->currentText());
+    tqparent->setVectorClassNameInclude(form->m_listIncludeFileHistoryCombo->currentText());
+    tqparent->setVectorIncludeIsGlobal(form->m_globalListCheckBox->isChecked());
 
-    parent->blockSignals(false);
+    tqparent->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 eb7aa9ce..6e32c62d 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h
@@ -28,9 +28,10 @@
 
 class CPPCodeGenerationPolicyPage : public CodeGenerationPolicyPage {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
-    explicit CPPCodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, CPPCodeGenerationPolicy * policy = 0);
+    explicit CPPCodeGenerationPolicyPage (TQWidget *tqparent=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 b5c12dd6..1893ce65 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerator.cpp
@@ -95,7 +95,7 @@ bool CPPCodeGenerator::addHeaderCodeDocument ( CPPHeaderCodeDocument * doc )
         doc->setID(tag);
     }
 
-    if(m_codeDocumentDictionary.find(tag))
+    if(m_codeDocumentDictionary.tqfind(tag))
         return false; // return false, we already have some object with this tag in the list
     else
         m_codeDocumentDictionary.insert(tag, doc);
@@ -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* parent, CodeDocument *doc,
+CodeViewerDialog * CPPCodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, 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(parent,doc,state);
+        return CodeGenerator::getCodeViewerDialog(tqparent,doc,state);
     else {
         // build with passed (source) code document
         CodeViewerDialog *dialog;
@@ -138,11 +138,11 @@ CodeViewerDialog * CPPCodeGenerator::getCodeViewerDialog ( TQWidget* parent, Cod
         if(hdoc)
         {
             // if we have a header document..build with that
-            dialog = new CodeViewerDialog(parent, hdoc, state);
+            dialog = new CodeViewerDialog(tqparent, hdoc, state);
             dialog->addCodeDocument(doc);
         } else
             // shouldn't happen, but lets try to gracefully deliver something.
-            dialog = new CodeViewerDialog(parent, doc, state);
+            dialog = new CodeViewerDialog(tqparent, 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 parent UMLDocument.
- * Need to override parent method because we have header documents to consider too.
+ * 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.
  */
 void CPPCodeGenerator::syncCodeToDocument ( ) {
 
@@ -347,7 +347,7 @@ void CPPCodeGenerator::initAttributes ( )
 
     UMLApp::app()->setPolicyExt ( new CPPCodeGenerationPolicy(UMLApp::app()->getConfig()) );
 
-    // load Classifier documents from parent document
+    // load Classifier documents from tqparent document
     //initFromParentDocument();
 }
 
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerator.h b/umbrello/umbrello/codegenerators/cppcodegenerator.h
index 2290c6e3..90b0c3f2 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerator.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerator.h
@@ -33,6 +33,7 @@ class KConfig;
 class CPPCodeGenerator : public CodeGenerator
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     static const bool DEFAULT_BUILD_MAKEFILE;
@@ -88,7 +89,7 @@ public:
 
     /** Get the editing dialog for this code document
      */
-    virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc,
+    virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc,
             Settings::CodeViewerState state);
 
     /**
@@ -157,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 parent UMLDocument.
+     * Force a synchronize of this code generator, and its present contents, to that of the tqparent 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.cpp b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp
index 868dea41..57ae0172 100644
--- a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp
@@ -25,10 +25,10 @@
 //
 
 CPPHeaderClassDeclarationBlock::CPPHeaderClassDeclarationBlock
-  ( CPPHeaderCodeDocument * parentDoc, const TQString &startText, const TQString &endText, const TQString &comment)
-        : OwnedHierarchicalCodeBlock(parentDoc->getParentClassifier(), parentDoc, startText, endText, comment)
+  ( CPPHeaderCodeDocument * tqparentDoc, const TQString &startText, const TQString &endText, const TQString &comment)
+        : OwnedHierarchicalCodeBlock(tqparentDoc->getParentClassifier(), tqparentDoc, startText, endText, comment)
 {
-    init(parentDoc, comment);
+    init(tqparentDoc, comment);
 }
 
 CPPHeaderClassDeclarationBlock::~CPPHeaderClassDeclarationBlock ( ) { }
@@ -75,10 +75,10 @@ void CPPHeaderClassDeclarationBlock::saveToXMI ( TQDomDocument & doc, TQDomEleme
 void CPPHeaderClassDeclarationBlock::updateContent ( )
 {
 
-    CPPHeaderCodeDocument *parentDoc = dynamic_cast<CPPHeaderCodeDocument*>(getParentDocument());
-    UMLClassifier *c = parentDoc->getParentClassifier();
+    CPPHeaderCodeDocument *tqparentDoc = dynamic_cast<CPPHeaderCodeDocument*>(getParentDocument());
+    UMLClassifier *c = tqparentDoc->getParentClassifier();
     TQString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars();
-    bool isInterface = parentDoc->parentIsInterface(); // a little shortcut
+    bool isInterface = tqparentDoc->tqparentIsInterface(); // a little shortcut
     TQString CPPHeaderClassName = CodeGenerator::cleanName(c->getName());
     bool forceDoc = UMLApp::app()->getCommonPolicy()->getCodeVerboseDocumentComments();
 
@@ -112,7 +112,7 @@ void CPPHeaderClassDeclarationBlock::updateContent ( )
     */
 
     /*
-        if(parentDoc->parentIsInterface())
+        if(tqparentDoc->tqparentIsInterface())
                 startText.append("interface ");
         else
     */
@@ -144,10 +144,10 @@ void CPPHeaderClassDeclarationBlock::updateContent ( )
 
 }
 
-void CPPHeaderClassDeclarationBlock::init (CPPHeaderCodeDocument *parentDoc, const TQString &comment)
+void CPPHeaderClassDeclarationBlock::init (CPPHeaderCodeDocument *tqparentDoc, const TQString &comment)
 {
 
-    setComment(new CPPCodeDocumentation(parentDoc));
+    setComment(new CPPCodeDocumentation(tqparentDoc));
     getComment()->setText(comment);
 
     setEndText("};");
diff --git a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h
index 0710560f..b6eb68c7 100644
--- a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h
@@ -25,6 +25,7 @@
 class CPPHeaderClassDeclarationBlock : public OwnedHierarchicalCodeBlock
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
@@ -33,7 +34,7 @@ public:
     /**
      * Empty Constructor
      */
-    explicit CPPHeaderClassDeclarationBlock ( CPPHeaderCodeDocument * parentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = "");
+    explicit CPPHeaderClassDeclarationBlock ( CPPHeaderCodeDocument * tqparentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = "");
 
     /**
      * Empty Destructor
@@ -60,7 +61,7 @@ protected:
 
 private:
 
-    void init (CPPHeaderCodeDocument * parent, const TQString &comment);
+    void init (CPPHeaderCodeDocument * tqparent, const TQString &comment);
 
 };
 
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp
index d96ad398..2c983a15 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp
+++ b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp
@@ -56,12 +56,12 @@ CPPHeaderCodeAccessorMethod::~CPPHeaderCodeAccessorMethod ( ) { }
 // we basically want to update the body of this method
 void CPPHeaderCodeAccessorMethod::updateContent( )
 {
-    CodeClassField * parentField = getParentClassField();
-    CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(parentField);
+    CodeClassField * tqparentField = getParentClassField();
+    CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(tqparentField);
     CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt();
     CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe);
     bool isInlineMethod = policy->getAccessorsAreInline( );
-    Uml::Visibility scope = parentField->getVisibility();
+    Uml::Visibility scope = tqparentField->getVisibility();
     TQString variableName = cppfield->getFieldName();
     TQString itemClassName = cppfield->getTypeName();
     TQString text;
@@ -92,11 +92,11 @@ void CPPHeaderCodeAccessorMethod::updateContent( )
 void CPPHeaderCodeAccessorMethod::updateMethodDeclaration()
 {
 
-    CodeClassField * parentField = getParentClassField();
-    ClassifierCodeDocument * doc = parentField->getParentDocument();
+    CodeClassField * tqparentField = getParentClassField();
+    ClassifierCodeDocument * doc = tqparentField->getParentDocument();
     CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt();
     CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe);
-    CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(parentField);
+    CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(tqparentField);
 
     bool isInlineMethod = policy->getAccessorsAreInline( );
 
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.h b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.h
index dea417fc..021436fa 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.h
+++ b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.h
@@ -25,6 +25,7 @@ class CodeClassField;
 class CPPHeaderCodeAccessorMethod : public CodeAccessorMethod
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp
index 3f15d05b..d2dba95d 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp
@@ -21,8 +21,8 @@
 // Constructors/Destructors
 //
 
-CPPHeaderCodeClassFieldDeclarationBlock::CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * parent )
-        : CodeClassFieldDeclarationBlock ( parent )
+CPPHeaderCodeClassFieldDeclarationBlock::CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * tqparent )
+        : CodeClassFieldDeclarationBlock ( tqparent )
 {
     setOverallIndentationLevel(1);
     updateContent();
@@ -41,8 +41,8 @@ CPPHeaderCodeClassFieldDeclarationBlock::~CPPHeaderCodeClassFieldDeclarationBloc
  */
 void CPPHeaderCodeClassFieldDeclarationBlock::updateContent( )
 {
-    UMLObject *umlparent = CodeClassFieldDeclarationBlock::getParentObject();
-    if (umlparent == NULL) {
+    UMLObject *umltqparent = CodeClassFieldDeclarationBlock::getParentObject();
+    if (umltqparent == NULL) {
         return;
     }
 
@@ -50,7 +50,7 @@ void CPPHeaderCodeClassFieldDeclarationBlock::updateContent( )
     CPPCodeClassField * hcppcf = dynamic_cast<CPPCodeClassField*>(cf);
 
     // Set the comment
-    TQString notes = umlparent->getDoc();
+    TQString notes = umltqparent->getDoc();
     getComment()->setText(notes);
     if(notes.isEmpty())
         getComment()->setWriteOutText(false);
@@ -59,12 +59,12 @@ void CPPHeaderCodeClassFieldDeclarationBlock::updateContent( )
 
 
     // Set the body
-    TQString staticValue = umlparent->getStatic() ? "static " : "";
+    TQString staticValue = umltqparent->getStatic() ? "static " : "";
     TQString typeName = hcppcf->getTypeName();
     TQString fieldName = hcppcf->getFieldName();
 
     // Ugh. Sloppy exception.
-    if (!cf->parentIsAttribute() && !cf->fieldIsSingleValue())
+    if (!cf->tqparentIsAttribute() && !cf->fieldIsSingleValue())
         typeName = hcppcf->getListFieldClassName();
 
     TQString body = staticValue + ' ' + typeName + ' ' + fieldName + ';';
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h
index 6a77047c..dc3a4c29 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h
@@ -23,6 +23,7 @@
 class CPPHeaderCodeClassFieldDeclarationBlock : public CodeClassFieldDeclarationBlock
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
@@ -31,7 +32,7 @@ public:
     /**
      * Constructor
      */
-    CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * parent );
+    CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * tqparent );
 
     /**
      * Empty Destructor
@@ -40,7 +41,7 @@ public:
 
 protected:
 
-    // this will be called by syncToParent whenever the parent object is "modified"
+    // this will be called by syncToParent whenever the tqparent object is "modified"
     void updateContent ( );
 
 private:
diff --git a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp
index 2c471667..92bafba1 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp
@@ -185,7 +185,7 @@ void CPPHeaderCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & root)
                                     } else
                                         if( name == "codeoperation" ) {
                                             // find the code operation by id
-                                            TQString id = element.attribute("parent_id","-1");
+                                            TQString id = element.attribute("tqparent_id","-1");
                                             UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id));
                                             UMLOperation * op = dynamic_cast<UMLOperation*>(obj);
                                             if(op) {
@@ -206,7 +206,7 @@ void CPPHeaderCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & root)
                                             {
                                                 CPPHeaderClassDeclarationBlock * block = getClassDecl();
                                                 block->loadFromXMI(element);
-                                                // normally this would be populated by the following syncToparent
+                                                // normally this would be populated by the following syncTotqparent
                                                 // 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 parent classifier object.
+// based on the tqparent 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 parent objects of this class...
+    // Gather info on the various fields and tqparent objects of this class...
     UMLClassifier * c = getParentClassifier();
     CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt();
     CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe);
@@ -370,7 +370,7 @@ void CPPHeaderCodeDocument::updateContent( )
     bool hasOperationMethods = c->getOpList().last() ? true : false;
     bool hasNamespace = false;
     bool isEnumeration = false;
-    bool isInterface = parentIsInterface();
+    bool isInterface = tqparentIsInterface();
     bool hasclassFields = hasClassFields();
     bool forcedoc = UMLApp::app()->getCommonPolicy()->getCodeVerboseDocumentComments();
     TQString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars();
@@ -412,14 +412,14 @@ void CPPHeaderCodeDocument::updateContent( )
 
     CodeGenerator::findObjectsRelated(c,includes);
     for(UMLPackage *con = includes.first(); con ; con = includes.next())
-        if (con->getBaseType() != Uml::ot_Datatype && !packageMap.contains(con))
+        if (con->getBaseType() != Uml::ot_Datatype && !packageMap.tqcontains(con))
         {
             packageMap.insert(con,con->getPackage());
             if(con != getParentClassifier())
                 includeStatement.append("#include \""+CodeGenerator::cleanName(con->getName().lower())+".h\""+endLine);
         }
     // now, add/update the includes codeblock
-    CodeBlockWithComments * inclBlock = addOrUpdateTaggedCodeBlockWithComments("includes", includeStatement, TQString::null, 0, false);
+    CodeBlockWithComments * inclBlock = addOrUpdateTaggedCodeBlockWithComments("includes", includeStatement, TQString(), 0, false);
     if(includeStatement.isEmpty() && inclBlock->getContentType() == CodeBlock::AutoGenerated)
         inclBlock->setWriteOutText(false);
     else
@@ -800,7 +800,7 @@ void CPPHeaderCodeDocument::updateContent( )
 
     // Operations
     //
-    // nothing to do here.. "updateOperations" in parent class puts things
+    // nothing to do here.. "updateOperations" in tqparent 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/cppheadercodedocument.h b/umbrello/umbrello/codegenerators/cppheadercodedocument.h
index ed7723d0..59cc9c8d 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodedocument.h
+++ b/umbrello/umbrello/codegenerators/cppheadercodedocument.h
@@ -34,6 +34,7 @@ class CPPHeaderClassDeclarationBlock;
 class CPPHeaderCodeDocument : public ClassifierCodeDocument
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp b/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp
index 471c7734..c4ec5145 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp
+++ b/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp
@@ -26,8 +26,8 @@
 //
 
 CPPHeaderCodeOperation::CPPHeaderCodeOperation
- ( CPPHeaderCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment )
-        : CodeOperation (doc, parent, body, comment)
+ ( CPPHeaderCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment )
+        : CodeOperation (doc, tqparent, body, comment)
 {
     // lets not go with the default comment and instead use
     // full-blown cpp documentation object instead
@@ -68,7 +68,7 @@ void CPPHeaderCodeOperation::updateContent( )
 void CPPHeaderCodeOperation::updateMethodDeclaration()
 {
     ClassifierCodeDocument *ccd = dynamic_cast<ClassifierCodeDocument*>(getParentDocument());
-    bool isInterface = ccd->parentIsInterface();
+    bool isInterface = ccd->tqparentIsInterface();
     UMLOperation * o = getParentOperation();
 
     CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt();
@@ -134,7 +134,7 @@ void CPPHeaderCodeOperation::updateMethodDeclaration()
 int CPPHeaderCodeOperation::lastEditableLine() {
     ClassifierCodeDocument * doc = dynamic_cast<ClassifierCodeDocument*>(getParentDocument());
     UMLOperation * o = getParentOperation();
-    if(doc->parentIsInterface() || o->getAbstract())
+    if(doc->tqparentIsInterface() || o->getAbstract())
         return -1; // very last line is NOT editable as its a one-line declaration w/ no body in
     // an interface.
     return 0;
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeoperation.h b/umbrello/umbrello/codegenerators/cppheadercodeoperation.h
index 18b7f33f..915c4ac1 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeoperation.h
+++ b/umbrello/umbrello/codegenerators/cppheadercodeoperation.h
@@ -26,6 +26,7 @@ class CPPHeaderCodeDocument;
 class CPPHeaderCodeOperation : virtual public CodeOperation
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/cppmakecodedocument.cpp b/umbrello/umbrello/codegenerators/cppmakecodedocument.cpp
index 33f945ae..873cd8c8 100644
--- a/umbrello/umbrello/codegenerators/cppmakecodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/cppmakecodedocument.cpp
@@ -47,7 +47,7 @@ void CPPMakefileCodeDocument::updateContent( ) {
 }
 
 /**
- * @return      QString
+ * @return      TQString
  */
 TQString CPPMakefileCodeDocument::toString ( ) {
     return "# cpp make build document";
@@ -63,10 +63,10 @@ TQString CPPMakefileCodeDocument::getPath ( )
     path.simplifyWhiteSpace();
 
     // Replace all blanks with underscore
-    path.replace(TQRegExp(" "), "_");
+    path.tqreplace(TQRegExp(" "), "_");
 
-    path.replace(TQRegExp("\\."),"/");
-    path.replace(TQRegExp("::"),"/");
+    path.tqreplace(TQRegExp("\\."),"/");
+    path.tqreplace(TQRegExp("::"),"/");
 
     path.lower();
 
diff --git a/umbrello/umbrello/codegenerators/cppmakecodedocument.h b/umbrello/umbrello/codegenerators/cppmakecodedocument.h
index 1b1c109b..18f97707 100644
--- a/umbrello/umbrello/codegenerators/cppmakecodedocument.h
+++ b/umbrello/umbrello/codegenerators/cppmakecodedocument.h
@@ -30,6 +30,7 @@
 class CPPMakefileCodeDocument : public CodeDocument
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     static const char * DOCUMENT_ID_VALUE;
@@ -48,7 +49,7 @@ public:
     virtual ~CPPMakefileCodeDocument ( );
 
     /**
-     * @return  QString
+     * @return  TQString
      */
     TQString toString ( );
 
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp
index c71f6d2a..2ff19637 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp
@@ -56,8 +56,8 @@ CPPSourceCodeAccessorMethod::~CPPSourceCodeAccessorMethod ( ) { }
 // we basically want to update the body of this method
 void CPPSourceCodeAccessorMethod::updateContent( )
 {
-    CodeClassField * parentField = getParentClassField();
-    CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(parentField);
+    CodeClassField * tqparentField = getParentClassField();
+    CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(tqparentField);
     CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt();
     CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe);
     bool isInlineMethod = policy->getAccessorsAreInline( );
@@ -92,11 +92,11 @@ void CPPSourceCodeAccessorMethod::updateContent( )
 void CPPSourceCodeAccessorMethod::updateMethodDeclaration()
 {
 
-    CodeClassField * parentField = getParentClassField();
-    ClassifierCodeDocument * doc = parentField->getParentDocument();
+    CodeClassField * tqparentField = getParentClassField();
+    ClassifierCodeDocument * doc = tqparentField->getParentDocument();
     CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt();
     CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe);
-    CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(parentField);
+    CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(tqparentField);
     UMLClassifier * c = doc->getParentClassifier();
 
     bool isInlineMethod = policy->getAccessorsAreInline( );
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.h b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.h
index 7c4088e9..f1565f2b 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.h
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.h
@@ -25,6 +25,7 @@ class CodeClassField;
 class CPPSourceCodeAccessorMethod : public CodeAccessorMethod
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp
index 016249e5..2e55e92a 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp
@@ -20,8 +20,8 @@
 // Constructors/Destructors
 //
 
-CPPSourceCodeClassFieldDeclarationBlock::CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * parent )
-        : CodeClassFieldDeclarationBlock ( parent )
+CPPSourceCodeClassFieldDeclarationBlock::CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * tqparent )
+        : CodeClassFieldDeclarationBlock ( tqparent )
 {
     setOverallIndentationLevel(1);
     updateContent();
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h
index a27c0684..00b6135f 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h
@@ -23,6 +23,7 @@
 class CPPSourceCodeClassFieldDeclarationBlock : public CodeClassFieldDeclarationBlock
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
@@ -31,7 +32,7 @@ public:
     /**
      * Constructor
      */
-    CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * parent );
+    CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * tqparent );
 
     /**
      * Empty Destructor
@@ -40,7 +41,7 @@ public:
 
 protected:
 
-    // this will be called by syncToParent whenever the parent object is "modified"
+    // this will be called by syncToParent whenever the tqparent object is "modified"
     void updateContent ( );
 
 private:
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp b/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp
index 3caefe82..53ee06f7 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 parent classifier object.
+// based on the tqparent 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 parent objects of this class...
+    // Gather info on the various fields and tqparent objects of this class...
     //UMLClassifier * c = getParentClassifier();
     CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt();
     CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe);
@@ -144,7 +144,7 @@ void CPPSourceCodeDocument::updateContent( )
     // Include own header file
     TQString myOwnName( getParentClassifier()->getName() );
     includeStatement.append("#include \""+CodeGenerator::cleanName(myOwnName.lower())+".h\""+endLine);
-    CodeBlockWithComments * iblock = addOrUpdateTaggedCodeBlockWithComments("includes", includeStatement, TQString::null, 0, false);
+    CodeBlockWithComments * iblock = addOrUpdateTaggedCodeBlockWithComments("includes", includeStatement, TQString(), 0, false);
     iblock->setWriteOutText(true);
 
     // After the includes we have just 2 big blocks basically, the "constructor" block and the
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodedocument.h b/umbrello/umbrello/codegenerators/cppsourcecodedocument.h
index 09ee93e6..c820d5a4 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodedocument.h
+++ b/umbrello/umbrello/codegenerators/cppsourcecodedocument.h
@@ -31,6 +31,7 @@
 class CPPSourceCodeDocument : public ClassifierCodeDocument
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp
index 61b1950e..5c3d0a74 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp
@@ -25,8 +25,8 @@
 // Constructors/Destructors
 //
 
-CPPSourceCodeOperation::CPPSourceCodeOperation ( CPPSourceCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment )
-        : CodeOperation (doc, parent, body, comment)
+CPPSourceCodeOperation::CPPSourceCodeOperation ( CPPSourceCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment )
+        : CodeOperation (doc, tqparent, body, comment)
 {
     // lets not go with the default comment and instead use
     // full-blown cpp documentation object instead
@@ -41,7 +41,7 @@ CPPSourceCodeOperation::CPPSourceCodeOperation ( CPPSourceCodeDocument * doc, UM
     CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe);
     UMLClassifier * c = doc->getParentClassifier();
     UMLOperation * o = getParentOperation();
-    bool isInterface = doc->parentIsInterface();
+    bool isInterface = doc->tqparentIsInterface();
     bool isInlineMethod = policy->getOperationsAreInline( );
 
     // first, the comment on the operation
@@ -131,7 +131,7 @@ void CPPSourceCodeOperation::updateMethodDeclaration()
     CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe);
     UMLClassifier * c = doc->getParentClassifier();
     UMLOperation * o = getParentOperation();
-    bool isInterface = doc->parentIsInterface();
+    bool isInterface = doc->tqparentIsInterface();
     bool isInlineMethod = policy->getOperationsAreInline( );
 
     // first, the comment on the operation
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.h b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.h
index 95073eea..86e5ff35 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.h
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.h
@@ -26,6 +26,7 @@ class CPPSourceCodeDocument;
 class CPPSourceCodeOperation : virtual public CodeOperation
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/cppwriter.cpp b/umbrello/umbrello/codegenerators/cppwriter.cpp
index ab2b8fcb..3f22a300 100644
--- a/umbrello/umbrello/codegenerators/cppwriter.cpp
+++ b/umbrello/umbrello/codegenerators/cppwriter.cpp
@@ -52,12 +52,12 @@ CppWriter::CppWriter()
     VECTOR_METHOD_REMOVE = "int i, size = %VARNAME%.size();\nfor ( i = 0; i < size; i++) {\n\t%ITEMCLASS% item = %VARNAME%.at(i);\n\tif(item == remove_object) {\n\t\tvector<%ITEMCLASS%>::iterator it = %VARNAME%.begin() + i;\n\t\t%VARNAME%.erase(it);\n\t\treturn;\n\t}\n }"; // for std::vector
     VECTOR_METHOD_INIT = TQString(); // nothing to be done
     /*
-        VECTOR_METHOD_APPEND = "%VARNAME%.append(&add_object);"; // Qt lib implementation
-        VECTOR_METHOD_REMOVE = "%VARNAME%.removeRef(&remove_object);"; // Qt lib implementation
-        VECTOR_METHOD_INIT = "%VARNAME%.setAutoDelete(false);"; // Qt library
+        VECTOR_METHOD_APPEND = "%VARNAME%.append(&add_object);"; // TQt lib implementation
+        VECTOR_METHOD_REMOVE = "%VARNAME%.removeRef(&remove_object);"; // TQt lib implementation
+        VECTOR_METHOD_INIT = "%VARNAME%.setAutoDelete(false);"; // TQt library
     */
 
-    OBJECT_METHOD_INIT = "%VARNAME% = new %ITEMCLASS%( );"; // Qt library
+    OBJECT_METHOD_INIT = "%VARNAME% = new %ITEMCLASS%( );"; // TQt library
 
     // boolean config params
     INLINE_ASSOCIATION_METHODS = false;
@@ -113,7 +113,7 @@ void CppWriter::writeClass(UMLClassifier *c)
         need_impl = false;
     }
     if (need_impl) {
-        fileName.replace( TQRegExp(".h$"), ".cpp");
+        fileName.tqreplace( TQRegExp(".h$"), ".cpp");
         if( !openFile(filecpp, fileName)) {
             emit codeGenerated(c, false);
             return;
@@ -141,13 +141,13 @@ void CppWriter::writeHeaderFile (UMLClassifier *c, TQFile &fileh) {
     // write header blurb
     TQString str = getHeadingFile(".h");
     if(!str.isEmpty()) {
-        str.replace(TQRegExp("%filename%"),m_classifierInfo->fileName + ".h");
-        str.replace(TQRegExp("%filepath%"),fileh.name());
+        str.tqreplace(TQRegExp("%filename%"),m_classifierInfo->fileName + ".h");
+        str.tqreplace(TQRegExp("%filepath%"),fileh.name());
         h << str<< m_endl;
     }
 
     // Write the hash define stuff to prevent multiple parsing/inclusion of header
-    TQString hashDefine = m_classifierInfo->className.upper().simplifyWhiteSpace().replace(TQRegExp(" "),  "_");
+    TQString hashDefine = m_classifierInfo->className.upper().simplifyWhiteSpace().tqreplace(TQRegExp(" "),  "_");
     writeBlankLine(h);
     h << "#ifndef "<< hashDefine + "_H" << m_endl;
     h << "#define "<< hashDefine + "_H" << m_endl;
@@ -206,8 +206,8 @@ void CppWriter::writeSourceFile (UMLClassifier *c, TQFile &filecpp ) {
     TQString str;
     str = getHeadingFile(".cpp");
     if(!str.isEmpty()) {
-        str.replace(TQRegExp("%filename%"),m_classifierInfo->fileName + ".cpp");
-        str.replace(TQRegExp("%filepath%"),filecpp.name());
+        str.tqreplace(TQRegExp("%filename%"),m_classifierInfo->fileName + ".cpp");
+        str.tqreplace(TQRegExp("%filepath%"),filecpp.name());
         cpp << str << m_endl;
     }
 
@@ -627,7 +627,7 @@ void CppWriter::writeAttributeMethods(UMLAttributeList *attribs,
         // from what I can tell, this IS the default behavior for
         // cleanName. I dunno why its not working -b.t.
         methodBaseName = methodBaseName.stripWhiteSpace();
-        methodBaseName.replace(0,1,methodBaseName.at(0).upper());
+        methodBaseName.tqreplace(0,1,methodBaseName.tqat(0).upper());
 
         writeSingleAttributeAccessorMethods(at->getTypeName(), varName,
                                             methodBaseName, at->getDoc(), Uml::chg_Changeable, isHeaderMethod,
@@ -641,7 +641,7 @@ void CppWriter::writeComment(const TQString &comment, const TQString &myIndent,
     // in the case we have several line comment..
     // NOTE: this part of the method has the problem of adopting UNIX newline,
     // need to resolve for using with MAC/WinDoze eventually I assume
-    if (comment.contains(TQRegExp("\n"))) {
+    if (comment.tqcontains(TQRegExp("\n"))) {
 
         TQStringList lines = TQStringList::split( "\n", comment);
         for(uint i= 0; i < lines.count(); i++)
@@ -736,14 +736,14 @@ void CppWriter::writeAssociationRoleDecl(TQString fieldClassName, TQString roleN
     // declare the association based on whether it is this a single variable
     // or a List (Vector). One day this will be done correctly with special
     // multiplicity object that we don't have to figure out what it means via regex.
-    if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$")))
+    if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$")))
     {
         TQString fieldVarName = "m_" + roleName.lower();
 
         // record this for later consideration of initialization IF the
         // multi value requires 1 of these objects
-        if(ObjectFieldVariables.findIndex(fieldVarName) == -1 &&
-                multi.contains(TQRegExp("^1$"))
+        if(ObjectFieldVariables.tqfindIndex(fieldVarName) == -1 &&
+                multi.tqcontains(TQRegExp("^1$"))
           )
         {
             // ugh. UGLY. Storing variable name and its class in pairs.
@@ -759,7 +759,7 @@ void CppWriter::writeAssociationRoleDecl(TQString fieldClassName, TQString roleN
 
         // record unique occurrences for later when we want to check
         // for initialization of this vector
-        if(VectorFieldVariables.findIndex(fieldVarName) == -1)
+        if(VectorFieldVariables.tqfindIndex(fieldVarName) == -1)
             VectorFieldVariables.append(fieldVarName);
 
         stream << indent << policyExt()->getVectorClassName() <<"<" << fieldClassName << "*";
@@ -823,7 +823,7 @@ void CppWriter::writeAssociationRoleMethod (const TQString &fieldClassName,
         const TQString &description, Uml::Changeability_Type change,
         TQTextStream &stream)
 {
-    if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$")))
+    if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$")))
     {
         TQString fieldVarName = "m_" + roleName.lower();
         writeSingleAttributeAccessorMethods(fieldClassName, fieldVarName, roleName,
@@ -860,9 +860,9 @@ void CppWriter::writeVectorAttributeAccessorMethods (
         stream << "add" << fldName << " ( " << className << " add_object )";
         if (writeMethodBody) {
             TQString method = VECTOR_METHOD_APPEND;
-            method.replace(TQRegExp("%VARNAME%"),fieldVarName);
-            method.replace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName());
-            method.replace(TQRegExp("%ITEMCLASS%"),className);
+            method.tqreplace(TQRegExp("%VARNAME%"),fieldVarName);
+            method.tqreplace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName());
+            method.tqreplace(TQRegExp("%ITEMCLASS%"),className);
             stream << indent << " {" << m_endl;
             m_indentLevel++;
             printTextAsSeparateLinesWithIndent(method,getIndent(),stream);
@@ -883,9 +883,9 @@ void CppWriter::writeVectorAttributeAccessorMethods (
         stream << "remove" << fldName << " ( " << className << " remove_object )";
         if (writeMethodBody) {
             TQString method = VECTOR_METHOD_REMOVE;
-            method.replace(TQRegExp("%VARNAME%"),fieldVarName);
-            method.replace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName());
-            method.replace(TQRegExp("%ITEMCLASS%"),className);
+            method.tqreplace(TQRegExp("%VARNAME%"),fieldVarName);
+            method.tqreplace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName());
+            method.tqreplace(TQRegExp("%ITEMCLASS%"),className);
             stream << indent << " {" << m_endl;
             m_indentLevel++;
             printTextAsSeparateLinesWithIndent(method,getIndent(),stream);
@@ -1034,8 +1034,8 @@ void CppWriter::writeInitAttibuteMethod (TQTextStream &stream)
         for( it = VectorFieldVariables.begin(); it != VectorFieldVariables.end(); ++it ) {
             TQString fieldVarName = *it;
             TQString method = VECTOR_METHOD_INIT;
-            method.replace(TQRegExp("%VARNAME%"),fieldVarName);
-            method.replace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName());
+            method.tqreplace(TQRegExp("%VARNAME%"),fieldVarName);
+            method.tqreplace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName());
             stream << getIndent() << method << m_endl;
         }
     }
@@ -1047,8 +1047,8 @@ void CppWriter::writeInitAttibuteMethod (TQTextStream &stream)
             it++;
             TQString fieldClassName = *it;
             TQString method = OBJECT_METHOD_INIT;
-            method.replace(TQRegExp("%VARNAME%"),fieldVarName);
-            method.replace(TQRegExp("%ITEMCLASS%"),fieldClassName);
+            method.tqreplace(TQRegExp("%VARNAME%"),fieldVarName);
+            method.tqreplace(TQRegExp("%ITEMCLASS%"),fieldClassName);
             stream << getIndent() << method << m_endl;
         }
     }
diff --git a/umbrello/umbrello/codegenerators/csharpwriter.cpp b/umbrello/umbrello/codegenerators/csharpwriter.cpp
index 42b055e5..a6c64db4 100644
--- a/umbrello/umbrello/codegenerators/csharpwriter.cpp
+++ b/umbrello/umbrello/codegenerators/csharpwriter.cpp
@@ -169,8 +169,8 @@ void CSharpWriter::writeClass(UMLClassifier *c) {
     TQString str;
     str = getHeadingFile(".cs");
     if (!str.isEmpty()) {
-        str.replace(TQRegExp("%filename%"),fileName);
-        str.replace(TQRegExp("%filepath%"),filecs.name());
+        str.tqreplace(TQRegExp("%filename%"),fileName);
+        str.tqreplace(TQRegExp("%filepath%"),filecs.name());
         cs<<str<<m_endl;
     }
 
@@ -199,7 +199,7 @@ void CSharpWriter::writeClass(UMLClassifier *c) {
             UMLClassifier *cl = dynamic_cast<UMLClassifier*>(p);
             if (cl)
                 p = cl->getUMLPackage();
-            if (p != logicalView && m_seenIncludes.findRef(p) == -1 && p != container) {
+            if (p != logicalView && m_seenIncludes.tqfindRef(p) == -1 && p != container) {
                 cs << "using " << p->getFullyQualifiedName(".") << ";" << m_endl;
                 m_seenIncludes.append(p);
             }
@@ -405,7 +405,7 @@ void CSharpWriter::writeOverridesRecursive(UMLClassifierList *superclasses, TQTe
 
             opabstract.clear();
         }
-        // Recurse to parent superclasses
+        // Recurse to tqparent superclasses
         UMLClassifierList superRecursive = obj->getSuperClasses();
         UMLClassifierList *superRecursivePtr =& superRecursive;
         if (superRecursivePtr->count() > 0) {
@@ -433,10 +433,10 @@ 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 parent realizations
-        UMLAssociationList parentReal = real->getRealizations();
-        if (!parentReal.isEmpty()) {
-            writeRealizationsRecursive(real, &parentReal, cs);
+        // Recurse to tqparent realizations
+        UMLAssociationList tqparentReal = real->getRealizations();
+        if (!tqparentReal.isEmpty()) {
+            writeRealizationsRecursive(real, &tqparentReal, cs);
         }
     }
 }
@@ -470,7 +470,7 @@ void CSharpWriter::writeOperations(UMLOperationList opList,
                 if (forceDoc() || !at->getDoc().isEmpty()) {
                     cs << m_container_indent << m_indentation << "/// <param name=\"" << cleanName(at->getName()) << "\">";
                     //removing newlines from parameter doc
-                    cs << formatDoc(at->getDoc(), "").replace("\n", " ").remove('\r').replace(TQRegExp(" $"), "");
+                    cs << formatDoc(at->getDoc(), "").tqreplace("\n", " ").remove('\r').tqreplace(TQRegExp(" $"), "");
                     cs << "</param>" << m_endl;
                 }
             }
@@ -493,7 +493,7 @@ void CSharpWriter::writeOperations(UMLOperationList opList,
                 if (op->getStatic()) cs << "static ";
             }
             else {
-                // method overriding an abstract parent
+                // method overriding an abstract tqparent
                 cs << op->getVisibility().toString() << " override ";
                 if (op->getStatic()) cs << "static ";
             }
@@ -629,7 +629,7 @@ void CSharpWriter::writeAssociatedAttributes(UMLAssociationList &associated, UML
         TQString roleName = cleanName(a->getRoleName(Uml::B));
         TQString typeName = cleanName(o->getName());
         if (roleName.isEmpty()) {
-            roleName = TQString("UnnamedRoleB_%1").arg(m_unnamedRoles++);
+            roleName = TQString("UnnamedRoleB_%1").tqarg(m_unnamedRoles++);
         }
         TQString roleDoc = a->getRoleDoc(Uml::B);
 
@@ -693,7 +693,7 @@ void CSharpWriter::writeAttribute(TQString doc, Uml::Visibility visibility, bool
 
 TQString CSharpWriter::makeLocalTypeName(UMLClassifierListItem *cl) {
     UMLPackage *p = cl->getType()->getUMLPackage();
-    if (m_seenIncludes.findRef(p) != -1) {
+    if (m_seenIncludes.tqfindRef(p) != -1) {
         return cl->getType()->getName();
     }
     else {
diff --git a/umbrello/umbrello/codegenerators/csharpwriter.h b/umbrello/umbrello/codegenerators/csharpwriter.h
index ef09bac5..6cf4d3f6 100644
--- a/umbrello/umbrello/codegenerators/csharpwriter.h
+++ b/umbrello/umbrello/codegenerators/csharpwriter.h
@@ -31,6 +31,7 @@
 class CSharpWriter : public SimpleCodeGenerator
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     CSharpWriter();
 
@@ -79,7 +80,7 @@ private:
     int m_unnamedRoles;
 
     /**
-      * write realizations of a class and recurse to parent classes
+      * write realizations of a class and recurse to tqparent classes
 
       * @param currentClass class to start with
       * @param realizations realizations of this class
diff --git a/umbrello/umbrello/codegenerators/dwriter.cpp b/umbrello/umbrello/codegenerators/dwriter.cpp
index 088ab9c1..60bc2abb 100644
--- a/umbrello/umbrello/codegenerators/dwriter.cpp
+++ b/umbrello/umbrello/codegenerators/dwriter.cpp
@@ -114,8 +114,8 @@ void DWriter::writeClass(UMLClassifier *c) {
     TQString str;
     str = getHeadingFile(".d");
     if(!str.isEmpty()) {
-        str.replace(TQRegExp("%filename%"),fileName);
-        str.replace(TQRegExp("%filepath%"),file.name());
+        str.tqreplace(TQRegExp("%filename%"),fileName);
+        str.tqreplace(TQRegExp("%filepath%"),file.name());
         d<<str<<m_endl;
     }
 
@@ -442,8 +442,8 @@ void DWriter::writeComment(const TQString &comment, const TQString &myIndent,
         TQString tmp = lines[i];
 
         while (tmp.length() > 77) {
-            uint l = tmp.left(77).findRev(' ');
-            if (l < 1) l = tmp.find(' ', 77);
+            uint l = tmp.left(77).tqfindRev(' ');
+            if (l < 1) l = tmp.tqfind(' ', 77);
             if (l < 1 || l > tmp.length()) {
                 d << myIndent << (dDocStyle ? " * " : "// ") << tmp << m_endl;
                 break;
@@ -527,7 +527,7 @@ void DWriter::writeAssociationRoleDecl(TQString fieldClassName,
     // declare the association based on whether it is this a single variable
     // or a List (Vector). One day this will be done correctly with special
     // multiplicity object that we don't have to figure out what it means via regex.
-    if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) {
+    if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) {
         d << m_indentation << fieldClassName << " ";
 
         if (hasAccessors) d << "m_";
@@ -584,7 +584,7 @@ void DWriter::writeAssociationMethods (UMLAssociationList associations, UMLClass
 void DWriter::writeAssociationRoleMethod (TQString fieldClassName, TQString roleName, TQString multi,
         TQString description, Uml::Visibility visib, Uml::Changeability_Type change,
         TQTextStream &d) {
-    if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) {
+    if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) {
         TQString fieldVarName = "m_" + deCapitaliseFirstLetter(roleName);
 
         writeSingleAttributeAccessorMethods(
@@ -942,7 +942,7 @@ TQString DWriter::getUMLObjectName(UMLObject *obj) {
 }
 
 TQString DWriter::deCapitaliseFirstLetter(TQString string) {
-    string.replace( 0, 1, string[0].lower());
+    string.tqreplace( 0, 1, string[0].lower());
     return string;
 }
 
diff --git a/umbrello/umbrello/codegenerators/idlwriter.cpp b/umbrello/umbrello/codegenerators/idlwriter.cpp
index dc367f50..8e5688ac 100644
--- a/umbrello/umbrello/codegenerators/idlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/idlwriter.cpp
@@ -70,7 +70,7 @@ void IDLWriter::computeAssocTypeAndRole
                 at == Uml::at_UniAssociation) {
             // Assuming unidirectional association, and we are
             // at the "wrong" side.
-            // Returning roleName = TQString::null tells caller to
+            // Returning roleName = TQString() tells caller to
             // skip this association at this side.
             roleName = TQString();
             return;
@@ -129,8 +129,8 @@ void IDLWriter::writeClass(UMLClassifier *c) {
     TQString str;
     str = getHeadingFile(".idl");
     if (!str.isEmpty()) {
-        str.replace(TQRegExp("%filename%"), fileName);
-        str.replace(TQRegExp("%filepath%"), file.name());
+        str.tqreplace(TQRegExp("%filename%"), fileName);
+        str.tqreplace(TQRegExp("%filepath%"), file.name());
         idl << str << m_endl;
     }
 
@@ -275,13 +275,13 @@ void IDLWriter::writeClass(UMLClassifier *c) {
     UMLClassifierList superclasses = c->getSuperClasses();
     if (! superclasses.isEmpty()) {
         idl << " : ";
-        UMLClassifier *parent = superclasses.first();
+        UMLClassifier *tqparent = superclasses.first();
         int n_parents = superclasses.count();
         while (n_parents--) {
-            idl << parent->getFullyQualifiedName("::");
+            idl << tqparent->getFullyQualifiedName("::");
             if (n_parents)
                 idl << ", ";
-            parent = superclasses.next();
+            tqparent = superclasses.next();
         }
     }
     idl << " {" << m_endl << m_endl;
diff --git a/umbrello/umbrello/codegenerators/javaantcodedocument.cpp b/umbrello/umbrello/codegenerators/javaantcodedocument.cpp
index cc9e394b..1fd6fd69 100644
--- a/umbrello/umbrello/codegenerators/javaantcodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/javaantcodedocument.cpp
@@ -146,7 +146,7 @@ void JavaANTCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & root)
                                     } else
                                         if( name == "codeoperation" ) {
                                             // find the code operation by id
-                                            TQString id = element.attribute("parent_id","-1");
+                                            TQString id = element.attribute("tqparent_id","-1");
                                             UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id));
                                             UMLOperation * op = dynamic_cast<UMLOperation*>(obj);
                                             if(op) {
@@ -297,10 +297,10 @@ TQString JavaANTCodeDocument::getPath ( )
     path.simplifyWhiteSpace();
 
     // Replace all blanks with underscore
-    path.replace(TQRegExp(" "), "_");
+    path.tqreplace(TQRegExp(" "), "_");
 
-    path.replace(TQRegExp("\\."),"/");
-    path.replace(TQRegExp("::"), "/");
+    path.tqreplace(TQRegExp("\\."),"/");
+    path.tqreplace(TQRegExp("::"), "/");
 
     path.lower();
 
diff --git a/umbrello/umbrello/codegenerators/javaantcodedocument.h b/umbrello/umbrello/codegenerators/javaantcodedocument.h
index 97d19c50..27c8e7c5 100644
--- a/umbrello/umbrello/codegenerators/javaantcodedocument.h
+++ b/umbrello/umbrello/codegenerators/javaantcodedocument.h
@@ -32,6 +32,7 @@
 class JavaANTCodeDocument : public CodeDocument
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp
index e1966001..babc04a9 100644
--- a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp
@@ -23,10 +23,10 @@
 //
 
 JavaClassDeclarationBlock::JavaClassDeclarationBlock
- ( JavaClassifierCodeDocument * parentDoc, const TQString &startText, const TQString &endText, const TQString &comment)
-        : OwnedHierarchicalCodeBlock(parentDoc->getParentClassifier(), parentDoc, startText, endText, comment)
+ ( JavaClassifierCodeDocument * tqparentDoc, const TQString &startText, const TQString &endText, const TQString &comment)
+        : OwnedHierarchicalCodeBlock(tqparentDoc->getParentClassifier(), tqparentDoc, startText, endText, comment)
 {
-    init(parentDoc, comment);
+    init(tqparentDoc, comment);
 }
 
 JavaClassDeclarationBlock::~JavaClassDeclarationBlock ( ) { }
@@ -66,12 +66,12 @@ void JavaClassDeclarationBlock::loadFromXMI ( TQDomElement & root )
 void JavaClassDeclarationBlock::updateContent ( )
 {
 
-    JavaClassifierCodeDocument *parentDoc = dynamic_cast<JavaClassifierCodeDocument*>(getParentDocument());
-    UMLClassifier *c = parentDoc->getParentClassifier();
+    JavaClassifierCodeDocument *tqparentDoc = dynamic_cast<JavaClassifierCodeDocument*>(getParentDocument());
+    UMLClassifier *c = tqparentDoc->getParentClassifier();
     CodeGenerationPolicy *commonPolicy = UMLApp::app()->getCommonPolicy();
     TQString endLine = commonPolicy->getNewLineEndingChars();
-    bool isInterface = parentDoc->parentIsInterface(); // a little shortcut
-    TQString JavaClassName = parentDoc->getJavaClassName(c->getName());
+    bool isInterface = tqparentDoc->tqparentIsInterface(); // a little shortcut
+    TQString JavaClassName = tqparentDoc->getJavaClassName(c->getName());
 
     // COMMENT
     if(isInterface)
@@ -101,7 +101,7 @@ void JavaClassDeclarationBlock::updateContent ( )
     } else
         startText.append("public ");
 
-    if(parentDoc->parentIsInterface())
+    if(tqparentDoc->tqparentIsInterface())
         startText.append("interface ");
     else
         startText.append("class ");
@@ -122,7 +122,7 @@ void JavaClassDeclarationBlock::updateContent ( )
         startText.append(" extends ");
     for (UMLClassifier * concept= superclasses.first(); concept; concept = superclasses.next())
     {
-        startText.append(parentDoc->cleanName(concept->getName()));
+        startText.append(tqparentDoc->cleanName(concept->getName()));
         if(i != (nrof_superclasses-1))
             startText.append(", ");
         i++;
@@ -140,7 +140,7 @@ void JavaClassDeclarationBlock::updateContent ( )
     }
     for (UMLClassifier * concept= superinterfaces.first(); concept; concept = superinterfaces.next())
     {
-        startText.append(parentDoc->cleanName(concept->getName()));
+        startText.append(tqparentDoc->cleanName(concept->getName()));
         if(i != (nrof_superinterfaces-1))
             startText.append(", ");
         i++;
@@ -153,10 +153,10 @@ void JavaClassDeclarationBlock::updateContent ( )
 
 }
 
-void JavaClassDeclarationBlock::init (JavaClassifierCodeDocument *parentDoc, const TQString &comment)
+void JavaClassDeclarationBlock::init (JavaClassifierCodeDocument *tqparentDoc, const TQString &comment)
 {
 
-    setComment(new JavaCodeDocumentation(parentDoc));
+    setComment(new JavaCodeDocumentation(tqparentDoc));
     getComment()->setText(comment);
 
     setEndText("}");
diff --git a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h
index 08e639c7..caa07074 100644
--- a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h
@@ -25,6 +25,7 @@
 class JavaClassDeclarationBlock : public OwnedHierarchicalCodeBlock
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
@@ -33,7 +34,7 @@ public:
     /**
      * Empty Constructor
      */
-    explicit JavaClassDeclarationBlock ( JavaClassifierCodeDocument * parentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = "");
+    explicit JavaClassDeclarationBlock ( JavaClassifierCodeDocument * tqparentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = "");
 
     /**
      * Empty Destructor
@@ -59,7 +60,7 @@ protected:
 
 private:
 
-    void init (JavaClassifierCodeDocument * parent, const TQString &comment);
+    void init (JavaClassifierCodeDocument * tqparent, const TQString &comment);
 
 };
 
diff --git a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
index 426c6d9a..bcf46bb6 100644
--- a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
@@ -89,10 +89,10 @@ TQString JavaClassifierCodeDocument::getPath ( )
     path.simplifyWhiteSpace();
 
     // Replace all blanks with underscore
-    path.replace(TQRegExp(" "), "_");
+    path.tqreplace(TQRegExp(" "), "_");
 
-    path.replace(TQRegExp("\\."),"/");
-    path.replace(TQRegExp("::"), "/");
+    path.tqreplace(TQRegExp("\\."),"/");
+    path.tqreplace(TQRegExp("::"), "/");
 
     path.lower();
 
@@ -222,7 +222,7 @@ void JavaClassifierCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & ro
                                     } else
                                         if( name == "codeoperation" ) {
                                             // find the code operation by id
-                                            TQString id = element.attribute("parent_id","-1");
+                                            TQString id = element.attribute("tqparent_id","-1");
                                             UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id));
                                             UMLOperation * op = dynamic_cast<UMLOperation*>(obj);
                                             if(op) {
@@ -326,7 +326,7 @@ void JavaClassifierCodeDocument::resetTextBlocks()
 }
 
 // This method will cause the class to rebuild its text representation.
-// based on the parent classifier object.
+// based on the tqparent 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 parent objects of this class...
+    // Gather info on the various fields and tqparent objects of this class...
     UMLClassifier * c = getParentClassifier();
     CodeGenerationPolicy * commonPolicy = UMLApp::app()->getCommonPolicy();
     CodeGenPolicyExt * pe = UMLApp::app()->getPolicyExt();
@@ -344,7 +344,7 @@ void JavaClassifierCodeDocument::updateContent( )
     // This depends on whether or not we have attribute/association classes
     CodeClassFieldList * cfList = getCodeClassFieldList();
     for(CodeClassField * field = cfList->first(); field; field = cfList->next())
-        if(field->parentIsAttribute())
+        if(field->tqparentIsAttribute())
             field->setWriteOutMethods(policy->getAutoGenerateAttribAccessors());
         else
             field->setWriteOutMethods(policy->getAutoGenerateAssocAccessors());
@@ -359,7 +359,7 @@ void JavaClassifierCodeDocument::updateContent( )
     CodeClassFieldList aggregationClassFields = getSpecificClassFields ( CodeClassField::Aggregation );
     CodeClassFieldList compositionClassFields = getSpecificClassFields ( CodeClassField::Composition );
 
-    bool isInterface = parentIsInterface();
+    bool isInterface = tqparentIsInterface();
     bool hasOperationMethods = c->getOpList().last() ? true : false;
     TQString endLine = commonPolicy->getNewLineEndingChars(); // a shortcut..so we don't have to call this all the time
 
@@ -371,7 +371,7 @@ void JavaClassifierCodeDocument::updateContent( )
     // PACKAGE CODE BLOCK
     //
     TQString pkgs = getPackage();
-    pkgs.replace(TQRegExp("::"), ".");
+    pkgs.tqreplace(TQRegExp("::"), ".");
     TQString packageText = getPackage().isEmpty() ? "" : "package "+pkgs+';'+endLine;
     CodeBlockWithComments * pblock = addOrUpdateTaggedCodeBlockWithComments("packages", packageText, "", 0, false);
     if(packageText.isEmpty() && pblock->getContentType() == CodeBlock::AutoGenerated)
@@ -397,7 +397,7 @@ void JavaClassifierCodeDocument::updateContent( )
         // NO (default) datatypes in the import statement.. use defined
         // ones whould be possible, but no idea how to do that...at least for now.
         // Dynamic casting is slow..not an optimal way to do this.
-        if (!packageMap.contains(con) && con->getBaseType() != Uml::ot_Datatype)
+        if (!packageMap.tqcontains(con) && con->getBaseType() != Uml::ot_Datatype)
         {
             packageMap.insert(con, con->getPackage());
 
@@ -428,7 +428,7 @@ void JavaClassifierCodeDocument::updateContent( )
 
     // NOW create document in sections..
     // now we want to populate the body of our class
-    // our layout is the following general groupings of code blocks:
+    // our tqlayout is the following general groupings of code blocks:
 
     // start java classifier document
 
@@ -532,7 +532,7 @@ void JavaClassifierCodeDocument::updateContent( )
         constBlock->addOrUpdateTaggedCodeBlockWithComments("emptyconstructor", emptyConstStatement, "Empty Constructor", 1, false);
     // Now, as an additional condition we only show the empty constructor block
     // IF it was desired to be shown
-    if(parentIsClass() && pol->getAutoGenerateConstructors())
+    if(tqparentIsClass() && pol->getAutoGenerateConstructors())
         emptyConstBlock->setWriteOutText(true);
     else
         emptyConstBlock->setWriteOutText(false);
diff --git a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.h b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.h
index 831e0555..5813609f 100644
--- a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.h
+++ b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.h
@@ -40,6 +40,7 @@ class JavaCodeGenerationPolicy;
 class JavaClassifierCodeDocument : public ClassifierCodeDocument
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp
index 6c883952..dde0ca31 100644
--- a/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp
+++ b/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp
@@ -74,8 +74,8 @@ void JavaCodeAccessorMethod::setAttributesFromNode( TQDomElement & root)
 void JavaCodeAccessorMethod::updateContent( )
 {
 
-    CodeClassField * parentField = getParentClassField();
-    JavaCodeClassField * javafield = dynamic_cast<JavaCodeClassField*>(parentField);
+    CodeClassField * tqparentField = getParentClassField();
+    JavaCodeClassField * javafield = dynamic_cast<JavaCodeClassField*>(tqparentField);
     TQString fieldName = javafield->getFieldName();
 
     TQString text = "";
@@ -150,7 +150,7 @@ void JavaCodeAccessorMethod::updateMethodDeclaration()
 
     // set scope of this accessor appropriately..if its an attribute,
     // we need to be more sophisticated
-    if(javafield->parentIsAttribute())
+    if(javafield->tqparentIsAttribute())
         switch (scopePolicy) {
         case CodeGenerationPolicy::Public:
         case CodeGenerationPolicy::Private:
@@ -159,7 +159,7 @@ void JavaCodeAccessorMethod::updateMethodDeclaration()
             break;
         default:
         case CodeGenerationPolicy::FromParent:
-            // do nothing..already have taken parent value
+            // do nothing..already have taken tqparent value
             break;
         }
 
diff --git a/umbrello/umbrello/codegenerators/javacodeaccessormethod.h b/umbrello/umbrello/codegenerators/javacodeaccessormethod.h
index e26ef033..902b37c4 100644
--- a/umbrello/umbrello/codegenerators/javacodeaccessormethod.h
+++ b/umbrello/umbrello/codegenerators/javacodeaccessormethod.h
@@ -25,6 +25,7 @@ class CodeClassField;
 class JavaCodeAccessorMethod : public CodeAccessorMethod
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/javacodeclassfield.cpp b/umbrello/umbrello/codegenerators/javacodeclassfield.cpp
index 0777cf1d..c168ac35 100644
--- a/umbrello/umbrello/codegenerators/javacodeclassfield.cpp
+++ b/umbrello/umbrello/codegenerators/javacodeclassfield.cpp
@@ -36,14 +36,14 @@
 // Constructors/Destructors
 //
 
-JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role)
-        : CodeClassField(parentDoc, role)
+JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role)
+        : CodeClassField(tqparentDoc, role)
 {
 
 }
 
-JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib)
-        : CodeClassField(parentDoc, attrib)
+JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib)
+        : CodeClassField(tqparentDoc, attrib)
 {
 
 }
@@ -58,7 +58,7 @@ JavaCodeClassField::~JavaCodeClassField ( ) { }
 //
 
 TQString JavaCodeClassField::getFieldName() {
-    if (parentIsAttribute())
+    if (tqparentIsAttribute())
     {
         UMLAttribute * at = (UMLAttribute*) getParentObject();
         return cleanName(at->getName());
@@ -68,7 +68,7 @@ TQString JavaCodeClassField::getFieldName() {
         UMLRole * role = (UMLRole*) getParentObject();
         TQString roleName = role->getName();
         if(fieldIsSingleValue()) {
-            return roleName.replace(0, 1, roleName.left(1).lower());
+            return roleName.tqreplace(0, 1, roleName.left(1).lower());
         } else {
             return roleName.lower() + "Vector";
         }
@@ -78,13 +78,13 @@ TQString JavaCodeClassField::getFieldName() {
 
 TQString JavaCodeClassField::getInitialValue() {
 
-    if (parentIsAttribute())
+    if (tqparentIsAttribute())
     {
         UMLAttribute * at = dynamic_cast<UMLAttribute*>( getParentObject() );
         if (at) {
             return fixInitialStringDeclValue(at->getInitialValue(), getTypeName());
         } else {
-            kError() << "JavaodeClassField::getInitialValue: parent object is not a UMLAttribute"
+            kError() << "JavaodeClassField::getInitialValue: tqparent object is not a UMLAttribute"
             << endl;
             return "";
         }
diff --git a/umbrello/umbrello/codegenerators/javacodeclassfield.h b/umbrello/umbrello/codegenerators/javacodeclassfield.h
index b381796c..0cad977b 100644
--- a/umbrello/umbrello/codegenerators/javacodeclassfield.h
+++ b/umbrello/umbrello/codegenerators/javacodeclassfield.h
@@ -27,6 +27,7 @@ class ClassifierCodeDocument;
 class JavaCodeClassField : public CodeClassField
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
@@ -35,8 +36,8 @@ public:
     /**
      * Constructors
      */
-    JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role);
-    JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib);
+    JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role);
+    JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib);
 
     /**
      * Empty Destructor
diff --git a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp
index 5507c314..6f6eb5ec 100644
--- a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp
@@ -27,8 +27,8 @@
 // Constructors/Destructors
 //
 
-JavaCodeClassFieldDeclarationBlock::JavaCodeClassFieldDeclarationBlock ( CodeClassField * parent )
-        : CodeClassFieldDeclarationBlock ( parent )
+JavaCodeClassFieldDeclarationBlock::JavaCodeClassFieldDeclarationBlock ( CodeClassField * tqparent )
+        : CodeClassFieldDeclarationBlock ( tqparent )
 {
     setOverallIndentationLevel(1);
     updateContent();
@@ -67,7 +67,7 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( )
     TQString scopeStr = jdoc->scopeToJavaDecl(getParentObject()->getVisibility());
 
     // IF this is from an association, then scope taken as appropriate to policy
-    if(!jcf->parentIsAttribute())
+    if(!jcf->tqparentIsAttribute())
     {
         switch (scopePolicy) {
         case CodeGenerationPolicy::Public:
@@ -77,7 +77,7 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( )
             break;
         default:
         case CodeGenerationPolicy::FromParent:
-            // do nothing here... will leave as from parent object
+            // do nothing here... will leave as from tqparent object
             break;
         }
     }
@@ -86,13 +86,13 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( )
     TQString fieldName = jcf->getFieldName();
     TQString initialV = jcf->getInitialValue();
 
-    if (!cf->parentIsAttribute() && !cf->fieldIsSingleValue())
+    if (!cf->tqparentIsAttribute() && !cf->fieldIsSingleValue())
         typeName = "List";
 
     TQString body = staticValue+scopeStr+' '+typeName+' '+fieldName;
     if (!initialV.isEmpty())
         body.append(" = " + initialV);
-    else if (!cf->parentIsAttribute())
+    else if (!cf->tqparentIsAttribute())
     {
         UMLRole * role = dynamic_cast<UMLRole*>(cf->getParentObject());
         if (role->getObject()->getBaseType() == Uml::ot_Interface)
@@ -101,7 +101,7 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( )
         } else {
 
             // FIX?: IF a constructor method exists in the classifiercodedoc
-            // of the parent Object, then we can use that instead (if its empty).
+            // of the tqparent 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 1ed37a43..d7f3c2f5 100644
--- a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h
@@ -23,6 +23,7 @@
 class JavaCodeClassFieldDeclarationBlock : public CodeClassFieldDeclarationBlock
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
@@ -31,7 +32,7 @@ public:
     /**
      * Constructor
      */
-    JavaCodeClassFieldDeclarationBlock ( CodeClassField * parent );
+    JavaCodeClassFieldDeclarationBlock ( CodeClassField * tqparent );
 
     /**
      * Empty Destructor
@@ -40,7 +41,7 @@ public:
 
 protected:
 
-    // this will be called by syncToParent whenever the parent object is "modified"
+    // this will be called by syncToParent whenever the tqparent object is "modified"
     void updateContent ( );
 
 private:
diff --git a/umbrello/umbrello/codegenerators/javacodecomment.cpp b/umbrello/umbrello/codegenerators/javacodecomment.cpp
index 588a0acc..38794003 100644
--- a/umbrello/umbrello/codegenerators/javacodecomment.cpp
+++ b/umbrello/umbrello/codegenerators/javacodecomment.cpp
@@ -62,7 +62,7 @@ TQString JavaCodeComment::unformatText ( const TQString & text , const TQString
 }
 
 /**
- * @return      QString
+ * @return      TQString
  */
 TQString JavaCodeComment::toString ( )
 {
diff --git a/umbrello/umbrello/codegenerators/javacodecomment.h b/umbrello/umbrello/codegenerators/javacodecomment.h
index 468b2a7c..2d756d70 100644
--- a/umbrello/umbrello/codegenerators/javacodecomment.h
+++ b/umbrello/umbrello/codegenerators/javacodecomment.h
@@ -31,6 +31,7 @@
 class JavaCodeComment : virtual public CodeComment
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
@@ -54,7 +55,7 @@ public:
     // other
 
     /**
-     * @return  QString
+     * @return  TQString
      */
     TQString toString ( );
 
diff --git a/umbrello/umbrello/codegenerators/javacodedocumentation.cpp b/umbrello/umbrello/codegenerators/javacodedocumentation.cpp
index 662b88c9..a04a3cd1 100644
--- a/umbrello/umbrello/codegenerators/javacodedocumentation.cpp
+++ b/umbrello/umbrello/codegenerators/javacodedocumentation.cpp
@@ -54,12 +54,12 @@ 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 parent TextBlock method
+    // just use tqparent TextBlock method
     root.appendChild( blockElement );
 }
 
 /**
- * @return      QString
+ * @return      TQString
  */
 TQString JavaCodeDocumentation::toString ( )
 {
diff --git a/umbrello/umbrello/codegenerators/javacodedocumentation.h b/umbrello/umbrello/codegenerators/javacodedocumentation.h
index acc386c1..dff2da00 100644
--- a/umbrello/umbrello/codegenerators/javacodedocumentation.h
+++ b/umbrello/umbrello/codegenerators/javacodedocumentation.h
@@ -33,6 +33,7 @@ class JavaClassifierCodeDocument;
 class JavaCodeDocumentation : virtual public CodeComment
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
@@ -61,7 +62,7 @@ public:
     virtual void saveToXMI ( TQDomDocument & doc, TQDomElement & root );
 
     /**
-     * @return  QString
+     * @return  TQString
      */
     TQString toString ( );
 
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui
index cd39611a..e756333c 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui
+++ b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>JavaCodeGenerationFormBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -16,15 +16,15 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QGroupBox" row="3" column="0">
+                <widget class="TQGroupBox" row="3" column="0">
                     <property name="name">
                         <cstring>groupBox3</cstring>
                     </property>
@@ -43,7 +43,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>m_makeANTDocumentCheckBox</cstring>
                             </property>
@@ -53,7 +53,7 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QGroupBox" row="2" column="0">
+                <widget class="TQGroupBox" row="2" column="0">
                     <property name="name">
                         <cstring>groupBox2</cstring>
                     </property>
@@ -72,15 +72,15 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget" row="0" column="0">
+                        <widget class="TQLayoutWidget" row="0" column="0">
                             <property name="name">
-                                <cstring>layout2</cstring>
+                                <cstring>tqlayout2</cstring>
                             </property>
                             <grid>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QCheckBox" row="0" column="0">
+                                <widget class="TQCheckBox" row="0" column="0">
                                     <property name="name">
                                         <cstring>m_generateConstructors</cstring>
                                     </property>
@@ -91,7 +91,7 @@
                                         <bool>false</bool>
                                     </property>
                                 </widget>
-                                <widget class="QCheckBox" row="2" column="0">
+                                <widget class="TQCheckBox" row="2" column="0">
                                     <property name="name">
                                         <cstring>m_generateAssocAccessors</cstring>
                                     </property>
@@ -102,7 +102,7 @@
                                         <bool>true</bool>
                                     </property>
                                 </widget>
-                                <widget class="QCheckBox" row="1" column="0">
+                                <widget class="TQCheckBox" row="1" column="0">
                                     <property name="name">
                                         <cstring>m_generateAttribAccessors</cstring>
                                     </property>
@@ -115,15 +115,15 @@
                                 </widget>
                             </grid>
                         </widget>
-                        <widget class="QLayoutWidget" row="1" column="0">
+                        <widget class="TQLayoutWidget" row="1" column="0">
                             <property name="name">
-                                <cstring>layout4</cstring>
+                                <cstring>tqlayout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QComboBox" row="0" column="1">
+                                <widget class="TQComboBox" row="0" column="1">
                                     <item>
                                         <property name="text">
                                             <string>Public</string>
@@ -151,7 +151,7 @@
                                         <number>3</number>
                                     </property>
                                 </widget>
-                                <widget class="QLabel" row="0" column="0">
+                                <widget class="TQLabel" row="0" column="0">
                                     <property name="name">
                                         <cstring>textLabel1_3</cstring>
                                     </property>
@@ -161,15 +161,15 @@
                                 </widget>
                             </grid>
                         </widget>
-                        <widget class="QLayoutWidget" row="2" column="0">
+                        <widget class="TQLayoutWidget" row="2" column="0">
                             <property name="name">
-                                <cstring>layout4</cstring>
+                                <cstring>tqlayout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel" row="0" column="0">
+                                <widget class="TQLabel" row="0" column="0">
                                     <property name="name">
                                         <cstring>textLabel1_3_2</cstring>
                                     </property>
@@ -177,7 +177,7 @@
                                         <string>Default association field scope:</string>
                                     </property>
                                 </widget>
-                                <widget class="QComboBox" row="0" column="1">
+                                <widget class="TQComboBox" row="0" column="1">
                                     <item>
                                         <property name="text">
                                             <string>Public</string>
@@ -209,7 +209,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QGroupBox" row="1" column="0">
+                <widget class="TQGroupBox" row="1" column="0">
                     <property name="name">
                         <cstring>groupBox1</cstring>
                     </property>
@@ -228,7 +228,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
@@ -236,7 +236,7 @@
                                 <string>Style:</string>
                             </property>
                         </widget>
-                        <widget class="QComboBox">
+                        <widget class="TQComboBox">
                             <item>
                                 <property name="text">
                                     <string>Slash-Slash (//)</string>
@@ -253,7 +253,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1_2</cstring>
                     </property>
@@ -273,5 +273,5 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp
index 6225485f..aeee86e0 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 *parent, const char *name ) {
-    return new JavaCodeGenerationPolicyPage ( parent, name, this );
+CodeGenerationPolicyPage * JavaCodeGenerationPolicy::createPage ( TQWidget *tqparent, const char *name ) {
+    return new JavaCodeGenerationPolicyPage ( tqparent, name, this );
 }
 
 void JavaCodeGenerationPolicy::init() {
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
index e72c5161..cb9171f4 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
@@ -27,6 +27,7 @@ class CodeGenerationPolicyPage;
 class JavaCodeGenerationPolicy : public CodeGenPolicyExt
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     static const bool DEFAULT_AUTO_GEN_ATTRIB_ACCESSORS;
@@ -96,7 +97,7 @@ public:
      * Create a new dialog interface for this object.
      * @return dialog object
      */
-    CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0);
+    CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0);
 
 protected:
 
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp
index c7bfbf0b..c802024a 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 *parent, const char *name, JavaCodeGenerationPolicy * policy )
-  : CodeGenerationPolicyPage(parent, name, policy)
+JavaCodeGenerationPolicyPage::JavaCodeGenerationPolicyPage( TQWidget *tqparent, const char *name, JavaCodeGenerationPolicy * policy )
+  : CodeGenerationPolicyPage(tqparent, 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 * parent = (JavaCodeGenerationPolicy*) m_parentPolicy;
+    JavaCodeGenerationPolicy * tqparent = (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());
-    parent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked());
-    parent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked());
+    tqparent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked());
+    tqparent->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 01b739b9..2ace585e 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h
@@ -28,9 +28,10 @@
 
 class JavaCodeGenerationPolicyPage : public CodeGenerationPolicyPage {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
-    explicit JavaCodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, JavaCodeGenerationPolicy * policy = 0);
+    explicit JavaCodeGenerationPolicyPage (TQWidget *tqparent=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 0f78a0fb..12462784 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* parent, CodeDocument *doc,
+CodeViewerDialog * JavaCodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, CodeDocument *doc,
         Settings::CodeViewerState state)
 {
-    CodeViewerDialog *dialog = new CodeViewerDialog(parent, doc, state);
+    CodeViewerDialog *dialog = new CodeViewerDialog(tqparent, doc, state);
     if(getCreateANTBuildFile())
         dialog->addCodeDocument(findCodeDocumentByID("ANTDOC"));
     return dialog;
@@ -115,7 +115,7 @@ TQString JavaCodeGenerator::getListFieldClassName () {
 // Same thing again for "bool" to "boolean"
 TQString JavaCodeGenerator::fixTypeName(const TQString &string)
 {
-    if (string.isEmpty() || string.contains(TQRegExp("^\\s+$")))
+    if (string.isEmpty() || string.tqcontains(TQRegExp("^\\s+$")))
         return "void";
     if (string == "string")
         return "String";
@@ -143,7 +143,7 @@ CodeDocument * JavaCodeGenerator::newClassifierCodeDocument ( UMLClassifier * c)
 }
 
 void JavaCodeGenerator::init() {
-    // load Classifier documents from parent document
+    // load Classifier documents from tqparent document
     //initFromParentDocument();
 
     // add in an ANT document
diff --git a/umbrello/umbrello/codegenerators/javacodegenerator.h b/umbrello/umbrello/codegenerators/javacodegenerator.h
index 3d94ad5f..c9fc49e7 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerator.h
+++ b/umbrello/umbrello/codegenerators/javacodegenerator.h
@@ -36,6 +36,7 @@ class CodeViewerDialog;
 class JavaCodeGenerator : public CodeGenerator
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
@@ -91,7 +92,7 @@ public:
 
     /** Get the editing dialog for this code document
      */
-    virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc,
+    virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc,
             Settings::CodeViewerState state);
 
     // Other methods
diff --git a/umbrello/umbrello/codegenerators/javacodeoperation.cpp b/umbrello/umbrello/codegenerators/javacodeoperation.cpp
index c7e7d162..a788b215 100644
--- a/umbrello/umbrello/codegenerators/javacodeoperation.cpp
+++ b/umbrello/umbrello/codegenerators/javacodeoperation.cpp
@@ -25,8 +25,8 @@
 //
 
 JavaCodeOperation::JavaCodeOperation
- ( JavaClassifierCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment )
-        : CodeOperation (doc, parent, body, comment)
+ ( JavaClassifierCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment )
+        : CodeOperation (doc, tqparent, 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 parent is an interface, our operations look different
+    // IF the tqparent is an interface, our operations look different
     // e.g. they have no body
     if(isInterface) {
         startText += ';';
@@ -123,7 +123,7 @@ void JavaCodeOperation::updateMethodDeclaration()
 
 int JavaCodeOperation::lastEditableLine() {
     ClassifierCodeDocument * doc = dynamic_cast<ClassifierCodeDocument*>(getParentDocument());
-    if(doc->parentIsInterface())
+    if(doc->tqparentIsInterface())
         return -1; // very last line is NOT editable as its a one-line declaration w/ no body in
     // an interface.
     return 0;
diff --git a/umbrello/umbrello/codegenerators/javacodeoperation.h b/umbrello/umbrello/codegenerators/javacodeoperation.h
index 50087fd7..51b7f48a 100644
--- a/umbrello/umbrello/codegenerators/javacodeoperation.h
+++ b/umbrello/umbrello/codegenerators/javacodeoperation.h
@@ -26,6 +26,7 @@ class JavaClassifierCodeDocument;
 class JavaCodeOperation : virtual public CodeOperation
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/javawriter.cpp b/umbrello/umbrello/codegenerators/javawriter.cpp
index db6d6515..9c351555 100644
--- a/umbrello/umbrello/codegenerators/javawriter.cpp
+++ b/umbrello/umbrello/codegenerators/javawriter.cpp
@@ -137,8 +137,8 @@ void JavaWriter::writeClass(UMLClassifier *c)
     TQString str;
     str = getHeadingFile(".java");
     if(!str.isEmpty()) {
-        str.replace(TQRegExp("%filename%"),fileName);
-        str.replace(TQRegExp("%filepath%"),file.name());
+        str.tqreplace(TQRegExp("%filename%"),fileName);
+        str.tqreplace(TQRegExp("%filepath%"),file.name());
         java<<str<<m_endl;
     }
 
@@ -408,7 +408,7 @@ void JavaWriter::writeAttributeMethods(UMLAttributeList &atpub, Uml::Visibility
         // from what I can tell, this IS the default behavior for
         // cleanName. I dunno why its not working -b.t.
         fieldName.stripWhiteSpace();
-        fieldName.replace(0,1,fieldName.at(0).upper());
+        fieldName.tqreplace(0,1,fieldName.tqat(0).upper());
 
         writeSingleAttributeAccessorMethods(at->getTypeName(),
                                             cleanName(at->getName()),
@@ -425,7 +425,7 @@ void JavaWriter::writeComment(const TQString &comment, const TQString &myIndent,
     // in the case we have several line comment..
     // NOTE: this part of the method has the problem of adopting UNIX newline,
     // need to resolve for using with MAC/WinDoze eventually I assume
-    if (comment.contains(TQRegExp("\n"))) {
+    if (comment.tqcontains(TQRegExp("\n"))) {
 
         if(javaDocStyle)
             java << myIndent << "/**" << m_endl;
@@ -530,9 +530,9 @@ void JavaWriter::writeAssociationRoleDecl(TQString fieldClassName,
     // declare the association based on whether it is this a single variable
     // or a List (Vector). One day this will be done correctly with special
     // multiplicity object that we don't have to figure out what it means via regex.
-    if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$")))
+    if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$")))
     {
-        TQString fieldVarName = "m_" + roleName.replace(0, 1, roleName.left(1).lower());
+        TQString fieldVarName = "m_" + roleName.tqreplace(0, 1, roleName.left(1).lower());
         java<<startline<<scope<<" "<<fieldClassName<<" "<<fieldVarName<<";";
     }
     else
@@ -589,9 +589,9 @@ void JavaWriter::writeAssociationRoleMethod (TQString fieldClassName, TQString r
         TQString description, Uml::Visibility visib, Uml::Changeability_Type change,
         TQTextStream &java)
 {
-    if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$")))
+    if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$")))
     {
-        TQString fieldVarName = "m_" + roleName.replace(0, 1, roleName.left(1).lower());
+        TQString fieldVarName = "m_" + roleName.tqreplace(0, 1, roleName.left(1).lower());
         writeSingleAttributeAccessorMethods(fieldClassName, fieldVarName, roleName,
                                             description, visib, change, false, java);
     }
diff --git a/umbrello/umbrello/codegenerators/jswriter.cpp b/umbrello/umbrello/codegenerators/jswriter.cpp
index ea4cc2e1..b53cd9f6 100644
--- a/umbrello/umbrello/codegenerators/jswriter.cpp
+++ b/umbrello/umbrello/codegenerators/jswriter.cpp
@@ -68,8 +68,8 @@ void JSWriter::writeClass(UMLClassifier *c)
     str = getHeadingFile(".js");
     if(!str.isEmpty())
     {
-        str.replace(TQRegExp("%filename%"),fileName);
-        str.replace(TQRegExp("%filepath%"),filejs.name());
+        str.tqreplace(TQRegExp("%filename%"),fileName);
+        str.tqreplace(TQRegExp("%filepath%"),filejs.name());
         js << str << m_endl;
     }
 
diff --git a/umbrello/umbrello/codegenerators/jswriter.h b/umbrello/umbrello/codegenerators/jswriter.h
index 679222b3..3f54101e 100644
--- a/umbrello/umbrello/codegenerators/jswriter.h
+++ b/umbrello/umbrello/codegenerators/jswriter.h
@@ -28,6 +28,7 @@
   */
 class JSWriter : public SimpleCodeGenerator {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     JSWriter();
diff --git a/umbrello/umbrello/codegenerators/pascalwriter.cpp b/umbrello/umbrello/codegenerators/pascalwriter.cpp
index 766ea6df..2a42bef7 100644
--- a/umbrello/umbrello/codegenerators/pascalwriter.cpp
+++ b/umbrello/umbrello/codegenerators/pascalwriter.cpp
@@ -129,7 +129,7 @@ void PascalWriter::writeClass(UMLClassifier *c) {
     const bool isClass = !c->isInterface();
     TQString classname = cleanName(c->getName());
     TQString fileName = qualifiedName(c).lower();
-    fileName.replace('.', '-');
+    fileName.tqreplace('.', '-');
 
     //find an appropriate name for our file
     fileName = overwritableName(c, fileName, ".pas");
@@ -151,8 +151,8 @@ void PascalWriter::writeClass(UMLClassifier *c) {
     TQString str;
     str = getHeadingFile(".pas");
     if (!str.isEmpty()) {
-        str.replace(TQRegExp("%filename%"), fileName);
-        str.replace(TQRegExp("%filepath%"), file.name());
+        str.tqreplace(TQRegExp("%filename%"), fileName);
+        str.tqreplace(TQRegExp("%filepath%"), file.name());
         pas << str << endl;
     }
 
@@ -244,8 +244,8 @@ void PascalWriter::writeClass(UMLClassifier *c) {
     pas << getIndent() << classname << " = object";
     if (!superclasses.isEmpty()) {
         // FIXME: Multiple inheritance is not yet supported
-        UMLClassifier* parent = superclasses.first();
-        pas << "(" << qualifiedName(parent) << ")";
+        UMLClassifier* tqparent = superclasses.first();
+        pas << "(" << qualifiedName(tqparent) << ")";
     }
     pas << m_endl;
 
@@ -382,7 +382,7 @@ TQStringList PascalWriter::defaultDatatypes() {
     l.append("Longint");
     l.append("LongBool");
     l.append("Longword");
-    l.append("QWord");
+    l.append("TQWord");
     l.append("Real");
     l.append("Shortint");
     l.append("ShortString");
@@ -434,7 +434,7 @@ const TQStringList PascalWriter::reservedKeywords() const {
         keywords.append( "class" );
         keywords.append( "const" );
         keywords.append( "constructor" );
-        keywords.append( "contains" );
+        keywords.append( "tqcontains" );
         keywords.append( "default" );
         keywords.append( "deprecated" );
         keywords.append( "destructor" );
diff --git a/umbrello/umbrello/codegenerators/pascalwriter.h b/umbrello/umbrello/codegenerators/pascalwriter.h
index 0e1f93ca..e8db48ba 100644
--- a/umbrello/umbrello/codegenerators/pascalwriter.h
+++ b/umbrello/umbrello/codegenerators/pascalwriter.h
@@ -24,6 +24,7 @@ class UMLOperation;
  */
 class PascalWriter : public SimpleCodeGenerator {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     /**
diff --git a/umbrello/umbrello/codegenerators/perlwriter.cpp b/umbrello/umbrello/codegenerators/perlwriter.cpp
index 42563ec4..93195090 100644
--- a/umbrello/umbrello/codegenerators/perlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/perlwriter.cpp
@@ -54,7 +54,7 @@ bool PerlWriter::GetUseStatements(UMLClassifier *c, TQString &Ret,
     TQString neatName = cleanName(conc->getName());
     if (neatName != AV && neatName != SV && neatName != HV) {
       TQString OtherPkgName =  conc->getPackage(".");
-      OtherPkgName.replace(TQRegExp("\\."),"::");
+      OtherPkgName.tqreplace(TQRegExp("\\."),"::");
       TQString OtherName = OtherPkgName + "::" + cleanName(conc->getName());
 
       // Only print out the use statement if the other package isn't the
@@ -75,7 +75,7 @@ bool PerlWriter::GetUseStatements(UMLClassifier *c, TQString &Ret,
     for (UMLClassifier *obj = superclasses.first();
          obj; obj = superclasses.next()) {
       TQString packageName =  obj->getPackage(".");
-      packageName.replace(TQRegExp("\\."),"::");
+      packageName.tqreplace(TQRegExp("\\."),"::");
 
       Ret += packageName + "::" + cleanName(obj->getName()) + ' ';
     }
@@ -100,11 +100,11 @@ void PerlWriter::writeClass(UMLClassifier *c) {
   packageName.simplifyWhiteSpace();
 
   // Replace all blanks with underscore
-  packageName.replace(TQRegExp(" "), "_");
+  packageName.tqreplace(TQRegExp(" "), "_");
 
   // Replace all dots (".") with double colon scope resolution operators
   // ("::")
-  packageName.replace(TQRegExp("\\."),"::");
+  packageName.tqreplace(TQRegExp("\\."),"::");
 
   // Store complete package name
   TQString ThisPkgName = packageName + "::" + classname;
@@ -118,7 +118,7 @@ void PerlWriter::writeClass(UMLClassifier *c) {
 
   CodeGenerationPolicy *pol = UMLApp::app()->getCommonPolicy();
   TQString curDir = pol->getOutputDirectory().absPath();
-  if (fileName.contains("::")) {
+  if (fileName.tqcontains("::")) {
     // create new directories for each level
     TQString newDir;
     newDir = curDir;
@@ -166,14 +166,14 @@ void PerlWriter::writeClass(UMLClassifier *c) {
 
   str = getHeadingFile(".pm");   // what this mean?
   if(!str.isEmpty()) {
-    str.replace(TQRegExp("%filename%"),fileName);
-    str.replace(TQRegExp("%filepath%"),fileperl.name());
-    str.replace(TQRegExp("%year%"),TQDate::currentDate().toString("yyyy"));
-    str.replace(TQRegExp("%date%"),TQDate::currentDate().toString());
-    str.replace(TQRegExp("%time%"),TQTime::currentTime().toString());
-    str.replace(TQRegExp("%package-name%"),ThisPkgName);
-    if(str.find(TQRegExp("%PACKAGE-DECLARE%"))){
-      str.replace(TQRegExp("%PACKAGE-DECLARE%"),
+    str.tqreplace(TQRegExp("%filename%"),fileName);
+    str.tqreplace(TQRegExp("%filepath%"),fileperl.name());
+    str.tqreplace(TQRegExp("%year%"),TQDate::tqcurrentDate().toString("yyyy"));
+    str.tqreplace(TQRegExp("%date%"),TQDate::tqcurrentDate().toString());
+    str.tqreplace(TQRegExp("%time%"),TQTime::currentTime().toString());
+    str.tqreplace(TQRegExp("%package-name%"),ThisPkgName);
+    if(str.tqfind(TQRegExp("%PACKAGE-DECLARE%"))){
+      str.tqreplace(TQRegExp("%PACKAGE-DECLARE%"),
                   "package " + ThisPkgName + ';'
                   + m_endl + m_endl
                   + "#UML_MODELER_BEGIN_PERSONAL_VARS_" + classname
@@ -184,10 +184,10 @@ void PerlWriter::writeClass(UMLClassifier *c) {
       bPackageDeclared = true;
     }
 
-    if(str.find(TQRegExp("%USE-STATEMENTS%"))){
+    if(str.tqfind(TQRegExp("%USE-STATEMENTS%"))){
       TQString UseStms;
       if(GetUseStatements(c,UseStms,ThisPkgName)){
-        str.replace(TQRegExp("%USE-STATEMENTS%"), UseStms);
+        str.tqreplace(TQRegExp("%USE-STATEMENTS%"), UseStms);
         bUseStmsWritten = true;
       }
     }
diff --git a/umbrello/umbrello/codegenerators/perlwriter.h b/umbrello/umbrello/codegenerators/perlwriter.h
index 4d5fdabd..99e39bb1 100644
--- a/umbrello/umbrello/codegenerators/perlwriter.h
+++ b/umbrello/umbrello/codegenerators/perlwriter.h
@@ -32,6 +32,7 @@ class UMLClassifier;
   */
 class PerlWriter : public SimpleCodeGenerator {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     PerlWriter();
diff --git a/umbrello/umbrello/codegenerators/php5writer.cpp b/umbrello/umbrello/codegenerators/php5writer.cpp
index 64a01b47..d1eadb0b 100644
--- a/umbrello/umbrello/codegenerators/php5writer.cpp
+++ b/umbrello/umbrello/codegenerators/php5writer.cpp
@@ -173,7 +173,7 @@ static const char *php5words[] =
         "checkout",
         "chgrp",
         "child_nodes",
-        "children",
+        "tqchildren",
         "chmod",
         "chop",
         "chown",
@@ -345,7 +345,7 @@ static const char *php5words[] =
         "dba_open",
         "dba_optimize",
         "dba_popen",
-        "dba_replace",
+        "dba_tqreplace",
         "dbase_add_record",
         "dbase_close",
         "dbase_create",
@@ -367,7 +367,7 @@ static const char *php5words[] =
         "dbminsert",
         "dbmnextkey",
         "dbmopen",
-        "dbmreplace",
+        "dbmtqreplace",
         "dbplus_add",
         "dbplus_aql",
         "dbplus_chdir",
@@ -375,7 +375,7 @@ static const char *php5words[] =
         "dbplus_curr",
         "dbplus_errcode",
         "dbplus_errno",
-        "dbplus_find",
+        "dbplus_tqfind",
         "dbplus_first",
         "dbplus_flush",
         "dbplus_freealllocks",
@@ -511,8 +511,8 @@ static const char *php5words[] =
         "E_PARSE",
         "ereg",
         "eregi",
-        "eregi_replace",
-        "ereg_replace",
+        "eregi_tqreplace",
+        "ereg_tqreplace",
         "error_log",
         "error_reporting",
         "escapeshellarg",
@@ -646,7 +646,7 @@ static const char *php5words[] =
         "_FILES",
         "filesize",
         "filetype",
-        "find",
+        "tqfind",
         "first_child",
         "floatval",
         "flock",
@@ -760,8 +760,8 @@ static const char *php5words[] =
         "getrusage",
         "getservbyname",
         "getservbyport",
-        "getshape1",
-        "getshape2",
+        "gettqshape1",
+        "gettqshape2",
         "gettext",
         "gettimeofday",
         "gettype",
@@ -1293,7 +1293,7 @@ static const char *php5words[] =
         "ldap_mod_add",
         "ldap_mod_del",
         "ldap_modify",
-        "ldap_mod_replace",
+        "ldap_mod_tqreplace",
         "ldap_next_attribute",
         "ldap_next_entry",
         "ldap_next_reference",
@@ -1350,9 +1350,9 @@ static const char *php5words[] =
         "mb_encode_numericentity",
         "mb_ereg",
         "mb_eregi",
-        "mb_eregi_replace",
+        "mb_eregi_tqreplace",
         "mb_ereg_match",
-        "mb_ereg_replace",
+        "mb_ereg_tqreplace",
         "mb_ereg_search",
         "mb_ereg_search_getpos",
         "mb_ereg_search_getregs",
@@ -1565,7 +1565,7 @@ static const char *php5words[] =
         "msession_create",
         "msession_destroy",
         "msession_disconnect",
-        "msession_find",
+        "msession_tqfind",
         "msession_get",
         "msession_get_array",
         "msession_getdata",
@@ -1776,7 +1776,7 @@ static const char *php5words[] =
         "ncurses_killchar",
         "ncurses_longname",
         "ncurses_mouseinterval",
-        "ncurses_mousemask",
+        "ncurses_mousetqmask",
         "ncurses_move",
         "ncurses_mvaddch",
         "ncurses_mvaddchnstr",
@@ -2051,8 +2051,8 @@ static const char *php5words[] =
         "ovrimos_rollback",
         "owner_document",
         "pack",
-        "parent_node",
-        "parents",
+        "tqparent_node",
+        "tqparents",
         "parse_ini_file",
         "parse_str",
         "parse_url",
@@ -2323,7 +2323,7 @@ static const char *php5words[] =
         "preg_match",
         "preg_match_all",
         "preg_quote",
-        "preg_replace",
+        "preg_tqreplace",
         "preg_replace_callback",
         "preg_split",
         "prev",
@@ -2389,7 +2389,7 @@ static const char *php5words[] =
         "putenv",
         "qdom_error",
         "qdom_tree",
-        "QUERY_STRING",
+        "TQUERY_STRING",
         "quoted_printable_decode",
         "quotemeta",
         "rad2deg",
@@ -2424,7 +2424,7 @@ static const char *php5words[] =
         "remove_attribute",
         "remove_child",
         "rename",
-        "replace",
+        "tqreplace",
         "replace_child",
         "replace_node",
         "_REQUEST",
@@ -2661,7 +2661,7 @@ static const char *php5words[] =
         "strpos",
         "strrchr",
         "str_repeat",
-        "str_replace",
+        "str_tqreplace",
         "strrev",
         "str_rot13",
         "strrpos",
@@ -2677,7 +2677,7 @@ static const char *php5words[] =
         "str_word_count",
         "substr",
         "substr_count",
-        "substr_replace",
+        "substr_tqreplace",
         "SWFAction",
         "swf_actiongeturl",
         "swf_actiongotoframe",
@@ -2704,7 +2704,7 @@ static const char *php5words[] =
         "SWFDisplayItem",
         "swf_endbutton",
         "swf_enddoaction",
-        "swf_endshape",
+        "swf_endtqshape",
         "swf_endsymbol",
         "SWFFill",
         "SWFFont",
@@ -2738,21 +2738,21 @@ static const char *php5words[] =
         "swf_setfont",
         "swf_setframe",
         "SWFShape",
-        "swf_shapearc",
-        "swf_shapecurveto",
-        "swf_shapecurveto3",
-        "swf_shapefillbitmapclip",
-        "swf_shapefillbitmaptile",
-        "swf_shapefilloff",
-        "swf_shapefillsolid",
-        "swf_shapelinesolid",
-        "swf_shapelineto",
-        "swf_shapemoveto",
+        "swf_tqshapearc",
+        "swf_tqshapecurveto",
+        "swf_tqshapecurveto3",
+        "swf_tqshapefillbitmapclip",
+        "swf_tqshapefillbitmaptile",
+        "swf_tqshapefilloff",
+        "swf_tqshapefillsolid",
+        "swf_tqshapelinesolid",
+        "swf_tqshapelineto",
+        "swf_tqshapemoveto",
         "swf_showframe",
         "SWFSprite",
         "swf_startbutton",
         "swf_startdoaction",
-        "swf_startshape",
+        "swf_starttqshape",
         "swf_startsymbol",
         "SWFText",
         "SWFTextField",
@@ -2816,7 +2816,7 @@ static const char *php5words[] =
         "udm_crc32",
         "udm_errno",
         "udm_error",
-        "udm_find",
+        "udm_tqfind",
         "udm_free_agent",
         "udm_free_ispell_data",
         "udm_free_res",
@@ -3024,8 +3024,8 @@ void Php5Writer::writeClass(UMLClassifier *c) {
     TQString str;
     str = getHeadingFile(".php");
     if(!str.isEmpty()) {
-        str.replace(TQRegExp("%filename%"),fileName);
-        str.replace(TQRegExp("%filepath%"),filephp.name());
+        str.tqreplace(TQRegExp("%filename%"),fileName);
+        str.tqreplace(TQRegExp("%filepath%"),filephp.name());
         php<<str<<m_endl;
     }
 
diff --git a/umbrello/umbrello/codegenerators/php5writer.h b/umbrello/umbrello/codegenerators/php5writer.h
index ea2a7862..726cf09b 100644
--- a/umbrello/umbrello/codegenerators/php5writer.h
+++ b/umbrello/umbrello/codegenerators/php5writer.h
@@ -30,6 +30,7 @@
   */
 class Php5Writer : public SimpleCodeGenerator {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     Php5Writer();
diff --git a/umbrello/umbrello/codegenerators/phpwriter.cpp b/umbrello/umbrello/codegenerators/phpwriter.cpp
index e9dba103..5536c2c9 100644
--- a/umbrello/umbrello/codegenerators/phpwriter.cpp
+++ b/umbrello/umbrello/codegenerators/phpwriter.cpp
@@ -171,7 +171,7 @@ static const char *words[] =
         "checkout",
         "chgrp",
         "child_nodes",
-        "children",
+        "tqchildren",
         "chmod",
         "chop",
         "chown",
@@ -343,7 +343,7 @@ static const char *words[] =
         "dba_open",
         "dba_optimize",
         "dba_popen",
-        "dba_replace",
+        "dba_tqreplace",
         "dbase_add_record",
         "dbase_close",
         "dbase_create",
@@ -365,7 +365,7 @@ static const char *words[] =
         "dbminsert",
         "dbmnextkey",
         "dbmopen",
-        "dbmreplace",
+        "dbmtqreplace",
         "dbplus_add",
         "dbplus_aql",
         "dbplus_chdir",
@@ -373,7 +373,7 @@ static const char *words[] =
         "dbplus_curr",
         "dbplus_errcode",
         "dbplus_errno",
-        "dbplus_find",
+        "dbplus_tqfind",
         "dbplus_first",
         "dbplus_flush",
         "dbplus_freealllocks",
@@ -509,8 +509,8 @@ static const char *words[] =
         "E_PARSE",
         "ereg",
         "eregi",
-        "eregi_replace",
-        "ereg_replace",
+        "eregi_tqreplace",
+        "ereg_tqreplace",
         "error_log",
         "error_reporting",
         "escapeshellarg",
@@ -644,7 +644,7 @@ static const char *words[] =
         "_FILES",
         "filesize",
         "filetype",
-        "find",
+        "tqfind",
         "first_child",
         "floatval",
         "flock",
@@ -758,8 +758,8 @@ static const char *words[] =
         "getrusage",
         "getservbyname",
         "getservbyport",
-        "getshape1",
-        "getshape2",
+        "gettqshape1",
+        "gettqshape2",
         "gettext",
         "gettimeofday",
         "gettype",
@@ -1289,7 +1289,7 @@ static const char *words[] =
         "ldap_mod_add",
         "ldap_mod_del",
         "ldap_modify",
-        "ldap_mod_replace",
+        "ldap_mod_tqreplace",
         "ldap_next_attribute",
         "ldap_next_entry",
         "ldap_next_reference",
@@ -1346,9 +1346,9 @@ static const char *words[] =
         "mb_encode_numericentity",
         "mb_ereg",
         "mb_eregi",
-        "mb_eregi_replace",
+        "mb_eregi_tqreplace",
         "mb_ereg_match",
-        "mb_ereg_replace",
+        "mb_ereg_tqreplace",
         "mb_ereg_search",
         "mb_ereg_search_getpos",
         "mb_ereg_search_getregs",
@@ -1561,7 +1561,7 @@ static const char *words[] =
         "msession_create",
         "msession_destroy",
         "msession_disconnect",
-        "msession_find",
+        "msession_tqfind",
         "msession_get",
         "msession_get_array",
         "msession_getdata",
@@ -1772,7 +1772,7 @@ static const char *words[] =
         "ncurses_killchar",
         "ncurses_longname",
         "ncurses_mouseinterval",
-        "ncurses_mousemask",
+        "ncurses_mousetqmask",
         "ncurses_move",
         "ncurses_mvaddch",
         "ncurses_mvaddchnstr",
@@ -2047,8 +2047,8 @@ static const char *words[] =
         "ovrimos_rollback",
         "owner_document",
         "pack",
-        "parent_node",
-        "parents",
+        "tqparent_node",
+        "tqparents",
         "parse_ini_file",
         "parse_str",
         "parse_url",
@@ -2319,7 +2319,7 @@ static const char *words[] =
         "preg_match",
         "preg_match_all",
         "preg_quote",
-        "preg_replace",
+        "preg_tqreplace",
         "preg_replace_callback",
         "preg_split",
         "prev",
@@ -2385,7 +2385,7 @@ static const char *words[] =
         "putenv",
         "qdom_error",
         "qdom_tree",
-        "QUERY_STRING",
+        "TQUERY_STRING",
         "quoted_printable_decode",
         "quotemeta",
         "rad2deg",
@@ -2420,7 +2420,7 @@ static const char *words[] =
         "remove_attribute",
         "remove_child",
         "rename",
-        "replace",
+        "tqreplace",
         "replace_child",
         "replace_node",
         "_REQUEST",
@@ -2657,7 +2657,7 @@ static const char *words[] =
         "strpos",
         "strrchr",
         "str_repeat",
-        "str_replace",
+        "str_tqreplace",
         "strrev",
         "str_rot13",
         "strrpos",
@@ -2673,7 +2673,7 @@ static const char *words[] =
         "str_word_count",
         "substr",
         "substr_count",
-        "substr_replace",
+        "substr_tqreplace",
         "SWFAction",
         "swf_actiongeturl",
         "swf_actiongotoframe",
@@ -2700,7 +2700,7 @@ static const char *words[] =
         "SWFDisplayItem",
         "swf_endbutton",
         "swf_enddoaction",
-        "swf_endshape",
+        "swf_endtqshape",
         "swf_endsymbol",
         "SWFFill",
         "SWFFont",
@@ -2734,21 +2734,21 @@ static const char *words[] =
         "swf_setfont",
         "swf_setframe",
         "SWFShape",
-        "swf_shapearc",
-        "swf_shapecurveto",
-        "swf_shapecurveto3",
-        "swf_shapefillbitmapclip",
-        "swf_shapefillbitmaptile",
-        "swf_shapefilloff",
-        "swf_shapefillsolid",
-        "swf_shapelinesolid",
-        "swf_shapelineto",
-        "swf_shapemoveto",
+        "swf_tqshapearc",
+        "swf_tqshapecurveto",
+        "swf_tqshapecurveto3",
+        "swf_tqshapefillbitmapclip",
+        "swf_tqshapefillbitmaptile",
+        "swf_tqshapefilloff",
+        "swf_tqshapefillsolid",
+        "swf_tqshapelinesolid",
+        "swf_tqshapelineto",
+        "swf_tqshapemoveto",
         "swf_showframe",
         "SWFSprite",
         "swf_startbutton",
         "swf_startdoaction",
-        "swf_startshape",
+        "swf_starttqshape",
         "swf_startsymbol",
         "SWFText",
         "SWFTextField",
@@ -2812,7 +2812,7 @@ static const char *words[] =
         "udm_crc32",
         "udm_errno",
         "udm_error",
-        "udm_find",
+        "udm_tqfind",
         "udm_free_agent",
         "udm_free_ispell_data",
         "udm_free_res",
@@ -3020,8 +3020,8 @@ void PhpWriter::writeClass(UMLClassifier *c) {
     TQString str;
     str = getHeadingFile(".php");
     if(!str.isEmpty()) {
-        str.replace(TQRegExp("%filename%"),fileName);
-        str.replace(TQRegExp("%filepath%"),filephp.name());
+        str.tqreplace(TQRegExp("%filename%"),fileName);
+        str.tqreplace(TQRegExp("%filepath%"),filephp.name());
         php<<str<<m_endl;
     }
 
diff --git a/umbrello/umbrello/codegenerators/phpwriter.h b/umbrello/umbrello/codegenerators/phpwriter.h
index e03699f1..b7b9affa 100644
--- a/umbrello/umbrello/codegenerators/phpwriter.h
+++ b/umbrello/umbrello/codegenerators/phpwriter.h
@@ -28,6 +28,7 @@
   */
 class PhpWriter : public SimpleCodeGenerator {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     PhpWriter();
diff --git a/umbrello/umbrello/codegenerators/pythonwriter.cpp b/umbrello/umbrello/codegenerators/pythonwriter.cpp
index f243ab2c..ba1a636e 100644
--- a/umbrello/umbrello/codegenerators/pythonwriter.cpp
+++ b/umbrello/umbrello/codegenerators/pythonwriter.cpp
@@ -64,7 +64,7 @@ void PythonWriter::writeClass(UMLClassifier *c) {
     //Replace the first letter of the filename because
     //python class begin with an upper caracter (convention)
     first = first.upper();
-    fileName = fileName.replace(0, 1, first);
+    fileName = fileName.tqreplace(0, 1, first);
 
     TQFile fileh;
     if( !openFile(fileh, fileName) ) {
@@ -83,8 +83,8 @@ void PythonWriter::writeClass(UMLClassifier *c) {
 
     str = getHeadingFile(".py");
     if(!str.isEmpty()) {
-        str.replace(TQRegExp("%filename%"), fileName);
-        str.replace(TQRegExp("%filepath%"), fileh.name());
+        str.tqreplace(TQRegExp("%filename%"), fileName);
+        str.tqreplace(TQRegExp("%filepath%"), fileh.name());
         h<<str<<m_endl;
     }
 
@@ -115,9 +115,9 @@ void PythonWriter::writeClass(UMLClassifier *c) {
             headerName.remove(TQRegExp(".py$"));
             first = headerName.at(0);
             first = first.upper();
-            headerName = headerName.replace(0, 1, first);
-            str = headerName.replace(TQChar('/'),TQChar('.'));
-            if (includesList.findIndex(str) < 0)  // not yet imported
+            headerName = headerName.tqreplace(0, 1, first);
+            str = headerName.tqreplace(TQChar('/'),TQChar('.'));
+            if (includesList.tqfindIndex(str) < 0)  // not yet imported
                 h << "from " << str << " import *" << m_endl;
         }
     }
@@ -418,7 +418,7 @@ const TQStringList PythonWriter::reservedKeywords() const {
         << "TypeError"
         << "UnboundLocalError"
         << "unichr"
-        << "unicode"
+        << "tqunicode"
         << "UnicodeError"
         << "UserWarning"
         << "ValueError"
diff --git a/umbrello/umbrello/codegenerators/pythonwriter.h b/umbrello/umbrello/codegenerators/pythonwriter.h
index c9dddc23..b7f324e7 100644
--- a/umbrello/umbrello/codegenerators/pythonwriter.h
+++ b/umbrello/umbrello/codegenerators/pythonwriter.h
@@ -31,6 +31,7 @@ enum Access {PRIVATE, PUBLIC, PROTECTED};
   */
 class PythonWriter : public SimpleCodeGenerator {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     PythonWriter();
diff --git a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp
index f75ff165..294175d5 100644
--- a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp
@@ -26,10 +26,10 @@
 //
 
 RubyClassDeclarationBlock::RubyClassDeclarationBlock
- ( RubyClassifierCodeDocument * parentDoc, const TQString &startText, const TQString &endText, const TQString &comment)
-        : OwnedHierarchicalCodeBlock(parentDoc->getParentClassifier(), parentDoc, startText, endText, comment)
+ ( RubyClassifierCodeDocument * tqparentDoc, const TQString &startText, const TQString &endText, const TQString &comment)
+        : OwnedHierarchicalCodeBlock(tqparentDoc->getParentClassifier(), tqparentDoc, startText, endText, comment)
 {
-    init(parentDoc, comment);
+    init(tqparentDoc, comment);
 }
 
 RubyClassDeclarationBlock::~RubyClassDeclarationBlock ( ) { }
@@ -69,20 +69,20 @@ void RubyClassDeclarationBlock::loadFromXMI ( TQDomElement & root )
 void RubyClassDeclarationBlock::updateContent ( )
 {
 
-    RubyClassifierCodeDocument *parentDoc = dynamic_cast<RubyClassifierCodeDocument*>(getParentDocument());
-    UMLClassifier *c = parentDoc->getParentClassifier();
+    RubyClassifierCodeDocument *tqparentDoc = dynamic_cast<RubyClassifierCodeDocument*>(getParentDocument());
+    UMLClassifier *c = tqparentDoc->getParentClassifier();
     CodeGenerationPolicy * p = UMLApp::app()->getCommonPolicy();
     TQString endLine = p->getNewLineEndingChars();
-    bool isInterface = parentDoc->parentIsInterface(); // a little shortcut
-    TQString RubyClassName = parentDoc->getRubyClassName(c->getName());
+    bool isInterface = tqparentDoc->tqparentIsInterface(); // a little shortcut
+    TQString RubyClassName = tqparentDoc->getRubyClassName(c->getName());
     bool forceDoc = p->getCodeVerboseDocumentComments();
 
     // COMMENT
     TQString comment = c->getDoc();
-    comment.replace("@ref ", "");
-    comment.replace("@see", "_See_");
-    comment.replace("@short", "_Summary_");
-    comment.replace("@author", "_Author_");
+    comment.tqreplace("@ref ", "");
+    comment.tqreplace("@see", "_See_");
+    comment.tqreplace("@short", "_Summary_");
+    comment.tqreplace("@author", "_Author_");
 
     if (isInterface)
         getComment()->setText("Module " + RubyClassName + endLine + comment);
@@ -98,7 +98,7 @@ void RubyClassDeclarationBlock::updateContent ( )
     // Now set START/ENDING Text
     TQString startText = "";
 
-    if (parentDoc->parentIsInterface()) {
+    if (tqparentDoc->tqparentIsInterface()) {
         startText.append("module ");
     } else {
         startText.append("class ");
@@ -131,10 +131,10 @@ void RubyClassDeclarationBlock::updateContent ( )
     setStartText(startText);
 }
 
-void RubyClassDeclarationBlock::init (RubyClassifierCodeDocument *parentDoc, const TQString &comment)
+void RubyClassDeclarationBlock::init (RubyClassifierCodeDocument *tqparentDoc, const TQString &comment)
 {
 
-    setComment(new RubyCodeDocumentation(parentDoc));
+    setComment(new RubyCodeDocumentation(tqparentDoc));
     getComment()->setText(comment);
 
     setEndText("end");
diff --git a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h
index 63e43702..10b7f5bd 100644
--- a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h
@@ -33,6 +33,7 @@
 class RubyClassDeclarationBlock : public OwnedHierarchicalCodeBlock
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
@@ -41,7 +42,7 @@ public:
     /**
      * Empty Constructor
      */
-    explicit RubyClassDeclarationBlock ( RubyClassifierCodeDocument * parentDoc, const TQString &start = "", const TQString &endText = "end", const TQString &comment = "");
+    explicit RubyClassDeclarationBlock ( RubyClassifierCodeDocument * tqparentDoc, const TQString &start = "", const TQString &endText = "end", const TQString &comment = "");
 
     /**
      * Empty Destructor
@@ -67,7 +68,7 @@ protected:
 
 private:
 
-    void init (RubyClassifierCodeDocument * parent, const TQString &comment);
+    void init (RubyClassifierCodeDocument * tqparent, const TQString &comment);
 
 };
 
diff --git a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
index ada4b0bb..ecd5523b 100644
--- a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
@@ -86,10 +86,10 @@ TQString RubyClassifierCodeDocument::getPath ( )
     path.simplifyWhiteSpace();
 
     // Replace all blanks with underscore
-    path.replace(TQRegExp(" "), "_");
+    path.tqreplace(TQRegExp(" "), "_");
 
-    path.replace(TQRegExp("\\."),"/");
-    path.replace(TQRegExp("::"), "/");
+    path.tqreplace(TQRegExp("\\."),"/");
+    path.tqreplace(TQRegExp("::"), "/");
 
     path.lower();
 
@@ -252,7 +252,7 @@ void RubyClassifierCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & ro
                                     } else
                                         if( name == "codeoperation" ) {
                                             // find the code operation by id
-                                            TQString id = element.attribute("parent_id","-1");
+                                            TQString id = element.attribute("tqparent_id","-1");
                                             UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id));
                                             UMLOperation * op = dynamic_cast<UMLOperation*>(obj);
                                             if(op) {
@@ -355,7 +355,7 @@ void RubyClassifierCodeDocument::resetTextBlocks()
 }
 
 // This method will cause the class to rebuild its text representation.
-// based on the parent classifier object.
+// based on the tqparent 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 parent objects of this class...
+    // Gather info on the various fields and tqparent objects of this class...
     UMLClassifier * c = getParentClassifier();
     RubyCodeGenerator * gen = dynamic_cast<RubyCodeGenerator*>(UMLApp::app()->getGenerator());
 
@@ -371,7 +371,7 @@ void RubyClassifierCodeDocument::updateContent( )
     // This depends on whether or not we have attribute/association classes
     CodeClassFieldList * cfList = getCodeClassFieldList();
     for(CodeClassField * field = cfList->first(); field; field = cfList->next())
-        if(field->parentIsAttribute())
+        if(field->tqparentIsAttribute())
             field->setWriteOutMethods(gen->getAutoGenerateAttribAccessors());
         else
             field->setWriteOutMethods(gen->getAutoGenerateAssocAccessors());
@@ -399,7 +399,7 @@ void RubyClassifierCodeDocument::updateContent( )
     CodeClassFieldList privAggregationClassFields = getSpecificClassFields ( CodeClassField::Aggregation, Uml::Visibility::Private);
     CodeClassFieldList privCompositionClassFields = getSpecificClassFields ( CodeClassField::Composition, Uml::Visibility::Private);
 
-    bool isInterface = parentIsInterface();
+    bool isInterface = tqparentIsInterface();
     bool hasOperationMethods = c->getOpList().last() ? true : false;
     CodeGenerationPolicy *pol = UMLApp::app()->getCommonPolicy();
     TQString endLine = pol->getNewLineEndingChars(); // a shortcut..so we don't have to call this all the time
@@ -435,7 +435,7 @@ void RubyClassifierCodeDocument::updateContent( )
 
     // NOW create document in sections..
     // now we want to populate the body of our class
-    // our layout is the following general groupings of code blocks:
+    // our tqlayout is the following general groupings of code blocks:
 
     // start ruby classifier document
 
diff --git a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.h b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.h
index cfaa66fe..05f73e14 100644
--- a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.h
+++ b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.h
@@ -42,6 +42,7 @@ class RubyCodeGenerationPolicy;
 class RubyClassifierCodeDocument : public ClassifierCodeDocument
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp
index 43986061..8a4fd7bd 100644
--- a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp
@@ -78,8 +78,8 @@ void RubyCodeAccessorMethod::setAttributesFromNode( TQDomElement & root)
 void RubyCodeAccessorMethod::updateContent( )
 {
 
-    CodeClassField * parentField = getParentClassField();
-    RubyCodeClassField * rubyfield = dynamic_cast<RubyCodeClassField*>(parentField);
+    CodeClassField * tqparentField = getParentClassField();
+    RubyCodeClassField * rubyfield = dynamic_cast<RubyCodeClassField*>(tqparentField);
     TQString fieldName = rubyfield->getFieldName();
     TQString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars();
 
@@ -153,13 +153,13 @@ void RubyCodeAccessorMethod::updateMethodDeclaration()
     TQString endLine = p->getNewLineEndingChars();
 
     TQString description = getParentObject()->getDoc();
-    description.replace(TQRegExp("m_[npb](?=[A-Z])"), "");
-    description.replace("m_", "");
-    description.replace(TQRegExp("[\\n\\r]+[\\t ]*"), endLine);
+    description.tqreplace(TQRegExp("m_[npb](?=[A-Z])"), "");
+    description.tqreplace("m_", "");
+    description.tqreplace(TQRegExp("[\\n\\r]+[\\t ]*"), endLine);
 
     // set scope of this accessor appropriately..if its an attribute,
     // we need to be more sophisticated
-    if(rubyfield->parentIsAttribute())
+    if(rubyfield->tqparentIsAttribute())
         switch (scopePolicy) {
         case CodeGenerationPolicy::Public:
         case CodeGenerationPolicy::Private:
@@ -168,7 +168,7 @@ void RubyCodeAccessorMethod::updateMethodDeclaration()
             break;
         default:
         case CodeGenerationPolicy::FromParent:
-            // do nothing..already have taken parent value
+            // do nothing..already have taken tqparent value
             break;
         }
 
diff --git a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.h b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.h
index 0e61a978..cc58ce2e 100644
--- a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.h
+++ b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.h
@@ -31,6 +31,7 @@
 class RubyCodeAccessorMethod : public CodeAccessorMethod
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp b/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp
index b3b723b9..e04d189a 100644
--- a/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp
@@ -38,14 +38,14 @@
 // Constructors/Destructors
 //
 
-RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role)
-        : CodeClassField(parentDoc, role)
+RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role)
+        : CodeClassField(tqparentDoc, role)
 {
 
 }
 
-RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib)
-        : CodeClassField(parentDoc, attrib)
+RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib)
+        : CodeClassField(tqparentDoc, attrib)
 {
 
 }
@@ -60,7 +60,7 @@ RubyCodeClassField::~RubyCodeClassField ( ) { }
 //
 
 TQString RubyCodeClassField::getFieldName() {
-    if (parentIsAttribute())
+    if (tqparentIsAttribute())
     {
         UMLAttribute * at = (UMLAttribute*) getParentObject();
         return cleanName(at->getName());
@@ -70,7 +70,7 @@ TQString RubyCodeClassField::getFieldName() {
         UMLRole * role = (UMLRole*) getParentObject();
         TQString roleName = role->getName();
         if(fieldIsSingleValue()) {
-            return roleName.replace(0, 1, roleName.left(1).lower());
+            return roleName.tqreplace(0, 1, roleName.left(1).lower());
         } else {
             return roleName.lower() + "Array";
         }
@@ -80,13 +80,13 @@ TQString RubyCodeClassField::getFieldName() {
 
 TQString RubyCodeClassField::getInitialValue() {
 
-    if (parentIsAttribute())
+    if (tqparentIsAttribute())
     {
         UMLAttribute * at = dynamic_cast<UMLAttribute*>( getParentObject() );
         if (at) {
             return fixInitialStringDeclValue(at->getInitialValue(), getTypeName());
         } else {
-            kError() << "RubyodeClassField::getInitialValue: parent object is not a UMLAttribute"
+            kError() << "RubyodeClassField::getInitialValue: tqparent object is not a UMLAttribute"
             << endl;
             return "";
         }
diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfield.h b/umbrello/umbrello/codegenerators/rubycodeclassfield.h
index 50269729..28e96b74 100644
--- a/umbrello/umbrello/codegenerators/rubycodeclassfield.h
+++ b/umbrello/umbrello/codegenerators/rubycodeclassfield.h
@@ -29,6 +29,7 @@ class ClassifierCodeDocument;
 class RubyCodeClassField : public CodeClassField
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
@@ -37,8 +38,8 @@ public:
     /**
      * Constructors
      */
-    RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role);
-    RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib);
+    RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role);
+    RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib);
 
     /**
      * Empty Destructor
diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp
index e99ca774..2171bb28 100644
--- a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp
@@ -22,8 +22,8 @@
 // Constructors/Destructors
 //
 
-RubyCodeClassFieldDeclarationBlock::RubyCodeClassFieldDeclarationBlock ( CodeClassField * parent )
-        : CodeClassFieldDeclarationBlock ( parent )
+RubyCodeClassFieldDeclarationBlock::RubyCodeClassFieldDeclarationBlock ( CodeClassField * tqparent )
+        : CodeClassFieldDeclarationBlock ( tqparent )
 {
     setOverallIndentationLevel(1);
     updateContent();
@@ -61,7 +61,7 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( )
     TQString scopeStr = rdoc->scopeToRubyDecl(getParentObject()->getVisibility());
 
     // IF this is from an association, then scope taken as appropriate to policy
-    if(!rcf->parentIsAttribute())
+    if(!rcf->tqparentIsAttribute())
     {
         switch (scopePolicy) {
         case CodeGenerationPolicy::Public:
@@ -71,7 +71,7 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( )
             break;
         default:
         case CodeGenerationPolicy::FromParent:
-            // do nothing here... will leave as from parent object
+            // do nothing here... will leave as from tqparent object
             break;
         }
     }
@@ -80,13 +80,13 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( )
     TQString fieldName = rcf->getFieldName();
     TQString initialV = rcf->getInitialValue();
 
-    if (!cf->parentIsAttribute() && !cf->fieldIsSingleValue())
+    if (!cf->tqparentIsAttribute() && !cf->fieldIsSingleValue())
         typeName = "Array";
 
     TQString body = staticValue+scopeStr+' '+typeName+' '+fieldName;
     if (!initialV.isEmpty())
         body.append(" = " + initialV);
-    else if (!cf->parentIsAttribute())
+    else if (!cf->tqparentIsAttribute())
     {
         UMLRole * role = dynamic_cast<UMLRole*>(cf->getParentObject());
         if (role->getObject()->getBaseType() == Uml::ot_Interface)
@@ -95,7 +95,7 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( )
         } else {
 
             // FIX?: IF a constructor method exists in the classifiercodedoc
-            // of the parent Object, then we can use that instead (if its empty).
+            // of the tqparent 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 beba96c2..1dd6b342 100644
--- a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h
@@ -27,6 +27,7 @@
 class RubyCodeClassFieldDeclarationBlock : public CodeClassFieldDeclarationBlock
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
@@ -35,7 +36,7 @@ public:
     /**
      * Constructor
      */
-    RubyCodeClassFieldDeclarationBlock ( CodeClassField * parent );
+    RubyCodeClassFieldDeclarationBlock ( CodeClassField * tqparent );
 
     /**
      * Empty Destructor
@@ -44,7 +45,7 @@ public:
 
 protected:
 
-    // this will be called by syncToParent whenever the parent object is "modified"
+    // this will be called by syncToParent whenever the tqparent object is "modified"
     void updateContent ( );
 
 private:
diff --git a/umbrello/umbrello/codegenerators/rubycodecomment.cpp b/umbrello/umbrello/codegenerators/rubycodecomment.cpp
index 89508b63..bf85df1a 100644
--- a/umbrello/umbrello/codegenerators/rubycodecomment.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodecomment.cpp
@@ -65,7 +65,7 @@ TQString RubyCodeComment::unformatText(const TQString & text, const TQString & i
 }
 
 /**
- * @return    QString
+ * @return    TQString
  */
 TQString RubyCodeComment::toString( )
 {
diff --git a/umbrello/umbrello/codegenerators/rubycodecomment.h b/umbrello/umbrello/codegenerators/rubycodecomment.h
index 0646cd33..8c7cec59 100644
--- a/umbrello/umbrello/codegenerators/rubycodecomment.h
+++ b/umbrello/umbrello/codegenerators/rubycodecomment.h
@@ -34,6 +34,7 @@
 class RubyCodeComment : virtual public CodeComment
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      * Constructors
@@ -46,7 +47,7 @@ public:
     virtual ~RubyCodeComment ( );
 
     /**
-     * @return    QString
+     * @return    TQString
      */
     TQString toString ( );
 
diff --git a/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp b/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp
index e19f4daa..9afee3f1 100644
--- a/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp
@@ -57,12 +57,12 @@ 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 parent TextBlock method
+    // just use tqparent TextBlock method
     root.appendChild( blockElement );
 }
 
 /**
- * @return    QString
+ * @return    TQString
  */
 TQString RubyCodeDocumentation::toString ( )
 {
diff --git a/umbrello/umbrello/codegenerators/rubycodedocumentation.h b/umbrello/umbrello/codegenerators/rubycodedocumentation.h
index 0d210419..a4db50ab 100644
--- a/umbrello/umbrello/codegenerators/rubycodedocumentation.h
+++ b/umbrello/umbrello/codegenerators/rubycodedocumentation.h
@@ -35,6 +35,7 @@ class RubyClassifierCodeDocument;
 class RubyCodeDocumentation : virtual public CodeComment
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
@@ -63,7 +64,7 @@ public:
     virtual void saveToXMI ( TQDomDocument & doc, TQDomElement & root );
 
     /**
-     * @return    QString
+     * @return    TQString
      */
     TQString toString ( );
 
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui
index 14bcf0f2..39d29328 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>RubyCodeGenerationFormBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -16,15 +16,15 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QGroupBox" row="2" column="0">
+                <widget class="TQGroupBox" row="2" column="0">
                     <property name="name">
                         <cstring>groupBox2</cstring>
                     </property>
@@ -43,15 +43,15 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget" row="0" column="0">
+                        <widget class="TQLayoutWidget" row="0" column="0">
                             <property name="name">
-                                <cstring>layout2</cstring>
+                                <cstring>tqlayout2</cstring>
                             </property>
                             <grid>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QCheckBox" row="0" column="0">
+                                <widget class="TQCheckBox" row="0" column="0">
                                     <property name="name">
                                         <cstring>m_generateConstructors</cstring>
                                     </property>
@@ -62,7 +62,7 @@
                                         <bool>false</bool>
                                     </property>
                                 </widget>
-                                <widget class="QCheckBox" row="2" column="0">
+                                <widget class="TQCheckBox" row="2" column="0">
                                     <property name="name">
                                         <cstring>m_generateAssocAccessors</cstring>
                                     </property>
@@ -73,7 +73,7 @@
                                         <bool>true</bool>
                                     </property>
                                 </widget>
-                                <widget class="QCheckBox" row="1" column="0">
+                                <widget class="TQCheckBox" row="1" column="0">
                                     <property name="name">
                                         <cstring>m_generateAttribAccessors</cstring>
                                     </property>
@@ -86,15 +86,15 @@
                                 </widget>
                             </grid>
                         </widget>
-                        <widget class="QLayoutWidget" row="1" column="0">
+                        <widget class="TQLayoutWidget" row="1" column="0">
                             <property name="name">
-                                <cstring>layout4</cstring>
+                                <cstring>tqlayout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QComboBox" row="0" column="1">
+                                <widget class="TQComboBox" row="0" column="1">
                                     <item>
                                         <property name="text">
                                             <string>Public</string>
@@ -122,7 +122,7 @@
                                         <number>3</number>
                                     </property>
                                 </widget>
-                                <widget class="QLabel" row="0" column="0">
+                                <widget class="TQLabel" row="0" column="0">
                                     <property name="name">
                                         <cstring>textLabel1_3</cstring>
                                     </property>
@@ -132,15 +132,15 @@
                                 </widget>
                             </grid>
                         </widget>
-                        <widget class="QLayoutWidget" row="2" column="0">
+                        <widget class="TQLayoutWidget" row="2" column="0">
                             <property name="name">
-                                <cstring>layout4</cstring>
+                                <cstring>tqlayout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel" row="0" column="0">
+                                <widget class="TQLabel" row="0" column="0">
                                     <property name="name">
                                         <cstring>textLabel1_3_2</cstring>
                                     </property>
@@ -148,7 +148,7 @@
                                         <string>Default association field scope:</string>
                                     </property>
                                 </widget>
-                                <widget class="QComboBox" row="0" column="1">
+                                <widget class="TQComboBox" row="0" column="1">
                                     <item>
                                         <property name="text">
                                             <string>Public</string>
@@ -180,7 +180,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QGroupBox" row="1" column="0">
+                <widget class="TQGroupBox" row="1" column="0">
                     <property name="name">
                         <cstring>groupBox1</cstring>
                     </property>
@@ -199,7 +199,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
@@ -207,7 +207,7 @@
                                 <string>Style:</string>
                             </property>
                         </widget>
-                        <widget class="QComboBox">
+                        <widget class="TQComboBox">
                             <item>
                                 <property name="text">
                                     <string>Hash (#)</string>
@@ -224,7 +224,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1_2</cstring>
                     </property>
@@ -244,5 +244,5 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp
index 8e58fdf0..62df797d 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 *parent, const char *name ) {
-    return new RubyCodeGenerationPolicyPage ( parent, name, this );
+CodeGenerationPolicyPage * RubyCodeGenerationPolicy::createPage ( TQWidget *tqparent, const char *name ) {
+    return new RubyCodeGenerationPolicyPage ( tqparent, name, this );
 }
 
 void RubyCodeGenerationPolicy::init() {
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
index 56c051e2..459e80d0 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
@@ -30,6 +30,7 @@ class CodeGenerationPolicyPage;
 class RubyCodeGenerationPolicy : public CodeGenPolicyExt
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     static const bool DEFAULT_AUTO_GEN_ATTRIB_ACCESSORS;
@@ -98,7 +99,7 @@ public:
      * Create a new dialog interface for this object.
      * @return dialog object
      */
-    CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0);
+    CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0);
 
 protected:
 
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp
index 5c890b4f..c6153448 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 *parent, const char *name, RubyCodeGenerationPolicy * policy )
-  : CodeGenerationPolicyPage(parent, name, policy)
+RubyCodeGenerationPolicyPage::RubyCodeGenerationPolicyPage( TQWidget *tqparent, const char *name, RubyCodeGenerationPolicy * policy )
+  : CodeGenerationPolicyPage(tqparent, 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 * parent = (RubyCodeGenerationPolicy*) m_parentPolicy;
+    RubyCodeGenerationPolicy * tqparent = (RubyCodeGenerationPolicy*) m_parentPolicy;
 
     // block signals so we don't cause too many update content calls to code documents
-    parent->blockSignals(true);
+    tqparent->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());
-    parent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked());
-    parent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked());
+    tqparent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked());
+    tqparent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked());
 
-    parent->blockSignals(false);
+    tqparent->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 1637843b..c994dff8 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h
@@ -31,9 +31,10 @@
 
 class RubyCodeGenerationPolicyPage : public CodeGenerationPolicyPage {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
-    explicit RubyCodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, RubyCodeGenerationPolicy * policy = 0);
+    explicit RubyCodeGenerationPolicyPage (TQWidget *tqparent=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 4acfd65a..e0732773 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* parent, CodeDocument *doc,
+CodeViewerDialog * RubyCodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, CodeDocument *doc,
         Settings::CodeViewerState state)
 {
-    CodeViewerDialog *dialog = new CodeViewerDialog(parent, doc, state);
+    CodeViewerDialog *dialog = new CodeViewerDialog(tqparent, doc, state);
     return dialog;
 }
 
@@ -90,25 +90,25 @@ TQString RubyCodeGenerator::getListFieldClassName () {
 
 TQString RubyCodeGenerator::cppToRubyType(const TQString &typeStr) {
     TQString type = cleanName(typeStr);
-    type.replace("const ", "");
-    type.replace(TQRegExp("[*&\\s]"), "");
-    type.replace(TQRegExp("[<>]"), "_");
-    type.replace("TQStringList", "Array");
-    type.replace(TQRegExp("^string$"),"String");
-    type.replace("TQString", "String");
-    type.replace("bool", "true|false");
-    type.replace(TQRegExp("^(uint|int|ushort|short|ulong|long)$"), "Integer");
-    type.replace(TQRegExp("^(float|double)$"), "Float");
-    type.replace(TQRegExp("^Q(?=[A-Z])"), "Qt::");
-    type.replace(TQRegExp("^K(?!(DE|Parts|IO)"), "KDE::");
+    type.tqreplace("const ", "");
+    type.tqreplace(TQRegExp("[*&\\s]"), "");
+    type.tqreplace(TQRegExp("[<>]"), "_");
+    type.tqreplace(TQSTRINGLIST_OBJECT_NAME_STRING, "Array");
+    type.tqreplace(TQRegExp("^string$"),"String");
+    type.tqreplace(TQSTRING_OBJECT_NAME_STRING, "String");
+    type.tqreplace("bool", "true|false");
+    type.tqreplace(TQRegExp("^(uint|int|ushort|short|ulong|long)$"), "Integer");
+    type.tqreplace(TQRegExp("^(float|double)$"), "Float");
+    type.tqreplace(TQRegExp("^Q(?=[A-Z])"), "TQt::");
+    type.tqreplace(TQRegExp("^K(?!(DE|Parts|IO)"), "KDE::");
 
     return type;
 }
 
 TQString RubyCodeGenerator::cppToRubyName(const TQString &nameStr) {
     TQString name = cleanName(nameStr);
-    name.replace(TQRegExp("^m_"), "");
-    name.replace(TQRegExp("^[pbn](?=[A-Z])"), "");
+    name.tqreplace(TQRegExp("^m_"), "");
+    name.tqreplace(TQRegExp("^[pbn](?=[A-Z])"), "");
     name = name.mid(0, 1).lower() + name.mid(1);
     return name;
 }
@@ -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 parent document
+    // load Classifier documents from tqparent document
     initFromParentDocument();
 }
  */
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerator.h b/umbrello/umbrello/codegenerators/rubycodegenerator.h
index 611338ca..4be5e7e8 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerator.h
+++ b/umbrello/umbrello/codegenerators/rubycodegenerator.h
@@ -36,6 +36,7 @@ class CodeViewerDialog;
 class RubyCodeGenerator : public CodeGenerator
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
@@ -76,7 +77,7 @@ public:
 
     /** Get the editing dialog for this code document
      */
-    virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc,
+    virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc,
             Settings::CodeViewerState state);
 
     // Other methods
@@ -97,8 +98,8 @@ public:
     Uml::Programming_Language getLanguage();
 
     /**
-     * Convert a C++ type such as 'int' or 'QWidget' to
-     * ruby types Integer and Qt::Widget
+     * Convert a C++ type such as 'int' or 'TQWidget' to
+     * ruby types Integer and TQt::Widget
      *
      * @param cppType the C++ type to be converted
      */
diff --git a/umbrello/umbrello/codegenerators/rubycodeoperation.cpp b/umbrello/umbrello/codegenerators/rubycodeoperation.cpp
index 7354281b..bba8b462 100644
--- a/umbrello/umbrello/codegenerators/rubycodeoperation.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeoperation.cpp
@@ -32,8 +32,8 @@
 // Constructors/Destructors
 //
 
-RubyCodeOperation::RubyCodeOperation ( RubyClassifierCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment )
-        : CodeOperation (doc, parent, body, comment)
+RubyCodeOperation::RubyCodeOperation ( RubyClassifierCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment )
+        : CodeOperation (doc, tqparent, body, comment)
 {
     // lets not go with the default comment and instead use
     // full-blown ruby documentation object instead
@@ -85,7 +85,7 @@ void RubyCodeOperation::updateMethodDeclaration()
         methodName = "initialize";
     }
 
-    methodName.replace(TQRegExp("operator\\s*"), "");
+    methodName.tqreplace(TQRegExp("operator\\s*"), "");
     methodName = methodName.mid(0, 1).lower() + methodName.mid(1);
 
     TQString paramStr = TQString("");
@@ -131,7 +131,7 @@ void RubyCodeOperation::updateMethodDeclaration()
             UMLAttributeList parameters = o->getParmList();
             for(UMLAttributeListIt iterator(parameters); iterator.current(); ++iterator) {
                 comment += endLine + "* _" + iterator.current()->getName() + "_ ";
-                comment += (' ' + iterator.current()->getDoc().replace( TQRegExp("[\\n\\r]+[\\t ]*"),
+                comment += (' ' + iterator.current()->getDoc().tqreplace( TQRegExp("[\\n\\r]+[\\t ]*"),
                                                                         endLine + "  " ) );
             }
             // add a returns statement too
@@ -140,15 +140,15 @@ void RubyCodeOperation::updateMethodDeclaration()
             getComment()->setText(comment);
         }
     } else {
-        comment.replace(TQRegExp("[\\n\\r]+ *"), endLine);
-        comment.replace(TQRegExp("[\\n\\r]+\\t*"), endLine);
+        comment.tqreplace(TQRegExp("[\\n\\r]+ *"), endLine);
+        comment.tqreplace(TQRegExp("[\\n\\r]+\\t*"), endLine);
 
-        comment.replace(" m_", " ");
-        comment.replace(TQRegExp("\\s[npb](?=[A-Z])"), " ");
+        comment.tqreplace(" m_", " ");
+        comment.tqreplace(TQRegExp("\\s[npb](?=[A-Z])"), " ");
         TQRegExp re_params("@param (\\w)(\\w*)");
         int pos = re_params.search(comment);
         while (pos != -1) {
-            comment.replace( re_params.cap(0),
+            comment.tqreplace( re_params.cap(0),
                             TQString("@param _") + re_params.cap(1).lower() + re_params.cap(2) + '_' );
             commentedParams.append(re_params.cap(1).lower() + re_params.cap(2));
 
@@ -160,28 +160,28 @@ void RubyCodeOperation::updateMethodDeclaration()
         for (UMLAttributeListIt iterator(parameters); iterator.current(); ++iterator) {
             // Only write an individual @param entry if one hasn't been found already
             // in the main doc comment
-            if (commentedParams.contains(RubyCodeGenerator::cppToRubyName(iterator.current()->getName())) == 0) {
+            if (commentedParams.tqcontains(RubyCodeGenerator::cppToRubyName(iterator.current()->getName())) == 0) {
                 comment += (endLine + "@param _" + RubyCodeGenerator::cppToRubyName(iterator.current()->getName()) + '_');
                 if (iterator.current()->getDoc().isEmpty()) {
                     comment += (' ' + RubyCodeGenerator::cppToRubyType(iterator.current()->getTypeName()));
                 } else {
-                    comment += (' ' + iterator.current()->getDoc().replace(TQRegExp("[\\n\\r]+[\\t ]*"), endLine + "  "));
+                    comment += (' ' + iterator.current()->getDoc().tqreplace(TQRegExp("[\\n\\r]+[\\t ]*"), endLine + "  "));
                 }
             }
         }
 
-        comment.replace("@ref ", "");
-        comment.replace("@param", "*");
-        comment.replace("@return", "* _returns_");
+        comment.tqreplace("@ref ", "");
+        comment.tqreplace("@param", "*");
+        comment.tqreplace("@return", "* _returns_");
 
         // All lines after the first one starting with '*' in the doc comment
         // must be indented correctly. If they aren't a list
         // item starting with '*', then indent the text with
         // two spaces, '  ', to line up with the list item.
-        pos = comment.find(endLine + '*');
+        pos = comment.tqfind(endLine + '*');
         if (pos != -1) {
             pos += endLine.length() + 1;
-            pos = comment.find(endLine, pos);
+            pos = comment.tqfind(endLine, pos);
         }
 
         while (pos > 0) {
@@ -191,13 +191,13 @@ void RubyCodeOperation::updateMethodDeclaration()
                 pos += 2;
             }
 
-            pos = comment.find(endLine, pos);
+            pos = comment.tqfind(endLine, pos);
         }
 
         TQString typeStr = RubyCodeGenerator::cppToRubyType(o->getTypeName());
         if ( !typeStr.isEmpty()
                 && !TQRegExp("^void\\s*$").exactMatch(typeStr)
-                && comment.contains("_returns_") == 0 )
+                && comment.tqcontains("_returns_") == 0 )
         {
             comment += endLine + "* _returns_ " + typeStr;
         }
@@ -217,7 +217,7 @@ void RubyCodeOperation::updateMethodDeclaration()
 
 int RubyCodeOperation::lastEditableLine() {
     ClassifierCodeDocument * doc = dynamic_cast<ClassifierCodeDocument*>(getParentDocument());
-    if(doc->parentIsInterface())
+    if(doc->tqparentIsInterface())
         return -1; // very last line is NOT editable as its a one-line declaration w/ no body in
     // an interface.
     return 0;
diff --git a/umbrello/umbrello/codegenerators/rubycodeoperation.h b/umbrello/umbrello/codegenerators/rubycodeoperation.h
index fab1d239..1bdc4556 100644
--- a/umbrello/umbrello/codegenerators/rubycodeoperation.h
+++ b/umbrello/umbrello/codegenerators/rubycodeoperation.h
@@ -28,6 +28,7 @@ class RubyClassifierCodeDocument;
 class RubyCodeOperation : virtual public CodeOperation
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/rubywriter.cpp b/umbrello/umbrello/codegenerators/rubywriter.cpp
index 571634a5..5b193220 100644
--- a/umbrello/umbrello/codegenerators/rubywriter.cpp
+++ b/umbrello/umbrello/codegenerators/rubywriter.cpp
@@ -80,18 +80,18 @@ void RubyWriter::writeClass(UMLClassifier *c) {
 
     str = getHeadingFile(".rb");
     if(!str.isEmpty()) {
-        str.replace(TQRegExp("%filename%"), fileName);
-        str.replace(TQRegExp("%filepath%"), fileh.name());
+        str.tqreplace(TQRegExp("%filename%"), fileName);
+        str.tqreplace(TQRegExp("%filepath%"), fileh.name());
         h<<str<<m_endl;
     }
 
     if(forceDoc() || !c->getDoc().isEmpty()) {
         TQString docStr = c->getDoc();
-        docStr.replace(TQRegExp("\\n"), "\n# ");
-        docStr.replace("@ref ", "");
-        docStr.replace("@see", "_See_");
-        docStr.replace("@short", "_Summary_");
-        docStr.replace("@author", "_Author_");
+        docStr.tqreplace(TQRegExp("\\n"), "\n# ");
+        docStr.tqreplace("@ref ", "");
+        docStr.tqreplace("@see", "_See_");
+        docStr.tqreplace("@short", "_Summary_");
+        docStr.tqreplace("@author", "_Author_");
         h<<"#"<<m_endl;
         h<<"# "<<docStr<<m_endl;
         h<<"#"<<m_endl<<m_endl;
@@ -146,24 +146,24 @@ void RubyWriter::writeClass(UMLClassifier *c) {
 
 TQString RubyWriter::cppToRubyType(const TQString &typeStr) {
     TQString type = cleanName(typeStr);
-    type.replace("const ", "");
-    type.replace(TQRegExp("[*&\\s]"), "");
-    type.replace(TQRegExp("[<>]"), "_");
-    type.replace("TQStringList", "Array");
-    type.replace("TQString", "String");
-    type.replace("bool", "true|false");
-    type.replace(TQRegExp("^(uint|int|ushort|short|ulong|long)$"), "Integer");
-    type.replace(TQRegExp("^(float|double)$"), "Float");
-    type.replace(TQRegExp("^Q(?=[A-Z])"), "Qt::");
-    type.replace(TQRegExp("^K(?!(DE|Parts|IO)"), "KDE::");
+    type.tqreplace("const ", "");
+    type.tqreplace(TQRegExp("[*&\\s]"), "");
+    type.tqreplace(TQRegExp("[<>]"), "_");
+    type.tqreplace(TQSTRINGLIST_OBJECT_NAME_STRING, "Array");
+    type.tqreplace(TQSTRING_OBJECT_NAME_STRING, "String");
+    type.tqreplace("bool", "true|false");
+    type.tqreplace(TQRegExp("^(uint|int|ushort|short|ulong|long)$"), "Integer");
+    type.tqreplace(TQRegExp("^(float|double)$"), "Float");
+    type.tqreplace(TQRegExp("^Q(?=[A-Z])"), "TQt::");
+    type.tqreplace(TQRegExp("^K(?!(DE|Parts|IO)"), "KDE::");
 
     return type;
 }
 
 TQString RubyWriter::cppToRubyName(const TQString &nameStr) {
     TQString name = cleanName(nameStr);
-    name.replace(TQRegExp("^m_"), "");
-    name.replace(TQRegExp("^[pbn](?=[A-Z])"), "");
+    name.tqreplace(TQRegExp("^m_"), "");
+    name.tqreplace(TQRegExp("^[pbn](?=[A-Z])"), "");
     name = name.mid(0, 1).lower() + name.mid(1);
     return name;
 }
@@ -251,7 +251,7 @@ void RubyWriter::writeOperations(const TQString &classname, UMLOperationList &op
             methodName = "initialize";
         }
 
-        methodName.replace("operator ", "");
+        methodName.tqreplace("operator ", "");
         methodName = methodName.mid(0, 1).lower() + methodName.mid(1);
 
         UMLAttributeList atl = op->getParmList();
@@ -267,15 +267,15 @@ void RubyWriter::writeOperations(const TQString &classname, UMLOperationList &op
             h << m_indentation << "#" << m_endl;
             TQString docStr = op->getDoc();
 
-            docStr.replace(TQRegExp("[\\n\\r]+ *"), m_endl);
-            docStr.replace(TQRegExp("[\\n\\r]+\\t*"), m_endl);
+            docStr.tqreplace(TQRegExp("[\\n\\r]+ *"), m_endl);
+            docStr.tqreplace(TQRegExp("[\\n\\r]+\\t*"), m_endl);
 
-            docStr.replace(" m_", " ");
-            docStr.replace(TQRegExp("\\s[npb](?=[A-Z])"), " ");
+            docStr.tqreplace(" m_", " ");
+            docStr.tqreplace(TQRegExp("\\s[npb](?=[A-Z])"), " ");
             TQRegExp re_params("@param (\\w)(\\w*)");
             int pos = re_params.search(docStr);
             while (pos != -1) {
-                docStr.replace( re_params.cap(0),
+                docStr.tqreplace( re_params.cap(0),
                                 TQString("@param _") + re_params.cap(1).lower() + re_params.cap(2) + '_' );
                 commentedParams.append(re_params.cap(1).lower() + re_params.cap(2));
 
@@ -283,31 +283,31 @@ void RubyWriter::writeOperations(const TQString &classname, UMLOperationList &op
                 pos = re_params.search(docStr, pos);
             }
 
-            docStr.replace("\n", TQString("\n") + m_indentation + "# ");
+            docStr.tqreplace("\n", TQString("\n") + m_indentation + "# ");
 
             // Write parameter documentation
             for (at = atl.first(); at ; at = atl.next()) {
                 // Only write an individual @param entry if one hasn't been found already
                 // in the main doc comment
-                if (commentedParams.contains(cppToRubyName(at->getName())) == 0) {
+                if (commentedParams.tqcontains(cppToRubyName(at->getName())) == 0) {
                     docStr += (m_endl + m_indentation + "# @param _" + cppToRubyName(at->getName()) + '_');
                     if (at->getDoc().isEmpty()) {
                         docStr += (' ' + cppToRubyType(at->getTypeName()));
                     } else {
-                        docStr += (' ' + at->getDoc().replace(TQRegExp("[\\n\\r]+[\\t ]*"), m_endl + "   "));
+                        docStr += (' ' + at->getDoc().tqreplace(TQRegExp("[\\n\\r]+[\\t ]*"), m_endl + "   "));
                     }
                 }
             }
 
-            docStr.replace("@ref ", "");
-            docStr.replace("@param", "*");
-            docStr.replace("@return", "* _returns_");
+            docStr.tqreplace("@ref ", "");
+            docStr.tqreplace("@param", "*");
+            docStr.tqreplace("@return", "* _returns_");
 
             // All lines after the first '# *' in the doc comment
             // must be indented correctly. If they aren't a list
             // item starting with '# *', then indent the text with
             // three spaces, '#   ', to line up with the list item.
-            pos = docStr.find("# *");
+            pos = docStr.tqfind("# *");
             TQRegExp re_linestart("# (?!\\*)");
             pos = re_linestart.search(docStr, pos);
             while (pos > 0) {
@@ -320,7 +320,7 @@ void RubyWriter::writeOperations(const TQString &classname, UMLOperationList &op
             h << m_indentation << "# "<< docStr << m_endl;
 
             TQString typeStr = cppToRubyType(op->getTypeName());
-            if (!typeStr.isEmpty() && typeStr != "void" && docStr.contains("_returns_") == 0) {
+            if (!typeStr.isEmpty() && typeStr != "void" && docStr.tqcontains("_returns_") == 0) {
                 h << m_indentation << "# * _returns_ " << typeStr << m_endl;
             }
         }
@@ -375,9 +375,9 @@ void RubyWriter::writeSingleAttributeAccessorMethods(
         TQTextStream &h)
 {
     TQString description = descr;
-    description.replace(TQRegExp("m_[npb](?=[A-Z])"), "");
-    description.replace("m_", "");
-    description.replace("\n", TQString("\n") + m_indentation + "# ");
+    description.tqreplace(TQRegExp("m_[npb](?=[A-Z])"), "");
+    description.tqreplace("m_", "");
+    description.tqreplace("\n", TQString("\n") + m_indentation + "# ");
 
     if (!description.isEmpty()) {
         h << m_indentation << "# " << description << m_endl;
diff --git a/umbrello/umbrello/codegenerators/rubywriter.h b/umbrello/umbrello/codegenerators/rubywriter.h
index c1a69775..929a7306 100644
--- a/umbrello/umbrello/codegenerators/rubywriter.h
+++ b/umbrello/umbrello/codegenerators/rubywriter.h
@@ -33,6 +33,7 @@ class ClassifierInfo;
   */
 class RubyWriter : public SimpleCodeGenerator {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     RubyWriter();
@@ -56,8 +57,8 @@ public:
 
 private:
     /**
-     * Convert a C++ type such as 'int' or 'QWidget' to
-     * ruby types Integer and Qt::Widget
+     * Convert a C++ type such as 'int' or 'TQWidget' to
+     * ruby types Integer and TQt::Widget
      *
      * @param cppType the C++ type to be converted
      */
diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
index 6b7ac992..d4f62cc3 100644
--- a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
@@ -47,10 +47,10 @@
 SimpleCodeGenerator::SimpleCodeGenerator (bool createDirHierarchyForPackages /* =true */)
 {
     m_indentLevel = 0;
-    UMLDoc * parentDoc = UMLApp::app()->getDocument();
-    parentDoc->disconnect(this); // disconnect from UMLDoc.. we arent planning to be synced at all
+    UMLDoc * tqparentDoc = UMLApp::app()->getDocument();
+    tqparentDoc->disconnect(this); // disconnect from UMLDoc.. we arent planning to be synced at all
     m_createDirHierarchyForPackages = createDirHierarchyForPackages;
-    initFields(parentDoc);
+    initFields(tqparentDoc);
 }
 
 SimpleCodeGenerator::~SimpleCodeGenerator ( ) { }
@@ -77,7 +77,7 @@ TQString SimpleCodeGenerator::getIndent ()
 TQString SimpleCodeGenerator::findFileName(UMLPackage* concept, const TQString &ext) {
 
     //if we already know to which file this class was written/should be written, just return it.
-    if (m_fileMap.contains(concept))
+    if (m_fileMap.tqcontains(concept))
         return m_fileMap[concept];
 
     //else, determine the "natural" file name
@@ -89,16 +89,16 @@ TQString SimpleCodeGenerator::findFileName(UMLPackage* concept, const TQString &
     package.simplifyWhiteSpace();
 
     // Replace all blanks with underscore
-    package.replace(TQRegExp(" "), "_");
+    package.tqreplace(TQRegExp(" "), "_");
 
     // Convert all "::" to "/" : Platform-specific path separator
-    // package.replace(TQRegExp("::"), "/");
+    // package.tqreplace(TQRegExp("::"), "/");
 
     // if package is given add this as a directory to the file name
     if (!package.isEmpty() && m_createDirHierarchyForPackages) {
         name = package + '.' + concept->getName();
-        name.replace(TQRegExp("\\."),"/");
-        package.replace(TQRegExp("\\."), "/");
+        name.tqreplace(TQRegExp("\\."),"/");
+        package.tqreplace(TQRegExp("\\."), "/");
         package = '/' + package;
     } else {
         name = concept->getFullyQualifiedName("-");
@@ -136,10 +136,10 @@ TQString SimpleCodeGenerator::findFileName(UMLPackage* concept, const TQString &
 
 
     name.simplifyWhiteSpace();
-    name.replace(TQRegExp(" "),"_");
+    name.tqreplace(TQRegExp(" "),"_");
 
     TQString extension = ext.simplifyWhiteSpace();
-    extension.replace(' ', '_');
+    extension.tqreplace(' ', '_');
 
     return overwritableName(concept, name, extension);
 }
@@ -256,14 +256,14 @@ void SimpleCodeGenerator::writeCodeToFile ( UMLClassifierList & concepts) {
         this->writeClass(c); // call the writer for each class.
 }
 
-void SimpleCodeGenerator::initFields ( UMLDoc * parentDoc ) {
+void SimpleCodeGenerator::initFields ( UMLDoc * tqparentDoc ) {
 
-    // load Classifier documents from parent document
+    // load Classifier documents from tqparent document
     // initFromParentDocument();
 
     m_fileMap.clear();
     m_applyToAllRemaining = true;
-    m_doc = parentDoc;
+    m_doc = tqparentDoc;
 
     // this really is just being used to sync the internal params
     // to the codegenpolicy as there are no code documents to really sync.
@@ -282,7 +282,7 @@ void SimpleCodeGenerator::syncCodeToDocument() {
 }
 
 
-// override parent method
+// override tqparent method
 void SimpleCodeGenerator::initFromParentDocument( )
 {
     // Do nothing
diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.h b/umbrello/umbrello/codegenerators/simplecodegenerator.h
index c9d4a32d..301dc780 100644
--- a/umbrello/umbrello/codegenerators/simplecodegenerator.h
+++ b/umbrello/umbrello/codegenerators/simplecodegenerator.h
@@ -35,6 +35,7 @@ class UMLDoc;
 class SimpleCodeGenerator : public CodeGenerator
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
@@ -88,7 +89,7 @@ protected:
      */
     TQMap<UMLPackage*,TQString> m_fileMap;
 
-    // the parent document
+    // the tqparent document
     UMLDoc *m_doc;
 
     /**
@@ -104,7 +105,7 @@ protected:
     int m_indentLevel;
     TQString m_endl;
 
-    // override parent method..we need special handling
+    // override tqparent method..we need special handling
     void initFromParentDocument( );
 
 private:
diff --git a/umbrello/umbrello/codegenerators/sqlwriter.cpp b/umbrello/umbrello/codegenerators/sqlwriter.cpp
index 8582ec93..d08ea1fe 100644
--- a/umbrello/umbrello/codegenerators/sqlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/sqlwriter.cpp
@@ -30,12 +30,12 @@
 #include "../association.h"
 #include "../attribute.h"
 
-SQLWriter::SQLWriter() {
+STQLWriter::STQLWriter() {
 }
 
-SQLWriter::~SQLWriter() {}
+STQLWriter::~STQLWriter() {}
 
-void SQLWriter::writeClass(UMLClassifier *c) {
+void STQLWriter::writeClass(UMLClassifier *c) {
 
     if(!c) {
         kDebug()<<"Cannot write class of NULL concept!" << endl;
@@ -65,8 +65,8 @@ void SQLWriter::writeClass(UMLClassifier *c) {
     TQString str;
     str = getHeadingFile(".sql");
     if(!str.isEmpty()) {
-        str.replace(TQRegExp("%filename%"),fileName);
-        str.replace(TQRegExp("%filepath%"),file.name());
+        str.tqreplace(TQRegExp("%filename%"),fileName);
+        str.tqreplace(TQRegExp("%filepath%"),file.name());
         sql<<str<<m_endl;
     }
 
@@ -113,7 +113,7 @@ void SQLWriter::writeClass(UMLClassifier *c) {
 }
 
 
-void SQLWriter::writeAttributes(UMLClassifier *c, TQTextStream &sql) {
+void STQLWriter::writeAttributes(UMLClassifier *c, TQTextStream &sql) {
     UMLAttributeList atpub, atprot, atpriv, atimp;
     atpub.setAutoDelete(false);
     atprot.setAutoDelete(false);
@@ -140,7 +140,7 @@ void SQLWriter::writeAttributes(UMLClassifier *c, TQTextStream &sql) {
     }
 
     // now print the attributes; they are sorted by there scope
-    // in front of the first attribute shouldn't be a , -> so we need to find
+    // in front of the first attribute shouldn't be a , -> so we need to tqfind
     // out, when the first attribute was added
     bool first = true;
 
@@ -171,7 +171,7 @@ void SQLWriter::writeAttributes(UMLClassifier *c, TQTextStream &sql) {
     return;
 }
 
-void SQLWriter::printAttributes(TQTextStream& sql, UMLAttributeList attributeList, bool first) {
+void STQLWriter::printAttributes(TQTextStream& sql, UMLAttributeList attributeList, bool first) {
     TQString attrDoc = "";
     UMLAttribute* at;
 
@@ -211,11 +211,11 @@ void SQLWriter::printAttributes(TQTextStream& sql, UMLAttributeList attributeLis
     return;
 }
 
-Uml::Programming_Language SQLWriter::getLanguage() {
+Uml::Programming_Language STQLWriter::getLanguage() {
     return Uml::pl_SQL;
 }
 
-TQStringList SQLWriter::defaultDatatypes() {
+TQStringList STQLWriter::defaultDatatypes() {
     TQStringList l;
     l.append("varchar");
     l.append("tinyint");
@@ -244,7 +244,7 @@ TQStringList SQLWriter::defaultDatatypes() {
     return l;
 }
 
-const TQStringList SQLWriter::reservedKeywords() const {
+const TQStringList STQLWriter::reservedKeywords() const {
 
     static TQStringList keywords;
 
diff --git a/umbrello/umbrello/codegenerators/sqlwriter.h b/umbrello/umbrello/codegenerators/sqlwriter.h
index 42271af0..e4df5e2b 100644
--- a/umbrello/umbrello/codegenerators/sqlwriter.h
+++ b/umbrello/umbrello/codegenerators/sqlwriter.h
@@ -15,24 +15,25 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef SQLWRITER_H
-#define SQLWRITER_H
+#ifndef STQLWRITER_H
+#define STQLWRITER_H
 
 #include "simplecodegenerator.h"
 #include "../umlattributelist.h"
 
 /**
-  * class SQLWriter is a code generator for UMLClassifier objects.
+  * class STQLWriter is a code generator for UMLClassifier objects.
   * Create an instance of this class, and feed it a UMLClassifier when
   * calling writeClass and it will generate a sql source file for
   * that concept
   */
-class SQLWriter : public SimpleCodeGenerator {
+class STQLWriter : public SimpleCodeGenerator {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
-    SQLWriter();
-    virtual ~SQLWriter();
+    STQLWriter();
+    virtual ~STQLWriter();
 
     /**
      * call this method to generate sql code for a UMLClassifier
@@ -74,4 +75,4 @@ private:
     void printAttributes(TQTextStream& sql, UMLAttributeList attributeList, bool first);
 };
 
-#endif // SQLWRITER_H
+#endif // STQLWRITER_H
diff --git a/umbrello/umbrello/codegenerators/tclwriter.cpp b/umbrello/umbrello/codegenerators/tclwriter.cpp
index f443e8f1..913211c4 100644
--- a/umbrello/umbrello/codegenerators/tclwriter.cpp
+++ b/umbrello/umbrello/codegenerators/tclwriter.cpp
@@ -58,7 +58,7 @@ static const char *tclwords[] = {
                                  "llength",
                                  "load",
                                  "lrange",
-                                 "lreplace",
+                                 "ltqreplace",
                                  "method",
                                  "namespace",
                                  "private",
@@ -165,8 +165,8 @@ TclWriter::writeHeaderFile(UMLClassifier * c, TQFile & fileh)
     // write header blurb
     TQString         str = getHeadingFile(".tcl");
     if (!str.isEmpty()) {
-        str.replace(TQRegExp("%filename%"), classifierInfo->fileName);
-        str.replace(TQRegExp("%filepath%"), fileh.name());
+        str.tqreplace(TQRegExp("%filename%"), classifierInfo->fileName);
+        str.tqreplace(TQRegExp("%filepath%"), fileh.name());
         writeCode(str);
     }
     // set current namespace
@@ -337,8 +337,8 @@ TclWriter::writeSourceFile(UMLClassifier * c, TQFile & filetcl)
     TQString         str;
     str = getHeadingFile(".tclbody");
     if (!str.isEmpty()) {
-        str.replace(TQRegExp("%filename%"), classifierInfo->fileName + "body");
-        str.replace(TQRegExp("%filepath%"), filetcl.name());
+        str.tqreplace(TQRegExp("%filename%"), classifierInfo->fileName + "body");
+        str.tqreplace(TQRegExp("%filepath%"), filetcl.name());
         writeCode(str);
     }
     // Start body of class
@@ -599,13 +599,13 @@ TclWriter::writeAssociationRoleDecl(const TQString &fieldClassName, const TQStri
     // declare the association based on whether it is this a single variable
     // or a List (Vector). One day this will be done correctly with special
     // multiplicity object that we don't have to figure out what it means via regex.
-    if (multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) {
+    if (multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) {
         TQString         fieldVarName = roleName.lower();
 
         // record this for later consideration of initialization IF the
         // multi value requires 1 of these objects
-        if (ObjectFieldVariables.findIndex(fieldVarName) == -1 &&
-                multi.contains(TQRegExp("^1$"))
+        if (ObjectFieldVariables.tqfindIndex(fieldVarName) == -1 &&
+                multi.tqcontains(TQRegExp("^1$"))
            ) {
             // ugh. UGLY. Storing variable name and its class in pairs.
             ObjectFieldVariables.append(fieldVarName);
@@ -619,7 +619,7 @@ TclWriter::writeAssociationRoleDecl(const TQString &fieldClassName, const TQStri
 
         // record unique occurrences for later when we want to check
         // for initialization of this vector
-        if (VectorFieldVariables.findIndex(fieldVarName) == -1)
+        if (VectorFieldVariables.tqfindIndex(fieldVarName) == -1)
             VectorFieldVariables.append(fieldVarName);
         writeDocu(m_endl + "@var" + scope + " variable <" + fieldClassName +
                   "*> " + fieldVarName + m_endl + doc);
@@ -888,7 +888,7 @@ TclWriter::writeAssociationRoleSource(const TQString &fieldClassName,
     // declare the association based on whether it is this a single variable
     // or a List (Vector). One day this will be done correctly with special
     // multiplicity object that we don't have to figure out what it means via regex.
-    if (multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) {
+    if (multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) {
         TQString         fieldVarName = roleName.lower();
 
         writeCode("configbody " + mClassGlobal + "::" + fieldVarName + " {} {");
@@ -921,7 +921,7 @@ TclWriter::writeAssociationRoleSource(const TQString &fieldClassName,
     writeCode('}' + m_endl);
 }
 
-QString
+TQString
 TclWriter::fixTypeName(const TQString &string)
 {
     if (string.isEmpty())
@@ -930,13 +930,13 @@ TclWriter::fixTypeName(const TQString &string)
 }
 
 // methods like this _shouldn't_ be needed IF we properly did things thruought the code.
-QString
+TQString
 TclWriter::getUMLObjectName(UMLObject * obj)
 {
     return (obj != 0) ? obj->getName() : TQString("NULL");
 }
 
-const           QStringList
+const           TQStringList
 TclWriter::reservedKeywords() const
 {
     static TQStringList keywords;
diff --git a/umbrello/umbrello/codegenerators/xmlcodecomment.cpp b/umbrello/umbrello/codegenerators/xmlcodecomment.cpp
index 8d3a6893..01e79399 100644
--- a/umbrello/umbrello/codegenerators/xmlcodecomment.cpp
+++ b/umbrello/umbrello/codegenerators/xmlcodecomment.cpp
@@ -41,7 +41,7 @@ XMLCodeComment::~XMLCodeComment ( ) { }
 //
 
 /**
- * @return      QString
+ * @return      TQString
  */
 TQString XMLCodeComment::toString ( )
 {
diff --git a/umbrello/umbrello/codegenerators/xmlcodecomment.h b/umbrello/umbrello/codegenerators/xmlcodecomment.h
index e3f55ccc..688ade91 100644
--- a/umbrello/umbrello/codegenerators/xmlcodecomment.h
+++ b/umbrello/umbrello/codegenerators/xmlcodecomment.h
@@ -31,6 +31,7 @@ class CodeDocument;
 class XMLCodeComment: virtual public CodeComment
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
@@ -54,7 +55,7 @@ public:
     //
 
     /**
-     * @return  QString
+     * @return  TQString
      */
     TQString toString ( );
 
diff --git a/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp b/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp
index 6a068113..21dd5230 100644
--- a/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp
+++ b/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp
@@ -29,10 +29,10 @@
 // Constructors/Destructors
 //
 
-XMLElementCodeBlock::XMLElementCodeBlock ( CodeDocument * parentDoc, const TQString & nodeName, const TQString & comment)
-        : HierarchicalCodeBlock(parentDoc)
+XMLElementCodeBlock::XMLElementCodeBlock ( CodeDocument * tqparentDoc, const TQString & nodeName, const TQString & comment)
+        : HierarchicalCodeBlock(tqparentDoc)
 {
-    init(parentDoc, nodeName, comment);
+    init(tqparentDoc, nodeName, comment);
 }
 
 XMLElementCodeBlock::~XMLElementCodeBlock ( ) { }
@@ -150,10 +150,10 @@ void XMLElementCodeBlock::updateContent ( )
 
 }
 
-void XMLElementCodeBlock::init (CodeDocument *parentDoc, const TQString &nodeName, const TQString &comment)
+void XMLElementCodeBlock::init (CodeDocument *tqparentDoc, const TQString &nodeName, const TQString &comment)
 {
 
-    setComment(new XMLCodeComment(parentDoc));
+    setComment(new XMLCodeComment(tqparentDoc));
     getComment()->setText(comment);
 
     m_nodeName = nodeName;
diff --git a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h
index 334cac17..21427df0 100644
--- a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h
+++ b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h
@@ -28,6 +28,7 @@ class UMLAttribute;
 class XMLElementCodeBlock : public HierarchicalCodeBlock
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     // Constructors/Destructors
@@ -36,7 +37,7 @@ public:
     /**
      * Empty Constructor
      */
-    XMLElementCodeBlock ( CodeDocument * parentDoc, const TQString & nodeName, const TQString & comment = "");
+    XMLElementCodeBlock ( CodeDocument * tqparentDoc, const TQString & nodeName, const TQString & comment = "");
 
     /**
      * Empty Destructor
@@ -81,7 +82,7 @@ private:
 
     UMLAttributeList m_attList;
     TQString m_nodeName;
-    void init (CodeDocument * parent, const TQString &nodeName, const TQString &comment);
+    void init (CodeDocument * tqparent, const TQString &nodeName, const TQString &comment);
 
 };
 
diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
index 8c043a3e..00753349 100644
--- a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
+++ b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
@@ -87,8 +87,8 @@ void XMLSchemaWriter::writeClass(UMLClassifier *c)
     // 1. create the header
     TQString headerText = getHeadingFile(".xsd");
     if(!headerText.isEmpty()) {
-        headerText.replace(TQRegExp("%filename%"),fileName);
-        headerText.replace(TQRegExp("%filepath%"),file.name());
+        headerText.tqreplace(TQRegExp("%filename%"),fileName);
+        headerText.tqreplace(TQRegExp("%filepath%"),file.name());
     }
     if(!headerText.isEmpty())
         XMLschema<<headerText<<m_endl;
@@ -445,7 +445,7 @@ void XMLSchemaWriter::writeChildObjsInAssociation (UMLClassifier *c,
 }
 
 bool XMLSchemaWriter::hasBeenWritten(UMLClassifier *c) {
-    if (writtenClassifiers.contains(c))
+    if (writtenClassifiers.tqcontains(c))
         return true;
     else
         return false;
@@ -529,7 +529,7 @@ void XMLSchemaWriter::writeComment( const TQString &comment, TQTextStream &XMLsc
     // need to resolve for using with MAC/WinDoze eventually I assume
     TQString indent = getIndent();
     XMLschema<<indent<<"<!-- ";
-    if (comment.contains(TQRegExp("\n"))) {
+    if (comment.tqcontains(TQRegExp("\n"))) {
         XMLschema<<m_endl;
         TQStringList lines = TQStringList::split( "\n", comment);
         for(uint i= 0; i < lines.count(); i++)
@@ -543,7 +543,7 @@ void XMLSchemaWriter::writeComment( const TQString &comment, TQTextStream &XMLsc
     }
 }
 
-// all that matters here is roleA, the role served by the children of this class
+// all that matters here is roleA, the role served by the tqchildren of this class
 // in any composition or aggregation association. In full associations, I have only
 // considered the case of "self" association, so it shouldn't matter if we use role A or
 // B to find the child class as long as we don't use BOTH roles. I bet this will fail
@@ -673,10 +673,10 @@ void XMLSchemaWriter::writeAssociationRoleDecl( UMLClassifier *c, const TQString
         {
             // populate both with the actual value as long as our value isnt an asterix
             // In that case, use special value (from above)
-            if(values[0].contains(TQRegExp("\\d{1,}")))
+            if(values[0].tqcontains(TQRegExp("\\d{1,}")))
                 minOccurs = values[0]; // use first number in sequence
 
-            if(values[values.count()-1].contains(TQRegExp("\\d{1,}")))
+            if(values[values.count()-1].tqcontains(TQRegExp("\\d{1,}")))
                 maxOccurs = values[values.count()-1]; // use only last number in sequence
         }
     }
@@ -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 parent could go. The tradeoff is that "group" nodes may not be extended, so the
+    // it tqparent 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 parent went without
+    // class (err. element node) wont be able to go into the document where it tqparent 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
@@ -736,8 +736,8 @@ void XMLSchemaWriter::writeAssociationRoleDecl( UMLClassifier *c, const TQString
 // Same thing again for "bool" to "boolean"
 TQString XMLSchemaWriter::fixTypeName(const TQString& string)
 {
-    //  string.replace(TQRegExp("^string$"),schemaNamespaceTag+":string");
-    //  string.replace(TQRegExp("^bool$"),schemaNamespaceTag+":boolean");
+    //  string.tqreplace(TQRegExp("^string$"),schemaNamespaceTag+":string");
+    //  string.tqreplace(TQRegExp("^bool$"),schemaNamespaceTag+":boolean");
     return schemaNamespaceTag + ':' + string;
 }
 
diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.h b/umbrello/umbrello/codegenerators/xmlschemawriter.h
index 95210078..cc4372a2 100644
--- a/umbrello/umbrello/codegenerators/xmlschemawriter.h
+++ b/umbrello/umbrello/codegenerators/xmlschemawriter.h
@@ -38,6 +38,7 @@
 class XMLSchemaWriter : public SimpleCodeGenerator
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     /**
@@ -87,7 +88,7 @@ private:
 
     /**
      * write a <group> declaration for this classifier. Used for interfaces to classes with
-     * inheriting children.
+     * inheriting tqchildren.
      */
     void writeGroupClassifierDecl(UMLClassifier *c,
                                   UMLClassifierList superclassifiers,
author	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2011-06-12 01:36:19 +0000
committer	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2011-06-12 01:36:19 +0000
commit	99a2774ca6f1cab334de5d43fe36fc44ae889a4c (patch)
tree	eff34cf0762227f6baf2a93e8fef48d4bed2651c /umbrello/umbrello/codegenerators
parent	1c104292188541106338d4940b0f04beeb4301a0 (diff)
download	tdesdk-99a2774c.tar.gz tdesdk-99a2774c.zip