QmlDesigner: Removing out commented code

Change-Id: I7e3fc3fc1f7d846d64e68acd39552159e1820c70
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

8 files changed, 1 insertions, 77 deletions

diff --git a/src/plugins/qmldesigner/components/formeditor/bindingindicatorgraphicsitem.cpp b/src/plugins/qmldesigner/components/formeditor/bindingindicatorgraphicsitem.cpp
index 498daf4ce6..c6b4ca6fd0 100644
--- a/src/plugins/qmldesigner/components/formeditor/bindingindicatorgraphicsitem.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/bindingindicatorgraphicsitem.cpp
@@ -39,7 +39,6 @@ void BindingIndicatorGraphicsItem::paint(QPainter *painter, const QStyleOptionGr
     painter->save();
     QPen linePen(QColor(255, 0, 0, 255), 2);
     linePen.setCosmetic(true);
-    //linePen.setDashPattern(QVector<double>() << 3. << 2.);
     painter->setPen(linePen);
     painter->drawLine(m_bindingLine);
     painter->restore();
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp
index deebbbb307..9158e33862 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp
@@ -102,7 +102,7 @@ void FormEditorGraphicsView::mousePressEvent(QMouseEvent *event)
 void FormEditorGraphicsView::mouseReleaseEvent(QMouseEvent *event)
 {
     // not sure why buttons() are empty here, but we have that information from the enum
-    if (/*event->buttons().testFlag(Qt::MiddleButton) && */m_isPanning == Panning::MouseWheelStarted)
+    if (m_isPanning == Panning::MouseWheelStarted)
         stopPanning(event);
     else
         QGraphicsView::mouseReleaseEvent(event);
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
index 6575413265..574fafac04 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
@@ -109,8 +109,6 @@ void FormEditorItem::updateGeometry()
 
 void FormEditorItem::updateVisibilty()
 {
-//    setVisible(nodeInstance().isVisible());
-//    setOpacity(nodeInstance().opacity());
 }
 
 
diff --git a/src/plugins/qmldesigner/components/formeditor/itemutilfunctions.cpp b/src/plugins/qmldesigner/components/formeditor/itemutilfunctions.cpp
index dffb5bf040..a16ca4b54d 100644
--- a/src/plugins/qmldesigner/components/formeditor/itemutilfunctions.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/itemutilfunctions.cpp
@@ -44,29 +44,4 @@ QRectF boundingRectForItemList(QList<FormEditorItem*> itemList)
     return boundingRect;
 }
 
-//ModelNode parentNodeSemanticallyChecked(const ModelNode &childNode, const ModelNode &parentNode)
-//{
-//    if (ModelUtilities::canReparent(childNode, parentNode)) {
-//        ModelNode newParentNode;
-//         newParentNode = ModelUtilities::mapGraphicsViewToGraphicsScene(parentNode);
-//        if (newParentNode == childNode.parentNode())
-//            return ModelNode();
-//        if (ModelUtilities::isQWidget(childNode))
-//            return ModelUtilities::reparentAndProxymize(childNode, newParentNode);
-//        else
-//            return parentNode;
-//    }
-//
-//    return ModelNode();
-//}
-
-//FormEditorItem* mapGraphicsViewToGraphicsScene(FormEditorItem* item)
-//{
-//    if (item == 0) //null pointer
-//        return 0;
-//     ModelNode newNode  = ModelUtilities::mapGraphicsViewToGraphicsScene(item->modelNode());
-//     return item->scene()->itemForNode(newNode);
-//}
-
-
 }
diff --git a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp
index ea78035612..f591073e5b 100644
--- a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp
@@ -158,8 +158,6 @@ void MoveManipulator::begin(const QPointF &beginPoint)
 
     m_beginPoint = beginPoint;
 
-//    setOpacityForAllElements(0.62);
-
     setDirectUpdateInNodeInstances(true);
 
     beginRewriterTransaction();
diff --git a/src/plugins/qmldesigner/components/formeditor/resizetool.cpp b/src/plugins/qmldesigner/components/formeditor/resizetool.cpp
index 6e941a3514..c9e8a977fd 100644
--- a/src/plugins/qmldesigner/components/formeditor/resizetool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/resizetool.cpp
@@ -161,9 +161,6 @@ void ResizeTool::keyReleaseEvent(QKeyEvent * keyEvent)
             keyEvent->setAccepted(false);
             return;
     }
-
-//     if (!keyEvent->isAutoRepeat())
-//         m_resizeManipulator.clear();
 }
 
 void ResizeTool::itemsAboutToRemoved(const QList<FormEditorItem*> & /*itemList*/)
diff --git a/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp b/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp
index 870d04de1f..77809bf08d 100644
--- a/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp
@@ -63,17 +63,6 @@ void SelectionIndicator::clear()
     m_indicatorShapeHash.clear();
 }
 
