Rename a number of old tq methods that are no longer tq specific

23 files changed, 72 insertions, 72 deletions

diff --git a/umbrello/umbrello/codegenerators/adawriter.cpp b/umbrello/umbrello/codegenerators/adawriter.cpp
index ec2bf59a..c4b36956 100644
--- a/umbrello/umbrello/codegenerators/adawriter.cpp
+++ b/umbrello/umbrello/codegenerators/adawriter.cpp
@@ -20,7 +20,7 @@
 #include <kmessagebox.h>
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "../umldoc.h"
 #include "../uml.h"
diff --git a/umbrello/umbrello/codegenerators/aswriter.cpp b/umbrello/umbrello/codegenerators/aswriter.cpp
index e973a55e..e3e72a38 100644
--- a/umbrello/umbrello/codegenerators/aswriter.cpp
+++ b/umbrello/umbrello/codegenerators/aswriter.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 ASWriter::ASWriter() {
 }
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
index 6ca8377b..dee5c9f4 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
@@ -41,7 +41,7 @@
             </property>
             <widget class="TQLayoutWidget" row="0" column="0">
                 <property name="name">
-                    <cstring>tqlayout4</cstring>
+                    <cstring>layout4</cstring>
                 </property>
                 <grid>
                     <property name="name">
@@ -149,7 +149,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>410</width>
                             <height>113</height>
@@ -166,7 +166,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout17</cstring>
+                        <cstring>layout17</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -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/cppwriter.cpp b/umbrello/umbrello/codegenerators/cppwriter.cpp
index d58ceae4..5517d2f3 100644
--- a/umbrello/umbrello/codegenerators/cppwriter.cpp
+++ b/umbrello/umbrello/codegenerators/cppwriter.cpp
@@ -20,7 +20,7 @@
 #include "cppwriter.h"
 // qt/kde includes
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 #include <kdebug.h>
 // app includes
@@ -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..167ccb12 100644
--- a/umbrello/umbrello/codegenerators/csharpwriter.cpp
+++ b/umbrello/umbrello/codegenerators/csharpwriter.cpp
@@ -16,7 +16,7 @@
 
 #include <kdebug.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "../uml.h"
 #include "../umldoc.h"
@@ -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/dwriter.cpp b/umbrello/umbrello/codegenerators/dwriter.cpp
index 088ab9c1..fdcc63b6 100644
--- a/umbrello/umbrello/codegenerators/dwriter.cpp
+++ b/umbrello/umbrello/codegenerators/dwriter.cpp
@@ -20,7 +20,7 @@
 #include "dwriter.h"
 // qt includes
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 // kde includes
 #include <kdebug.h>
diff --git a/umbrello/umbrello/codegenerators/idlwriter.cpp b/umbrello/umbrello/codegenerators/idlwriter.cpp
index efb49dc9..675982ca 100644
--- a/umbrello/umbrello/codegenerators/idlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/idlwriter.cpp
@@ -15,7 +15,7 @@
 #include <kmessagebox.h>
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "../umldoc.h"
 #include "../classifier.h"
diff --git a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
index 1587c265..426c6d9a 100644
--- a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
@@ -428,7 +428,7 @@ void JavaClassifierCodeDocument::updateContent( )
 
     // NOW create document in sections..
     // now we want to populate the body of our class
-    // our tqlayout is the following general groupings of code blocks:
+    // our layout is the following general groupings of code blocks:
 
     // start java classifier document
 
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui
index a9ba6a89..60764673 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui
+++ b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -74,7 +74,7 @@
                         </property>
                         <widget class="TQLayoutWidget" row="0" column="0">
                             <property name="name">
-                                <cstring>tqlayout2</cstring>
+                                <cstring>layout2</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -117,7 +117,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="1" column="0">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -163,7 +163,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="2" column="0">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
diff --git a/umbrello/umbrello/codegenerators/javawriter.cpp b/umbrello/umbrello/codegenerators/javawriter.cpp
index 19f3c1fd..a1e4d0b3 100644
--- a/umbrello/umbrello/codegenerators/javawriter.cpp
+++ b/umbrello/umbrello/codegenerators/javawriter.cpp
@@ -21,7 +21,7 @@
 #include "javawriter.h"
 // qt includes
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 // kde includes
 #include <kdebug.h>
@@ -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/jswriter.cpp b/umbrello/umbrello/codegenerators/jswriter.cpp
index ea4cc2e1..9d58cf3d 100644
--- a/umbrello/umbrello/codegenerators/jswriter.cpp
+++ b/umbrello/umbrello/codegenerators/jswriter.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 JSWriter::JSWriter() {
 }
