1 files changed, 24 insertions, 24 deletions

diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
index 98477f15..6b7ac992 100644
--- a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
@@ -19,9 +19,9 @@
 // system includes
 #include <cstdlib> //to get the user name
 // qt includes
-#include <qdatetime.h>
-#include <qregexp.h>
-#include <qdir.h>
+#include <tqdatetime.h>
+#include <tqregexp.h>
+#include <tqdir.h>
 // kde includes
 #include <klocale.h>
 #include <kdebug.h>
@@ -66,39 +66,39 @@ SimpleCodeGenerator::~SimpleCodeGenerator ( ) { }
 // Other methods
 //
 
-QString SimpleCodeGenerator::getIndent ()
+TQString SimpleCodeGenerator::getIndent ()
 {
-    QString myIndent;
+    TQString myIndent;
     for (int i = 0 ; i < m_indentLevel ; i++)
         myIndent.append(m_indentation);
     return myIndent;
 }
 
-QString SimpleCodeGenerator::findFileName(UMLPackage* concept, const QString &ext) {
+TQString SimpleCodeGenerator::findFileName(UMLPackage* concept, const TQString &ext) {
 
     //if we already know to which file this class was written/should be written, just return it.
     if (m_fileMap.contains(concept))
         return m_fileMap[concept];
 
     //else, determine the "natural" file name
-    QString name;
+    TQString name;
     // Get the package name
-    QString package = concept->getPackage(".");
+    TQString package = concept->getPackage(".");
 
     // Replace all white spaces with blanks
     package.simplifyWhiteSpace();
 
     // Replace all blanks with underscore
-    package.replace(QRegExp(" "), "_");
+    package.replace(TQRegExp(" "), "_");
 
     // Convert all "::" to "/" : Platform-specific path separator
-    // package.replace(QRegExp("::"), "/");
+    // package.replace(TQRegExp("::"), "/");
 
     // if package is given add this as a directory to the file name
     if (!package.isEmpty() && m_createDirHierarchyForPackages) {
         name = package + '.' + concept->getName();
-        name.replace(QRegExp("\\."),"/");
-        package.replace(QRegExp("\\."), "/");
+        name.replace(TQRegExp("\\."),"/");
+        package.replace(TQRegExp("\\."), "/");
         package = '/' + package;
     } else {
         name = concept->getFullyQualifiedName("-");
@@ -111,15 +111,15 @@ QString SimpleCodeGenerator::findFileName(UMLPackage* concept, const QString &ex
 
     // if a package name exists check the existence of the package directory
     if (!package.isEmpty() && m_createDirHierarchyForPackages) {
-        QDir pathDir(UMLApp::app()->getCommonPolicy()->getOutputDirectory().absPath() + package);
+        TQDir pathDir(UMLApp::app()->getCommonPolicy()->getOutputDirectory().absPath() + package);
         // does our complete output directory exist yet? if not, try to create it
         if (!pathDir.exists())
         {
-            QStringList dirs = QStringList::split("/",pathDir.absPath());
-            QString currentDir = "";
+            TQStringList dirs = TQStringList::split("/",pathDir.absPath());
+            TQString currentDir = "";
 
-            QStringList::iterator end(dirs.end());
-            for (QStringList::iterator dir(dirs.begin()); dir != end; ++dir)
+            TQStringList::iterator end(dirs.end());
+            for (TQStringList::iterator dir(dirs.begin()); dir != end; ++dir)
             {
                 currentDir += '/' + *dir;
                 if (! (pathDir.exists(currentDir)
@@ -136,19 +136,19 @@ QString SimpleCodeGenerator::findFileName(UMLPackage* concept, const QString &ex
 
 
     name.simplifyWhiteSpace();
-    name.replace(QRegExp(" "),"_");
+    name.replace(TQRegExp(" "),"_");
 
-    QString extension = ext.simplifyWhiteSpace();
+    TQString extension = ext.simplifyWhiteSpace();
     extension.replace(' ', '_');
 
     return overwritableName(concept, name, extension);
 }
 
-QString SimpleCodeGenerator::overwritableName(UMLPackage* concept, const QString &name, const QString &ext) {
+TQString SimpleCodeGenerator::overwritableName(UMLPackage* concept, const TQString &name, const TQString &ext) {
     //check if a file named "name" with extension "ext" already exists
     CodeGenerationPolicy *commonPolicy = UMLApp::app()->getCommonPolicy();
-    QDir outputDir = commonPolicy->getOutputDirectory();
-    QString filename = name + ext;
+    TQDir outputDir = commonPolicy->getOutputDirectory();
+    TQString filename = name + ext;
     if(!outputDir.exists(filename)) {
         m_fileMap.insert(concept,filename);
         return filename; //if not, "name" is OK and we have not much to to
@@ -172,7 +172,7 @@ QString SimpleCodeGenerator::overwritableName(UMLPackage* concept, const QString
         case KDialogBase::No: //generate similar name
             suffix = 1;
             while (1) {
-                filename = name + "__" + QString::number(suffix) + ext;
+                filename = name + "__" + TQString::number(suffix) + ext;
                 if (!outputDir.exists(filename))
                     break;
                 suffix++;
@@ -197,7 +197,7 @@ QString SimpleCodeGenerator::overwritableName(UMLPackage* concept, const QString
     case CodeGenerationPolicy::Never: //generate similar name
         suffix = 1;
         while (1) {
-            filename = name + "__" + QString::number(suffix) + ext;
+            filename = name + "__" + TQString::number(suffix) + ext;
             if (!outputDir.exists(filename))
                 break;
             suffix++;