CVS commit by luis: Revert change to QList. using qpointarray instead. minor fixes. M +9 -7 diagram.cpp 1.9 M +2 -1 diagram.h 1.6 --- kdesdk/umbrello/umbrello/diagram/diagram.h #1.5:1.6 @@ -25,4 +25,5 @@ class QDropEvent; class QDragEnterEvent; class QPopupMenu; +class QPointArray; namespace Umbrello{ @@ -77,5 +78,5 @@ public: * */ - void createAssociationWidget( UMLAssociation *assoc, UMLWidget *wA, UMLWidget *wB, const QPtrList &path ); + void createAssociationWidget( UMLAssociation *assoc, UMLWidget *wA, UMLWidget *wB, const QPointArray &path ); void fillContextMenu(QPopupMenu &menu) const; --- kdesdk/umbrello/umbrello/diagram/diagram.cpp #1.8:1.9 @@ -35,5 +35,5 @@ #include #include - +#include #include #include @@ -153,13 +153,15 @@ void Diagram::createUMLWidget( UMLObject } -void Diagram::createAssociationWidget( UMLAssociation *assoc,UMLWidget *wA, UMLWidget *wB, const QPtrList &path ) +void Diagram::createAssociationWidget( UMLAssociation *assoc,UMLWidget *wA, UMLWidget *wB, const QPointArray &path ) { - DiagramElement *w; - if( ( w = WidgetFactory::createAssociationWidget( assoc, wA, wB, path, this ) ) ) - { + DiagramElement *w = WidgetFactory::createAssociationWidget( assoc, wA, wB, path, this ); + if( w ) + {kdDebug()<<"showing association"<moveAbs(wA->x(), wA->y()); w->show(); update(); emit modified( ); } + else kdDebug()<<"widget factory regturned null assoc widget"<