Cleanup dead code and make code more consistent.

libdunnartcanvas/canvas.cpp

@@ -1713,25 +1713,25 @@ QString Canvas::filename(void)
 
 QList<CanvasItem *> Canvas::items(void) const
 {
-    QList<CanvasItem *> result;
+    QList<CanvasItem *> canvasItems;
 
     QList<QGraphicsItem *> itemList = QGraphicsScene::items();
     for (int i = 0; i < itemList.size(); ++i)
     {
         CanvasItem *canvasItem = dynamic_cast<CanvasItem *> (itemList.at(i));
         if (canvasItem)
         {
-            result.push_back(canvasItem);
+            canvasItems.push_back(canvasItem);
         }
     }
 
-    return result;
+    return canvasItems;
 }
 
 
 QList<CanvasItem *> Canvas::selectedItems(void) const
 {
-    QList<CanvasItem *> result;
+    QList<CanvasItem *> filteredSelection;
 
     // Filter and return just the CanvasItem-based objects.
     QList<QGraphicsItem *> selection = QGraphicsScene::selectedItems();
@@ -1740,28 +1740,29 @@ QList<CanvasItem *> Canvas::selectedItems(void) const
         CanvasItem *canvasItem = dynamic_cast<CanvasItem *> (selection.at(i));
         if (canvasItem)
         {
-            result.push_back(canvasItem);
+            filteredSelection.push_back(canvasItem);
         }
     }
 
     if (m_edit_mode == ModeConnection)
     {
         // In connection mode we want to allow selection of lone connectors
         // for editing purposes, but not selection of other objects.
-        if ((result.size() == 1) && dynamic_cast<Connector *> (result.first()))
+        if ((filteredSelection.size() == 1) &&
+                dynamic_cast<Connector *> (filteredSelection.first()))
         {
             // Return the single selected connector
-            return result;
+            return filteredSelection;
         }
         else
         {
             // Otherwise, return no selection.
-            QList<CanvasItem *> emptyResult;
-            return emptyResult;
+            QList<CanvasItem *> emptySelection;
+            return emptySelection;
         }
     }
 
-    return result;
+    return filteredSelection;
 }
 
 bool Canvas::useGmlClusters(void) const
@@ -2493,23 +2494,23 @@ void Canvas::repositionAndShowSelectionResizeHandles(bool calculatePosition)
 bool Canvas::singlePropUpdateID(QDomElement& node, const QString& prop,
             const QString ns)
 {
-    bool result = false;
+    bool wasSuccessful = false;
     QString oldId = nodeAttribute(node, ns, prop);
     if (!oldId.isNull())
     {
-        QString qName = (ns.isEmpty()) ? prop : ns + ":" + prop;
+        QString propertyName = (ns.isEmpty()) ? prop : ns + ":" + prop;
         if (m_paste_id_map.find(oldId) != m_paste_id_map.end())
         {
             // The object this ID refers to is in the selection.
-            node.setAttribute(qName, m_paste_id_map[oldId]);
-            result = true;
+            node.setAttribute(propertyName, m_paste_id_map[oldId]);
+            wasSuccessful = true;
         }
         else
         {
             node.removeAttribute(prop);
         }
     }
-    return result;
+    return wasSuccessful;
 }
 
 

libdunnartcanvas/canvasitem.cpp

@@ -126,12 +126,12 @@ const char *x_dunnartURI = "http://www.dunnart.org/ns/dunnart";
 
 CanvasItem::CanvasItem(QGraphicsItem *parent, QString id, unsigned int lev)
         : QGraphicsSvgItem(),
-          distance(-1),
-          cascade_glow(false),
           m_string_id(id),
           m_internal_id(0),
           m_is_collapsed(false),
