[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Pavel Heimlich]

SVN commit 1203385 by pavelheimlich:

fix QString ambiguity. fixes build with Sun Studio on Solaris.



 M  +1 -1      attribute.h  
 M  +1 -1      entityattribute.h  
 M  +1 -1      refactoring/refactoringassistant.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/attribute.h #1203384:1203385
@@ -42,7 +42,7 @@
     UMLAttribute(UMLObject *parent, const QString& name,
                  Uml::IDType id = Uml::id_None,
                  Uml::Visibility s = Uml::Visibility::Private,
-                 UMLObject *type = 0, const QString& iv = 0);
+                 UMLObject *type = 0, const QString& iv = QString());
 
     /**
      * Sets up an attribute.
--- trunk/KDE/kdesdk/umbrello/umbrello/entityattribute.h #1203384:1203385
@@ -29,7 +29,7 @@
     UMLEntityAttribute(UMLObject* parent, const QString& name,
                        Uml::IDType id = Uml::id_None,
                        Uml::Visibility s = Uml::Visibility::Private,
-                       UMLObject *type = 0, const QString& iv = 0);
+                       UMLObject *type = 0, const QString& iv = QString());
     UMLEntityAttribute(UMLObject* parent);
     virtual ~UMLEntityAttribute();
 
--- trunk/KDE/kdesdk/umbrello/umbrello/refactoring/refactoringassistant.h #1203384:1203385
@@ -29,7 +29,7 @@
     Q_OBJECT
 public:
 
-    explicit RefactoringAssistant(UMLDoc *doc, UMLClassifier *obj = 0, QWidget *parent = 0, const QString &name = 0);
+    explicit RefactoringAssistant(UMLDoc *doc, UMLClassifier *obj = 0, QWidget *parent = 0, const QString &name = QString());
     virtual ~RefactoringAssistant();
 
     void refactor(UMLClassifier *obj);