[Uml-devel] branches/work/soc-umbrello-2011/umbrello/soc-umbrello-2011
Camila San Martin Ayres
smayres at gmail.com
Wed Aug 24 14:20:04 UTC 2011
SVN commit 1249324 by ayres:
Adding a directory in the branche.
M +1 -1 boxwidget.cpp
A diagram.cpp.mine
A diagram.cpp.r1242849
A diagram.cpp.r1249323
M +4 -4 diagram.h
M +1 -1 objectwidget.h
A umlnamespace.cpp [License: GPL (v2+)]
A umlnamespace.h [License: GPL (v2+)]
M +1 -1 umlscene.cpp
M +26 -26 umlview.cpp
A umlview.h.mine
A umlview.h.r1243123
A umlview.h.r1249323
A umlwidget.cpp.mine
A umlwidget.cpp.r1243123
A umlwidget.cpp.r1249323
A umlwidget.h.mine
A umlwidget.h.r1243123
A umlwidget.h.r1249323
A widgetbase.cpp.mine
A widgetbase.cpp.r1242849
A widgetbase.cpp.r1249323
A widgetbase.h.mine
A widgetbase.h.r1242849
A widgetbase.h.r1249323
--- branches/work/soc-umbrello-2011/umbrello/soc-umbrello-2011/boxwidget.cpp #1249323:1249324
@@ -32,7 +32,7 @@
setFlag(ItemIsFocusable, true);
setFlag(ItemSendsGeometryChanges, true);
setAcceptDrops(true);
- UMLWidget::setBaseType( Uml::wt_Box );
+ UMLWidget::setBaseType( WidgetType::Box );
WidgetBase::m_bUsesDiagramLineColour = false;
WidgetBase::m_LineColour = QColor("black");
setZValue(m_origZ = 0);
--- branches/work/soc-umbrello-2011/umbrello/soc-umbrello-2011/diagram.h #1249323:1249324
@@ -13,7 +13,7 @@
#include <QObject>
-#include "umlnamespace.h"
+#include "basictypes.h"
#include "messagewidgetlist.h"
#include "associationwidgetlist.h"
#include "umlwidgetlist.h"
@@ -43,10 +43,10 @@
~Diagram();
UMLView *umlview() const;
- Uml::Diagram_Type typeDiagram() const;
+ Uml::DiagramType typeDiagram() const;
void setUmlView(UMLView *view);
- void setTypeDiagram(Uml::Diagram_Type t);
+ void setTypeDiagram(Uml::DiagramType t);
QString name() const;
@@ -96,7 +96,7 @@
private:
UMLView *m_view;
UMLScene *m_scene;
- Uml::Diagram_Type m_type;
+ Uml::DiagramType m_type;
QString m_name;
QString m_documentation;
QPointF m_pos;
--- branches/work/soc-umbrello-2011/umbrello/soc-umbrello-2011/objectwidget.h #1249323:1249324
@@ -12,7 +12,7 @@
#define QGV_OBJECTWIDGET_H
#include "soc-umbrello-2011/umlwidget.h"
-#include "umlnamespace.h"
+#include "basictypes.h"
class UMLObject;
class UMLDoc;
--- branches/work/soc-umbrello-2011/umbrello/soc-umbrello-2011/umlscene.cpp #1249323:1249324
@@ -39,7 +39,7 @@
setSceneRect(itemsBoundingRect());
m_imageexporter = new UMLViewImageExporter(m_view);
m_pToolBarStateFactory = new ToolBarStateFactory();
- m_pToolBarState = m_pToolBarStateFactory->getState(WorkToolBar::tbb_Arrow, m_view);
+ m_pToolBarState = m_pToolBarStateFactory->state(WorkToolBar::tbb_Arrow, m_view);
}
UMLScene::~UMLScene()
--- branches/work/soc-umbrello-2011/umbrello/soc-umbrello-2011/umlview.cpp #1249323:1249324
@@ -27,7 +27,7 @@
#include "object_factory.h"
#include "umlviewimageexporter.h"
-#include <QGraphicsItem>
+#include <QGraphicsView>
#include <KInputDialog>
#include <klocalizedstring.h>
#include <umlview.h>
@@ -300,42 +300,42 @@
{
//slotRemovePopupMenu();
- ListPopupMenu::Menu_Type menu = ListPopupMenu::mt_Undefined;
+ ListPopupMenu::MenuType menu = ListPopupMenu::mt_Undefined;
- switch (UMLApp::app()->currentView()->getType()) {
- case dt_Class:
+ switch (UMLApp::app()->currentView()->type()) {
+ case DiagramType::Class:
menu = ListPopupMenu::mt_On_Class_Diagram;
break;
- case dt_UseCase:
+ case DiagramType::UseCase:
menu = ListPopupMenu::mt_On_UseCase_Diagram;
break;
- case dt_Sequence:
+ case DiagramType::Sequence:
menu = ListPopupMenu::mt_On_Sequence_Diagram;
break;
- case dt_Collaboration:
+ case DiagramType::Collaboration:
menu = ListPopupMenu::mt_On_Collaboration_Diagram;
break;
- case dt_State:
+ case DiagramType::State:
menu = ListPopupMenu::mt_On_State_Diagram;
break;
- case dt_Activity:
+ case DiagramType::Activity:
menu = ListPopupMenu::mt_On_Activity_Diagram;
break;
- case dt_Component:
+ case DiagramType::Component:
menu = ListPopupMenu::mt_On_Component_Diagram;
break;
- case dt_Deployment:
+ case DiagramType::Deployment:
menu = ListPopupMenu::mt_On_Deployment_Diagram;
break;
- case dt_EntityRelationship:
+ case DiagramType::EntityRelationship:
menu = ListPopupMenu::mt_On_EntityRelationship_Diagram;
break;
@@ -359,7 +359,7 @@
void UMLView::slotMenuSelection(QAction* action)
{
- ListPopupMenu::Menu_Type sel = ListPopupMenu::mt_Undefined;
+ ListPopupMenu::MenuType sel = ListPopupMenu::mt_Undefined;
if (m_menu != NULL) { // popup from this class
sel = m_menu->getMenuType(action);
} else { // popup from umldoc
@@ -397,64 +397,64 @@
case ListPopupMenu::mt_UseCase:
// m_bCreateObject = true;
- Object_Factory::createUMLObject(ot_UseCase);
+ Object_Factory::createUMLObject(UMLObject::ot_UseCase);
break;
case ListPopupMenu::mt_Actor:
// m_bCreateObject = true;
- Object_Factory::createUMLObject(ot_Actor);
+ Object_Factory::createUMLObject(UMLObject::ot_Actor);
break;
case ListPopupMenu::mt_Class:
case ListPopupMenu::mt_Object:
// m_bCreateObject = true;
- Object_Factory::createUMLObject(ot_Class);
- Object_Factory::createUMLObject(ot_Class);
+ Object_Factory::createUMLObject(UMLObject::ot_Class);
+ Object_Factory::createUMLObject(UMLObject::ot_Class);
break;
case ListPopupMenu::mt_Package:
// m_bCreateObject = true;
- Object_Factory::createUMLObject(ot_Package);
+ Object_Factory::createUMLObject(UMLObject::ot_Package);
break;
case ListPopupMenu::mt_Component:
// m_bCreateObject = true;
- Object_Factory::createUMLObject(ot_Component);
+ Object_Factory::createUMLObject(UMLObject::ot_Component);
break;
case ListPopupMenu::mt_Node:
// m_bCreateObject = true;
- Object_Factory::createUMLObject(ot_Node);
+ Object_Factory::createUMLObject(UMLObject::ot_Node);
break;
case ListPopupMenu::mt_Artifact:
// m_bCreateObject = true;
- Object_Factory::createUMLObject(ot_Artifact);
+ Object_Factory::createUMLObject(UMLObject::ot_Artifact);
break;
case ListPopupMenu::mt_Interface:
// m_bCreateObject = true;
- Object_Factory::createUMLObject(ot_Interface);
+ Object_Factory::createUMLObject(UMLObject::ot_Interface);
break;
case ListPopupMenu::mt_Enum:
// m_bCreateObject = true;
- Object_Factory::createUMLObject(ot_Enum);
+ Object_Factory::createUMLObject(UMLObject::ot_Enum);
break;
case ListPopupMenu::mt_Entity:
// m_bCreateObject = true;
- Object_Factory::createUMLObject(ot_Entity);
+ Object_Factory::createUMLObject(UMLObject::ot_Entity);
break;
case ListPopupMenu::mt_Category:
// m_bCreateObject = true;
- Object_Factory::createUMLObject(ot_Category);
+ Object_Factory::createUMLObject(UMLObject::ot_Category);
break;
case ListPopupMenu::mt_Datatype:
// m_bCreateObject = true;
- Object_Factory::createUMLObject(ot_Datatype);
+ Object_Factory::createUMLObject(UMLObject::ot_Datatype);
break;
case ListPopupMenu::mt_Cut:
More information about the umbrello-devel
mailing list