Rename old tq methods that no longer need a unique name

(cherry picked from commit 1dd83e5f38d1c16d3e6da18d0caca0ee093ab58f)

39 files changed, 110 insertions, 110 deletions

diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp
index 6ded541d..6d484307 100644
--- a/umbrello/umbrello/associationwidget.cpp
+++ b/umbrello/umbrello/associationwidget.cpp
@@ -2101,7 +2101,7 @@ void AssociationWidget::createAssocClassLine() {
     computeAssocClassLine();
     TQPen pen(getLineColor(), getLineWidth(), TQt::DashLine);
     m_pAssocClassLine->setPen(pen);
-    m_pAssocClassLine->tqsetVisible(true);
+    m_pAssocClassLine->setVisible(true);
 }
 
 void AssociationWidget::createAssocClassLine(ClassifierWidget* classifier,
diff --git a/umbrello/umbrello/autolayout/newautolayoutdialog.ui b/umbrello/umbrello/autolayout/newautolayoutdialog.ui
index 9301abe3..bca63027 100644
--- a/umbrello/umbrello/autolayout/newautolayoutdialog.ui
+++ b/umbrello/umbrello/autolayout/newautolayoutdialog.ui
@@ -330,7 +330,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>1</height>
@@ -366,7 +366,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>277</width>
                             <height>20</height>
diff --git a/umbrello/umbrello/classifierwidget.h b/umbrello/umbrello/classifierwidget.h
index b92b774f..f80f1289 100644
--- a/umbrello/umbrello/classifierwidget.h
+++ b/umbrello/umbrello/classifierwidget.h
@@ -101,7 +101,7 @@ public:
     /**
      * Return the status of showing operation signatures.
      *
-     * @return  tqStatus of showing operation signatures.
+     * @return  Status of showing operation signatures.
      */
     Uml::Signature_Type getShowOpSigs() const;
 
@@ -173,7 +173,7 @@ public:
      * Returns whether to show attribute signatures.
      * Only applies when m_pObject->getBaseType() is ot_Class.
      *
-     * @return  tqStatus of how attribute signatures are shown.
+     * @return  Status of how attribute signatures are shown.
      */
     Uml::Signature_Type getShowAttSigs() {
         return m_ShowAttSigs;
diff --git a/umbrello/umbrello/clipboard/umldrag.cpp b/umbrello/umbrello/clipboard/umldrag.cpp
index 543a4b39..27f8dde2 100644
--- a/umbrello/umbrello/clipboard/umldrag.cpp
+++ b/umbrello/umbrello/clipboard/umldrag.cpp
@@ -108,11 +108,11 @@ void UMLDrag::setSubType(const TQCString& string, int index) {
     data->setSubType(string, index);
 }
 
-void UMLDrag::setEncodedData(const TQByteArray& tqencodedData, int index) {
-    data->enc[index] = tqencodedData.copy();
+void UMLDrag::setEncodedData(const TQByteArray& encodedData, int index) {
+    data->enc[index] = encodedData.copy();
 }
 
-TQByteArray UMLDrag::tqencodedData(const char* dataName) const {
+TQByteArray UMLDrag::encodedData(const char* dataName) const {
     TQString str(dataName);
     for (int i = 0; i < 4; i++) {
         if ( !qstricmp(dataName,data->fmt[i]) ) {
@@ -286,7 +286,7 @@ bool UMLDrag::decodeClip1(const TQMimeSource* mimeSource, UMLObjectList& objects
     if ( !mimeSource->provides("application/x-uml-clip1") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip1");
+    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip1");
     if ( !payload.size() ) {
         return false;
     }
@@ -376,7 +376,7 @@ bool UMLDrag::decodeClip2(const TQMimeSource* mimeSource, UMLObjectList& objects
     if ( !mimeSource->provides("application/x-uml-clip2") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip2");
+    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip2");
     if ( !payload.size() ) {
         return false;
     }
@@ -486,7 +486,7 @@ bool UMLDrag::getClip3TypeAndID(const TQMimeSource* mimeSource,
     if ( !mimeSource->provides("application/x-uml-clip3") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip3");
+    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip3");
     if ( !payload.size() ) {
         return false;
     }
@@ -543,7 +543,7 @@ bool UMLDrag::decodeClip3(const TQMimeSource* mimeSource, UMLListViewItemList& u
     if ( !mimeSource->provides("application/x-uml-clip3") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip3");
+    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip3");
     if ( !payload.size() ) {
         return false;
     }
@@ -602,7 +602,7 @@ bool UMLDrag::decodeClip4(const TQMimeSource* mimeSource, UMLObjectList& objects
     if ( !mimeSource->provides("application/x-uml-clip4") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip4");
+    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip4");
     if ( !payload.size() ) {
         return false;
     }
@@ -699,7 +699,7 @@ bool UMLDrag::decodeClip5(const TQMimeSource* mimeSource, UMLObjectList& objects
     if ( !mimeSource->provides("application/x-uml-clip5") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip5");
+    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip5");
     if ( !payload.size() ) {
         return false;
     }
diff --git a/umbrello/umbrello/clipboard/umldrag.h b/umbrello/umbrello/clipboard/umldrag.h
index ad5e4f02..fa535399 100644
--- a/umbrello/umbrello/clipboard/umldrag.h
+++ b/umbrello/umbrello/clipboard/umldrag.h
@@ -149,7 +149,7 @@ public:
      *
      * @param dataName the name of the data type to return
      */
-    virtual TQByteArray tqencodedData(const char* dataName) const;
+    virtual TQByteArray encodedData(const char* dataName) const;
 
     /**
      * For use when the user selects only UML Objects
diff --git a/umbrello/umbrello/codedocument.cpp b/umbrello/umbrello/codedocument.cpp
index cb571b6b..a77e948a 100644
--- a/umbrello/umbrello/codedocument.cpp
+++ b/umbrello/umbrello/codedocument.cpp
@@ -281,7 +281,7 @@ void CodeDocument::updateHeader () {
     headingText.replace(TQRegExp("%filename%"),getFileName()+getFileExtension());
     headingText.replace(TQRegExp("%filepath%"),getPath());
     headingText.replace( TQRegExp("%time%"), TQTime::currentTime().toString());
-    headingText.replace( TQRegExp("%date%"), TQDate::tqcurrentDate().toString());
+    headingText.replace( TQRegExp("%date%"), TQDate::currentDate().toString());
 
     getHeader()->setText(headingText);
 
diff --git a/umbrello/umbrello/codegenerationpolicy.cpp b/umbrello/umbrello/codegenerationpolicy.cpp
index 4acfb2b5..5f7b9824 100644
--- a/umbrello/umbrello/codegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerationpolicy.cpp
@@ -552,7 +552,7 @@ TQString CodeGenerationPolicy::getHeadingFile(const TQString& str) {
     retstr.replace( TQRegExp("%author%"),TQString(getenv("USER")));  //get the user name from some where else
     retstr.replace( TQRegExp("%headingpath%"),filename );
     retstr.replace( TQRegExp("%time%"), TQTime::currentTime().toString());
-    retstr.replace( TQRegExp("%date%"), TQDate::tqcurrentDate().toString());
+    retstr.replace( TQRegExp("%date%"), TQDate::currentDate().toString());
     // the replace filepath, time parts are also in the code document updateHeader method
     // (which is not a virtual function)...
 
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
index 6ca8377b..86cee729 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
@@ -149,7 +149,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>410</width>
                             <height>113</height>
@@ -223,7 +223,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32</width>
                                     <height>32767</height>
@@ -285,7 +285,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -302,7 +302,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -430,7 +430,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32</width>
                                     <height>32767</height>
diff --git a/umbrello/umbrello/codegenerators/perlwriter.cpp b/umbrello/umbrello/codegenerators/perlwriter.cpp
index 9d51ffde..42563ec4 100644
--- a/umbrello/umbrello/codegenerators/perlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/perlwriter.cpp
@@ -168,8 +168,8 @@ void PerlWriter::writeClass(UMLClassifier *c) {
   if(!str.isEmpty()) {
     str.replace(TQRegExp("%filename%"),fileName);
     str.replace(TQRegExp("%filepath%"),fileperl.name());
-    str.replace(TQRegExp("%year%"),TQDate::tqcurrentDate().toString("yyyy"));
-    str.replace(TQRegExp("%date%"),TQDate::tqcurrentDate().toString());
+    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%"))){
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
index e273aeb7..0c55beac 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
@@ -466,7 +466,7 @@ TQString ClassOrNamespaceNameAST::text() const
 
     TQString str = m_name->text();
     if( m_templateArgumentList.get() )
-        str += TQString::tqfromLatin1("< ") + m_templateArgumentList->text() + TQString::tqfromLatin1(" >");
+        str += TQString::fromLatin1("< ") + m_templateArgumentList->text() + TQString::fromLatin1(" >");
 
     return str;
 }
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
index 9d070334..c3abfe83 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
@@ -66,7 +66,7 @@ void scopeOfNode( AST* ast, TQStringList& scope )
     case NodeType_ClassSpecifier:
         if( ((ClassSpecifierAST*)ast)->name() ){
 	    s = ((ClassSpecifierAST*)ast)->name()->text();
-	    s = s.isEmpty() ? TQString::tqfromLatin1("<unnamed>") : s;
+	    s = s.isEmpty() ? TQString::fromLatin1("<unnamed>") : s;
 	    scope.push_back( s );
 	}
 	break;
@@ -74,7 +74,7 @@ void scopeOfNode( AST* ast, TQStringList& scope )
     case NodeType_Namespace:
     {
         AST* namespaceName = ((NamespaceAST*)ast)->namespaceName();
-	s = namespaceName ? namespaceName->text() : TQString::tqfromLatin1("<unnamed>");
+	s = namespaceName ? namespaceName->text() : TQString::fromLatin1("<unnamed>");
 	scope.push_back( s );
     }
     break;
@@ -131,7 +131,7 @@ TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, b
    text += scope;
 
    if( declarator->subDeclarator() )
-       text += TQString::tqfromLatin1("(") + declaratorToString(declarator->subDeclarator()) + TQString::tqfromLatin1(")");
+       text += TQString::fromLatin1("(") + declaratorToString(declarator->subDeclarator()) + TQString::fromLatin1(")");
 
    if( declarator->declaratorId() )
        text += declarator->declaratorId()->text();
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
index f51c9986..73e54b61 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
@@ -381,14 +381,14 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline )
                 }
 
                 if( stringify ) {
-                    textToInsert.append( TQString::tqfromLatin1("\"") + str + TQString::tqfromLatin1("\" ") );
+                    textToInsert.append( TQString::fromLatin1("\"") + str + TQString::fromLatin1("\" ") );
                 } else if( merge ){
                     textToInsert.truncate( textToInsert.length() - 1 );
                     textToInsert.append( str );
                 } else if( tok == Token_ellipsis && d->hasBind("...") ){
                     textToInsert.append( ellipsisArg );
                 } else {
-                    textToInsert.append( str + TQString::tqfromLatin1(" ") );
+                    textToInsert.append( str + TQString::fromLatin1(" ") );
                 }
             }
 
diff --git a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
index 601b5385..48ee0ff7 100644
--- a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
+++ b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
@@ -163,7 +163,7 @@
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>30</width>
                                                 <height>20</height>
@@ -180,7 +180,7 @@
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>30</width>
                                                 <height>20</height>
@@ -297,7 +297,7 @@ generator wants to use as output file already exists:</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>30</height>
@@ -314,7 +314,7 @@ generator wants to use as output file already exists:</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>30</height>
@@ -331,7 +331,7 @@ generator wants to use as output file already exists:</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>30</height>
diff --git a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
index 517df16e..fdd59c2c 100644
--- a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
+++ b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
@@ -88,7 +88,7 @@ for in the right hand side list</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -146,7 +146,7 @@ for in the right hand side list</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -190,7 +190,7 @@ for in the right hand side list</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -206,7 +206,7 @@ for in the right hand side list</string>
             <cstring>status</cstring>
         </property>
         <attribute name="title">
-            <string>Code Generation tqStatus</string>
+            <string>Code Generation Status</string>
         </attribute>
         <vbox>
             <property name="name">
@@ -231,7 +231,7 @@ for in the right hand side list</string>
                     <cstring>GroupBox2</cstring>
                 </property>
                 <property name="title">
-                    <string>Generation tqStatus</string>
+                    <string>Generation Status</string>
                 </property>
                 <vbox>
                     <property name="name">
@@ -257,7 +257,7 @@ for in the right hand side list</string>
                         </column>
                         <column>
                             <property name="text">
-                                <string>Generation tqStatus</string>
+                                <string>Generation Status</string>
                             </property>
                             <property name="clickable">
                                 <bool>true</bool>
diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.cpp b/umbrello/umbrello/dialogs/codeviewerdialog.cpp
index 3f11adb3..04784752 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialog.cpp
+++ b/umbrello/umbrello/dialogs/codeviewerdialog.cpp
@@ -69,7 +69,7 @@ void CodeViewerDialog::initGUI ( const char * name) {
 
     CodeViewerDialogBaseLayout->setMargin(margin);
 
-    resize( TQSize(width, height).expandedTo(tqminimumSizeHint()) );
+    resize( TQSize(width, height).expandedTo(minimumSizeHint()) );
 
 }
 
diff --git a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
index ed75ea9d..1c44f8cb 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
+++ b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
@@ -31,7 +31,7 @@
         </widget>
         <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
-                <cstring>tqcolorGroupBox</cstring>
+                <cstring>colorGroupBox</cstring>
             </property>
             <property name="sizePolicy">
                 <sizepolicy>
diff --git a/umbrello/umbrello/dialogs/diagrampropertiespage.ui b/umbrello/umbrello/dialogs/diagrampropertiespage.ui
index 8dc7f029..da0482fa 100644
--- a/umbrello/umbrello/dialogs/diagrampropertiespage.ui
+++ b/umbrello/umbrello/dialogs/diagrampropertiespage.ui
@@ -131,7 +131,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>50</width>
                                     <height>20</height>
@@ -218,7 +218,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -307,7 +307,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -369,7 +369,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
index 443ad9e2..7560b850 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
+++ b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
@@ -33,7 +33,7 @@ ExportAllViewsDialog::ExportAllViewsDialog(
   : ExportAllViewsDialogBase(parent,name, modal,fl) {
     // create and initialize m_imageType
     m_imageType = new KFileFilterCombo(this, "m_imageType");
-    m_imageType->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth()));
+    m_imageType->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth()));
     m_imageType->setEditable(false);
 
     m_imageType->setMimeFilter(UMLViewImageExporterModel::supportedMimeTypes(), defaultMimeType);
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
index e795d2c9..4a7edb52 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
+++ b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
@@ -120,7 +120,7 @@ Only the folders made by the user are created in the base directory (Logical vie
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -151,7 +151,7 @@ Only the folders made by the user are created in the base directory (Logical vie
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/umbrello/umbrello/dialogs/umlroledialog.cpp b/umbrello/umbrello/dialogs/umlroledialog.cpp
index 607ac759..255f4010 100644
--- a/umbrello/umbrello/dialogs/umlroledialog.cpp
+++ b/umbrello/umbrello/dialogs/umlroledialog.cpp
@@ -35,7 +35,7 @@ void UMLRoleDialog::setupDialog() {
     m_pRoleProps = new UMLRoleProperties(this, m_pRole);
     setMainWidget( m_pRoleProps );
 
-    resize( TQSize(425, 620).expandedTo(tqminimumSizeHint()) );
+    resize( TQSize(425, 620).expandedTo(minimumSizeHint()) );
 
     //  topLayout -> addWidget( m_pParmsGB);
 
diff --git a/umbrello/umbrello/floatingtextwidget.cpp b/umbrello/umbrello/floatingtextwidget.cpp
index 700f9de4..94c5ec21 100644
--- a/umbrello/umbrello/floatingtextwidget.cpp
+++ b/umbrello/umbrello/floatingtextwidget.cpp
@@ -225,7 +225,7 @@ void FloatingTextWidget::changeName(const TQString& newText)
         setText( newText );
         UMLApp::app()->getDocument()->setModified(true);
     }
-    tqsetVisible( true );
+    setVisible( true );
     updateComponentSize();
     update();
 }
@@ -265,7 +265,7 @@ void FloatingTextWidget::changeTextDlg() {
 
     if(ok && newText != getText() && isTextValid(newText)) {
         setText( newText );
-        tqsetVisible( ( getText().length() > 0 ) );
+        setVisible( ( getText().length() > 0 ) );
         updateComponentSize();
         update();
     }
@@ -302,7 +302,7 @@ void FloatingTextWidget::showOpDlg() {
     opText = selectDlg.getOpText();
     if (selectDlg.isClassOp()) {
         Model_Utils::OpDescriptor od;
-        Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(opText, od, c);
+        Model_Utils::Parse_Status st = Model_Utils::parseOperation(opText, od, c);
         if (st == Model_Utils::PS_OK) {
             UMLClassifierList selfAndAncestors = c->findSuperClassConcepts();
             selfAndAncestors.prepend(c);
@@ -444,7 +444,7 @@ bool FloatingTextWidget::loadFromXMI( TQDomElement & qElement ) {
 void FloatingTextWidget::setMessageText() {
     if (m_pLink)
         m_pLink->setMessageText(this);
-    tqsetVisible(getText().length() > 0);
+    setVisible(getText().length() > 0);
     updateComponentSize();
 }
 
diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp
index c5efcb65..95007d73 100644
--- a/umbrello/umbrello/kplayerslideraction.cpp
+++ b/umbrello/umbrello/kplayerslideraction.cpp
@@ -74,7 +74,7 @@ KPlayerPopupSliderAction::KPlayerPopupSliderAction (const TQString& text,
     m_frame -> setFrameStyle (TQFrame::PopupPanel | TQFrame::Raised);
     m_frame -> setLineWidth (2);
     m_slider = new KPlayerSlider (Qt::Vertical, m_frame);
-    m_frame -> resize (36, m_slider -> tqsizeHint().height() + 4);
+    m_frame -> resize (36, m_slider -> sizeHint().height() + 4);
     m_slider -> setGeometry (m_frame -> contentsRect());
     //CHANGED  kdDebug() << "Popup slider size " << m_slider -> width() << "x" << m_slider -> height() << "\n";
     connect (m_slider, TQT_SIGNAL (changed (int)), receiver, slot);
@@ -278,9 +278,9 @@ KPlayerSlider::~KPlayerSlider()
     //CHANGED  kdDebug() << "KPlayerSlider destroyed\n";
 }
 
-TQSize KPlayerSlider::tqsizeHint() const
+TQSize KPlayerSlider::sizeHint() const
 {
-    TQSize hint = TQSlider::tqsizeHint();
+    TQSize hint = TQSlider::sizeHint();
     //CHANGED int length = kPlayerSettings() -> preferredSliderLength();
     int length = 200;
     if ( orientation() == Qt::Horizontal )
@@ -296,10 +296,10 @@ TQSize KPlayerSlider::tqsizeHint() const
     return hint;
 }
 
-TQSize KPlayerSlider::tqminimumSizeHint() const
+TQSize KPlayerSlider::minimumSizeHint() const
 {
     //kdDebug() << "KPlayerSlider minimum size hint\n";
-    TQSize hint = TQSlider::tqminimumSizeHint();
+    TQSize hint = TQSlider::minimumSizeHint();
     //CHANGED  int length = kPlayerSettings() -> minimumSliderLength();
     int length = 200;
     if ( orientation() == Qt::Horizontal )
diff --git a/umbrello/umbrello/kplayerslideraction.h b/umbrello/umbrello/kplayerslideraction.h
index 8c0b11ef..14866991 100644
--- a/umbrello/umbrello/kplayerslideraction.h
+++ b/umbrello/umbrello/kplayerslideraction.h
@@ -38,10 +38,10 @@ public:
 
     /** The size hint.
      */
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
     /** The minimum size hint.
      */
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     /** The minimum value.
       */
diff --git a/umbrello/umbrello/linepath.cpp b/umbrello/umbrello/linepath.cpp
index 2d23021d..df3f614d 100644
--- a/umbrello/umbrello/linepath.cpp
+++ b/umbrello/umbrello/linepath.cpp
@@ -176,7 +176,7 @@ bool LinePath::insertPoint( int pointIndex, const TQPoint &point ) {
         line -> setZ( -2 );
         line -> setPoints( point.x(), point.y(), ep.x(), ep.y() );
         line -> setPen( getPen() );
-        line -> tqsetVisible( true );
+        line -> setVisible( true );
         m_LineList.insert( 1, line );
         if (!bLoading)
             setupSelected();
@@ -191,7 +191,7 @@ bool LinePath::insertPoint( int pointIndex, const TQPoint &point ) {
         line -> setPoints( point.x(), point.y(), ep.x(), ep.y() );
         line -> setZ( -2 );
         line -> setPen( getPen() );
-        line -> tqsetVisible( true );
+        line -> setVisible( true );
         m_LineList.append( line );
         if (!bLoading)
             setupSelected();
@@ -205,7 +205,7 @@ bool LinePath::insertPoint( int pointIndex, const TQPoint &point ) {
     line -> setPoints( point.x(), point.y(), ep.x(), ep.y() );
     line -> setZ( -2 );
     line -> setPen( getPen() );
-    line -> tqsetVisible( true );
+    line -> setVisible( true );
     m_LineList.insert( pointIndex, line );
     if (!bLoading)
         setupSelected();
@@ -277,7 +277,7 @@ bool LinePath::setStartEndPoints( const TQPoint &start, const TQPoint &end ) {
         line -> setPoints( start.x(), start.y(), end.x(), end.y() );
         line -> setZ( -2 );
         line -> setPen( getPen() );
-        line -> tqsetVisible( true );
+        line -> setVisible( true );
         m_LineList.append( line );
         return true;
     }
@@ -644,7 +644,7 @@ void LinePath::growList(LineList &list, int by) {
         TQCanvasLine * line = new TQCanvasLine( getCanvas() );
         line -> setZ( 0 );
         line -> setPen( pen );
-        line -> tqsetVisible( true );
+        line -> setVisible( true );
         list.append( line );
     }
 }
@@ -665,7 +665,7 @@ void LinePath::createHeadLines() {
     case Uml::at_Realization:
         growList(m_HeadList, 3);
         m_pClearPoly = new TQCanvasPolygon( canvas );
-        m_pClearPoly -> tqsetVisible( true );
+        m_pClearPoly -> setVisible( true );
         m_pClearPoly -> setBrush( TQBrush( TQt::white ) );
         m_pClearPoly -> setZ( -1 );
         break;
@@ -674,7 +674,7 @@ void LinePath::createHeadLines() {
     case Uml::at_Aggregation:
         growList(m_HeadList, 4);
         m_pClearPoly = new TQCanvasPolygon( canvas );
-        m_pClearPoly -> tqsetVisible( true );
+        m_pClearPoly -> setVisible( true );
         if( getAssocType() == Uml::at_Aggregation )
             m_pClearPoly -> setBrush( TQBrush( TQt::white ) );
         else
diff --git a/umbrello/umbrello/messagewidget.cpp b/umbrello/umbrello/messagewidget.cpp
index 6f2eea21..f3227c31 100644
--- a/umbrello/umbrello/messagewidget.cpp
+++ b/umbrello/umbrello/messagewidget.cpp
@@ -64,7 +64,7 @@ void MessageWidget::init() {
     m_pOw[Uml::A] = m_pOw[Uml::B] = NULL;
     m_pFText = NULL;
     m_nY = 0;
-    tqsetVisible(true);
+    setVisible(true);
 }
 
 MessageWidget::~MessageWidget() {
@@ -353,7 +353,7 @@ void MessageWidget::calculateWidget() {
     setMessageText(m_pFText);
     calculateDimensions();
 
-    tqsetVisible(true);
+    setVisible(true);
 
     setX(m_nPosX);
     setY(m_nY);
@@ -464,7 +464,7 @@ bool MessageWidget::activate(IDChangeLog * Log /*= 0*/) {
     m_pFText -> setText("");
     m_pFText->setActivated();
     TQString messageText = m_pFText->getText();
-    m_pFText->tqsetVisible( messageText.length() > 1 );
+    m_pFText->setVisible( messageText.length() > 1 );
 
     connect(m_pOw[Uml::A], TQT_SIGNAL(sigWidgetMoved(Uml::IDType)), this, TQT_SLOT(slotWidgetMoved(Uml::IDType)));
     connect(m_pOw[Uml::B], TQT_SIGNAL(sigWidgetMoved(Uml::IDType)), this, TQT_SLOT(slotWidgetMoved(Uml::IDType)));
diff --git a/umbrello/umbrello/model_utils.cpp b/umbrello/umbrello/model_utils.cpp
index 4131d9b1..1c7a1add 100644
--- a/umbrello/umbrello/model_utils.cpp
+++ b/umbrello/umbrello/model_utils.cpp
@@ -407,7 +407,7 @@ int stringToDirection(TQString input, Uml::Parameter_Direction & result) {
     return dirLen;
 }
 
-Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope) {
+Parse_Status parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope) {
 
     UMLDoc *pDoc = UMLApp::app()->getDocument();
 
@@ -430,7 +430,7 @@ Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *ownin
     return PS_OK;
 }
 
-Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope,
+Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope,
                             Uml::Visibility *vis /* = 0 */) {
     UMLDoc *pDoc = UMLApp::app()->getDocument();
 
@@ -494,7 +494,7 @@ Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owni
     return PS_OK;
 }
 
-Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope) {
+Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope) {
     UMLDoc *pDoc = UMLApp::app()->getDocument();
 
     m = m.simplifyWhiteSpace();
@@ -546,7 +546,7 @@ Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *own
     TQStringList args = TQStringList::split( TQRegExp("\\s*,\\s*"), arglist);
     for (TQStringList::Iterator lit = args.begin(); lit != args.end(); ++lit) {
         NameAndType nmTp;
-        Parse_tqStatus ps = parseAttribute(*lit, nmTp, owningScope);
+        Parse_Status ps = parseAttribute(*lit, nmTp, owningScope);
         if (ps)
             return ps;
         desc.m_args.append(nmTp);
@@ -554,7 +554,7 @@ Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *own
     return PS_OK;
 }
 
-TQString psText(Parse_tqStatus value) {
+TQString psText(Parse_Status value) {
     const TQString text[] = {
                                i18n("OK"), i18n("Empty"), i18n("Malformed argument"),
                                i18n("Unknown argument type"), i18n("Illegal method name"),
diff --git a/umbrello/umbrello/model_utils.h b/umbrello/umbrello/model_utils.h
index 6660ff64..1e8bd83b 100644
--- a/umbrello/umbrello/model_utils.h
+++ b/umbrello/umbrello/model_utils.h
@@ -236,7 +236,7 @@ Uml::Programming_Language stringToProgLang(TQString str);
 /**
  * Return type of parseOperation()
  */
-enum Parse_tqStatus {
+enum Parse_Status {
     PS_OK, PS_Empty, PS_Malformed_Arg, PS_Unknown_ArgType,
     PS_Illegal_MethodName, PS_Unknown_ReturnType, PS_Unspecified_Error
 };
@@ -284,7 +284,7 @@ struct OpDescriptor {
  * @param owningScope   Pointer to the owning scope of the template param.
  * @return      Error status of the parse, PS_OK for success.
  */
-Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope);
+Parse_Status parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope);
 
 /**
  * Parses an attribute given in UML syntax.
@@ -303,7 +303,7 @@ Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *ownin
  *
  * @return      Error status of the parse, PS_OK for success.
  */
-Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope,
+Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope,
                             Uml::Visibility *vis = 0);
 
 /**
@@ -316,12 +316,12 @@ Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owni
  * @param owningScope   Pointer to the owning scope of the operation.
  * @return      Error status of the parse, PS_OK for success.
  */
-Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope);
+Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope);
 
 /**
- * Returns the Parse_tqStatus as a text.
+ * Returns the Parse_Status as a text.
  */
-TQString psText(Parse_tqStatus value);
+TQString psText(Parse_Status value);
 
 }
 
diff --git a/umbrello/umbrello/seqlinewidget.cpp b/umbrello/umbrello/seqlinewidget.cpp
index 18d70a68..9b992398 100644
--- a/umbrello/umbrello/seqlinewidget.cpp
+++ b/umbrello/umbrello/seqlinewidget.cpp
@@ -28,7 +28,7 @@ SeqLineWidget::SeqLineWidget( UMLView * pView, ObjectWidget * pObject ) : TQCanv
     m_pObject = pObject;
     setPen( TQPen( m_pObject->getLineColor(), 0, TQt::DashLine ) );
     setZ( 0 );
-    tqsetVisible( true );
+    setVisible( true );
     m_DestructionBox.line1 = 0;
     m_nLengthY = 250;
     setupDestructionBox();
@@ -83,13 +83,13 @@ void SeqLineWidget::setupDestructionBox() {
 
     m_DestructionBox.line1 = new TQCanvasLine( m_pView->canvas() );
     m_DestructionBox.setLine1Points(rect);
-    m_DestructionBox.line1->tqsetVisible( true );
+    m_DestructionBox.line1->setVisible( true );
     m_DestructionBox.line1->setPen( TQPen(m_pObject->getLineColor(), 2) );
     m_DestructionBox.line1->setZ( 3 );
 
     m_DestructionBox.line2 = new TQCanvasLine( m_pView -> canvas() );
     m_DestructionBox.setLine2Points(rect);
-    m_DestructionBox.line2->tqsetVisible( true );
+    m_DestructionBox.line2->setVisible( true );
     m_DestructionBox.line2->setPen( TQPen(m_pObject->getLineColor(), 2) );
     m_DestructionBox.line2->setZ( 3 );
 }
diff --git a/umbrello/umbrello/toolbarstatearrow.cpp b/umbrello/umbrello/toolbarstatearrow.cpp
index 05e98734..cbcbc20f 100644
--- a/umbrello/umbrello/toolbarstatearrow.cpp
+++ b/umbrello/umbrello/toolbarstatearrow.cpp
@@ -58,7 +58,7 @@ void ToolBarStateArrow::mousePressEmpty() {
             line->setPoints(m_pMouseEvent->x(), m_pMouseEvent->y(),
                             m_pMouseEvent->x(), m_pMouseEvent->y());
             line->setPen(TQPen(TQColor("grey"), 0, TQt::DotLine));
-            line->tqsetVisible(true);
+            line->setVisible(true);
             line->setZ(100);
             m_selectionRect.append(line);
         }
diff --git a/umbrello/umbrello/toolbarstateassociation.cpp b/umbrello/umbrello/toolbarstateassociation.cpp
index 340a28dc..005e5def 100644
--- a/umbrello/umbrello/toolbarstateassociation.cpp
+++ b/umbrello/umbrello/toolbarstateassociation.cpp
@@ -132,7 +132,7 @@ void ToolBarStateAssociation::setFirstWidget() {
     m_associationLine->setPoints(pos.x(), pos.y(), pos.x(), pos.y());
     m_associationLine->setPen(TQPen(m_pUMLView->getLineColor(), m_pUMLView->getLineWidth(), TQt::DashLine));
 
-    m_associationLine->tqsetVisible(true);
+    m_associationLine->setVisible(true);
 
     m_pUMLView->viewport()->setMouseTracking(true);
 }
diff --git a/umbrello/umbrello/toolbarstatemessages.cpp b/umbrello/umbrello/toolbarstatemessages.cpp
index 453c6d7c..f8e5930a 100644
--- a/umbrello/umbrello/toolbarstatemessages.cpp
+++ b/umbrello/umbrello/toolbarstatemessages.cpp
@@ -118,7 +118,7 @@ void ToolBarStateMessages::setFirstWidget(ObjectWidget* firstObject) {
     m_messageLine->setPoints(m_pMouseEvent->x(), m_pMouseEvent->y(), m_pMouseEvent->x(), m_pMouseEvent->y());
     m_messageLine->setPen(TQPen(m_pUMLView->getLineColor(), m_pUMLView->getLineWidth(), TQt::DashLine));
 
-    m_messageLine->tqsetVisible(true);
+    m_messageLine->setVisible(true);
 
     m_pUMLView->viewport()->setMouseTracking(true);
 }
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index 91986427..a6a79a97 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -374,7 +374,7 @@ void UMLApp::setupZoomMenu() {
 
 void UMLApp::initStatusBar() {
     m_statusLabel = new KStatusBarLabel( i18n("Ready."), 0, statusBar() );
-    m_statusLabel->setFixedHeight( m_statusLabel->tqsizeHint().height() );
+    m_statusLabel->setFixedHeight( m_statusLabel->sizeHint().height() );
 
     m_statusLabel->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain );
     m_statusLabel->setMargin( 0 );
@@ -382,7 +382,7 @@ void UMLApp::initStatusBar() {
 
     statusBar()->addWidget( m_statusLabel, 1, false );
 
-    m_statusLabel->tqsetAlignment(TQt::AlignLeft|TQt::AlignVCenter);
+    m_statusLabel->setAlignment(TQt::AlignLeft|TQt::AlignVCenter);
 
     connect(m_doc, TQT_SIGNAL( sigWriteToStatusBar(const TQString &) ), this, TQT_SLOT( slotStatusMsg(const TQString &) ));
 }
diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp
index 6abc0f8e..09410b62 100644
--- a/umbrello/umbrello/umldoc.cpp
+++ b/umbrello/umbrello/umldoc.cpp
@@ -1213,7 +1213,7 @@ void UMLDoc::saveToXMI(TQIODevice& file) {
 
     TQDomElement root = doc.createElement( "XMI" );
     root.setAttribute( "xmi.version", "1.2" );
-    TQDateTime now = TQDateTime::tqcurrentDateTime();
+    TQDateTime now = TQDateTime::currentDateTime();
     root.setAttribute( "timestamp", now.toString(Qt::ISODate));
     root.setAttribute( "verified", "false");
     root.setAttribute( "xmlns:UML", "http://schema.omg.org/spec/UML/1.3");
diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp
index 6fe7b84f..bdeee008 100644
--- a/umbrello/umbrello/umllistview.cpp
+++ b/umbrello/umbrello/umllistview.cpp
@@ -86,7 +86,7 @@ protected:
             return;
         UMLOperation *op = static_cast<UMLOperation*>(obj);
         TQString text = op->toString(Uml::st_ShowSig);
-        TQRect rect = lv->tqitemRect(item);
+        TQRect rect = lv->itemRect(item);
         tip(rect, text);
     }
 };
@@ -2111,7 +2111,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type
     } else if ( type == Uml::ot_Template )  {
         UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(parent);
         Model_Utils::NameAndType nt;
-        Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(text, nt, owningClassifier);
+        Model_Utils::Parse_Status st = Model_Utils::parseTemplate(text, nt, owningClassifier);
         if (st) {
             KMessageBox::error( kapp->mainWidget(),
                                 Model_Utils::psText(st),
@@ -2127,7 +2127,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type
         UMLClassifier *owningClass = static_cast<UMLClassifier*>(parent);
         Model_Utils::NameAndType nt;
         Uml::Visibility vis;
-        Model_Utils::Parse_tqStatus st;
+        Model_Utils::Parse_Status st;
         st = Model_Utils::parseAttribute(text, nt, owningClass, &vis);
         if (st) {
             KMessageBox::error( kapp->mainWidget(),
@@ -2143,7 +2143,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type
     } else if ( type == Uml::ot_Operation ) {
         UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(parent);
         Model_Utils::OpDescriptor od;
-        Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(text, od, owningClassifier);
+        Model_Utils::Parse_Status st = Model_Utils::parseOperation(text, od, owningClassifier);
         if (st) {
             KMessageBox::error( kapp->mainWidget(),
                                 Model_Utils::psText(st),
diff --git a/umbrello/umbrello/umllistviewitem.cpp b/umbrello/umbrello/umllistviewitem.cpp
index 01680fde..c6a5f954 100644
--- a/umbrello/umbrello/umllistviewitem.cpp
+++ b/umbrello/umbrello/umllistviewitem.cpp
@@ -333,7 +333,7 @@ void UMLListViewItem::okRename( int col ) {
             UMLOperation *op = static_cast<UMLOperation*>(m_pObject);
             UMLClassifier *parent = static_cast<UMLClassifier *>( op -> parent() );
             Model_Utils::OpDescriptor od;
-            Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(newText, od, parent);
+            Model_Utils::Parse_Status st = Model_Utils::parseOperation(newText, od, parent);
             if (st == Model_Utils::PS_OK) {
                 // TODO: Check that no operation with the exact same profile exists.
                 op->setName( od.m_name );
@@ -385,7 +385,7 @@ void UMLListViewItem::okRename( int col ) {
             UMLClassifier *parent = static_cast<UMLClassifier*>(m_pObject->parent());
             Model_Utils::NameAndType nt;
             Uml::Visibility vis;
-            Model_Utils::Parse_tqStatus st;
+            Model_Utils::Parse_Status st;
             st = Model_Utils::parseAttribute(newText, nt, parent, &vis);
             if (st == Model_Utils::PS_OK) {
                 UMLObject *exists = parent->findChildObject(newText);
@@ -417,7 +417,7 @@ void UMLListViewItem::okRename( int col ) {
             }
             UMLClassifier *parent = static_cast<UMLClassifier*>(m_pObject->parent());
             Model_Utils::NameAndType nt;
-            Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(newText, nt, parent);
+            Model_Utils::Parse_Status st = Model_Utils::parseTemplate(newText, nt, parent);
             if (st == Model_Utils::PS_OK) {
                 UMLObject *exists = parent->findChildObject(newText);
                 if (exists) {
diff --git a/umbrello/umbrello/umlview.cpp b/umbrello/umbrello/umlview.cpp
index a64b770c..39ef14fb 100644
--- a/umbrello/umbrello/umlview.cpp
+++ b/umbrello/umbrello/umlview.cpp
@@ -371,7 +371,7 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) {
 void UMLView::setupNewWidget(UMLWidget *w) {
     w->setX( m_Pos.x() );
     w->setY( m_Pos.y() );
-    w->tqsetVisible( true );
+    w->setVisible( true );
     w->setActivated();
     w->setFont( getFont() );
     w->slotColorChanged( getID() );
@@ -451,7 +451,7 @@ void UMLView::slotObjectCreated(UMLObject* o) {
     UMLWidget* newWidget = Widget_Factory::createWidget(this, o);
     if (newWidget == NULL)
         return;
-    newWidget->tqsetVisible( true );
+    newWidget->setVisible( true );
     newWidget->setActivated();
     newWidget->setFont( getFont() );
     newWidget->slotColorChanged( getID() );
@@ -1362,7 +1362,7 @@ void UMLView::activate() {
             continue;
 
         if (obj->activate()) {
-            obj->tqsetVisible(true);
+            obj->setVisible(true);
         } else {
             m_WidgetList.remove(obj);
             delete obj;
@@ -1378,7 +1378,7 @@ void UMLView::activate() {
             continue;
 
         obj->activate(m_pDoc->getChangeLog());
-        obj->tqsetVisible( true );
+        obj->setVisible( true );
 
     }//end while
 
@@ -2365,7 +2365,7 @@ void UMLView::setMenu() {
     if( menu != ListPopupMenu::mt_Undefined ) {
         m_pMenu = new ListPopupMenu(this, menu, this);
         connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int)));
-        m_pMenu->popup( mapToGlobal( contentsToViewport(tqworldMatrix().map(m_Pos)) ) );
+        m_pMenu->popup( mapToGlobal( contentsToViewport(worldMatrix().map(m_Pos)) ) );
     }
 }
 
@@ -2797,17 +2797,17 @@ void UMLView::setZoom(int zoom) {
 }
 
 int UMLView::currentZoom() {
-    return (int)(tqworldMatrix().m11()*100.0);
+    return (int)(worldMatrix().m11()*100.0);
 }
 
 void UMLView::zoomIn() {
-    TQWMatrix wm = tqworldMatrix();
+    TQWMatrix wm = worldMatrix();
     wm.scale(1.5,1.5); // adjust zooming step here
     setZoom( (int)(wm.m11()*100.0) );
 }
 
 void UMLView::zoomOut() {
-    TQWMatrix wm = tqworldMatrix();
+    TQWMatrix wm = worldMatrix();
     wm.scale(2.0/3.0, 2.0/3.0); //adjust zooming step here
     setZoom( (int)(wm.m11()*100.0) );
 }
diff --git a/umbrello/umbrello/umlview.h b/umbrello/umbrello/umlview.h
index 4cf51b7f..8ee2d3df 100644
--- a/umbrello/umbrello/umlview.h
+++ b/umbrello/umbrello/umlview.h
@@ -1152,7 +1152,7 @@ private:
     bool m_bActivated;
 
     /**
-     * tqStatus of a popupmenu on view.
+     * Status of a popupmenu on view.
      * true - a popup is on view
      */
     bool m_bPopupShowing;
diff --git a/umbrello/umbrello/umlwidget.h b/umbrello/umbrello/umlwidget.h
index 0cebb9d8..fd646306 100644
--- a/umbrello/umbrello/umlwidget.h
+++ b/umbrello/umbrello/umlwidget.h
@@ -466,7 +466,7 @@ public:
     /**
      * Set the m_bActivated flag of a widget but does not perform the Activate method
      *
-     * @param Active tqStatus of activation is to be set.
+     * @param Active Status of activation is to be set.
      */
     void setActivated(bool Active = true);
 
diff --git a/umbrello/umbrello/widget_utils.cpp b/umbrello/umbrello/widget_utils.cpp
index eeb51956..5c78ef23 100644
--- a/umbrello/umbrello/widget_utils.cpp
+++ b/umbrello/umbrello/widget_utils.cpp
@@ -101,7 +101,7 @@ TQCanvasRectangle *decoratePoint(const TQPoint& p) {
                                 SIZE, SIZE, currentView->canvas());
     rect->setBrush( TQBrush(TQt::blue) );
     rect->setPen( TQPen(TQt::blue) );
-    rect->tqsetVisible(true);
+    rect->setVisible(true);
     return rect;
 }