diff --git a/umbrello/umbrello/codegenerators/pascalwriter.cpp b/umbrello/umbrello/codegenerators/pascalwriter.cpp
index 0f3c32ef..9e75c6d6 100644
--- a/umbrello/umbrello/codegenerators/pascalwriter.cpp
+++ b/umbrello/umbrello/codegenerators/pascalwriter.cpp
@@ -16,7 +16,7 @@
 #include <kmessagebox.h>
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "../umldoc.h"
 #include "../uml.h"
diff --git a/umbrello/umbrello/codegenerators/perlwriter.cpp b/umbrello/umbrello/codegenerators/perlwriter.cpp
index 9d51ffde..def1c7dd 100644
--- a/umbrello/umbrello/codegenerators/perlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/perlwriter.cpp
@@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <tqdir.h>
 #include <tqdatetime.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 PerlWriter::PerlWriter()
 {
@@ -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/codegenerators/php5writer.cpp b/umbrello/umbrello/codegenerators/php5writer.cpp
index f0de28a3..c222e3c9 100644
--- a/umbrello/umbrello/codegenerators/php5writer.cpp
+++ b/umbrello/umbrello/codegenerators/php5writer.cpp
@@ -19,7 +19,7 @@
 
 #include <kdebug.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "../umldoc.h"
 #include "../classifier.h"
@@ -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..e589b661 100644
--- a/umbrello/umbrello/codegenerators/phpwriter.cpp
+++ b/umbrello/umbrello/codegenerators/phpwriter.cpp
@@ -18,7 +18,7 @@
 
 #include <kdebug.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "../umldoc.h"
 #include "../classifier.h"
@@ -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/pythonwriter.cpp b/umbrello/umbrello/codegenerators/pythonwriter.cpp
index 8c913022..c89da92e 100644
--- a/umbrello/umbrello/codegenerators/pythonwriter.cpp
+++ b/umbrello/umbrello/codegenerators/pythonwriter.cpp
@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 
 #include "../umldoc.h"
@@ -418,7 +418,7 @@ const TQStringList PythonWriter::reservedKeywords() const {
         << "TypeError"
         << "UnboundLocalError"
         << "unichr"
-        << "tqunicode"
+        << "unicode"
         << "UnicodeError"
         << "UserWarning"
         << "ValueError"
diff --git a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
index 22fa56fc..ada4b0bb 100644
--- a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
@@ -435,7 +435,7 @@ void RubyClassifierCodeDocument::updateContent( )
 
     // NOW create document in sections..
     // now we want to populate the body of our class
-    // our tqlayout is the following general groupings of code blocks:
+    // our layout is the following general groupings of code blocks:
 
     // start ruby classifier document
 
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui
index c47dc97f..28f74fd0 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -45,7 +45,7 @@
                         </property>
                         <widget class="TQLayoutWidget" row="0" column="0">
                             <property name="name">
-                                <cstring>tqlayout2</cstring>
+                                <cstring>layout2</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -88,7 +88,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="1" column="0">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -134,7 +134,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="2" column="0">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
diff --git a/umbrello/umbrello/codegenerators/rubywriter.cpp b/umbrello/umbrello/codegenerators/rubywriter.cpp
index e736641f..64302a80 100644
--- a/umbrello/umbrello/codegenerators/rubywriter.cpp
+++ b/umbrello/umbrello/codegenerators/rubywriter.cpp
@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 
 #include "classifierinfo.h"
diff --git a/umbrello/umbrello/codegenerators/sqlwriter.cpp b/umbrello/umbrello/codegenerators/sqlwriter.cpp
index 8582ec93..55717ea0 100644
--- a/umbrello/umbrello/codegenerators/sqlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/sqlwriter.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 
 #include "../classifier.h"
diff --git a/umbrello/umbrello/codegenerators/tclwriter.cpp b/umbrello/umbrello/codegenerators/tclwriter.cpp
index 6d40b4b0..c0c42ad6 100644
--- a/umbrello/umbrello/codegenerators/tclwriter.cpp
+++ b/umbrello/umbrello/codegenerators/tclwriter.cpp
@@ -18,7 +18,7 @@
 #include "tclwriter.h"
 // qt/kde includes
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 #include <kdebug.h>
 // app includes
diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
index f2bf7a66..bff55304 100644
--- a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
+++ b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
@@ -19,7 +19,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 
 #include "../umldoc.h"
@@ -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,