[Uml-devel] kdesdk/umbrello/umbrello
Oliver Kellogg
okellogg at users.sourceforge.net
Sun Mar 13 12:29:28 UTC 2005
CVS commit by okellogg:
First tender preparations for tackling beastie 53376.
M +3 -19 messagewidget.cpp 1.62
M +1 -12 messagewidget.h 1.30
M +1 -2 toolbarstatemessages.cpp 1.16
--- kdesdk/umbrello/umbrello/messagewidget.h #1.29:1.30
@@ -49,5 +49,4 @@ public:
* @param a The role A widget for this message.
* @param b The role B widget for this message.
- * @param ft The FloatingText widget that is needed to display text.
* @param y The vertical position to display this message.
* @param sequenceMessageType Whether synchronous or asynchronous
@@ -55,5 +54,5 @@ public:
* The default (-1) will prompt generation of a new ID.
*/
- MessageWidget(UMLView * view, ObjectWidget* a, ObjectWidget* b, FloatingText* ft,
+ MessageWidget(UMLView * view, ObjectWidget* a, ObjectWidget* b,
int y, Uml::Sequence_Message_Type sequenceMessageType,
Uml::IDType id = Uml::id_None);
@@ -88,14 +87,4 @@ public:
/**
- * Write property of QString m_Operation.
- */
- void setOperation( const QString &operation );
-
- /**
- * Read property of QString m_Operation.
- */
- QString getOperation() const;
-
- /**
* Returns whether the message is synchronous or asynchronous
*/
--- kdesdk/umbrello/umbrello/messagewidget.cpp #1.61:1.62
@@ -30,6 +30,5 @@
MessageWidget::MessageWidget(UMLView * view, ObjectWidget* a, ObjectWidget* b,
- FloatingText* ft, int y,
- Uml::Sequence_Message_Type sequenceMessageType,
+ int y, Uml::Sequence_Message_Type sequenceMessageType,
Uml::IDType id /* = Uml::id_None */)
: UMLWidget(view, id) {
@@ -37,5 +36,4 @@ MessageWidget::MessageWidget(UMLView * v
m_pOw[Uml::A] = a;
m_pOw[Uml::B] = b;
- m_pFText = ft;
m_nY = y;
m_sequenceMessageType = sequenceMessageType;
@@ -45,10 +43,4 @@ MessageWidget::MessageWidget(UMLView * v
}
- //CHECK: This is contorted - it should be in the caller's responsibility:
- if (ft) {
- ft->setUMLObject(b->getUMLObject());
- setLinkAndTextPos();
- }
-
connect(m_pOw[Uml::A], SIGNAL(sigWidgetMoved(Uml::IDType)), this, SLOT(slotWidgetMoved(Uml::IDType)));
connect(m_pOw[Uml::B], SIGNAL(sigWidgetMoved(Uml::IDType)), this, SLOT(slotWidgetMoved(Uml::IDType)));
@@ -450,5 +442,5 @@ void MessageWidget::setText(FloatingText
void MessageWidget::setSeqNumAndOp(const QString &seqNum, const QString &op) {
setSequenceNumber( seqNum );
- setOperation( op );
+ m_Operation = op;
}
@@ -461,12 +453,4 @@ QString MessageWidget::getSequenceNumber
}
-void MessageWidget::setOperation( const QString &operation ) {
- m_Operation = operation;
-}
-
-QString MessageWidget::getOperation() const {
- return m_Operation;
-}
-
void MessageWidget::lwSetFont (QFont font) {
UMLWidget::setFont( font );
@@ -482,5 +466,5 @@ UMLClassifier *MessageWidget::getOperati
void MessageWidget::setOperationText(FloatingText *ft, const QString &opText) {
- setOperation(opText);
+ m_Operation = opText;
ft->setMessageText();
}
--- kdesdk/umbrello/umbrello/toolbarstatemessages.cpp #1.15:1.16
@@ -113,6 +113,5 @@ void ToolBarStateMessages::mouseRelease(
}
MessageWidget* message = new MessageWidget(m_pUMLView, pFirstSelectedObj,
- clickedOnWidget, NULL,
- y, msgType);
+ clickedOnWidget, y, msgType);
// TODO Do we really need a connect? It makes the code so hard to read.
More information about the umbrello-devel
mailing list