Remove additional unneeded tq method conversions

53 files changed, 136 insertions, 136 deletions

diff --git a/umbrello/umbrello/aligntoolbar.cpp b/umbrello/umbrello/aligntoolbar.cpp
index 2ac38d4e..3aac8342 100644
--- a/umbrello/umbrello/aligntoolbar.cpp
+++ b/umbrello/umbrello/aligntoolbar.cpp
@@ -335,7 +335,7 @@ void AlignToolBar::slotButtonChanged(int btn) {
 
     // at least 2 widgets must be selected
     if (widgetList.count() > 1) {
-        // now perform tqalignment according to the clicked button
+        // now perform alignment according to the clicked button
         switch (btn) {
         case alac_align_left:
             alignLeft(widgetList);
@@ -380,7 +380,7 @@ void AlignToolBar::slotButtonChanged(int btn) {
         UMLApp::app()->getDocument()->setModified();
     } else {
         KMessageBox::messageBox(0, KMessageBox::Information,
-                                i18n("For tqalignment you have to select at least 2 objects like classes or actors. You can not align associations."),
+                                i18n("For alignment you have to select at least 2 objects like classes or actors. You can not align associations."),
                                 i18n("Information"), i18n("&OK"), TQString(""),
                                 "showAlignInformation");
     } // if (widgetList.count() > 1)
diff --git a/umbrello/umbrello/aligntoolbar.h b/umbrello/umbrello/aligntoolbar.h
index 7e2170a5..7720b9b3 100644
--- a/umbrello/umbrello/aligntoolbar.h
+++ b/umbrello/umbrello/aligntoolbar.h
@@ -21,10 +21,10 @@ class TQMainWindow;
 class UMLWidget;
 
 /**
- * This toolbar provides tools for tqalignment. Widgets can only be aligned, when
+ * This toolbar provides tools for alignment. Widgets can only be aligned, when
  * there are at least 2 widgets (not associations) are selected
  *
- * @short Toolbar providing tqalignment tools.
+ * @short Toolbar providing alignment tools.
  * @author Sebastian Stein <[email protected]>
  * Bugs and comments to [email protected] or http://bugs.kde.org
  */
@@ -34,7 +34,7 @@ class AlignToolBar : public KToolBar {
 public:
 
     /**
-     * Creates a bar with tools for tqalignment.
+     * Creates a bar with tools for alignment.
      *
      * @param parentWindow      The parent of the toolbar.
      * @param name              The name of the toolbar.
@@ -215,7 +215,7 @@ private:
 private slots:
 
     /**
-     * Performs the tqalignment when a button was clicked.
+     * Performs the alignment when a button was clicked.
      *
      * @param btn The clicked button.
      */
diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp
index 6d484307..81a1bb57 100644
--- a/umbrello/umbrello/associationwidget.cpp
+++ b/umbrello/umbrello/associationwidget.cpp
@@ -797,7 +797,7 @@ void AssociationWidget::setUMLAssociation (UMLAssociation * assoc)
         //    BTW, IMHO the concept of a widget being the parent of a UML object
         //    is fundamentally flawed. Widgets are pure presentation - they can
         //    come and go at a whim. If at all, the widgets could be considered
-        //    tqchildren of the corresponding UML object.
+        //    children of the corresponding UML object.
         //
         // ANSWER: This is the wrong treatment of cut and paste. Associations that
         // are being cut/n pasted should be serialized to XMI, then reconstituted
diff --git a/umbrello/umbrello/associationwidget.h b/umbrello/umbrello/associationwidget.h
index fbbdf214..175a64ec 100644
--- a/umbrello/umbrello/associationwidget.h
+++ b/umbrello/umbrello/associationwidget.h
@@ -1012,7 +1012,7 @@ public slots:
     /**
      * This slot is entered when an event has occurred on the views display,
      * most likely a mouse event.  Before it sends out that mouse event all
-     * tqchildren should make sure that they don't have a menu active or there
+     * children should make sure that they don't have a menu active or there
      * could be more than one popup menu displayed.
      */
     void slotRemovePopupMenu();
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.cpp b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
index e47911e6..6b6196d4 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.cpp
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
@@ -84,7 +84,7 @@ void AutolayoutDlg::slotSetClusterizeHierarchies(bool b)
 
 void AutolayoutDlg::slotSetShapeSeparation(int i)
 {
-    tqshapeSeparation=i;
+    shapeSeparation=i;
 }
 
 void AutolayoutDlg::slotReloadSettings()
@@ -115,7 +115,7 @@ void AutolayoutDlg::slotDoAutotqlayout()
     a->setGeneralizationWeight( generalizationWeight);
     a->setNoteConnectionWeight( 1);
     a->setNoteConnectionsAsEdges(true);
-    a->setShapeSeparation( tqshapeSeparation);
+    a->setShapeSeparation( shapeSeparation);
     a->autotqlayout( view);
     delete a;
     a=0;
@@ -134,7 +134,7 @@ void AutolayoutDlg::readConfig( KConfig * conf)
     generalizationCB->setChecked((bool)(conf->readBoolEntry( "genralizationAsEdges",true)));
     generalizationEdgessSL->setValue((int)(conf->readNumEntry( "generalizationWeight",1)));
     associationEdgesSL->setValue((int)(conf->readNumEntry( "associationWeight",0)));
-    tqshapeSeparationSB->setValue((int)(conf->readNumEntry( "tqshapeSeparation",0)));
+    shapeSeparationSB->setValue((int)(conf->readNumEntry( "shapeSeparation",0)));
     algorithmCOB->setCurrentItem((int)(conf->readNumEntry( "algorithm",0)));
 }
 
@@ -151,7 +151,7 @@ void AutolayoutDlg::writeConfig( KConfig * conf)
 
     conf->writeEntry("generalizationWeight",generalizationEdgessSL->value());
     conf->writeEntry("associationWeight",associationEdgesSL->value());
-    conf->writeEntry("tqshapeSeparation",tqshapeSeparationSB->value());
+    conf->writeEntry("shapeSeparation",shapeSeparationSB->value());
     //conf->writeEntry("al
 
 
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.h b/umbrello/umbrello/autolayout/autolayoutdlg.h
index f2614d03..a5e4117a 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.h
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.h
@@ -54,7 +54,7 @@ class AutolayoutDlg : public MyDialog1
     bool compressShapes;
     bool centerDiagram;
     bool clusterizeHierarchies;
-    int tqshapeSeparation;
+    int shapeSeparation;
     KConfig* config;
     TQString algname;
     Autotqlayout::Autolayouter* getAutolayouter();
diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.cpp b/umbrello/umbrello/autolayout/autolayouteradapter.cpp
index 3a245cbc..30f3fad7 100644
--- a/umbrello/umbrello/autolayout/autolayouteradapter.cpp
+++ b/umbrello/umbrello/autolayout/autolayouteradapter.cpp
@@ -118,7 +118,7 @@ void Autotqlayout::AutolayouterAdapter::setClusterizeHierarchies( bool b )
 
 void Autotqlayout::AutolayouterAdapter::setShapeSeparation( int i )
   {
-  tqshapeSeparation=i;
+  shapeSeparation=i;
   }
 
 Autotqlayout::Graph  * Autotqlayout::AutolayouterAdapter::setGraph( UMLView * view )
diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.h b/umbrello/umbrello/autolayout/autolayouteradapter.h
index 1d05f0d2..49e71803 100644
--- a/umbrello/umbrello/autolayout/autolayouteradapter.h
+++ b/umbrello/umbrello/autolayout/autolayouteradapter.h
@@ -70,7 +70,7 @@ protected:
     bool compressShapes;
     bool centerDiagram;
     bool clusterizeHierarchies;
-    int tqshapeSeparation;
+    int shapeSeparation;
     int noteConnectionWeight;
     bool noteConnectionAsEdges;
     bool anchorsAsEdges;
diff --git a/umbrello/umbrello/autolayout/graphvizgraph.cpp b/umbrello/umbrello/autolayout/graphvizgraph.cpp
index a3b4ea8a..36a50170 100644
--- a/umbrello/umbrello/autolayout/graphvizgraph.cpp
+++ b/umbrello/umbrello/autolayout/graphvizgraph.cpp
@@ -42,7 +42,7 @@ GraphvizGraph::GraphvizGraph()
     a_weight= agedgeattr(_agraph,"weight","");
     agnodeattr(_agraph, "fixedsize", "true");
     agnodeattr(_agraph, "margin", "0.01,0.01");
-    agnodeattr(_agraph, "tqshape", "box");
+    agnodeattr(_agraph, "shape", "box");
     agraphattr(_agraph, "dpi", "DPI/0");
 
 
diff --git a/umbrello/umbrello/autolayout/newautolayoutdialog.ui b/umbrello/umbrello/autolayout/newautolayoutdialog.ui
index bca63027..af2e3db5 100644
--- a/umbrello/umbrello/autolayout/newautolayoutdialog.ui
+++ b/umbrello/umbrello/autolayout/newautolayoutdialog.ui
@@ -88,12 +88,12 @@
                         <string>Shape separation</string>
                     </property>
                     <property name="buddy" stdset="0">
-                        <cstring>tqshapeSeparationSB</cstring>
+                        <cstring>shapeSeparationSB</cstring>
                     </property>
                 </widget>
                 <widget class="TQSpinBox">
                     <property name="name">
-                        <cstring>tqshapeSeparationSB</cstring>
+                        <cstring>shapeSeparationSB</cstring>
                     </property>
                     <property name="prefix">
                         <string></string>
@@ -450,7 +450,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
-        <sender>tqshapeSeparationSB</sender>
+        <sender>shapeSeparationSB</sender>
         <signal>valueChanged(int)</signal>
         <receiver>MyDialog1</receiver>
         <slot>slotSetShapeSeparation(int)</slot>
diff --git a/umbrello/umbrello/clipboard/umlclipboard.cpp b/umbrello/umbrello/clipboard/umlclipboard.cpp
index d654e083..069ba84b 100644
--- a/umbrello/umbrello/clipboard/umlclipboard.cpp
+++ b/umbrello/umbrello/clipboard/umlclipboard.cpp
@@ -267,7 +267,7 @@ void UMLClipboard::checkItemForCopyType(UMLListViewItem* Item, bool & WithDiagra
     }
 }
 
-/** Adds the tqchildren of a UMLListViewItem to m_ItemList */
+/** Adds the children of a UMLListViewItem to m_ItemList */
 bool UMLClipboard::insertItemChildren(UMLListViewItem * Item, UMLListViewItemList& SelectedItems) {
     if(Item->childCount()) {
         UMLListViewItem * child = (UMLListViewItem*)Item->firstChild();
@@ -347,7 +347,7 @@ bool UMLClipboard::pasteClip1(TQMimeSource* data) {
         return true;
     lv->setStartedCopy(false);
     /* If we get here we are pasting after a Copy and need to
-    // paste possible tqchildren.
+    // paste possible children.
     UMLListViewItem* itemdata = 0;
     UMLListViewItemListIt it(itemdatalist);
     while ( (itemdata=it.current()) != 0 ) {
@@ -630,7 +630,7 @@ bool UMLClipboard::pasteClip5(TQMimeSource* data) {
                 break;
             }
         default :
-            kWarning() << "pasting unknown tqchildren type in clip type 5" << endl;
+            kWarning() << "pasting unknown children type in clip type 5" << endl;
             return false;
         }
     }
diff --git a/umbrello/umbrello/clipboard/umlclipboard.h b/umbrello/umbrello/clipboard/umlclipboard.h
index b0607ef2..017a4beb 100644
--- a/umbrello/umbrello/clipboard/umlclipboard.h
+++ b/umbrello/umbrello/clipboard/umlclipboard.h
@@ -167,13 +167,13 @@ private:
                               bool& OnlyAttsOps);
 
     /**
-     * Adds the tqchildren of a UMLListViewItem to m_ItemList.
+     * Adds the children of a UMLListViewItem to m_ItemList.
      */
     bool insertItemChildren(UMLListViewItem* Item,
                             UMLListViewItemList& SelectedItems);
 
     /**
-     * Inserts the data of the tqchildren of the given item
+     * Inserts the data of the children of the given item
      * into the item data list.  Used for clip type 4.  Used
      * to make * sure classes have all the attributes and
      * operations saved.
@@ -181,7 +181,7 @@ private:
     bool insertItemChildren(UMLListViewItem* item);
 
     /**
-     * Pastes the tqchildren of a UMLListViewItem (The Parent)
+     * Pastes the children of a UMLListViewItem (The Parent)
      */
     bool pasteChildren(UMLListViewItem* parent, IDChangeLog *chgLog);
 
diff --git a/umbrello/umbrello/codegenerator.cpp b/umbrello/umbrello/codegenerator.cpp
index 44a65c62..41ac6ed2 100644
--- a/umbrello/umbrello/codegenerator.cpp
+++ b/umbrello/umbrello/codegenerator.cpp
@@ -470,7 +470,7 @@ bool CodeGenerator::openFile (TQFile & file, const TQString &fileName ) {
         TQDir outputDirectory = UMLApp::app()->getCommonPolicy()->getOutputDirectory();
         file.setName(outputDirectory.absFilePath(fileName));
         if(!file.open(IO_WriteOnly)) {
-            KMessageBox::sorry(0,i18n("Cannot open file %1 for writing. Please make sure the folder exists and you have permissions to write to it.").tqarg(file.name()),i18n("Cannot Open File"));
+            KMessageBox::sorry(0,i18n("Cannot open file %1 for writing. Please make sure the folder exists and you have permissions to write to it.").arg(file.name()),i18n("Cannot Open File"));
             return false;
         }
         return true;
diff --git a/umbrello/umbrello/codegenerators/cppwriter.cpp b/umbrello/umbrello/codegenerators/cppwriter.cpp
index d58ceae4..e748333d 100644
--- a/umbrello/umbrello/codegenerators/cppwriter.cpp
+++ b/umbrello/umbrello/codegenerators/cppwriter.cpp
@@ -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.tqat(0).upper());
+        methodBaseName.replace(0,1,methodBaseName.at(0).upper());
 
         writeSingleAttributeAccessorMethods(at->getTypeName(), varName,
                                             methodBaseName, at->getDoc(), Uml::chg_Changeable, isHeaderMethod,
diff --git a/umbrello/umbrello/codegenerators/csharpwriter.cpp b/umbrello/umbrello/codegenerators/csharpwriter.cpp
index 180ba176..42b055e5 100644
--- a/umbrello/umbrello/codegenerators/csharpwriter.cpp
+++ b/umbrello/umbrello/codegenerators/csharpwriter.cpp
@@ -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").tqarg(m_unnamedRoles++);
+            roleName = TQString("UnnamedRoleB_%1").arg(m_unnamedRoles++);
         }
         TQString roleDoc = a->getRoleDoc(Uml::B);
 
diff --git a/umbrello/umbrello/codegenerators/javawriter.cpp b/umbrello/umbrello/codegenerators/javawriter.cpp
index 19f3c1fd..db6d6515 100644
--- a/umbrello/umbrello/codegenerators/javawriter.cpp
+++ b/umbrello/umbrello/codegenerators/javawriter.cpp
@@ -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.tqat(0).upper());
+        fieldName.replace(0,1,fieldName.at(0).upper());
 
         writeSingleAttributeAccessorMethods(at->getTypeName(),
                                             cleanName(at->getName()),
diff --git a/umbrello/umbrello/codegenerators/php5writer.cpp b/umbrello/umbrello/codegenerators/php5writer.cpp
index f0de28a3..64a01b47 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",
-        "tqchildren",
+        "children",
         "chmod",
         "chop",
         "chown",
@@ -760,8 +760,8 @@ static const char *php5words[] =
         "getrusage",
         "getservbyname",
         "getservbyport",
-        "gettqshape1",
-        "gettqshape2",
+        "getshape1",
+        "getshape2",
         "gettext",
         "gettimeofday",
         "gettype",
@@ -2704,7 +2704,7 @@ static const char *php5words[] =
         "SWFDisplayItem",
         "swf_endbutton",
         "swf_enddoaction",
-        "swf_endtqshape",
+        "swf_endshape",
         "swf_endsymbol",
         "SWFFill",
         "SWFFont",
@@ -2738,21 +2738,21 @@ static const char *php5words[] =
         "swf_setfont",
         "swf_setframe",
         "SWFShape",
-        "swf_tqshapearc",
-        "swf_tqshapecurveto",
-        "swf_tqshapecurveto3",
-        "swf_tqshapefillbitmapclip",
-        "swf_tqshapefillbitmaptile",
-        "swf_tqshapefilloff",
-        "swf_tqshapefillsolid",
-        "swf_tqshapelinesolid",
-        "swf_tqshapelineto",
-        "swf_tqshapemoveto",
+        "swf_shapearc",
+        "swf_shapecurveto",
+        "swf_shapecurveto3",
+        "swf_shapefillbitmapclip",
+        "swf_shapefillbitmaptile",
+        "swf_shapefilloff",
+        "swf_shapefillsolid",
+        "swf_shapelinesolid",
+        "swf_shapelineto",
+        "swf_shapemoveto",
         "swf_showframe",
         "SWFSprite",
         "swf_startbutton",
         "swf_startdoaction",
-        "swf_starttqshape",
+        "swf_startshape",
         "swf_startsymbol",
         "SWFText",
         "SWFTextField",
diff --git a/umbrello/umbrello/codegenerators/phpwriter.cpp b/umbrello/umbrello/codegenerators/phpwriter.cpp
index f7e1e76e..e9dba103 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",
-        "tqchildren",
+        "children",
         "chmod",
         "chop",
         "chown",
@@ -758,8 +758,8 @@ static const char *words[] =
         "getrusage",
         "getservbyname",
         "getservbyport",
-        "gettqshape1",
-        "gettqshape2",
+        "getshape1",
+        "getshape2",
         "gettext",
         "gettimeofday",
         "gettype",
@@ -2700,7 +2700,7 @@ static const char *words[] =
         "SWFDisplayItem",
         "swf_endbutton",
         "swf_enddoaction",
-        "swf_endtqshape",
+        "swf_endshape",
         "swf_endsymbol",
         "SWFFill",
         "SWFFont",
@@ -2734,21 +2734,21 @@ static const char *words[] =
         "swf_setfont",
         "swf_setframe",
         "SWFShape",
-        "swf_tqshapearc",
-        "swf_tqshapecurveto",
-        "swf_tqshapecurveto3",
-        "swf_tqshapefillbitmapclip",
-        "swf_tqshapefillbitmaptile",
-        "swf_tqshapefilloff",
-        "swf_tqshapefillsolid",
-        "swf_tqshapelinesolid",
-        "swf_tqshapelineto",
-        "swf_tqshapemoveto",
+        "swf_shapearc",
+        "swf_shapecurveto",
+        "swf_shapecurveto3",
+        "swf_shapefillbitmapclip",
+        "swf_shapefillbitmaptile",
+        "swf_shapefilloff",
+        "swf_shapefillsolid",
+        "swf_shapelinesolid",
+        "swf_shapelineto",
+        "swf_shapemoveto",
         "swf_showframe",
         "SWFSprite",
         "swf_startbutton",
         "swf_startdoaction",
-        "swf_starttqshape",
+        "swf_startshape",
         "swf_startsymbol",
         "SWFText",
         "SWFTextField",
diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
index f2bf7a66..8c043a3e 100644
--- a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
+++ b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
@@ -543,7 +543,7 @@ void XMLSchemaWriter::writeComment( const TQString &comment, TQTextStream &XMLsc
     }
 }
 
-// all that matters here is roleA, the role served by the tqchildren of this class
+// all that matters here is roleA, the role served by the children 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
diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.h b/umbrello/umbrello/codegenerators/xmlschemawriter.h
index cc4372a2..cb5546d8 100644
--- a/umbrello/umbrello/codegenerators/xmlschemawriter.h
+++ b/umbrello/umbrello/codegenerators/xmlschemawriter.h
@@ -88,7 +88,7 @@ private:
 
     /**
      * write a <group> declaration for this classifier. Used for interfaces to classes with
-     * inheriting tqchildren.
+     * inheriting children.
      */
     void writeGroupClassifierDecl(UMLClassifier *c,
                                   UMLClassifierList superclassifiers,
diff --git a/umbrello/umbrello/codegenobjectwithtextblocks.cpp b/umbrello/umbrello/codegenobjectwithtextblocks.cpp
index 0c689e1e..c3fb2fd6 100644
--- a/umbrello/umbrello/codegenobjectwithtextblocks.cpp
+++ b/umbrello/umbrello/codegenobjectwithtextblocks.cpp
@@ -170,7 +170,7 @@ CodeGenObjectWithTextBlocks * CodeGenObjectWithTextBlocks::findParentObjectForTa
         return this;
 
     // shouldn't happen unless the textblock doesn't exist in this object
-    // or its tqchildren at all
+    // or its children at all
     return (CodeGenObjectWithTextBlocks*) NULL;
 
 }
@@ -378,7 +378,7 @@ void CodeGenObjectWithTextBlocks::setAttributesFromNode ( TQDomElement & root)
 // in this vanilla version, we only load comments and codeblocks
 // as they are the only instanciatable (vanilla) things
 // this method should be overridden if this class is inherited
-// by some other class that is concrete and takes tqchildren
+// by some other class that is concrete and takes children
 // derived from codeblock/codecomment
 void CodeGenObjectWithTextBlocks::loadChildTextBlocksFromNode ( TQDomElement & root)
 {
diff --git a/umbrello/umbrello/codegenobjectwithtextblocks.h b/umbrello/umbrello/codegenobjectwithtextblocks.h
index b8f50454..7bf338f2 100644
--- a/umbrello/umbrello/codegenobjectwithtextblocks.h
+++ b/umbrello/umbrello/codegenobjectwithtextblocks.h
@@ -165,7 +165,7 @@ protected:
       * in this vanilla version, we only load comments and codeblocks
       * as they are the only instanciatable (vanilla) things
       * this method should be overridden if this class is inherited
-      * by some other class that is concrete and takes tqchildren
+      * by some other class that is concrete and takes children
       * derived from codeblock/codecomment/hierarchicalcb/ownedhiercodeblock
       */
     virtual void loadChildTextBlocksFromNode ( TQDomElement & root);
diff --git a/umbrello/umbrello/codeimport/classimport.cpp b/umbrello/umbrello/codeimport/classimport.cpp
index 469e4030..e32758dd 100644
--- a/umbrello/umbrello/codeimport/classimport.cpp
+++ b/umbrello/umbrello/codeimport/classimport.cpp
@@ -32,7 +32,7 @@ void ClassImport::importFiles(const TQStringList &fileList) {
             fileIT != fileList.end(); ++fileIT) {
         TQString fileName = (*fileIT);
         umldoc->writeToStatusBar(i18n("Importing file: %1 Progress: %2/%3").
-                                 tqarg(fileName).tqarg(processedFilesCount).tqarg(fileList.size()));
+                                 arg(fileName).arg(processedFilesCount).arg(fileList.size()));
         parseFile(fileName);
         processedFilesCount++;
     }
diff --git a/umbrello/umbrello/codeimport/import_utils.cpp b/umbrello/umbrello/codeimport/import_utils.cpp
index 4e38a1aa..6b87f493 100644
--- a/umbrello/umbrello/codeimport/import_utils.cpp
+++ b/umbrello/umbrello/codeimport/import_utils.cpp
@@ -178,7 +178,7 @@ UMLObject *createUMLObject(Uml::Object_Type type,
                         /* We know std and TQt are namespaces */
                         if (scopeName != "std" && scopeName != "TQt") {
                             wantNamespace = KMessageBox::questionYesNo(NULL,
-                                        i18n("Is the scope %1 a namespace or a class?").tqarg(scopeName),
+                                        i18n("Is the scope %1 a namespace or a class?").arg(scopeName),
                                         i18n("C++ Import Requests Your Help"),
                                         i18n("Namespace"), i18n("Class"));
                         }
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
index 4dba6be5..2c962e5d 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
@@ -128,7 +128,7 @@ AST::AST()
       m_endLine( 0 ), m_endColumn( 0 )
 {
 #ifndef CPPPARSER_NO_CHILDREN
-    m_tqchildren.setAutoDelete( false );
+    m_children.setAutoDelete( false );
 #endif
 }
 
@@ -188,12 +188,12 @@ void AST::setParent( AST* parent )
 #ifndef CPPPARSER_NO_CHILDREN
 void AST::appendChild( AST* child )
 {
-    m_tqchildren.append( child );
+    m_children.append( child );
 }
 
 void AST::removeChild( AST* child )
 {
-    m_tqchildren.remove( child );
+    m_children.remove( child );
 }
 #endif
 
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.h b/umbrello/umbrello/codeimport/kdevcppparser/ast.h
index 49520e33..3c96da9e 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.h
@@ -232,7 +232,7 @@ public:
     void getEndPosition( int* line, int* col ) const;
 
 #ifndef CPPPARSER_NO_CHILDREN
-    TQPtrList<AST> tqchildren() { return m_tqchildren; }
+    TQPtrList<AST> children() { return m_children; }
     void appendChild( AST* child );
     void removeChild( AST* child );
 #endif
@@ -266,7 +266,7 @@ private:
     int m_endLine, m_endColumn;
     Slice m_slice;
 #ifndef CPPPARSER_NO_CHILDREN
-    TQPtrList<AST> m_tqchildren;
+    TQPtrList<AST> m_children;
 #endif
     TQString m_comment;
 
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
index 679e0f90..44c10f82 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
@@ -35,8 +35,8 @@ AST* findNodeAt( AST* node, int line, int column )
     if( (line > startLine || (line == startLine && column >= startColumn)) &&
         (line < endLine || (line == endLine && column < endColumn)) ){
 
-        TQPtrList<AST> tqchildren = node->tqchildren();
-	TQPtrListIterator<AST> it( tqchildren );
+        TQPtrList<AST> children = node->children();
+	TQPtrListIterator<AST> it( children );
 	while( it.current() ){
 	    AST* a = it.current();
 	    ++it;
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
index 7054e1a4..38561d53 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
@@ -374,7 +374,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline )
                 TQString tokText = tok.text();
                 TQString str = (tok == Token_identifier && d->hasBind(tokText)) ? d->apply( tokText ) : tokText;
                 if( str == ide ){
-                    //Problem p( i18n("unsafe use of macro '%1'").tqarg(ide), m_currentLine, m_currentColumn );
+                    //Problem p( i18n("unsafe use of macro '%1'").arg(ide), m_currentLine, m_currentColumn );
                     //m_driver->addProblem( m_driver->currentFileName(), p );
                     m_driver->removeMacro( ide );
                     // str = TQString();
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
index 51837b1e..b724faba 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
@@ -37,7 +37,7 @@ using namespace std;
 { \
   const Token& token = lex->lookAhead( 0 ); \
   if( token != tk ){ \
-      reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \
+      reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \
       return false; \
   } \
   lex->nextToken(); \
@@ -47,7 +47,7 @@ using namespace std;
 { \
   const Token& token = lex->lookAhead( 0 ); \
   if( token != tk ){ \
-      reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \
+      reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \
   } \
   else \
       lex->nextToken(); \
@@ -137,7 +137,7 @@ bool Parser::reportError( const Error& err )
 	if( s.isEmpty() )
 	    s = i18n( "<eof>" );
 
-	m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.tqarg(s), line, col) );
+	m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.arg(s), line, col) );
     }
 
     return true;
diff --git a/umbrello/umbrello/dialogs/classoptionspage.h b/umbrello/umbrello/dialogs/classoptionspage.h
index e9c81525..718944cc 100644
--- a/umbrello/umbrello/dialogs/classoptionspage.h
+++ b/umbrello/umbrello/dialogs/classoptionspage.h
@@ -23,7 +23,7 @@ class ClassifierWidget;
 
 /**
  * A dialog page to display options for a @ref UMLWidget and its
- * tqchildren.  This is not normally called by you.  It is used by
+ * children.  This is not normally called by you.  It is used by
  * the @ref ClassPropDlg.
  *
  * @short A dialog page to display the options for a UMLWidget.
diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.cpp b/umbrello/umbrello/dialogs/codegenerationwizard.cpp
index 30ab5817..b64e30dc 100644
--- a/umbrello/umbrello/dialogs/codegenerationwizard.cpp
+++ b/umbrello/umbrello/dialogs/codegenerationwizard.cpp
@@ -159,7 +159,7 @@ void CodeGenerationWizard::showPage(TQWidget *page) {
         if(!info.exists())
         {
             if (KMessageBox::questionYesNo(this,
-                                           i18n("The folder %1 does not exist. Do you want to create it now?").tqarg(info.filePath()),
+                                           i18n("The folder %1 does not exist. Do you want to create it now?").arg(info.filePath()),
                                            i18n("Output Folder Does Not Exist"), i18n("Create Folder"), i18n("Do Not Create")) == KMessageBox::Yes)
             {
                 TQDir dir;
@@ -188,7 +188,7 @@ void CodeGenerationWizard::showPage(TQWidget *page) {
             // it exits and we can write... make sure it is a directory
             if(!info.isDir())
             {
-                KMessageBox::sorry(this,i18n("%1 does not seem to be a folder. Please choose a valid folder.").tqarg(info.filePath()),
+                KMessageBox::sorry(this,i18n("%1 does not seem to be a folder. Please choose a valid folder.").arg(info.filePath()),
                                    i18n("Please Choose Valid Folder"));
                 return;
             }
diff --git a/umbrello/umbrello/dialogs/diagramprintpage.cpp b/umbrello/umbrello/dialogs/diagramprintpage.cpp
index 34176e3a..8374def4 100644
--- a/umbrello/umbrello/dialogs/diagramprintpage.cpp
+++ b/umbrello/umbrello/dialogs/diagramprintpage.cpp
@@ -112,13 +112,13 @@ void DiagramPrintPage::getOptions( TQMap<TQString,TQString>& opts, bool /*inclde
     for(int     i=0;i<listCount;i++) {
         if(m_pSelectLB -> isSelected(i)) {
             UMLView *view = (UMLView *)m_pDoc -> findView(m_nIdList[i]);
-            TQString sCount = TQString("%1").tqarg(count);
-            TQString sID = TQString("%1").tqarg(ID2STR(view -> getID()));
+            TQString sCount = TQString("%1").arg(count);
+            TQString sID = TQString("%1").arg(ID2STR(view -> getID()));
             opts.insert(diagram + sCount, sID);
             count++;
         }
     }
-    opts.insert("kde-uml-count", TQString("%1").tqarg(count));
+    opts.insert("kde-uml-count", TQString("%1").arg(count));
 }
 
 void DiagramPrintPage::setOptions( const TQMap<TQString,TQString>& /*opts*/ ) {}
diff --git a/umbrello/umbrello/dialogs/overwritedialogue.cpp b/umbrello/umbrello/dialogs/overwritedialogue.cpp
index 9088b794..0c7aabd3 100644
--- a/umbrello/umbrello/dialogs/overwritedialogue.cpp
+++ b/umbrello/umbrello/dialogs/overwritedialogue.cpp
@@ -28,7 +28,7 @@ KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes
 
     TQVBoxLayout* tqlayout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
 
-    TQLabel* dialogueLabel = new TQLabel(i18n("The file %1 already exists in %2.\n\nUmbrello can overwrite the file, generate a similar\nfile name or not generate this file.").tqarg(fileName).tqarg(outputDirectory), plainPage() );
+    TQLabel* dialogueLabel = new TQLabel(i18n("The file %1 already exists in %2.\n\nUmbrello can overwrite the file, generate a similar\nfile name or not generate this file.").arg(fileName).arg(outputDirectory), plainPage() );
     tqlayout->addWidget(dialogueLabel);
 
     m_applyToAllRemaining = new TQCheckBox( i18n("&Apply to all remaining files"), plainPage() );
diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp
index e8216b99..a1be7a6f 100644
--- a/umbrello/umbrello/dialogs/umloperationdialog.cpp
+++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp
@@ -463,7 +463,7 @@ bool UMLOperationDialog::apply()
     if( classifier != 0L &&
             classifier->checkOperationSignature(name, m_pOperation->getParmList(), m_pOperation) )
     {
-        TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).tqarg(classifier->getName())
+        TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).arg(classifier->getName())
                       +
                       TQString(i18n("Choose a different name or parameter list." ));
         KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false);
diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.cpp b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
index e577a6c3..41bf5d12 100644
--- a/umbrello/umbrello/docgenerators/docbookgenerator.cpp
+++ b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
@@ -96,7 +96,7 @@ KIO::Job* DocbookGenerator::generateDocbookForProjectInto(const KURL& destDir)
 
   // lets open the file for writing
   if( !file.open( IO_WriteOnly ) ) {
-    KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(tmpfile.name()), i18n("Save Error"));
+    KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(tmpfile.name()), i18n("Save Error"));
     return false;
   }
   umlDoc->saveToXMI(*TQT_TQIODEVICE(&file)); // save the xmi stuff to it
