[Uml-devel] branches/KDE/4.7/kdesdk/umbrello/umbrello/codegenerators

[David Faure]

SVN commit 1266265 by dfaure:

Backport r1244457 | fischer: fix compilation with Qt-4.8


 M  +6 -0      ownedcodeblock.cpp  
 M  +2 -11     ownedcodeblock.h  


--- branches/KDE/4.7/kdesdk/umbrello/umbrello/codegenerators/ownedcodeblock.cpp #1266264:1266265
@@ -22,6 +22,9 @@
 #include "uml.h"
 #include "textblock.h"
 
+/**
+ * Constructor
+ */
 OwnedCodeBlock::OwnedCodeBlock ( UMLObject * parent )
     : QObject ( parent )
 {
@@ -29,6 +32,9 @@
     initFields(parent);
 }
 
+/**
+ * Empty Destructor
+ */
 OwnedCodeBlock::~OwnedCodeBlock ( )
 {
     /*
--- branches/KDE/4.7/kdesdk/umbrello/umbrello/codegenerators/ownedcodeblock.h #1266264:1266265
@@ -5,7 +5,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   copyright (C) 2003      Brian Thomas <thomas at mail630.gsfc.nasa.gov>   *
- *   copyright (C) 2004-2008                                               *
+ *   copyright (C) 2004-2011                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -23,19 +23,12 @@
  * Describes any codeblock which is 'owned' by a UMLobject of some sort and should
  * be in sync with that parent.
  */
-class OwnedCodeBlock : virtual public QObject
+class OwnedCodeBlock : public QObject
 {
     Q_OBJECT
 public:
 
-    /**
-     * Constructor
-     */
     OwnedCodeBlock ( UMLObject * parent );
-
-    /**
-     * Empty Destructor
-     */
     virtual ~OwnedCodeBlock ( );
 
     UMLObject * getParentObject ( );
@@ -47,9 +40,7 @@
     virtual void release ();
 
     virtual void setAttributesOnNode ( QDomDocument & doc, QDomElement & blockElement);
-
     virtual void setAttributesFromNode ( QDomElement & element);
-
     virtual void setAttributesFromObject (TextBlock * obj);
 
 private: