diff --git a/src/app/tools/drawTools/vtoolalongline.cpp b/src/app/tools/drawTools/vtoolalongline.cpp index 461b2fb2f..75b8a1fb0 100644 --- a/src/app/tools/drawTools/vtoolalongline.cpp +++ b/src/app/tools/drawTools/vtoolalongline.cpp @@ -107,16 +107,6 @@ void VToolAlongLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) ContextMenu(this, event); } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief ShowContextMenu handle context menu event. - * @param event context menu event. - */ -void VToolAlongLine::ShowContextMenu(QGraphicsSceneContextMenuEvent *event) -{ - ContextMenu(this, event); -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief RemoveReferens decrement value of reference. diff --git a/src/app/tools/drawTools/vtoolalongline.h b/src/app/tools/drawTools/vtoolalongline.h index 52bf7a1f8..af32bf23d 100644 --- a/src/app/tools/drawTools/vtoolalongline.h +++ b/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(); diff --git a/src/app/tools/drawTools/vtoolbisector.cpp b/src/app/tools/drawTools/vtoolbisector.cpp index 96979cd8c..44f42301b 100644 --- a/src/app/tools/drawTools/vtoolbisector.cpp +++ b/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(this, event); -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief contextMenuEvent handle context menu events. diff --git a/src/app/tools/drawTools/vtoolbisector.h b/src/app/tools/drawTools/vtoolbisector.h index 428512cef..38056063b 100644 --- a/src/app/tools/drawTools/vtoolbisector.h +++ b/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(); diff --git a/src/app/tools/drawTools/vtoolcurveintersectaxis.cpp b/src/app/tools/drawTools/vtoolcurveintersectaxis.cpp index 32095d032..408686d62 100644 --- a/src/app/tools/drawTools/vtoolcurveintersectaxis.cpp +++ b/src/app/tools/drawTools/vtoolcurveintersectaxis.cpp @@ -271,12 +271,6 @@ void VToolCurveIntersectAxis::FullUpdateFromFile() } } -//--------------------------------------------------------------------------------------------------------------------- -void VToolCurveIntersectAxis::ShowContextMenu(QGraphicsSceneContextMenuEvent *event) -{ - ContextMenu(this, event); -} - //--------------------------------------------------------------------------------------------------------------------- void VToolCurveIntersectAxis::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) { diff --git a/src/app/tools/drawTools/vtoolcurveintersectaxis.h b/src/app/tools/drawTools/vtoolcurveintersectaxis.h index cff89776f..d70080cb1 100644 --- a/src/app/tools/drawTools/vtoolcurveintersectaxis.h +++ b/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); diff --git a/src/app/tools/drawTools/vtoolcutarc.cpp b/src/app/tools/drawTools/vtoolcutarc.cpp index b9006e653..d3aea3129 100644 --- a/src/app/tools/drawTools/vtoolcutarc.cpp +++ b/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(this, event); -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief contextMenuEvent handle context menu events. diff --git a/src/app/tools/drawTools/vtoolcutarc.h b/src/app/tools/drawTools/vtoolcutarc.h index 7505e729f..9af2b4a16 100644 --- a/src/app/tools/drawTools/vtoolcutarc.h +++ b/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); diff --git a/src/app/tools/drawTools/vtoolcutspline.cpp b/src/app/tools/drawTools/vtoolcutspline.cpp index 5a5b1323c..696a80ce6 100644 --- a/src/app/tools/drawTools/vtoolcutspline.cpp +++ b/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(this, event); -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief contextMenuEvent handle context menu events. diff --git a/src/app/tools/drawTools/vtoolcutspline.h b/src/app/tools/drawTools/vtoolcutspline.h index eb151e0a9..9445ed33a 100644 --- a/src/app/tools/drawTools/vtoolcutspline.h +++ b/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); diff --git a/src/app/tools/drawTools/vtoolcutsplinepath.cpp b/src/app/tools/drawTools/vtoolcutsplinepath.cpp index ee6c5af82..b67579844 100644 --- a/src/app/tools/drawTools/vtoolcutsplinepath.cpp +++ b/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(this, event); -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief contextMenuEvent handle context menu events. diff --git a/src/app/tools/drawTools/vtoolcutsplinepath.h b/src/app/tools/drawTools/vtoolcutsplinepath.h index 67fdf0ae0..859a81a29 100644 --- a/src/app/tools/drawTools/vtoolcutsplinepath.h +++ b/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); diff --git a/src/app/tools/drawTools/vtoolendline.cpp b/src/app/tools/drawTools/vtoolendline.cpp index bbda3397f..6b1101b29 100644 --- a/src/app/tools/drawTools/vtoolendline.cpp +++ b/src/app/tools/drawTools/vtoolendline.cpp @@ -211,16 +211,6 @@ void VToolEndLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) ContextMenu(this, event); } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief ShowContextMenu show context menu. - * @param event context menu event. - */ -void VToolEndLine::ShowContextMenu(QGraphicsSceneContextMenuEvent *event) -{ - ContextMenu(this, event); -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief SaveDialog save options into file after change in dialog. diff --git a/src/app/tools/drawTools/vtoolendline.h b/src/app/tools/drawTools/vtoolendline.h index 5233078bc..ec816f386 100644 --- a/src/app/tools/drawTools/vtoolendline.h +++ b/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); diff --git a/src/app/tools/drawTools/vtoolheight.cpp b/src/app/tools/drawTools/vtoolheight.cpp index 480efc0bb..6a452a5d8 100644 --- a/src/app/tools/drawTools/vtoolheight.cpp +++ b/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(this, event); -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief contextMenuEvent handle context menu events. diff --git a/src/app/tools/drawTools/vtoolheight.h b/src/app/tools/drawTools/vtoolheight.h index 7f76f94c3..9a9f7d27d 100644 --- a/src/app/tools/drawTools/vtoolheight.h +++ b/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); diff --git a/src/app/tools/drawTools/vtoollineintersect.cpp b/src/app/tools/drawTools/vtoollineintersect.cpp index feeb67549..fa0358d35 100644 --- a/src/app/tools/drawTools/vtoollineintersect.cpp +++ b/src/app/tools/drawTools/vtoollineintersect.cpp @@ -219,16 +219,6 @@ void VToolLineIntersect::SetFactor(qreal factor) RefreshPointGeometry(*VAbstractTool::data.GeometricObject(id)); } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief ShowContextMenu show context menu. - * @param event context menu event. - */ -void VToolLineIntersect::ShowContextMenu(QGraphicsSceneContextMenuEvent *event) -{ - ContextMenu(this, event); -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief contextMenuEvent handle context menu events. diff --git a/src/app/tools/drawTools/vtoollineintersect.h b/src/app/tools/drawTools/vtoollineintersect.h index 722feba2f..62273cfbb 100644 --- a/src/app/tools/drawTools/vtoollineintersect.h +++ b/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(); diff --git a/src/app/tools/drawTools/vtoollineintersectaxis.cpp b/src/app/tools/drawTools/vtoollineintersectaxis.cpp index 0b9c63422..7d7cf2296 100644 --- a/src/app/tools/drawTools/vtoollineintersectaxis.cpp +++ b/src/app/tools/drawTools/vtoollineintersectaxis.cpp @@ -285,12 +285,6 @@ void VToolLineIntersectAxis::FullUpdateFromFile() } } -//--------------------------------------------------------------------------------------------------------------------- -void VToolLineIntersectAxis::ShowContextMenu(QGraphicsSceneContextMenuEvent *event) -{ - ContextMenu(this, event); -} - //--------------------------------------------------------------------------------------------------------------------- void VToolLineIntersectAxis::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) { diff --git a/src/app/tools/drawTools/vtoollineintersectaxis.h b/src/app/tools/drawTools/vtoollineintersectaxis.h index 8db43bb49..34f4e7a94 100644 --- a/src/app/tools/drawTools/vtoollineintersectaxis.h +++ b/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); diff --git a/src/app/tools/drawTools/vtoolnormal.cpp b/src/app/tools/drawTools/vtoolnormal.cpp index 27d849474..5cec77114 100644 --- a/src/app/tools/drawTools/vtoolnormal.cpp +++ b/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(this, event); -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief contextMenuEvent handle context menu events. diff --git a/src/app/tools/drawTools/vtoolnormal.h b/src/app/tools/drawTools/vtoolnormal.h index 2752101fd..815d65017 100644 --- a/src/app/tools/drawTools/vtoolnormal.h +++ b/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(); diff --git a/src/app/tools/drawTools/vtoolpoint.cpp b/src/app/tools/drawTools/vtoolpoint.cpp index f5293b81d..90a2660c3 100644 --- a/src/app/tools/drawTools/vtoolpoint.cpp +++ b/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(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) { diff --git a/src/app/tools/drawTools/vtoolpoint.h b/src/app/tools/drawTools/vtoolpoint.h index 5bed286a1..5ae150ac0 100644 --- a/src/app/tools/drawTools/vtoolpoint.h +++ b/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) }; diff --git a/src/app/tools/drawTools/vtoolpointofcontact.cpp b/src/app/tools/drawTools/vtoolpointofcontact.cpp index 598370a08..3829b96b5 100644 --- a/src/app/tools/drawTools/vtoolpointofcontact.cpp +++ b/src/app/tools/drawTools/vtoolpointofcontact.cpp @@ -271,16 +271,6 @@ void VToolPointOfContact::SetFactor(qreal factor) RefreshPointGeometry(*VAbstractTool::data.GeometricObject(id)); } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief ShowContextMenu show context menu. - * @param event context menu event. - */ -void VToolPointOfContact::ShowContextMenu(QGraphicsSceneContextMenuEvent *event) -{ - ContextMenu(this, event); -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief contextMenuEvent handle context menu events. diff --git a/src/app/tools/drawTools/vtoolpointofcontact.h b/src/app/tools/drawTools/vtoolpointofcontact.h index f47b044cf..0be23dadc 100644 --- a/src/app/tools/drawTools/vtoolpointofcontact.h +++ b/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(); diff --git a/src/app/tools/drawTools/vtoolpointofintersection.cpp b/src/app/tools/drawTools/vtoolpointofintersection.cpp index 6cc5dd4d5..bfc62e0a2 100644 --- a/src/app/tools/drawTools/vtoolpointofintersection.cpp +++ b/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(this, event); -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief RemoveReferens decrement value of reference. diff --git a/src/app/tools/drawTools/vtoolpointofintersection.h b/src/app/tools/drawTools/vtoolpointofintersection.h index 751a88c75..9697550af 100644 --- a/src/app/tools/drawTools/vtoolpointofintersection.h +++ b/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 ); diff --git a/src/app/tools/drawTools/vtoolshoulderpoint.cpp b/src/app/tools/drawTools/vtoolshoulderpoint.cpp index 8e148e1ca..f140b5705 100644 --- a/src/app/tools/drawTools/vtoolshoulderpoint.cpp +++ b/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(this, event); -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief contextMenuEvent handle context menu events. diff --git a/src/app/tools/drawTools/vtoolshoulderpoint.h b/src/app/tools/drawTools/vtoolshoulderpoint.h index 78348ab84..2d24b9b32 100644 --- a/src/app/tools/drawTools/vtoolshoulderpoint.h +++ b/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(); diff --git a/src/app/tools/drawTools/vtoolsinglepoint.cpp b/src/app/tools/drawTools/vtoolsinglepoint.cpp index 15c010e37..68e6ddb42 100644 --- a/src/app/tools/drawTools/vtoolsinglepoint.cpp +++ b/src/app/tools/drawTools/vtoolsinglepoint.cpp @@ -329,23 +329,6 @@ void VToolSinglePoint::SetFactor(qreal factor) RefreshPointGeometry(*(VAbstractTool::data.GeometricObject(id))); } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief ShowContextMenu show context menu. - * @param event context menu event. - */ -void VToolSinglePoint::ShowContextMenu(QGraphicsSceneContextMenuEvent *event) -{ - if (doc->CountPP() > 1) - { - ContextMenu(this, event); - } - else - { - ContextMenu(this, event, false); - } -} - //--------------------------------------------------------------------------------------------------------------------- void VToolSinglePoint::EnableToolMove(bool move) { diff --git a/src/app/tools/drawTools/vtoolsinglepoint.h b/src/app/tools/drawTools/vtoolsinglepoint.h index fa0af58a8..3e10d950d 100644 --- a/src/app/tools/drawTools/vtoolsinglepoint.h +++ b/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: /** diff --git a/src/app/tools/drawTools/vtooltriangle.cpp b/src/app/tools/drawTools/vtooltriangle.cpp index 7f9024e76..7c940caf3 100644 --- a/src/app/tools/drawTools/vtooltriangle.cpp +++ b/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(this, event); -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief RemoveReferens decrement value of reference. diff --git a/src/app/tools/drawTools/vtooltriangle.h b/src/app/tools/drawTools/vtooltriangle.h index 1e7f80b0f..1f0779272 100644 --- a/src/app/tools/drawTools/vtooltriangle.h +++ b/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 );