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

[Ralf Habacker]

SVN commit 1288028 by habacker:

Reduced differences to soc-umbrello branch.

 M  +1 -1      umlscene.cpp  
 M  +3 -6      umlscene.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.cpp #1288027:1288028
@@ -105,7 +105,7 @@
 #define MANUAL_CONTROL_DOUBLE_BUFFERING
 
 // static members
-const int UMLScene::defaultCanvasSize = 1300;
+const UMLSceneValue UMLScene::defaultCanvasSize = 1300;
 
 using namespace Uml;
 
--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.h #1288027:1288028
@@ -280,11 +280,6 @@
 
     void resizeCanvasToItems();
 
-    /**
-     * The width and height of a diagram canvas in pixels.
-     */
-    static const int defaultCanvasSize;
-
     // Load/Save interface:
 
     virtual void saveToXMI(QDomDocument & qDoc, QDomElement & qElement);
@@ -383,7 +378,9 @@
     bool m_bStartedCut;  ///< Flag if view/children started cut operation.
     UMLWidgetList m_SelectedList;
 
-protected:
+private:
+    static const UMLSceneValue defaultCanvasSize;  ///< The width and height of a diagram canvas in pixels.
+
     UMLView *m_view;   ///< The view to which this scene is related.
     UMLFolder *m_pFolder;  ///< The folder in which this UMLView is contained.