Refactoring. Removed dublicate public slot. We can use method contextMenuEvent

instead.

--HG--
branch : develop

src/app/tools/drawTools/vtoolalongline.cpp

@@ -107,16 +107,6 @@ void VToolAlongLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
     ContextMenu<DialogAlongLine>(this, event);
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief ShowContextMenu handle context menu event.
- * @param event context menu event.
- */
-void VToolAlongLine::ShowContextMenu(QGraphicsSceneContextMenuEvent *event)
-{
-    ContextMenu<DialogAlongLine>(this, event);
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief RemoveReferens decrement value of reference.

src/app/tools/drawTools/vtoolalongline.h

@@ -59,7 +59,6 @@ public:
 public slots:
     virtual void FullUpdateFromFile();
     virtual void SetFactor(qreal factor);
-    virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event);
 protected:
     virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event );
     virtual void RemoveReferens();

src/app/tools/drawTools/vtoolbisector.cpp

@@ -251,16 +251,6 @@ void VToolBisector::SetFactor(qreal factor)
     RefreshGeometry();
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief ShowContextMenu show context menu.
- * @param event context menu event.
- */
-void VToolBisector::ShowContextMenu(QGraphicsSceneContextMenuEvent *event)
-{
-    ContextMenu<DialogBisector>(this, event);
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief contextMenuEvent handle context menu events.

src/app/tools/drawTools/vtoolbisector.h

@@ -66,7 +66,6 @@ public:
 public slots:
     virtual void   FullUpdateFromFile();
     virtual void   SetFactor(qreal factor);
-    virtual void   ShowContextMenu(QGraphicsSceneContextMenuEvent *event);
 protected:
     virtual void   contextMenuEvent ( QGraphicsSceneContextMenuEvent * event );
     virtual void   RemoveReferens();

src/app/tools/drawTools/vtoolcurveintersectaxis.cpp

@@ -271,12 +271,6 @@ void VToolCurveIntersectAxis::FullUpdateFromFile()
     }
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-void VToolCurveIntersectAxis::ShowContextMenu(QGraphicsSceneContextMenuEvent *event)
-{
-    ContextMenu<DialogCurveIntersectAxis>(this, event);
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 void VToolCurveIntersectAxis::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
 {

src/app/tools/drawTools/vtoolcurveintersectaxis.h

@@ -64,7 +64,6 @@ public:
     virtual void ShowVisualization(bool show);
 public slots:
     virtual void FullUpdateFromFile();
-    virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event);
 protected:
     virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event );
     virtual void SaveDialog(QDomElement &domElement);

src/app/tools/drawTools/vtoolcutarc.cpp

@@ -245,16 +245,6 @@ void VToolCutArc::CurveChoosed(quint32 id)
     emit ChoosedTool(id, SceneObject::Arc);
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief ShowContextMenu show context menu.
- * @param event context menu event.
- */
-void VToolCutArc::ShowContextMenu(QGraphicsSceneContextMenuEvent *event)
-{
-    ContextMenu<DialogCutArc>(this, event);
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief contextMenuEvent handle context menu events.

src/app/tools/drawTools/vtoolcutarc.h

@@ -54,7 +54,6 @@ public:
 public slots:
     virtual void FullUpdateFromFile();
     virtual void CurveChoosed(quint32 id);
-    virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event);
 protected:
     virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event );
     virtual void SaveDialog(QDomElement &domElement);

src/app/tools/drawTools/vtoolcutspline.cpp

