[Uml-devel] branches/work/isi-umbrello/umbrello/umbrello

[Thomas Gallinari]

SVN commit 638592 by gallinari:

Using QList instead of List in combinedfragmentwidget.h and combinedfragmentwidget.cpp.


 M  +6 -7      combinedfragmentwidget.cpp  
 M  +2 -2      combinedfragmentwidget.h  


--- branches/work/isi-umbrello/umbrello/umbrello/combinedfragmentwidget.cpp #638591:638592
@@ -116,7 +116,7 @@
                 p.drawText(offsetX + COMBINED_FRAGMENT_MARGIN, offsetY ,
 			w - COMBINED_FRAGMENT_MARGIN * 2, fontHeight, Qt::AlignLeft, "alt");
                 // dash lines
-                for(list<FloatingDashLineWidget*>::iterator it=m_dashLines->begin() ; it!=m_dashLines->end() ; it++) {
+                for(QList<FloatingDashLineWidget*>::iterator it=m_dashLines->begin() ; it!=m_dashLines->end() ; it++) {
                     (*it)->setX(getX());
                     old_Y = (*it)->getYMin();
                     (*it)->setYMin(getY());
@@ -131,7 +131,7 @@
                 p.drawText(offsetX + COMBINED_FRAGMENT_MARGIN, offsetY ,
 			w - COMBINED_FRAGMENT_MARGIN * 2, fontHeight, Qt::AlignLeft, "parallel");
                 // dash lines
-                for(list<FloatingDashLineWidget*>::iterator it=m_dashLines->begin() ; it!=m_dashLines->end() ; it++) {
+                for(QList<FloatingDashLineWidget*>::iterator it=m_dashLines->begin() ; it!=m_dashLines->end() ; it++) {
                     (*it)->setX(getX());
                     old_Y = (*it)->getYMin();
                     (*it)->setYMin(getY());
@@ -181,7 +181,7 @@
     // creates a dash line if the combined fragment type is alternative or parallel
     if(m_CombinedFragment == Alt || m_CombinedFragment == Par)
     {
-        m_dashLines = new list<FloatingDashLineWidget*>();
+        m_dashLines = new QList<FloatingDashLineWidget*>();
         m_dashLines->push_back(new FloatingDashLineWidget(m_pView));
         if(m_CombinedFragment == Alt)
         {
@@ -270,9 +270,9 @@
     // save the corresponding floating dash lines
     /*QString dashlineId("dashlineId");
     int i=1;
-    for (list<FloatingDashLineWidget>::iterator it = m_dashLines->begin() ; it != m_dashLines->end() ; it++) {
-        combinedFragmentElement.setAttribute( dashlineId.append(i), ID2STR(it->getID()) );
-        it -> saveToXMI( qDoc, combinedFragmentElement );
+    for (list<FloatingDashLineWidget*>::iterator it = m_dashLines->begin() ; it != m_dashLines->end() ; it++) {
+        combinedFragmentElement.setAttribute( dashlineId.append(i), ID2STR((*it)->getID()) );
+        (*it) -> saveToXMI( qDoc, combinedFragmentElement );
         i++;
     }*/
 
@@ -329,7 +329,6 @@
     switch (sel) {
         // for alternative or parallel combined fragments
         case ListPopupMenu::mt_AddInteractionOperand:
-            kDebug()<<"yeeeeeeeeeeeeeeeeeeeeeeeeeeees !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n";
             m_dashLines->push_back(new FloatingDashLineWidget(m_pView));
             if(m_CombinedFragment == Alt)
             {
--- branches/work/isi-umbrello/umbrello/umbrello/combinedfragmentwidget.h #638591:638592
@@ -12,7 +12,7 @@
 #ifndef COMBINEDFRAGMENTWIDGET_H
 #define COMBINEDFRAGMENTWIDGET_H
 
-#include <list>
+#include <qlist.h>
 #include "umlwidget.h"
 #include "worktoolbar.h"
 #include "floatingdashlinewidget.h"
@@ -125,7 +125,7 @@
     /**
      * Dash lines of an alternative or parallel combined fragment
      */
-    list<FloatingDashLineWidget*> *m_dashLines ;
+    QList<FloatingDashLineWidget*> *m_dashLines ;
 };
 
 #endif