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

[Jonathan Riddell]

CVS commit by jriddell: 

removed namespace around min() and max() functions and included diagramelement.h in classwidget.cpp
Hopefully this should stop the fatal compile errors.


  M +7 -5      classwidget.cpp   1.8
  M +12 -14    diagramelement.cpp   1.6


--- kdesdk/umbrello/umbrello/diagram/classwidget.cpp  #1.7:1.8
@@ -28,4 +28,6 @@
 #include "../refactoring/refactoringassistant.h"
 
+#include "diagramelement.h"
+
 #include <qapplication.h>
 #include <klocale.h>

--- kdesdk/umbrello/umbrello/diagram/diagramelement.cpp  #1.5:1.6
@@ -21,8 +21,6 @@
 
 //anonymous namespace for file-only data
-namespace {
 float min( float a, float b ) { return a < b ? a: b;}
 float max( float a, float b ) { return a > b ? a: b;}
-}