-          _inactive(false),
+          m_is_inactive(false),
+          m_connection_distance(-1),
+          m_connection_cascade_glow(false),
           m_constraint_conflict(false)
 {
     Q_UNUSED (parent)
@@ -141,7 +141,7 @@ CanvasItem::CanvasItem(QGraphicsItem *parent, QString id, unsigned int lev)
     setCacheMode(QGraphicsItem::NoCache);
 
     setZValue(lev);
-    connectedObjs[0] = connectedObjs[1] = NULL;
+    m_connected_objects[0] = m_connected_objects[1] = NULL;
 
     setAcceptHoverEvents(true);
     setFlag(QGraphicsItem::ItemIsSelectable, true);
@@ -810,7 +810,7 @@ void CanvasItem::setAsCollapsed(bool collapsed)
 
 bool CanvasItem::isInactive(void) const
 {
-    return _inactive;
+    return m_is_inactive;
 }
 
 
@@ -857,7 +857,7 @@ void CanvasItem::maybeReturn(void)
 
 void CanvasItem::setAsInactive(bool inactive, CanvasItemSet fullSet)
 {
-    if (_inactive == inactive)
+    if (m_is_inactive == inactive)
     {
         qFatal("Existing inactive state passed to CanvasItem::setAsInactive");
     }
@@ -867,8 +867,8 @@ void CanvasItem::setAsInactive(bool inactive, CanvasItemSet fullSet)
     ShapeObj *shape = dynamic_cast<ShapeObj *> (this);
 
     QDomDocument doc("XML");
-    _inactive = inactive;
-    if (_inactive)
+    m_is_inactive = inactive;
+    if (m_is_inactive)
     {
         QDomElement xn = to_QDomElement(XMLSS_ALL, doc);
         assert(!xn.isNull());
@@ -1011,30 +1011,30 @@ bool CanvasItem::cascade_logic(int& nextval, int dist, unsigned int dir,
         int index = dist + 1;
         while (path[index])
         {
-            path[index]->distance = -1;
+            path[index]->m_connection_distance = -1;
             path[index] = NULL;
             ++index;
         }
     }
 
     if (path && (this == path[0]))
     {
-        if (distance == -1)
+        if (m_connection_distance == -1)
         {
-            distance = dist;
+            m_connection_distance = dist;
         }
         path[dist + 1] = this;
         // Have reached destination
         for (int i = dist + 1; i > 0; --i)
         {
             // Mark path.
-            path[i]->distance = -2;
-            path[i]->cascade_glow = true;
+            path[i]->m_connection_distance = -2;
+            path[i]->m_connection_cascade_glow = true;
 
             if ((i > 1) && (i < (dist + 1)))
             {
-                path[i]->connectedObjs[0] = path[i - 1];
-                path[i]->connectedObjs[1] = path[i + 1];
+                path[i]->m_connected_objects[0] = path[i - 1];
+                path[i]->m_connected_objects[1] = path[i + 1];
             }
 
 #if 0
@@ -1048,12 +1048,12 @@ bool CanvasItem::cascade_logic(int& nextval, int dist, unsigned int dir,
         return false;
     }
 
-    if (distance == -1)
+    if (m_connection_distance == -1)
     {
-        distance = dist;
+        m_connection_distance = dist;
         path[dist + 1] = this;
     }
-    else if (dist >= distance)
+    else if (dist >= m_connection_distance)
     {
         return false;
     }

libdunnartcanvas/canvasitem.h

@@ -221,9 +221,6 @@ class CanvasItem: public QGraphicsSvgItem
         virtual void loneSelectedChange(const bool value);
         QString svgCodeAsString(const QSize& size, const QRectF& viewBox);
 
-        int distance;
-        int cascade_glow;
-        CanvasItem *connectedObjs[2];
     protected:
         void setHoverMessage(const QString& message);
         virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
@@ -253,9 +250,15 @@ class CanvasItem: public QGraphicsSvgItem
         virtual void routerResize(void);
 
         QString m_string_id;
-        uint m_internal_id;
+        uint m_internal_id;        
         bool m_is_collapsed;
-        bool _inactive;
+        bool m_is_inactive;
+
+        // Used for constraint debugging:
+        int m_connection_distance;
+        int m_connection_cascade_glow;
+        CanvasItem *m_connected_objects[2];
+
     private:
         friend class AlterCanvasItemProperty;
         virtual void userMoveBy(qreal dx, qreal dy);

libdunnartcanvas/cluster.cpp

@@ -804,9 +804,10 @@ QPainterPath Cluster::buildPainterPath(void)
 }
 
 
-void Cluster::set_label(const char *l)
+void Cluster::setLabel(const QString& label)
 {
-    Q_UNUSED (l)
+    Q_UNUSED (label)
+
     // Do nothing
     return;
 }

libdunnartcanvas/cluster.h

@@ -58,10 +58,11 @@ class Cluster: public ShapeObj
         }
         Cluster(CanvasItemList& memberList, QString id);
         Cluster(Canvas *canvas, const QDomElement& node, const QString& ns);
-        QDomElement to_QDomElement(const unsigned int subset, 
+
+        QDomElement to_QDomElement(const unsigned int subset,
                 QDomDocument& doc);
         Avoid::Polygon *poly(const double buffer, Avoid::Polygon *poly = NULL);
-        virtual void set_label(const char *l);
+        virtual void setLabel(const QString& label);
         void recomputeBoundary(void);
         void setNewBoundary(std::vector<Avoid::Point>& points);
         void computeBoundingBox(void);
@@ -88,6 +89,9 @@ class Cluster: public ShapeObj
     private:
         virtual void userMoveBy(qreal dx, qreal dy);
 
+        void calculateBoundary(void);
+        void changeDetailLevel(bool expand);
+
         ShapeList members;
         std::vector<Avoid::Point> boundary;
         int psn;
@@ -98,8 +102,6 @@ class Cluster: public ShapeObj
         ConnSet internalConns;
         XmlNodeList expandedConnRoutes;
 
-        void calculateBoundary(void);
-        void changeDetailLevel(bool expand);
 };