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

[Andi Fischer]

SVN commit 1273091 by fischer:

Some synch between branch and trunk.

 M  +9 -1      statewidget.cpp  
 M  +3 -6      statewidget.h  


--- branches/work/soc-umbrello/umbrello/widgets/statewidget.cpp #1273090:1273091
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2002-2011                                               *
+ *   copyright (C) 2002-2012                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -201,6 +201,14 @@
 }
 
 /**
+ * @return Type of state.
+ */
+StateType StateWidget::stateType() const
+{
+    return m_stateType;
+}
+
+/**
  * Sets the StateType of this widget to \a stateType.
  */
 void StateWidget::setStateType(StateType stateType)
--- branches/work/soc-umbrello/umbrello/widgets/statewidget.h #1273090:1273091
@@ -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-2012                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
 ***************************************************************************/
 
@@ -51,10 +51,7 @@
 
     virtual void paint(QPainter *p, const QStyleOptionGraphicsItem *item, QWidget *w);
 
-    /// @return Type of state.
-    StateType stateType() const {
-        return m_stateType;
-    }
+    StateType stateType() const;
     void setStateType( StateType stateType );
 
     bool addActivity( const QString &activity );
@@ -62,7 +59,7 @@
     bool renameActivity( const QString &activity, const QString &newName );
 
     QStringList activities() const;
-    void setActivities( QStringList & list );
+    void setActivities(const QStringList &list);
 
     virtual void showPropertiesDialog();