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

[Carsten Pfeiffer]

CVS commit by pfeiffer: 

- compile even more
  (but not fully yet :-/ )
- includemocs


  M +2 -0      actorwidget.cpp   1.2
  M +2 -0      classwidget.cpp   1.2
  M +8 -5      diagram.cpp   1.3
  M +2 -0      diagramelement.cpp   1.2
  M +3 -1      diagramview.cpp   1.2
  M +1 -1      diagramview.h   1.2
  M +2 -0      umlwidget.cpp   1.2


--- kdesdk/umbrello/umbrello/diagram/actorwidget.cpp  #1.1:1.2
@@ -122,2 +122,4 @@ m_height = 1*lineHeight + (2*vMargin) + 
 
 } //end of namespace NewDiagram
+
+#include "actorwidget.moc"

--- kdesdk/umbrello/umbrello/diagram/classwidget.cpp  #1.1:1.2
@@ -240,2 +240,4 @@ kdDebug()<<"class widget properties"<<en
 }
 } //end of namespace NewDiagram
+
+#include "classwidget.moc"

--- kdesdk/umbrello/umbrello/diagram/diagram.cpp  #1.2:1.3
@@ -29,4 +29,5 @@
 #include <typeinfo>
 #include <algorithm>
+#include <list>
 #include <qpopupmenu.h>
 #include <qcolor.h>
@@ -38,5 +39,5 @@ typedef UMLConcept UMLClass;
 using std::map;
 using std::find;
-using std::type_info;
+using std::list;
 
 
@@ -131,5 +132,5 @@ void Diagram::createWidget( UMLObject *o
 
         UMLWidget *w = 0L;
-        const type_info &type = typeid(*obj);
+        const std::type_info &type = typeid(*obj);
         if(!acceptType(type))
         {kdDebug()<<"type "<<type.name()<<"not accepted by diagram.(diagram type ="<<m_type<<")"<<endl;
@@ -161,5 +162,5 @@ void Diagram::createWidget( UMLObject *o
 
 
-bool Diagram::acceptType(const type_info &type)
+bool Diagram::acceptType(const std::type_info &type)
 {kdDebug()<<"accept? "<<type.name()<<endl;
 return (find((allowedTypes[m_type]).begin(),
@@ -270,9 +271,9 @@ UMLDoc* Diagram::document() const
 
 /////////////////////////////////////////////////////////////////
-map<Diagram::DiagramType,list<const type_info*> > Diagram::allowedTypes;
+map<Diagram::DiagramType,list<const std::type_info*> > Diagram::allowedTypes;
 
 void Diagram::initAllowedTypesMap()
 {
-        list<const type_info*> *list = &allowedTypes[ClassDiagram];
+        list<const std::type_info*> *list = &allowedTypes[ClassDiagram];
                 list->insert(list->end(),&typeid(UMLClass));
                 list->insert(list->end(),&typeid(UMLInterface));
@@ -296,2 +297,4 @@ void Diagram::initAllowedTypesMap()
 }
 
+
+#include "diagram.moc"

--- kdesdk/umbrello/umbrello/diagram/diagramelement.cpp  #1.1:1.2
@@ -101,2 +101,4 @@ Diagram* DiagramElement::diagram() const
 }
 
+
+#include "diagramelement.moc"

--- kdesdk/umbrello/umbrello/diagram/diagramview.cpp  #1.1:1.2
@@ -344,5 +344,5 @@ kdDebug()<<"telling toolbar to change ic
 
 //////////////////////////////////////////////////////////
-map<WorkToolBar::EditTool, const type_info*> DiagramView::toolMap;
+map<WorkToolBar::EditTool, const std::type_info*> DiagramView::toolMap;
 void DiagramView::initToolMap()
 {
@@ -377,2 +377,4 @@ void DiagramView::initToolMap()
 
 }
+
+#include "diagramview.moc"

--- kdesdk/umbrello/umbrello/diagram/diagramview.h  #1.1:1.2
@@ -55,5 +55,5 @@ protected:
         
         long m_currentAction;
-        static std::map<WorkToolBar::EditTool, const type_info*> toolMap;
+        static std::map<WorkToolBar::EditTool, const std::type_info*> toolMap;
 private:
         void initToolMap();

--- kdesdk/umbrello/umbrello/diagram/umlwidget.cpp  #1.1:1.2
@@ -128,2 +128,4 @@ void UMLWidget::getConnectingPoint(QPoin
 
 }
+
+#include "umlwidget.moc"