diff --git a/umbrello/umbrello/folder.cpp b/umbrello/umbrello/folder.cpp
index 127c3b34..1c608d8f 100644
--- a/umbrello/umbrello/folder.cpp
+++ b/umbrello/umbrello/folder.cpp
@@ -286,11 +286,11 @@ bool UMLFolder::loadDiagramsFromXMI(TQDomNode& diagrams) {
 bool UMLFolder::loadFolderFile(const TQString& path) {
     TQFile file(path);
     if (!file.exists()) {
-        KMessageBox::error(0, i18n("The folderfile %1 does not exist.").tqarg(path), i18n("Load Error"));
+        KMessageBox::error(0, i18n("The folderfile %1 does not exist.").arg(path), i18n("Load Error"));
         return false;
     }
     if (!file.open(IO_ReadOnly)) {
-        KMessageBox::error(0, i18n("The folderfile %1 cannot be opened.").tqarg(path), i18n("Load Error"));
+        KMessageBox::error(0, i18n("The folderfile %1 cannot be opened.").arg(path), i18n("Load Error"));
         return false;
     }
     TQTextStream stream(&file);
diff --git a/umbrello/umbrello/messagewidget.h b/umbrello/umbrello/messagewidget.h
index 9d36922b..db24fd36 100644
--- a/umbrello/umbrello/messagewidget.h
+++ b/umbrello/umbrello/messagewidget.h
@@ -209,7 +209,7 @@ public:
     UMLClassifier * getSeqNumAndOp(TQString& seqNum, TQString& op);
 
     /**
-     * Calculate the tqgeometry of the widget.
+     * Calculate the geometry of the widget.
      */
     void calculateWidget();
 
diff --git a/umbrello/umbrello/notewidget.cpp b/umbrello/umbrello/notewidget.cpp
index 1826847b..29ba1906 100644
--- a/umbrello/umbrello/notewidget.cpp
+++ b/umbrello/umbrello/notewidget.cpp
@@ -201,7 +201,7 @@ void NoteWidget::drawText(TQPainter * p /*=NULL*/, int offsetX /*=0*/, int offse
 #if defined (NOTEWIDGET_EMBED_EDITOR)
     m_pEditor->setText( getDoc() );
     m_pEditor->setShown(true);
-    m_pEditor->tqrepaint();
+    m_pEditor->repaint();
 #else
     if (p == NULL)
         return;
diff --git a/umbrello/umbrello/notewidgetcontroller.h b/umbrello/umbrello/notewidgetcontroller.h
index 7c3da48c..081556ed 100644
--- a/umbrello/umbrello/notewidgetcontroller.h
+++ b/umbrello/umbrello/notewidgetcontroller.h
@@ -44,7 +44,7 @@ public:
     /**
      * Overriden from UMLWidgetController.
      * Handles a mouse move event.
-     * Executes base code and then sets the tqgeometry of the editor.
+     * Executes base code and then sets the geometry of the editor.
      *
      * @param me The TQMouseEvent event.
      */
diff --git a/umbrello/umbrello/refactoring/refactoringassistant.cpp b/umbrello/umbrello/refactoring/refactoringassistant.cpp
index 1986cfa3..193f9545 100644
--- a/umbrello/umbrello/refactoring/refactoringassistant.cpp
+++ b/umbrello/umbrello/refactoring/refactoringassistant.cpp
@@ -650,7 +650,7 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV
         UMLOperation *op = static_cast<UMLOperation*>(movingObject);
         if(newClassifier->checkOperationSignature(op->getName(), op->getParmList()))
         {
-            TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).tqarg(newClassifier->getName())
+            TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).arg(newClassifier->getName())
                           +
                           TQString(i18n("Choose a different name or parameter list." ));
             KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false);
@@ -666,7 +666,7 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV
         //              UMLAttribute *att = static_cast<UMLAttribute*>(movingObject);
         //              if(!newClassifier->checkAttributeSignature(att))
         //              {
-        //                      TQString msg = TQString(i18n("An attribute with that signature already exists in %1.\n")).tqarg(newClassifier->getName())
+        //                      TQString msg = TQString(i18n("An attribute with that signature already exists in %1.\n")).arg(newClassifier->getName())
         //                              +
         //                            TQString(i18n("Choose a different name or parameter list." ));
         //                      KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false);
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index 099b72f6..7be8936a 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -737,7 +737,7 @@ bool UMLApp::slotFileSaveAs()
             TQDir d = url.path(-1);
 
             if(TQFile::exists(d.path())) {
-                int want_save = KMessageBox::warningContinueCancel(this, i18n("The file %1 exists.\nDo you wish to overwrite it?").tqarg(url.path()), i18n("Warning"), i18n("Overwrite"));
+                int want_save = KMessageBox::warningContinueCancel(this, i18n("The file %1 exists.\nDo you wish to overwrite it?").arg(url.path()), i18n("Warning"), i18n("Overwrite"));
                 if(want_save == KMessageBox::Continue)
                     cont = false;
             } else
@@ -776,7 +776,7 @@ void UMLApp::slotFilePrint()
     DiagramPrintPage * selectPage = new DiagramPrintPage(0, m_doc);
     printer.addDialogPage(selectPage);
     TQString msg;
-    if (printer.setup(this, i18n("Print %1").tqarg(m_doc->URL().prettyURL()))) {
+    if (printer.setup(this, i18n("Print %1").arg(m_doc->URL().prettyURL()))) {
 
         m_doc -> print(&printer);
     }
@@ -895,7 +895,7 @@ void UMLApp::slotStatusMsg(const TQString &text) {
     statusBar()->clear();
     m_statusLabel->setText( text );
 
-    m_statusLabel->tqrepaint();
+    m_statusLabel->repaint();
 }
 
 void UMLApp::slotClassDiagram() {
diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h
index 3e5b27e7..d9bff6bc 100644
--- a/umbrello/umbrello/uml.h
+++ b/umbrello/umbrello/uml.h
@@ -340,7 +340,7 @@ protected:
 
     /**
      * Save general Options like all bar positions and status
-     * as well as the tqgeometry and the recent file list to
+     * as well as the geometry and the recent file list to
      * the configuration file.
      */
     void saveOptions();
diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp
index 8f404a86..edf56b23 100644
--- a/umbrello/umbrello/umldoc.cpp
+++ b/umbrello/umbrello/umldoc.cpp
@@ -352,7 +352,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
     KIO::NetAccess::download( url, tmpfile, UMLApp::app() );
     TQFile file( tmpfile );
     if ( !file.exists() ) {
-        KMessageBox::error(0, i18n("The file %1 does not exist.").tqarg(d.path()), i18n("Load Error"));
+        KMessageBox::error(0, i18n("The file %1 does not exist.").arg(d.path()), i18n("Load Error"));
         m_doc_url.setFileName(i18n("Untitled"));
         m_bLoading = false;
         newDocument();
@@ -377,7 +377,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
         KTar archive(tmpfile, mimetype);
         if (archive.open(IO_ReadOnly) == false)
         {
-            KMessageBox::error(0, i18n("The file %1 seems to be corrupted.").tqarg(d.path()), i18n("Load Error"));
+            KMessageBox::error(0, i18n("The file %1 seems to be corrupted.").arg(d.path()), i18n("Load Error"));
             m_doc_url.setFileName(i18n("Untitled"));
             m_bLoading = false;
             newDocument();
@@ -419,7 +419,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
             entry = const_cast<KArchiveEntry*>(rootDir->entry(*it));
             if (entry == 0)
             {
-                KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(d.path()), i18n("Load Error"));
+                KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").arg(d.path()), i18n("Load Error"));
                 m_doc_url.setFileName(i18n("Untitled"));
                 m_bLoading = false;
                 newDocument();
@@ -431,7 +431,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
             fileEntry = dynamic_cast<KArchiveFile*>(entry);
             if (fileEntry == 0)
             {
-                KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(d.path()), i18n("Load Error"));
+                KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").arg(d.path()), i18n("Load Error"));
                 m_doc_url.setFileName(i18n("Untitled"));
                 m_bLoading = false;
                 newDocument();
@@ -445,7 +445,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
             TQFile xmi_file(tmp_dir.name() + *it);
             if( !xmi_file.open( IO_ReadOnly ) )
             {
-                KMessageBox::error(0, i18n("There was a problem loading the extracted file: %1").tqarg(d.path()), i18n("Load Error"));
+                KMessageBox::error(0, i18n("There was a problem loading the extracted file: %1").arg(d.path()), i18n("Load Error"));
                 m_doc_url.setFileName(i18n("Untitled"));
                 m_bLoading = false;
                 newDocument();
@@ -458,7 +458,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
             tmp_dir.unlink();
 
         } else {
-            KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(d.path()), i18n("Load Error"));
+            KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").arg(d.path()), i18n("Load Error"));
             m_doc_url.setFileName(i18n("Untitled"));
             m_bLoading = false;
             newDocument();
@@ -469,7 +469,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
     } else {
         // no, it seems to be an ordinary file
         if( !file.open( IO_ReadOnly ) ) {
-            KMessageBox::error(0, i18n("There was a problem loading file: %1").tqarg(d.path()), i18n("Load Error"));
+            KMessageBox::error(0, i18n("There was a problem loading file: %1").arg(d.path()), i18n("Load Error"));
             m_doc_url.setFileName(i18n("Untitled"));
             m_bLoading = false;
             newDocument();
@@ -485,7 +485,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
     KIO::NetAccess::removeTempFile( tmpfile );
     if( !status )
     {
-        KMessageBox::error(0, i18n("There was a problem loading file: %1").tqarg(d.path()), i18n("Load Error"));
+        KMessageBox::error(0, i18n("There was a problem loading file: %1").arg(d.path()), i18n("Load Error"));
         m_bLoading = false;
         newDocument();
         return false;
@@ -553,7 +553,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
         // now check if we can write to the file
         if (archive->open(IO_WriteOnly) == false)
         {
-            KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error"));
+            KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
             return false;
         }
 
@@ -562,7 +562,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
         KTempFile tmp_xmi_file;
         file.setName(tmp_xmi_file.name());
         if( !file.open( IO_WriteOnly ) ) {
-            KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error"));
+            KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
             return false;
         }
         saveToXMI(*TQT_TQIODEVICE(&file)); // save XMI to this file...
@@ -582,7 +582,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
 #if KDE_IS_VERSION(3,4,89)
         if (!archive->closeSucceeded())
         {
-            KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error"));
+            KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
             return false;
         }
 #endif
@@ -617,7 +617,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
 
         // lets open the file for writing
         if( !file.open( IO_WriteOnly ) ) {
-            KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error"));
+            KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
             return false;
         }
         saveToXMI(*TQT_TQIODEVICE(&file)); // save the xmi stuff to it
@@ -630,7 +630,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
         } else {
             // now remove the original file
             if ( KIO::NetAccess::file_move( tmpfile.name(), d.path(), -1, true ) == false ) {
-                KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error"));
+                KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
                 m_doc_url.setFileName(i18n("Untitled"));
                 return false;
             }
@@ -638,7 +638,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
     }
     if( !uploaded )
     {
-        KMessageBox::error(0, i18n("There was a problem uploading file: %1").tqarg(d.path()), i18n("Save Error"));
+        KMessageBox::error(0, i18n("There was a problem uploading file: %1").arg(d.path()), i18n("Save Error"));
         m_doc_url.setFileName(i18n("Untitled"));
     }
     setModified(false);
@@ -1096,7 +1096,7 @@ void UMLDoc::removeDiagram(Uml::IDType id) {
         kError()<<"Request to remove diagram " << ID2STR(id) << ": Diagram not found!"<<endl;
         return;
     }
-    if (KMessageBox::warningContinueCancel(0, i18n("Are you sure you want to delete diagram %1?").tqarg(umlview->getName()), i18n("Delete Diagram"),KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Continue) {
+    if (KMessageBox::warningContinueCancel(0, i18n("Are you sure you want to delete diagram %1?").arg(umlview->getName()), i18n("Delete Diagram"),KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Continue) {
         removeView(umlview);
         emit sigDiagramRemoved(id);
         setModified(true);
@@ -1915,7 +1915,7 @@ void UMLDoc::print(KPrinter * pPrinter) {
     for(int i = 0;i < count;i++) {
         if(i>0)
             pPrinter -> newPage();
-        TQString diagram = i18n("kde-uml-Diagram") + TQString("%1").tqarg(i);
+        TQString diagram = i18n("kde-uml-Diagram") + TQString("%1").arg(i);
         TQString sID = pPrinter -> option(diagram);
         Uml::IDType id = STR2ID(sID);
         printView = findView(id);
@@ -2101,7 +2101,7 @@ void UMLDoc::slotAutoSave() {
     }
     KURL tempURL = m_doc_url;
     if( tempURL.fileName() == i18n("Untitled") ) {
-        tempURL.setPath( TQDir::homeDirPath() + i18n("/autosave%1").tqarg(".xmi") );
+        tempURL.setPath( TQDir::homeDirPath() + i18n("/autosave%1").arg(".xmi") );
         saveDocument( tempURL );
         m_doc_url.setFileName( i18n("Untitled") );
         m_modified = true;
diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp
index bdeee008..5db7d670 100644
--- a/umbrello/umbrello/umllistview.cpp
+++ b/umbrello/umbrello/umllistview.cpp
@@ -381,7 +381,7 @@ void UMLListView::popupMenuSel(int sel) {
                 file.close();
             } else {
                 KMessageBox::error(0,
-                                   i18n("There was a problem saving file: %1").tqarg(fileName),
+                                   i18n("There was a problem saving file: %1").arg(fileName),
                                    i18n("Save Error"));
                 return;
             }
@@ -1719,7 +1719,7 @@ void UMLListView::focusOutEvent ( TQFocusEvent * fe) {
         clearSelection();
         triggerUpdate();
     }
-    //tqrepaint();
+    //repaint();
 
     TQListView::focusOutEvent(fe);
 }
@@ -2378,7 +2378,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement &
         UMLListViewItem * item = 0;
         if (nID != Uml::id_None) {
             // The following is an ad hoc hack for the copy/paste code.
-            // The clip still contains the old tqchildren although new
+            // The clip still contains the old children although new
             // UMLCLassifierListItems have already been created.
             // If the IDChangeLog finds new IDs this means we are in
             // copy/paste and need to adjust the child listitems to the
diff --git a/umbrello/umbrello/umllistview.h b/umbrello/umbrello/umllistview.h
index b6bf201c..f2328cef 100644
--- a/umbrello/umbrello/umllistview.h
+++ b/umbrello/umbrello/umllistview.h
@@ -88,7 +88,7 @@ public:
     int getSelectedItems(UMLListViewItemList &ItemList);
 
     /**
-     * Get selected items, but only root elements selected (without tqchildren).
+     * Get selected items, but only root elements selected (without children).
      *
      * @param ItemList  List of UMLListViewItems returned.
      * @return          The number of selected items.
diff --git a/umbrello/umbrello/umllistviewitem.cpp b/umbrello/umbrello/umllistviewitem.cpp
index c6a5f954..89bb581c 100644
--- a/umbrello/umbrello/umllistviewitem.cpp
+++ b/umbrello/umbrello/umllistviewitem.cpp
@@ -465,7 +465,7 @@ void UMLListViewItem::okRename( int col ) {
         }
     default:
         KMessageBox::error( kapp->mainWidget() ,
-                            i18n("Renaming an item of listview type %1 is not yet implemented.").tqarg(m_Type),
+                            i18n("Renaming an item of listview type %1 is not yet implemented.").arg(m_Type),
                             i18n("Function Not Implemented") );
         TQListViewItem::setText(0, m_Label);
         break;
diff --git a/umbrello/umbrello/umllistviewitem.h b/umbrello/umbrello/umllistviewitem.h
index 596a93f5..1064befc 100644
--- a/umbrello/umbrello/umllistviewitem.h
+++ b/umbrello/umbrello/umllistviewitem.h
@@ -190,7 +190,7 @@ public:
     virtual int compare(TQListViewItem *other, int col, bool ascending) const;
 
     /**
-     * Returns the number of tqchildren of the UMLListViewItem
+     * Returns the number of children of the UMLListViewItem
      * containing this object
      */
     int childCount() const {
@@ -213,7 +213,7 @@ public:
 
     /**
      * Find the UMLListViewItem that represents the given UMLClassifierListItem
-     * in the tqchildren of the current UMLListViewItem.  (Only makes sense if
+     * in the children of the current UMLListViewItem.  (Only makes sense if
      * the current UMLListViewItem represents a UMLClassifier.)
      * Return a pointer to the item or NULL if not found.
      */
diff --git a/umbrello/umbrello/umlobject.h b/umbrello/umbrello/umlobject.h
index a0e02160..aedc2325 100644
--- a/umbrello/umbrello/umlobject.h
+++ b/umbrello/umbrello/umlobject.h
@@ -379,7 +379,7 @@ public slots:
 
 signals:
     /** Emitted when the UMLObject has changed. Note that some objects emit
-      * this signal when one of its tqchildren changes, for example, a UMLClass
+      * this signal when one of its children changes, for example, a UMLClass
       * emits a modified() signal when one of its operation changes while the Operation
       * itself emits the corresponding signal as well.
       */
diff --git a/umbrello/umbrello/umlview.cpp b/umbrello/umbrello/umlview.cpp
index 39ef14fb..aef18eca 100644
--- a/umbrello/umbrello/umlview.cpp
+++ b/umbrello/umbrello/umlview.cpp
@@ -294,7 +294,7 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) {
             pPainter.translate(offsetX,offsetY);
 
             //draw foot note
-            TQString string = i18n("Diagram: %2 Page %1").tqarg(page + 1).tqarg(getName());
+            TQString string = i18n("Diagram: %2 Page %1").arg(page + 1).arg(getName());
             TQColor textColor(50, 50, 50);
             pPainter.setPen(textColor);
             pPainter.drawLine(0, height + 2, width, height + 2);
@@ -354,7 +354,7 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) {
     getDiagram(TQRect(rect.x(), rect.y(), windowWidth, diagramHeight), pPainter);
 
     //draw foot note
-    TQString string = i18n("Diagram: %2 Page %1").tqarg( 1).tqarg(getName());
+    TQString string = i18n("Diagram: %2 Page %1").arg( 1).arg(getName());
     TQColor textColor(50, 50, 50);
     pPainter.setPen(textColor);
     pPainter.drawLine(rect.x(), footTop    , windowWidth, footTop);
@@ -3014,10 +3014,10 @@ bool UMLView::loadFromXMI( TQDomElement & qElement ) {
     TQString zoom = qElement.attribute( "zoom", "100" );
     m_nZoom = zoom.toInt();
 
-    TQString height = qElement.attribute( "canvasheight", TQString("%1").tqarg(UMLView::defaultCanvasSize) );
+    TQString height = qElement.attribute( "canvasheight", TQString("%1").arg(UMLView::defaultCanvasSize) );
     m_nCanvasHeight = height.toInt();
 
-    TQString width = qElement.attribute( "canvaswidth", TQString("%1").tqarg(UMLView::defaultCanvasSize) );
+    TQString width = qElement.attribute( "canvaswidth", TQString("%1").arg(UMLView::defaultCanvasSize) );
     m_nCanvasWidth = width.toInt();
 
     int nType = type.toInt();
@@ -3226,7 +3226,7 @@ bool UMLView::loadUisDiagramPresentation(TQDomElement & qElement) {
         while (!e.isNull()) {
             tag = e.tagName();
             kDebug() << "Presentation: tag = " << tag << endl;
-            if (Uml::tagEq(tag, "Presentation.tqgeometry")) {
+            if (Uml::tagEq(tag, "Presentation.geometry")) {
                 TQDomNode gnode = e.firstChild();
                 TQDomElement gelem = gnode.toElement();
                 TQString csv = gelem.text();
diff --git a/umbrello/umbrello/umlview.h b/umbrello/umbrello/umlview.h
index 8ee2d3df..ce84e17c 100644
--- a/umbrello/umbrello/umlview.h
+++ b/umbrello/umbrello/umlview.h
@@ -706,7 +706,7 @@ public:
     void resetPastePoint();
 
     /**
-     * Called by the view or any of its tqchildren when they start a cut
+     * Called by the view or any of its children when they start a cut
      * operation.
      */
     void setStartedCut() {
@@ -1120,7 +1120,7 @@ protected:
     UMLWidgetList m_SelectedList;
 
     /**
-     *  Flag if view/tqchildren started cut operation.
+     *  Flag if view/children started cut operation.
      */
     bool m_bStartedCut;
 
diff --git a/umbrello/umbrello/umlviewimageexporter.cpp b/umbrello/umbrello/umlviewimageexporter.cpp
index 23164171..c669086d 100644
--- a/umbrello/umbrello/umlviewimageexporter.cpp
+++ b/umbrello/umbrello/umlviewimageexporter.cpp
@@ -63,7 +63,7 @@ bool UMLViewImageExporter::prepareExportView() {
         // check if the file exists
         if (KIO::NetAccess::exists(m_imageURL, true, UMLApp::app())) {
             int wantSave = KMessageBox::warningContinueCancel(0,
-                                i18n("The selected file %1 exists.\nDo you want to overwrite it?").tqarg(m_imageURL.prettyURL()),
+                                i18n("The selected file %1 exists.\nDo you want to overwrite it?").arg(m_imageURL.prettyURL()),
                                 i18n("File Already Exists"), i18n("&Overwrite"));
             if (wantSave == KMessageBox::Continue) {
                 exportPrepared = true;
diff --git a/umbrello/umbrello/umlviewimageexportermodel.cpp b/umbrello/umbrello/umlviewimageexportermodel.cpp
index a8de3637..155ba9b8 100644
--- a/umbrello/umbrello/umlviewimageexportermodel.cpp
+++ b/umbrello/umbrello/umlviewimageexportermodel.cpp
@@ -123,7 +123,7 @@ TQStringList UMLViewImageExporterModel::exportAllViews(const TQString &imageType
 TQString UMLViewImageExporterModel::exportView(UMLView* view, const TQString &imageType, const KURL &url) const {
     // create the needed directories
     if (!prepareDirectory(url)) {
-        return i18n("Can not create directory: %1").tqarg(url.directory());
+        return i18n("Can not create directory: %1").arg(url.directory());
     }
 
     // The fileName will be used when exporting the image. If the url isn't local,
@@ -148,14 +148,14 @@ TQString UMLViewImageExporterModel::exportView(UMLView* view, const TQString &im
     // exporting the view to the file
     if (!exportViewTo(view, imageType, fileName)) {
         tmpFile.unlink();
-        return i18n("A problem occured while saving diagram in %1").tqarg(fileName);
+        return i18n("A problem occured while saving diagram in %1").arg(fileName);
     }
 
     // if the file wasn't local, upload the temp file to the target
     if (!url.isLocalFile()) {
         if (!KIO::NetAccess::upload(tmpFile.name(), url, UMLApp::app())) {
             tmpFile.unlink();
-            return i18n("There was a problem saving file: %1").tqarg(url.path());
+            return i18n("There was a problem saving file: %1").arg(url.path());
         }
     } //!isLocalFile
 
@@ -177,7 +177,7 @@ TQString UMLViewImageExporterModel::getDiagramFileName(UMLView *view, const TQSt
     listViewItem = static_cast<UMLListViewItem*>(listViewItem->parent());
 
     // Relies on the tree structure of the UMLListView. There are a base "Views" folder
-    // and five tqchildren, one for each view type (Logical, use case, components, deployment
+    // and five children, one for each view type (Logical, use case, components, deployment
     // and entity relationship)
     while (listView->rootView(listViewItem->getType()) == NULL) {
         name.insert(0, listViewItem->getText() + '/');
@@ -320,7 +320,7 @@ bool UMLViewImageExporterModel::fixEPS(const TQString &fileName, const TQRect& r
 
     // modify content
     fileContent.replace(pos,rx.cap(0).length(),
-                        TQString("%%BoundingBox: %1 %2 %3 %4").tqarg(left).tqarg(bottom).tqarg(right).tqarg(top));
+                        TQString("%%BoundingBox: %1 %2 %3 %4").arg(left).arg(bottom).arg(right).arg(top));
 
     ts << fileContent;
     epsfile.close();
diff --git a/umbrello/umbrello/umlwidget.h b/umbrello/umbrello/umlwidget.h
index fd646306..6a74579f 100644
--- a/umbrello/umbrello/umlwidget.h
+++ b/umbrello/umbrello/umlwidget.h
@@ -667,7 +667,7 @@ public slots:
     /**
      * This slot is entered when an event has occurred on the views display,
      * most likely a mouse event.  Before it sends out that mouse event all
-     * tqchildren should make sure that they don't have a menu active or there
+     * children should make sure that they don't have a menu active or there
      * could be more than one popup menu displayed.
      */
     virtual void slotRemovePopupMenu();