[Uml-devel] kdesdk/umbrello/umbrello/plugins/umlwidgets

[Oliver Kellogg]

CVS commit by okellogg: 

Remove reason for KDE_OPTIONS = nofinal


  M +1 -4      Makefile.am   1.7
  M +2 -10     classwidget.cpp   1.4
  M +5 -0      classwidget.h   1.2
  M +2 -10     interfacewidget.cpp   1.4
  M +4 -0      interfacewidget.h   1.2
  M +2 -11     packagewidget.cpp   1.3
  M +5 -0      packagewidget.h   1.2


--- kdesdk/umbrello/umbrello/plugins/umlwidgets/Makefile.am  #1.6:1.7
@@ -1,6 +1,3 @@
-#interfacewidget.cpp:41: error: redefinition of `int <unnamed>::hMargin'
-#classwidget.cpp:43: error: `int <unnamed>::hMargin' previously defined here
-# TODO: fix the problem
-KDE_OPTIONS = nofinal
+# KDE_OPTIONS = nofinal
 
 SUBDIRS = dialogs

--- kdesdk/umbrello/umbrello/plugins/umlwidgets/classwidget.cpp  #1.3:1.4
@@ -37,15 +36,8 @@
 #include <kdebug.h>
 
-// unnamed namespace : data for this file only
-namespace{
- //vertical and horizontal margins
- int vMargin = 10;
- int hMargin = 10;
- int lineHeight = 1;
-}
-
 
+namespace Umbrello {
 
-namespace Umbrello{
+int ClassWidget::lineHeight = 1;
 
 ClassWidget::ClassWidget(Diagram *diagram, uint id, UMLClass *object):

--- kdesdk/umbrello/umbrello/plugins/umlwidgets/classwidget.h  #1.1:1.2
@@ -79,4 +80,8 @@ protected:
         QValueList<AttString> m_atts;
         QValueList<OpString>  m_ops;
+
+        static const int vMargin = 10;
+        static const int hMargin = 10;
+        static int lineHeight;
 };
 

--- kdesdk/umbrello/umbrello/plugins/umlwidgets/interfacewidget.cpp  #1.3:1.4
@@ -35,15 +34,8 @@
 #include <kdebug.h>
 
-// unnamed namespace : data for this file only
-namespace{
- //vertical and horizontal margins
- int vMargin = 10;
- int hMargin = 10;
- int lineHeight = 1;
-}
-
 
+namespace Umbrello {
 
-namespace Umbrello{
+int InterfaceWidget::lineHeight = 1;
 
 InterfaceWidget::InterfaceWidget(Diagram *diagram, uint id, UMLInterface *object):

--- kdesdk/umbrello/umbrello/plugins/umlwidgets/interfacewidget.h  #1.1:1.2
@@ -71,4 +71,8 @@ protected:
         QString m_name;
         QValueList<OpString>  m_ops;
+
+        static const int vMargin = 10;
+        static const int hMargin = 10;
+        static int lineHeight;
 };
 

--- kdesdk/umbrello/umbrello/plugins/umlwidgets/packagewidget.cpp  #1.2:1.3
@@ -32,16 +31,8 @@
 #include <kdebug.h>
 
-// unnamed namespace : data for this file only
-namespace{
- //vertical and horizontal margins
- int vMargin = 10;
- int hMargin = 10;
- int tabHeight = 15;
- int lineHeight = 1;
-}
-
 
+namespace Umbrello {
 
-namespace Umbrello{
+int PackageWidget::lineHeight = 1;
 
 PackageWidget::PackageWidget(Diagram *diagram, uint id, UMLPackage *object):

--- kdesdk/umbrello/umbrello/plugins/umlwidgets/packagewidget.h  #1.1:1.2
@@ -64,4 +64,9 @@ protected:
         QString m_stereotype;
         QString m_name;
+
+        static const int vMargin = 10;
+        static const int hMargin = 10;
+        static const int tabHeight = 15;
+        static int lineHeight;
 };