[Uml-devel] branches/work/soc-umbrello/umbrello

[Andi Fischer]

SVN commit 1205522 by fischer:

Patch from pavelheimlich also applied to branch.

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


--- branches/work/soc-umbrello/umbrello/attribute.h #1205521:1205522
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2002-2008                                               *
+ *   copyright (C) 2002-2010                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -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.
--- branches/work/soc-umbrello/umbrello/entityattribute.h #1205521:1205522
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2002-2009                                               *
+ *   copyright (C) 2002-2010                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -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();
 
--- branches/work/soc-umbrello/umbrello/refactoring/refactoringassistant.h #1205521:1205522
@@ -5,7 +5,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   copyright (C) 2003 Luis De la Parra <lparrab at gmx.net>                 *
- *   copyright (C) 2004-2009                                               *
+ *   copyright (C) 2004-2010                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -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);