[Uml-devel] kdesdk/umbrello/umbrello

[Otto Bruggeman]

CVS commit by bruggie: 

Make it compile with srcdir!=builddir and some other thingies


  M +1 -1      diagram/Makefile.am   1.4
  M +4 -4      diagram/classwidget.cpp   1.9
  M +1 -1      refactoring/Makefile.am   1.2
  M +1 -1      refactoring/refactoringassistant.cpp   1.2


--- kdesdk/umbrello/umbrello/diagram/Makefile.am  #1.3:1.4
@@ -1,5 +1,5 @@
 noinst_LTLIBRARIES = libdiagram.la
 
-INCLUDES = -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_srcdir) -I$(top_builddir)/umbrello/umbrello/dialogs $(all_includes)
 
 libdiagram_la_METASOURCES = AUTO

--- kdesdk/umbrello/umbrello/diagram/classwidget.cpp  #1.8:1.9
@@ -301,13 +301,13 @@ void ClassWidget::calculateSize()
         QFontMetrics fm(font);
 
-        maxWidth = max(maxWidth,fm.width(m_stereotype));
-        maxWidth = max(maxWidth, fm.width(m_name));
+        maxWidth = kMax(maxWidth,fm.width(m_stereotype));
+        maxWidth = kMax(maxWidth, fm.width(m_name));
         for(QValueList<AttString>::Iterator it = m_atts.begin(); it != m_atts.end(); ++it )
         {
-                maxWidth = max(maxWidth,fm.width((*it).string));
+                maxWidth = kMax(maxWidth,fm.width((*it).string));
         }
         for(QValueList<OpString>::Iterator it = m_ops.begin(); it != m_ops.end(); ++it )
         {
-                maxWidth = max(maxWidth,fm.width((*it).string));
+                maxWidth = kMax(maxWidth,fm.width((*it).string));
         }
 

--- kdesdk/umbrello/umbrello/refactoring/Makefile.am  #1.1:1.2
@@ -1,5 +1,5 @@
 noinst_LTLIBRARIES = librefactoring.la
 
-INCLUDES = -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_srcdir) -I$(top_builddir)/umbrello/umbrello/dialogs $(all_includes)
 
 librefactoring_la_METASOURCES = AUTO

--- kdesdk/umbrello/umbrello/refactoring/refactoringassistant.cpp  #1.1:1.2
@@ -35,5 +35,5 @@
 #include <kdebug.h>
 
-using std::typeinfo;
+using std::type_info;