-//static void alignVertices(QPolygonF &polygon, double factor)
-//{
-//    QMutableVectorIterator<QPointF> iterator(polygon);
-//    while (iterator.hasNext()) {
-//        QPointF &vertex = iterator.next();
-//        vertex.setX(std::floor(vertex.x()) + factor);
-//        vertex.setY(std::floor(vertex.y()) + factor);
-//    }
-//
-//}
-
 void SelectionIndicator::setItems(const QList<FormEditorItem*> &itemList)
 {
     clear();
@@ -85,7 +74,6 @@ void SelectionIndicator::setItems(const QList<FormEditorItem*> &itemList)
         QGraphicsPolygonItem *newSelectionIndicatorGraphicsItem = new QGraphicsPolygonItem(m_layerItem.data());
         m_indicatorShapeHash.insert(item, newSelectionIndicatorGraphicsItem);
         QPolygonF boundingRectInSceneSpace(item->mapToScene(item->qmlItemNode().instanceBoundingRect()));
-        //        alignVertices(boundingRectInSceneSpace, 0.5 / item->formEditorView()->widget()->zoomAction()->zoomLevel());
         QPolygonF boundingRectInLayerItemSpace = m_layerItem->mapFromScene(boundingRectInSceneSpace);
         newSelectionIndicatorGraphicsItem->setPolygon(boundingRectInLayerItemSpace);
         newSelectionIndicatorGraphicsItem->setFlag(QGraphicsItem::ItemIsSelectable, false);
@@ -107,7 +95,6 @@ void SelectionIndicator::updateItems(const QList<FormEditorItem*> &itemList)
         if (m_indicatorShapeHash.contains(item)) {
             QGraphicsPolygonItem *indicatorGraphicsItem =  m_indicatorShapeHash.value(item);
             QPolygonF boundingRectInSceneSpace(item->mapToScene(item->qmlItemNode().instanceBoundingRect()));
-//            alignVertices(boundingRectInSceneSpace, 0.5 / item->formEditorView()->widget()->zoomAction()->zoomLevel());
             QPolygonF boundingRectInLayerItemSpace = m_layerItem->mapFromScene(boundingRectInSceneSpace);
             indicatorGraphicsItem->setPolygon(boundingRectInLayerItemSpace);
         }
diff --git a/src/plugins/qmldesigner/components/formeditor/snapper.cpp b/src/plugins/qmldesigner/components/formeditor/snapper.cpp
index 8eec5391a9..5b8e02a288 100644
--- a/src/plugins/qmldesigner/components/formeditor/snapper.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/snapper.cpp
@@ -299,10 +299,6 @@ QLineF Snapper::createSnapLine(Qt::Orientation orientation,
 
 static bool  compareLines(double snapLine, double lineToSnap)
 {
-//    if (qAbs(snapLine - lineToSnap) < 1.0)
-//        return true;
-//
-//    return false;
     return qFuzzyCompare(snapLine, lineToSnap);
 }
 
@@ -705,14 +701,6 @@ void Snapper::adjustAnchoringOfItem(FormEditorItem *formEditorItem)
     }
 }
 
-//static void alignLine(QLineF &line)
-//{
-//    line.setP1(QPointF(std::floor(line.p1().x()) + 0.5,
-//                       std::floor(line.p1().y()) + 0.5));
-//    line.setP2(QPointF(std::floor(line.p2().x()) + 0.5,
-//                       std::floor(line.p2().y()) + 0.5));
-//}
-
 QList<QGraphicsItem*> Snapper::generateSnappingLines(const QList<QRectF> &boundingRectList,
                                                      QGraphicsItem *layerItem,
                                                      const QTransform &transform)
@@ -723,32 +711,14 @@ QList<QGraphicsItem*> Snapper::generateSnappingLines(const QList<QRectF> &boundi
         QList<QRectF> snappedBoundingRectList;
         lineList += mergedHorizontalLines(horizontalSnappedLines(boundingRect, &snappedBoundingRectList));
         lineList += mergedVerticalLines(verticalSnappedLines(boundingRect, &snappedBoundingRectList));
-
-//        snappedBoundingRectList.append(boundingRect);
-//        foreach (const QRectF &snappedBoundingRect, snappedBoundingRectList) {
-//            QPolygonF rect = transform.map(snappedBoundingRect);
-//            alignVertices(rect);
-//            QGraphicsPolygonItem * item = new QGraphicsPolygonItem(rect, layerItem);
-//            item->setZValue(20);
-
-//            QColor brushColor(QApplication::palette().highlight().color());
-//            QColor brushColor(Qt::gray);
-//            brushColor.setAlphaF(0.25);
-//            QBrush brush(brushColor);
-//            item->setBrush(brush);
-//            item->setPen(Qt::NoPen);
-//            graphicsItemList.append(item);
-//        }
     }
 
     foreach (const QLineF &line, lineList) {
         QLineF lineInTransformationSpace = transform.map(line);
-//        alignLine(lineInTransformationSpace);
         QGraphicsLineItem * lineItem = new QGraphicsLineItem(lineInTransformationSpace, layerItem);
         lineItem->setZValue(40);
         QPen linePen;
         linePen.setCosmetic(true);
-//        linePen.setStyle(Qt::DashLine);
         linePen.setColor("#5d2dd7");
         lineItem->setPen(linePen);