@@ -258,16 +258,6 @@ void VToolCutSpline::CurveChoosed(quint32 id)
     emit ChoosedTool(id, SceneObject::Spline);
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief ShowContextMenu show context menu.
- * @param event context menu event.
- */
-void VToolCutSpline::ShowContextMenu(QGraphicsSceneContextMenuEvent *event)
-{
-    ContextMenu<DialogCutSpline>(this, event);
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief contextMenuEvent handle context menu events.

src/app/tools/drawTools/vtoolcutspline.h

@@ -56,7 +56,6 @@ public:
 public slots:
     virtual void  FullUpdateFromFile();
     virtual void  CurveChoosed(quint32 id);
-    virtual void  ShowContextMenu(QGraphicsSceneContextMenuEvent *event);
 protected:
     virtual void  contextMenuEvent ( QGraphicsSceneContextMenuEvent * event );
     virtual void  SaveDialog(QDomElement &domElement);

src/app/tools/drawTools/vtoolcutsplinepath.cpp

@@ -303,16 +303,6 @@ void VToolCutSplinePath::CurveChoosed(quint32 id)
     emit ChoosedTool(id, SceneObject::SplinePath);
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief ShowContextMenu show context menu.
- * @param event context menu event.
- */
-void VToolCutSplinePath::ShowContextMenu(QGraphicsSceneContextMenuEvent *event)
-{
-    ContextMenu<DialogCutSplinePath>(this, event);
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief contextMenuEvent handle context menu events.

src/app/tools/drawTools/vtoolcutsplinepath.h

@@ -57,7 +57,6 @@ public:
 public slots:
     virtual void  FullUpdateFromFile();
     virtual void  CurveChoosed(quint32 id);
-    virtual void  ShowContextMenu(QGraphicsSceneContextMenuEvent *event);
 protected:
     virtual void  contextMenuEvent ( QGraphicsSceneContextMenuEvent * event );
     virtual void  SaveDialog(QDomElement &domElement);

src/app/tools/drawTools/vtoolendline.cpp

@@ -211,16 +211,6 @@ void VToolEndLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
     ContextMenu<DialogEndLine>(this, event);
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief ShowContextMenu show context menu.
- * @param event context menu event.
- */
-void VToolEndLine::ShowContextMenu(QGraphicsSceneContextMenuEvent *event)
-{
-    ContextMenu<DialogEndLine>(this, event);
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief SaveDialog save options into file after change in dialog.

src/app/tools/drawTools/vtoolendline.h

@@ -59,7 +59,6 @@ public:
     virtual void ShowVisualization(bool show);
 public slots:
     virtual void FullUpdateFromFile();
-    virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event);
 protected:
     virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event );
     virtual void SaveDialog(QDomElement &domElement);

src/app/tools/drawTools/vtoolheight.cpp

@@ -211,16 +211,6 @@ void VToolHeight::FullUpdateFromFile()
     }
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief ShowContextMenu show context menu.
- * @param event context menu event.
- */
-void VToolHeight::ShowContextMenu(QGraphicsSceneContextMenuEvent *event)
-{
-    ContextMenu<DialogHeight>(this, event);
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief contextMenuEvent handle context menu events.

src/app/tools/drawTools/vtoolheight.h

@@ -62,7 +62,6 @@ public:
     virtual void   ShowVisualization(bool show);
 public slots:
     virtual void   FullUpdateFromFile();
-    virtual void   ShowContextMenu(QGraphicsSceneContextMenuEvent *event);
 protected:
     virtual void   contextMenuEvent ( QGraphicsSceneContextMenuEvent * event );
     virtual void   SaveDialog(QDomElement &domElement);

src/app/tools/drawTools/vtoollineintersect.cpp

@@ -219,16 +219,6 @@ void VToolLineIntersect::SetFactor(qreal factor)
     RefreshPointGeometry(*VAbstractTool::data.GeometricObject<VPointF>(id));
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief ShowContextMenu show context menu.
- * @param event context menu event.
- */
-void VToolLineIntersect::ShowContextMenu(QGraphicsSceneContextMenuEvent *event)
-{
-    ContextMenu<DialogLineIntersect>(this, event);
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief contextMenuEvent handle context menu events.

src/app/tools/drawTools/vtoollineintersect.h

@@ -67,7 +67,6 @@ public:
 public slots:
     virtual void FullUpdateFromFile();
     virtual void SetFactor(qreal factor);
-    virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event);
 protected:
     virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event );
     virtual void RemoveReferens();

src/app/tools/drawTools/vtoollineintersectaxis.cpp

@@ -285,12 +285,6 @@ void VToolLineIntersectAxis::FullUpdateFromFile()
     }
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-void VToolLineIntersectAxis::ShowContextMenu(QGraphicsSceneContextMenuEvent *event)
-{
-    ContextMenu<DialogLineIntersectAxis>(this, event);
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 void VToolLineIntersectAxis::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
 {

src/app/tools/drawTools/vtoollineintersectaxis.h

@@ -68,7 +68,6 @@ public:
     virtual void ShowVisualization(bool show);
 public slots:
     virtual void FullUpdateFromFile();
-    virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event);
 protected:
     virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event );
     virtual void SaveDialog(QDomElement &domElement);

