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

[Ralf Habacker]

SVN commit 1288029 by habacker:

Reduced differences to trunk.

 M  +2 -2      umlscene.cpp  
 M  +1 -2      umlscene.h  


--- branches/work/soc-umbrello/umbrello/umlscene.cpp #1288028:1288029
@@ -92,7 +92,7 @@
 #include <cmath>  // for ceil
 
 // static members
-const qreal UMLScene::DEFAULT_CANVAS_SIZE = 1300;
+const UMLSceneValue UMLScene::defaultCanvasSize = 1300;
 
 using namespace Uml;
 
@@ -100,7 +100,7 @@
  * Constructor.
  */
 UMLScene::UMLScene(UMLFolder *parentFolder)
-  : QGraphicsScene(0, 0, DEFAULT_CANVAS_SIZE, DEFAULT_CANVAS_SIZE),
+  : QGraphicsScene(0, 0, defaultCanvasSize, defaultCanvasSize),
     m_nLocalID(Uml::id_None),
     m_nID(Uml::id_None),
     m_Type(Uml::DiagramType::Undefined),
--- branches/work/soc-umbrello/umbrello/umlscene.h #1288028:1288029
@@ -396,9 +396,8 @@
     bool m_bStartedCut;  ///< Flag if view/children started cut operation.
 
 private:
+    static const UMLSceneValue defaultCanvasSize;  ///< The default size of a diagram in pixels.
 
-    static const qreal DEFAULT_CANVAS_SIZE;  ///< The default size of a diagram in pixels.
-
     UMLFolder *m_pFolder;  ///< The folder in which this UMLScene is contained.
 
     /**