1 files changed, 21 insertions, 21 deletions

diff --git a/umbrello/umbrello/model_utils.h b/umbrello/umbrello/model_utils.h
index 3fa19afb..9e1468c0 100644
--- a/umbrello/umbrello/model_utils.h
+++ b/umbrello/umbrello/model_utils.h
@@ -12,8 +12,8 @@
 #ifndef MODEL_UTILS_H
 #define MODEL_UTILS_H
 
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
 
 #include "umlnamespace.h"
 #include "umlobjectlist.h"
@@ -66,7 +66,7 @@ UMLObject * findObjectInList(Uml::IDType id, const UMLObjectList& inList);
  * @return      Pointer to the UMLObject found, or NULL if not found.
  */
 UMLObject* findUMLObject( const UMLObjectList& inList,
-                          const QString& name,
+                          const TQString& name,
                           Uml::Object_Type type = Uml::ot_UMLObject,
                           UMLObject *currentObj = NULL);
 
@@ -80,9 +80,9 @@ UMLObject* findUMLObject( const UMLObjectList& inList,
  *                  If no prefix is given then a type related
  *                  prefix will be chosen internally.
  */
-QString uniqObjectName(Uml::Object_Type type,
+TQString uniqObjectName(Uml::Object_Type type,
                        UMLPackage *parentPkg,
-                       QString prefix = QString::null);
+                       TQString prefix = TQString::null);
 
 /**
  * Return true if the given tag is a one of the common XMI
@@ -90,14 +90,14 @@ QString uniqObjectName(Uml::Object_Type type,
  * "name" | "visibility" | "isRoot" | "isLeaf" | "isAbstract" |
  * "isActive" | "ownerScope"
  */
-bool isCommonXMIAttribute(const QString &tag);
+bool isCommonXMIAttribute(const TQString &tag);
 
 /**
  * Return true if the given type is common among the majority
  * of programming languages, such as "bool" or "boolean".
  * TODO: Make this depend on the active programming language.
  */
-bool isCommonDataType(QString type);
+bool isCommonDataType(TQString type);
 
 /**
  * Return true if the given object type is a classifier list item type.
@@ -221,17 +221,17 @@ Uml::Model_Type guessContainer(UMLObject *o);
  * @return       Length of the string matched, excluding the optional
  *               whitespace.
  */
-int stringToDirection(QString input, Uml::Parameter_Direction & result);
+int stringToDirection(TQString input, Uml::Parameter_Direction & result);
 
 /**
  * Return string corresponding to the given Uml::Programming_Language.
  */
-QString progLangToString(Uml::Programming_Language pl);
+TQString progLangToString(Uml::Programming_Language pl);
 
 /**
  * Return Uml::Programming_Language corresponding to the given string.
  */
-Uml::Programming_Language stringToProgLang(QString str);
+Uml::Programming_Language stringToProgLang(TQString str);
 
 /**
  * Return type of parseOperation()
@@ -245,15 +245,15 @@ enum Parse_Status {
  * Data structure filled by parseAttribute()
  */
 struct NameAndType {
-    QString m_name;
+    TQString m_name;
     UMLObject *m_type;
     Uml::Parameter_Direction m_direction;
-    QString m_initialValue;
+    TQString m_initialValue;
     NameAndType() : m_type(0), m_direction(Uml::pd_In) {
     }
-    NameAndType(QString name, UMLObject *type,
+    NameAndType(TQString name, UMLObject *type,
                 Uml::Parameter_Direction direction = Uml::pd_In,
-                QString initialValue = QString::null)
+                TQString initialValue = TQString::null)
             : m_name(name), m_type(type),
               m_direction(direction), m_initialValue(initialValue) {
     }
@@ -262,14 +262,14 @@ struct NameAndType {
 /**
  * Auxiliary type for OpDescriptor
  */
-typedef QValueList<NameAndType> NameAndType_List;
-typedef QValueListIterator<NameAndType> NameAndType_ListIt;
+typedef TQValueList<NameAndType> NameAndType_List;
+typedef TQValueListIterator<NameAndType> NameAndType_ListIt;
 
 /**
  * Data structure filled by parseOperation()
  */
 struct OpDescriptor {
-    QString m_name;
+    TQString m_name;
     NameAndType_List m_args;
     UMLObject *m_pReturnType;
 };
@@ -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_Status parseTemplate(QString 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_Status parseTemplate(QString t, NameAndType& nmTp, UMLClassifier *owningSc
  *
  * @return      Error status of the parse, PS_OK for success.
  */
-Parse_Status parseAttribute(QString a, NameAndType& nmTp, UMLClassifier *owningScope,
+Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope,
                             Uml::Visibility *vis = 0);
 
 /**
@@ -316,12 +316,12 @@ Parse_Status parseAttribute(QString a, NameAndType& nmTp, UMLClassifier *owningS
  * @param owningScope   Pointer to the owning scope of the operation.
  * @return      Error status of the parse, PS_OK for success.
  */
-Parse_Status parseOperation(QString m, OpDescriptor& desc, UMLClassifier *owningScope);
+Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope);
 
 /**
  * Returns the Parse_Status as a text.
  */
-QString psText(Parse_Status value);
+TQString psText(Parse_Status value);
 
 }