src/app/tools/drawTools/vtoolnormal.cpp

@@ -229,16 +229,6 @@ void VToolNormal::SetFactor(qreal factor)
     RefreshGeometry();
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief ShowContextMenu show context menu.
- * @param event context menu event.
- */
-void VToolNormal::ShowContextMenu(QGraphicsSceneContextMenuEvent *event)
-{
-    ContextMenu<DialogNormal>(this, event);
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief contextMenuEvent handle context menu events.

src/app/tools/drawTools/vtoolnormal.h

@@ -61,7 +61,6 @@ public:
 public slots:
     virtual void   FullUpdateFromFile();
     virtual void   SetFactor(qreal factor);
-    virtual void   ShowContextMenu(QGraphicsSceneContextMenuEvent *event);
 protected:
     virtual void   contextMenuEvent ( QGraphicsSceneContextMenuEvent * event );
     virtual void   RemoveReferens();

src/app/tools/drawTools/vtoolpoint.cpp

@@ -52,7 +52,7 @@ VToolPoint::VToolPoint(VPattern *doc, VContainer *data, quint32 id, QGraphicsIte
 {
     radius = qApp->toPixel(DefPointRadius/*mm*/, Unit::Mm);
     namePoint = new VGraphicsSimpleTextItem(this);
-    connect(namePoint, &VGraphicsSimpleTextItem::ShowContextMenu, this, &VToolPoint::ShowContextMenu);
+    connect(namePoint, &VGraphicsSimpleTextItem::ShowContextMenu, this, &VToolPoint::contextMenuEvent);
     connect(namePoint, &VGraphicsSimpleTextItem::DeleteTool, this, &VToolPoint::DeleteFromLabel);
     connect(namePoint, &VGraphicsSimpleTextItem::PointChoosed, this, &VToolPoint::PointChoosed);
     lineName = new QGraphicsLineItem(this);
@@ -172,16 +172,6 @@ void VToolPoint::SetFactor(qreal factor)
     RefreshPointGeometry(*VAbstractTool::data.GeometricObject<VPointF>(id));
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief ShowContextMenu show context menu.
- * @param event context menu event.
- */
-void VToolPoint::ShowContextMenu(QGraphicsSceneContextMenuEvent *event)
-{
-    Q_UNUSED(event);
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 void VToolPoint::Disable(bool disable)
 {
@@ -346,6 +336,12 @@ void VToolPoint::keyReleaseEvent(QKeyEvent *event)
     QGraphicsEllipseItem::keyReleaseEvent ( event );
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void VToolPoint::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
+{
+    Q_UNUSED(event)
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void VToolPoint::setEnabled(bool enabled)
 {

src/app/tools/drawTools/vtoolpoint.h

@@ -56,7 +56,6 @@ public slots:
     virtual void            ChangedActivDraw(const QString &newName);
     virtual void            ShowTool(quint32 id, bool enable);
     virtual void            SetFactor(qreal factor);
-    virtual void            ShowContextMenu(QGraphicsSceneContextMenuEvent *event);
     void                    Disable(bool disable);
     void                    DeleteFromLabel();
     virtual void            EnableToolMove(bool move);
@@ -79,6 +78,7 @@ protected:
     void                    RefreshLine();
     virtual QVariant        itemChange ( GraphicsItemChange change, const QVariant &value );
     virtual void            keyReleaseEvent(QKeyEvent * event);
+    virtual void            contextMenuEvent ( QGraphicsSceneContextMenuEvent * event );
 private:
     Q_DISABLE_COPY(VToolPoint)
 };

src/app/tools/drawTools/vtoolpointofcontact.cpp

@@ -271,16 +271,6 @@ void VToolPointOfContact::SetFactor(qreal factor)
     RefreshPointGeometry(*VAbstractTool::data.GeometricObject<VPointF>(id));
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief ShowContextMenu show context menu.
- * @param event context menu event.
- */
-void VToolPointOfContact::ShowContextMenu(QGraphicsSceneContextMenuEvent *event)
-{
-    ContextMenu<DialogPointOfContact>(this, event);
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief contextMenuEvent handle context menu events.

src/app/tools/drawTools/vtoolpointofcontact.h

@@ -72,7 +72,6 @@ public:
 public slots:
     virtual void   FullUpdateFromFile();
     virtual void   SetFactor(qreal factor);
-    virtual void   ShowContextMenu(QGraphicsSceneContextMenuEvent *event);
 protected:
     virtual void   contextMenuEvent ( QGraphicsSceneContextMenuEvent * event );
     virtual void   RemoveReferens();

src/app/tools/drawTools/vtoolpointofintersection.cpp

@@ -178,16 +178,6 @@ void VToolPointOfIntersection::FullUpdateFromFile()
     }
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief ShowContextMenu show context menu.
- * @param event context menu event.
- */
-void VToolPointOfIntersection::ShowContextMenu(QGraphicsSceneContextMenuEvent *event)
-{
-    ContextMenu<DialogPointOfIntersection>(this, event);
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief RemoveReferens decrement value of reference.

src/app/tools/drawTools/vtoolpointofintersection.h

@@ -61,7 +61,6 @@ public:
     virtual void ShowVisualization(bool show);
 public slots:
     virtual void FullUpdateFromFile();
-    virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event);
 protected:
     virtual void RemoveReferens();
     virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event );

src/app/tools/drawTools/vtoolshoulderpoint.cpp

@@ -255,16 +255,6 @@ void VToolShoulderPoint::SetFactor(qreal factor)
     RefreshGeometry();
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief ShowContextMenu show context menu.
- * @param event context menu event.
- */
-void VToolShoulderPoint::ShowContextMenu(QGraphicsSceneContextMenuEvent *event)
-{
-    ContextMenu<DialogShoulderPoint>(this, event);
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief contextMenuEvent handle context menu events.

src/app/tools/drawTools/vtoolshoulderpoint.h

@@ -65,7 +65,6 @@ public:
 public slots:
     virtual void   FullUpdateFromFile();
     virtual void   SetFactor(qreal factor);
-    virtual void   ShowContextMenu(QGraphicsSceneContextMenuEvent *event);
 protected:
     virtual void   contextMenuEvent ( QGraphicsSceneContextMenuEvent * event );
     virtual void   RemoveReferens();

src/app/tools/drawTools/vtoolsinglepoint.cpp

@@ -329,23 +329,6 @@ void VToolSinglePoint::SetFactor(qreal factor)
     RefreshPointGeometry(*(VAbstractTool::data.GeometricObject<VPointF>(id)));
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief ShowContextMenu show context menu.
- * @param event context menu event.
- */
-void VToolSinglePoint::ShowContextMenu(QGraphicsSceneContextMenuEvent *event)
-{
-    if (doc->CountPP() > 1)
-    {
-        ContextMenu<DialogSinglePoint>(this, event);
-    }
-    else
-    {
-        ContextMenu<DialogSinglePoint>(this, event, false);
-    }
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 void VToolSinglePoint::EnableToolMove(bool move)
 {

src/app/tools/drawTools/vtoolsinglepoint.h

@@ -49,7 +49,6 @@ public:
 public slots:
     virtual void FullUpdateFromFile();
     virtual void SetFactor(qreal factor);
-    virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event);
     virtual void EnableToolMove(bool move);
 signals:
     /**

src/app/tools/drawTools/vtooltriangle.cpp

@@ -235,16 +235,6 @@ void VToolTriangle::FullUpdateFromFile()
     }
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief ShowContextMenu show context menu.
- * @param event context menu event.
- */
-void VToolTriangle::ShowContextMenu(QGraphicsSceneContextMenuEvent *event)
-{
-    ContextMenu<DialogTriangle>(this, event);
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief RemoveReferens decrement value of reference.

src/app/tools/drawTools/vtooltriangle.h

@@ -69,7 +69,6 @@ public:
     virtual void   ShowVisualization(bool show);
 public slots:
     virtual void   FullUpdateFromFile();
-    virtual void   ShowContextMenu(QGraphicsSceneContextMenuEvent *event);
 protected:
     virtual void   RemoveReferens();
     virtual void   contextMenuEvent ( QGraphicsSceneContextMenuEvent * event );