From 78f1e89f085fe3d75d86202d5ba7caf4292aeee0 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 15 Apr 2015 15:44:57 +0300 Subject: [PATCH] Cppcheck. --HG-- branch : develop --- src/app/container/variables/vcurvelength.cpp | 2 ++ src/app/container/variables/vlineangle.cpp | 2 ++ src/app/container/variables/vvariable.cpp | 2 ++ src/app/container/vcontainer.cpp | 2 ++ src/app/core/vapplication.cpp | 1 + src/app/dialogs/app/dialoglayoutsettings.cpp | 2 ++ src/app/dialogs/tools/dialogtool.cpp | 1 + src/app/dialogs/tools/dialogtool.h | 1 + src/app/geometry/vabstractcurve.cpp | 2 +- src/app/geometry/vabstractcurve.h | 2 +- src/app/geometry/vdetail.cpp | 1 + src/app/geometry/vgobject.cpp | 2 ++ src/app/geometry/vnodedetail.cpp | 2 ++ src/app/tools/drawTools/vabstractspline.h | 1 + src/app/tools/drawTools/vtoolcut.cpp | 3 +++ src/app/tools/drawTools/vtoolshoulderpoint.cpp | 2 ++ src/app/tools/nodeDetails/vnodearc.cpp | 1 + src/app/tools/vabstracttool.cpp | 1 + src/app/visualization/vistoolsplinepath.cpp | 1 + src/app/visualization/visualization.cpp | 2 ++ src/app/visualization/vsimplecurve.cpp | 1 + src/app/widgets/vmaingraphicsview.cpp | 2 ++ src/app/widgets/vtablegraphicsview.cpp | 3 +++ src/app/xml/vpattern.cpp | 2 ++ src/libs/ifc/exception/vexception.cpp | 1 + src/libs/ifc/xml/vdomdocument.cpp | 3 +++ src/libs/qmuparser/qmuparserbase.cpp | 1 + src/libs/qmuparser/qmuparsertest.cpp | 14 +++++++------- src/libs/qmuparser/qmuparsertest.h | 2 +- src/libs/vlayout/vlayoutdetail.cpp | 2 ++ src/libs/vlayout/vlayoutgenerator.cpp | 2 ++ src/libs/vlayout/vposition.cpp | 4 ++++ src/libs/vobj/predicates.c | 7 +++++++ src/libs/vobj/vobjengine.cpp | 2 ++ src/libs/vobj/vobjpaintdevice.cpp | 2 ++ src/libs/vpropertyexplorer/checkablemessagebox.cpp | 7 +++++++ .../plugins/vfilepropertyeditor.cpp | 2 ++ .../plugins/vlinecolorproperty.cpp | 1 + .../plugins/vlinetypeproperty.cpp | 1 + .../vpropertyexplorer/plugins/vobjectproperty.cpp | 2 ++ .../plugins/vshortcutpropertyeditor.cpp | 1 + .../vpropertyexplorer/plugins/vstringproperty.cpp | 1 + src/libs/vpropertyexplorer/vproperty.cpp | 1 + .../vpropertyexplorer/vpropertyfactorymanager.cpp | 2 ++ src/libs/vpropertyexplorer/vpropertyset.cpp | 1 + src/test/ValentinaTest/tst_vposter.cpp | 2 ++ 46 files changed, 92 insertions(+), 10 deletions(-) diff --git a/src/app/container/variables/vcurvelength.cpp b/src/app/container/variables/vcurvelength.cpp index 43f4ac20d..b099ae5fc 100644 --- a/src/app/container/variables/vcurvelength.cpp +++ b/src/app/container/variables/vcurvelength.cpp @@ -83,6 +83,7 @@ bool VCurveLength::Filter(quint32 id) } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction quint32 VCurveLength::GetId() const { return d->id; @@ -95,6 +96,7 @@ void VCurveLength::SetId(const quint32 &id) } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction quint32 VCurveLength::GetParentId() const { return d->parentId; diff --git a/src/app/container/variables/vlineangle.cpp b/src/app/container/variables/vlineangle.cpp index 9ed8195b1..aafa86560 100644 --- a/src/app/container/variables/vlineangle.cpp +++ b/src/app/container/variables/vlineangle.cpp @@ -89,12 +89,14 @@ void VLineAngle::SetValue(const VPointF *p1, const VPointF *p2) } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction quint32 VLineAngle::GetP1Id() const { return d->p1Id; } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction quint32 VLineAngle::GetP2Id() const { return d->p2Id; diff --git a/src/app/container/variables/vvariable.cpp b/src/app/container/variables/vvariable.cpp index a2fe21deb..a26d75dd2 100644 --- a/src/app/container/variables/vvariable.cpp +++ b/src/app/container/variables/vvariable.cpp @@ -135,6 +135,7 @@ qreal VVariable::GetKsize() const } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction void VVariable::SetKsize(const qreal &value) { d->ksize = value; @@ -152,6 +153,7 @@ qreal VVariable::GetKheight() const //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction void VVariable::SetKheight(const qreal &value) { d->kheight = value; diff --git a/src/app/container/vcontainer.cpp b/src/app/container/vcontainer.cpp index 92eb14068..68dd0c301 100644 --- a/src/app/container/vcontainer.cpp +++ b/src/app/container/vcontainer.cpp @@ -429,6 +429,7 @@ bool VContainer::IsUnique(const QString &name) * @param name name of row * @return true if contains */ +// cppcheck-suppress unusedFunction bool VContainer::VariableExist(const QString &name) { return d->variables.contains(name); @@ -453,6 +454,7 @@ const QMap > VContainer::DataVar(const VarType &type) } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction void VContainer::ClearDetails() { d->details.clear(); diff --git a/src/app/core/vapplication.cpp b/src/app/core/vapplication.cpp index 9f95cb93b..6c93bd068 100644 --- a/src/app/core/vapplication.cpp +++ b/src/app/core/vapplication.cpp @@ -1788,6 +1788,7 @@ QString VApplication::Description(const QString &measurement) const } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction QString VApplication::PostfixOperator(const QString &name) const { return postfixOperators.value(name).translate(); diff --git a/src/app/dialogs/app/dialoglayoutsettings.cpp b/src/app/dialogs/app/dialoglayoutsettings.cpp index bc57af02d..b65c45a2d 100644 --- a/src/app/dialogs/app/dialoglayoutsettings.cpp +++ b/src/app/dialogs/app/dialoglayoutsettings.cpp @@ -144,6 +144,7 @@ Cases DialogLayoutSettings::GetGroup() const } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction void DialogLayoutSettings::SetGroup(const Cases &value) { switch (value) @@ -182,6 +183,7 @@ int DialogLayoutSettings::GetIncrease() const } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction void DialogLayoutSettings::SetIncrease(int increase) { int index = ui->comboBoxIncrease->findText(QString::number(increase)); diff --git a/src/app/dialogs/tools/dialogtool.cpp b/src/app/dialogs/tools/dialogtool.cpp index 77ebae61e..8c72395a4 100644 --- a/src/app/dialogs/tools/dialogtool.cpp +++ b/src/app/dialogs/tools/dialogtool.cpp @@ -1123,6 +1123,7 @@ void DialogTool::UpdateList() } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction quint32 DialogTool::GetToolId() const { return toolId; diff --git a/src/app/dialogs/tools/dialogtool.h b/src/app/dialogs/tools/dialogtool.h index 2bf30d7e2..e3abb054d 100644 --- a/src/app/dialogs/tools/dialogtool.h +++ b/src/app/dialogs/tools/dialogtool.h @@ -127,6 +127,7 @@ protected: Q_DISABLE_COPY(DialogTool) /** @brief data container with data */ + // cppcheck-suppress duplInheritedMember const VContainer *data; /** @brief isInitialized true if window is initialized */ diff --git a/src/app/geometry/vabstractcurve.cpp b/src/app/geometry/vabstractcurve.cpp index 1fe4e149a..22ebbb16b 100644 --- a/src/app/geometry/vabstractcurve.cpp +++ b/src/app/geometry/vabstractcurve.cpp @@ -114,7 +114,7 @@ QVector VAbstractCurve::FromBegin(const QVector &points, const } //--------------------------------------------------------------------------------------------------------------------- -QVector VAbstractCurve::ToEnd(const QVector &points, const QPointF &end) const +QVector VAbstractCurve::ToEnd(const QVector &points, const QPointF &end) { QVector reversed = GetReversePoints(points); reversed = FromBegin(reversed, end); diff --git a/src/app/geometry/vabstractcurve.h b/src/app/geometry/vabstractcurve.h index c89bbfd8d..c894cee10 100644 --- a/src/app/geometry/vabstractcurve.h +++ b/src/app/geometry/vabstractcurve.h @@ -54,7 +54,7 @@ protected: QPainterPath ShowDirection(const QVector &points) const; private: static QVector FromBegin(const QVector &points, const QPointF &begin); - QVector ToEnd(const QVector &points, const QPointF &end) const; + static QVector ToEnd(const QVector &points, const QPointF &end); }; #endif // VABSTRACTCURVE_H diff --git a/src/app/geometry/vdetail.cpp b/src/app/geometry/vdetail.cpp index e1ae4ee30..72ced0fa1 100644 --- a/src/app/geometry/vdetail.cpp +++ b/src/app/geometry/vdetail.cpp @@ -655,6 +655,7 @@ QVector VDetail::getNodes() const * @brief setNodes set list of nodes * @param value list of nodes */ +// cppcheck-suppress unusedFunction void VDetail::setNodes(const QVector &value) { d->nodes = value; diff --git a/src/app/geometry/vgobject.cpp b/src/app/geometry/vgobject.cpp index 467d1be37..651645707 100644 --- a/src/app/geometry/vgobject.cpp +++ b/src/app/geometry/vgobject.cpp @@ -154,6 +154,7 @@ GOType VGObject::getType() const } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction void VGObject::setType(const GOType &type) { d->type = type; @@ -405,6 +406,7 @@ QVector VGObject::GetReversePoints(const QVector &points) * @param newPoints point whos we try to add to contour. * @return length length of contour. */ +// cppcheck-suppress unusedFunction int VGObject::GetLengthContour(const QVector &contour, const QVector &newPoints) { qreal length = 0; diff --git a/src/app/geometry/vnodedetail.cpp b/src/app/geometry/vnodedetail.cpp index 963b7a246..decba2343 100644 --- a/src/app/geometry/vnodedetail.cpp +++ b/src/app/geometry/vnodedetail.cpp @@ -78,6 +78,7 @@ Tool VNodeDetail::getTypeTool() const } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction void VNodeDetail::setTypeTool(const Tool &value) { d->typeTool = value; @@ -90,6 +91,7 @@ NodeDetail VNodeDetail::getTypeNode() const } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction void VNodeDetail::setTypeNode(const NodeDetail &value) { d->typeNode = value; diff --git a/src/app/tools/drawTools/vabstractspline.h b/src/app/tools/drawTools/vabstractspline.h index c6c3e7688..65fc8b4ea 100644 --- a/src/app/tools/drawTools/vabstractspline.h +++ b/src/app/tools/drawTools/vabstractspline.h @@ -39,6 +39,7 @@ class VAbstractSpline:public VDrawTool, public QGraphicsPathItem public: VAbstractSpline(VPattern *doc, VContainer *data, quint32 id, QGraphicsItem * parent = nullptr); virtual ~VAbstractSpline(); + // cppcheck-suppress duplInheritedMember static const QString TagName; virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0); virtual int type() const {return Type;} diff --git a/src/app/tools/drawTools/vtoolcut.cpp b/src/app/tools/drawTools/vtoolcut.cpp index 6af5c8133..f97ce2b37 100644 --- a/src/app/tools/drawTools/vtoolcut.cpp +++ b/src/app/tools/drawTools/vtoolcut.cpp @@ -86,12 +86,14 @@ void VToolCut::Disable(bool disable) } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction quint32 VToolCut::getCurveCutId() const { return curveCutId; } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction void VToolCut::setCurveCutId(const quint32 &value) { if (value != NULL_ID) @@ -145,6 +147,7 @@ void VToolCut::RemoveReferens() } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction void VToolCut::FullUpdateCurveFromFile(const QString &attrCurve) { Q_ASSERT_X(attrCurve.isEmpty() == false, Q_FUNC_INFO, "attribute name is empty"); diff --git a/src/app/tools/drawTools/vtoolshoulderpoint.cpp b/src/app/tools/drawTools/vtoolshoulderpoint.cpp index 054167ed8..8e148e1ca 100644 --- a/src/app/tools/drawTools/vtoolshoulderpoint.cpp +++ b/src/app/tools/drawTools/vtoolshoulderpoint.cpp @@ -336,12 +336,14 @@ void VToolShoulderPoint::ReadToolAttributes(const QDomElement &domElement) } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction quint32 VToolShoulderPoint::getPShoulder() const { return pShoulder; } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction void VToolShoulderPoint::setPShoulder(const quint32 &value) { if (value != NULL_ID) diff --git a/src/app/tools/nodeDetails/vnodearc.cpp b/src/app/tools/nodeDetails/vnodearc.cpp index a49ce5f4e..aafcda4ea 100644 --- a/src/app/tools/nodeDetails/vnodearc.cpp +++ b/src/app/tools/nodeDetails/vnodearc.cpp @@ -194,6 +194,7 @@ void VNodeArc::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) * @brief hoverMoveEvent handle hover move events. * @param event hover move event. */ +// cppcheck-suppress unusedFunction void VNodeArc::hoverMoveEvent(QGraphicsSceneHoverEvent *event) { Q_UNUSED(event); diff --git a/src/app/tools/vabstracttool.cpp b/src/app/tools/vabstracttool.cpp index 9f1c6581c..0949560c3 100644 --- a/src/app/tools/vabstracttool.cpp +++ b/src/app/tools/vabstracttool.cpp @@ -306,6 +306,7 @@ QMap VAbstractTool::ColorsList() } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction QMap VAbstractTool::PointsList() const { const QHash > *objs = data.DataGObjects(); diff --git a/src/app/visualization/vistoolsplinepath.cpp b/src/app/visualization/vistoolsplinepath.cpp index 73261cf55..78597eaa1 100644 --- a/src/app/visualization/vistoolsplinepath.cpp +++ b/src/app/visualization/vistoolsplinepath.cpp @@ -101,6 +101,7 @@ void VisToolSplinePath::setPath(const VSplinePath &value) } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction VSplinePath VisToolSplinePath::getPath() { return path; diff --git a/src/app/visualization/visualization.cpp b/src/app/visualization/visualization.cpp index 6050fc7f0..66dc9a856 100644 --- a/src/app/visualization/visualization.cpp +++ b/src/app/visualization/visualization.cpp @@ -58,6 +58,7 @@ void Visualization::setLineStyle(const Qt::PenStyle &value) } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction void Visualization::setScenePos(const QPointF &value) { scenePos = value; @@ -77,6 +78,7 @@ void Visualization::VisualMode(const quint32 &pointId) } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction void Visualization::setMainColor(const QColor &value) { mainColor = value; diff --git a/src/app/visualization/vsimplecurve.cpp b/src/app/visualization/vsimplecurve.cpp index 4a2661d2e..729539d1d 100644 --- a/src/app/visualization/vsimplecurve.cpp +++ b/src/app/visualization/vsimplecurve.cpp @@ -132,6 +132,7 @@ void VSimpleCurve::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction QColor VSimpleCurve::GetCurrentColor() const { return currentColor; diff --git a/src/app/widgets/vmaingraphicsview.cpp b/src/app/widgets/vmaingraphicsview.cpp index e01a1d685..a5469074b 100644 --- a/src/app/widgets/vmaingraphicsview.cpp +++ b/src/app/widgets/vmaingraphicsview.cpp @@ -65,12 +65,14 @@ void GraphicsViewZoom::gentle_zoom(double factor) } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction void GraphicsViewZoom::set_modifiers(Qt::KeyboardModifiers modifiers) { _modifiers = modifiers; } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction void GraphicsViewZoom::set_zoom_factor_base(double value) { _zoom_factor_base = value; diff --git a/src/app/widgets/vtablegraphicsview.cpp b/src/app/widgets/vtablegraphicsview.cpp index c4ac8b003..46425b455 100644 --- a/src/app/widgets/vtablegraphicsview.cpp +++ b/src/app/widgets/vtablegraphicsview.cpp @@ -46,6 +46,7 @@ VTableGraphicsView::VTableGraphicsView(QWidget *parent) /** * @brief selectionChanged handle selection change. */ +// cppcheck-suppress unusedFunction void VTableGraphicsView::selectionChanged() { QList listSelectedItems = scene()->selectedItems(); @@ -65,6 +66,7 @@ void VTableGraphicsView::selectionChanged() /** * @brief MirrorItem mirror detail. */ +// cppcheck-suppress unusedFunction void VTableGraphicsView::MirrorItem() { QList list = scene()->selectedItems(); @@ -110,6 +112,7 @@ void VTableGraphicsView::MirrorItem() * @brief wheelEvent handle wheel events. * @param event wheel event. */ +// cppcheck-suppress unusedFunction void VTableGraphicsView::wheelEvent(QWheelEvent *event) { if (QGuiApplication::keyboardModifiers() == Qt::ControlModifier) diff --git a/src/app/xml/vpattern.cpp b/src/app/xml/vpattern.cpp index 04c1c6a7b..1bd0a0f1c 100644 --- a/src/app/xml/vpattern.cpp +++ b/src/app/xml/vpattern.cpp @@ -553,6 +553,7 @@ void VPattern::DecrementReferens(quint32 id) const * @brief SPointActiveDraw return id base point current pattern peace. * @return id base point. */ +// cppcheck-suppress unusedFunction quint32 VPattern::SPointActiveDraw() { QDomElement calcElement; @@ -879,6 +880,7 @@ void VPattern::ClearScene() } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction void VPattern::customEvent(QEvent *event) { if (event->type() == UNDO_EVENT) diff --git a/src/libs/ifc/exception/vexception.cpp b/src/libs/ifc/exception/vexception.cpp index e1da1d3e1..837ac6c47 100644 --- a/src/libs/ifc/exception/vexception.cpp +++ b/src/libs/ifc/exception/vexception.cpp @@ -161,6 +161,7 @@ VException *VException::clone() const /** * @brief raise method raise for exception */ +// cppcheck-suppress unusedFunction Q_NORETURN void VException::raise() const { throw *this; diff --git a/src/libs/ifc/xml/vdomdocument.cpp b/src/libs/ifc/xml/vdomdocument.cpp index 05dac2940..20ad3237f 100644 --- a/src/libs/ifc/xml/vdomdocument.cpp +++ b/src/libs/ifc/xml/vdomdocument.cpp @@ -625,6 +625,7 @@ bool VDomDocument::SaveDocument(const QString &fileName, QString &error) const } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction QString VDomDocument::Major() const { QString version = UniqueTagText(TagVersion, "0.0.0"); @@ -633,6 +634,7 @@ QString VDomDocument::Major() const } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction QString VDomDocument::Minor() const { QString version = UniqueTagText(TagVersion, "0.0.0"); @@ -641,6 +643,7 @@ QString VDomDocument::Minor() const } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction QString VDomDocument::Patch() const { QString version = UniqueTagText(TagVersion, "0.0.0"); diff --git a/src/libs/qmuparser/qmuparserbase.cpp b/src/libs/qmuparser/qmuparserbase.cpp index 42d2dd9a6..2563349d9 100644 --- a/src/libs/qmuparser/qmuparserbase.cpp +++ b/src/libs/qmuparser/qmuparserbase.cpp @@ -746,6 +746,7 @@ void QmuParserBase::ApplyFunc( QStack &a_stOpt, QStack & } token_type funTok = a_stOpt.pop(); + // cppcheck-suppress assertWithSideEffect assert(funTok.GetFuncAddr()); // Binary operators must rely on their internal operator number diff --git a/src/libs/qmuparser/qmuparsertest.cpp b/src/libs/qmuparser/qmuparsertest.cpp index b13fb0dbe..8b5d77005 100644 --- a/src/libs/qmuparser/qmuparsertest.cpp +++ b/src/libs/qmuparser/qmuparsertest.cpp @@ -1442,17 +1442,17 @@ int QmuParserTester::EqnTest ( const QString &a_str, double a_fRes, bool a_fPass int QmuParserTester::EqnTestBulk(const QString &a_str, double a_fRes[4], bool a_fPass) { QmuParserTester::c_iCount++; - - // Define Bulk Variables - int nBulkSize = 4; - double vVariableA[] = { 1, 2, 3, 4 }; // variable values - double vVariableB[] = { 2, 2, 2, 2 }; // variable values - double vVariableC[] = { 3, 3, 3, 3 }; // variable values - double vResults[] = { 0, 0, 0, 0 }; // variable values int iRet(0); try { + // Define Bulk Variables + int nBulkSize = 4; + double vVariableA[] = { 1, 2, 3, 4 }; // variable values + double vVariableB[] = { 2, 2, 2, 2 }; // variable values + double vVariableC[] = { 3, 3, 3, 3 }; // variable values + double vResults[] = { 0, 0, 0, 0 }; // variable values + QmuParser p; p.DefineConst("const1", 1); p.DefineConst("const2", 2); diff --git a/src/libs/qmuparser/qmuparsertest.h b/src/libs/qmuparser/qmuparsertest.h index a46935672..c85ccafcf 100644 --- a/src/libs/qmuparser/qmuparsertest.h +++ b/src/libs/qmuparser/qmuparsertest.h @@ -64,7 +64,7 @@ private: static int ThrowTest ( const QString &a_str, int a_iErrc, bool a_bFail = true ); // Test Bulkmode - int EqnTestBulk(const QString &a_str, double a_fRes[4], bool a_fPass); + static int EqnTestBulk(const QString &a_str, double a_fRes[4], bool a_fPass); // Multiarg callbacks static qreal f1of1 ( qreal v ) diff --git a/src/libs/vlayout/vlayoutdetail.cpp b/src/libs/vlayout/vlayoutdetail.cpp index 2ff78c122..2cd9826f9 100644 --- a/src/libs/vlayout/vlayoutdetail.cpp +++ b/src/libs/vlayout/vlayoutdetail.cpp @@ -65,6 +65,7 @@ VLayoutDetail::~VLayoutDetail() {} //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction QVector VLayoutDetail::GetContourPoints() const { return d->contour; @@ -91,6 +92,7 @@ void VLayoutDetail::SetCountourPoints(const QVector &points) } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction QVector VLayoutDetail::GetSeamAllowencePoints() const { return d->seamAllowence; diff --git a/src/libs/vlayout/vlayoutgenerator.cpp b/src/libs/vlayout/vlayoutgenerator.cpp index 9b398eafb..af24b27c6 100644 --- a/src/libs/vlayout/vlayoutgenerator.cpp +++ b/src/libs/vlayout/vlayoutgenerator.cpp @@ -66,6 +66,7 @@ void VLayoutGenerator::SetCaseType(Cases caseType) } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction int VLayoutGenerator::DetailsCount() { return bank->AllDetailsCount(); @@ -184,6 +185,7 @@ void VLayoutGenerator::Abort() } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction int VLayoutGenerator::GetRotationIncrease() const { return rotationIncrease; diff --git a/src/libs/vlayout/vposition.cpp b/src/libs/vlayout/vposition.cpp index 51cc9ffb4..0ad744b18 100644 --- a/src/libs/vlayout/vposition.cpp +++ b/src/libs/vlayout/vposition.cpp @@ -95,6 +95,7 @@ void VPosition::run() } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction quint32 VPosition::getPaperIndex() const { return paperIndex; @@ -107,6 +108,7 @@ void VPosition::setPaperIndex(const quint32 &value) } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction quint32 VPosition::getFrame() const { return frame; @@ -119,6 +121,7 @@ void VPosition::setFrame(const quint32 &value) } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction quint32 VPosition::getDetailsCount() const { return detailsCount; @@ -576,6 +579,7 @@ void VPosition::AppendWhole(QVector &contour, const VLayoutDetail &deta } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction QPolygonF VPosition::GlobalPolygon() const { QVector points = gContour.GetContour(); diff --git a/src/libs/vobj/predicates.c b/src/libs/vobj/predicates.c index 7da2238e7..0ca0e81fa 100644 --- a/src/libs/vobj/predicates.c +++ b/src/libs/vobj/predicates.c @@ -527,21 +527,28 @@ qreal incircleadapt(qreal *pa, qreal *pb, qreal *pc, qreal *pd, qreal permanent) int temp8len, temp16alen, temp16blen, temp16clen; int temp32alen, temp32blen, temp48len, temp64len; qreal axtbb[8], axtcc[8], aytbb[8], aytcc[8]; + // cppcheck-suppress variableScope int axtbblen, axtcclen, aytbblen, aytcclen; qreal bxtaa[8], bxtcc[8], bytaa[8], bytcc[8]; + // cppcheck-suppress variableScope int bxtaalen, bxtcclen, bytaalen, bytcclen; qreal cxtaa[8], cxtbb[8], cytaa[8], cytbb[8]; + // cppcheck-suppress variableScope int cxtaalen, cxtbblen, cytaalen, cytbblen; qreal axtbc[8], aytbc[8], bxtca[8], bytca[8], cxtab[8], cytab[8]; int axtbclen, aytbclen, bxtcalen, bytcalen, cxtablen, cytablen; qreal axtbct[16], aytbct[16], bxtcat[16], bytcat[16], cxtabt[16], cytabt[16]; + // cppcheck-suppress variableScope int axtbctlen, aytbctlen, bxtcatlen, bytcatlen, cxtabtlen, cytabtlen; qreal axtbctt[8], aytbctt[8], bxtcatt[8]; qreal bytcatt[8], cxtabtt[8], cytabtt[8]; + // cppcheck-suppress variableScope int axtbcttlen, aytbcttlen, bxtcattlen, bytcattlen, cxtabttlen, cytabttlen; qreal abt[8], bct[8], cat[8]; + // cppcheck-suppress variableScope int abtlen, bctlen, catlen; qreal abtt[4], bctt[4], catt[4]; + // cppcheck-suppress variableScope int abttlen, bcttlen, cattlen; INEXACT qreal abtt3, bctt3, catt3; qreal negate; diff --git a/src/libs/vobj/vobjengine.cpp b/src/libs/vobj/vobjengine.cpp index 46220474e..bd02afe0a 100644 --- a/src/libs/vobj/vobjengine.cpp +++ b/src/libs/vobj/vobjengine.cpp @@ -119,6 +119,7 @@ bool VObjEngine::end() } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction void VObjEngine::updateState(const QPaintEngineState &state) { QPaintEngine::DirtyFlags flags = state.state(); @@ -252,6 +253,7 @@ void VObjEngine::drawPoints(const QPoint *points, int pointCount) } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction void VObjEngine::drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) { Q_UNUSED(r) diff --git a/src/libs/vobj/vobjpaintdevice.cpp b/src/libs/vobj/vobjpaintdevice.cpp index 5173e01b0..d6cb8c45d 100644 --- a/src/libs/vobj/vobjpaintdevice.cpp +++ b/src/libs/vobj/vobjpaintdevice.cpp @@ -49,12 +49,14 @@ VObjPaintDevice::~VObjPaintDevice() } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction QPaintEngine *VObjPaintDevice::paintEngine() const { return engine; } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction QString VObjPaintDevice::getFileName() const { return fileName; diff --git a/src/libs/vpropertyexplorer/checkablemessagebox.cpp b/src/libs/vpropertyexplorer/checkablemessagebox.cpp index 273a5c46c..c37e7c2ca 100644 --- a/src/libs/vpropertyexplorer/checkablemessagebox.cpp +++ b/src/libs/vpropertyexplorer/checkablemessagebox.cpp @@ -145,6 +145,7 @@ void CheckableMessageBox::setText(const QString &t) d->messageLabel->setText(t); } +// cppcheck-suppress unusedFunction QPixmap CheckableMessageBox::iconPixmap() const { if (const QPixmap *p = d->pixmapLabel->pixmap()) @@ -180,6 +181,7 @@ void CheckableMessageBox::setCheckBoxText(const QString &t) d->checkBox->setText(t); } +// cppcheck-suppress unusedFunction bool CheckableMessageBox::isCheckBoxVisible() const { return d->checkBox->isVisible(); @@ -276,6 +278,7 @@ CheckableMessageBox::information(QWidget *parent, return mb.clickedStandardButton(); } +// cppcheck-suppress unusedFunction QMessageBox::StandardButton CheckableMessageBox::dialogButtonBoxToMessageBoxButton(QDialogButtonBox::StandardButton db) { return static_cast(int(db)); @@ -337,6 +340,7 @@ void CheckableMessageBox::doNotAskAgain(QSettings *settings, const QString &sett with the escape key, or \a acceptButton if the dialog is suppressed. */ QDialogButtonBox::StandardButton +// cppcheck-suppress unusedFunction CheckableMessageBox::doNotAskAgainQuestion(QWidget *parent, const QString &title, const QString &text, QSettings *settings, const QString &settingsSubKey, @@ -370,6 +374,7 @@ CheckableMessageBox::doNotAskAgainQuestion(QWidget *parent, const QString &title with the escape key, or \a defaultButton if the dialog is suppressed. */ QDialogButtonBox::StandardButton +// cppcheck-suppress unusedFunction CheckableMessageBox::doNotShowAgainInformation(QWidget *parent, const QString &title, const QString &text, QSettings *settings, const QString &settingsSubKey, @@ -397,6 +402,7 @@ CheckableMessageBox::doNotShowAgainInformation(QWidget *parent, const QString &t Resets all suppression settings for doNotAskAgainQuestion() found in \a settings, so all these message boxes are shown again. */ +// cppcheck-suppress unusedFunction void CheckableMessageBox::resetAllDoNotAskAgainQuestions(QSettings *settings) { //Q_ASSERT(settings, return); @@ -409,6 +415,7 @@ void CheckableMessageBox::resetAllDoNotAskAgainQuestions(QSettings *settings) Returns whether any message boxes from doNotAskAgainQuestion() are suppressed in the \a settings. */ +// cppcheck-suppress unusedFunction bool CheckableMessageBox::hasSuppressedQuestions(QSettings *settings) { //Q_ASSERT(settings, return false); diff --git a/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.cpp b/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.cpp index a9d70d535..8479d8faf 100644 --- a/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.cpp +++ b/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.cpp @@ -168,11 +168,13 @@ void VFileEditWidget::dragEnterEvent(QDragEnterEvent* event) } } +// cppcheck-suppress unusedFunction void VFileEditWidget::dragMoveEvent(QDragMoveEvent* event) { event->acceptProposedAction(); } +// cppcheck-suppress unusedFunction void VFileEditWidget::dragLeaveEvent(QDragLeaveEvent* event) { event->accept(); diff --git a/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.cpp b/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.cpp index c82e50c3c..340bf6575 100644 --- a/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.cpp @@ -118,6 +118,7 @@ void VLineColorProperty::setColors(const QMap &colors) } } +// cppcheck-suppress unusedFunction QMap VLineColorProperty::getColors() const { return colors; diff --git a/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.cpp b/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.cpp index 558e40ec1..3d684e06f 100644 --- a/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.cpp @@ -119,6 +119,7 @@ void VLineTypeProperty::setStyles(const QMap &styles) } } +// cppcheck-suppress unusedFunction QMap VLineTypeProperty::getStyles() const { return styles; diff --git a/src/libs/vpropertyexplorer/plugins/vobjectproperty.cpp b/src/libs/vpropertyexplorer/plugins/vobjectproperty.cpp index d117e764e..7d66eee1f 100644 --- a/src/libs/vpropertyexplorer/plugins/vobjectproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vobjectproperty.cpp @@ -113,12 +113,14 @@ QVariant VObjectProperty::getEditorData(const QWidget *editor) const } //! Sets the objects list +// cppcheck-suppress unusedFunction void VObjectProperty::setObjectsList(const QMap &objects) { this->objects = objects; } //! Get the settings. This function has to be implemented in a subclass in order to have an effect +// cppcheck-suppress unusedFunction QMap VObjectProperty::getObjects() const { return objects; diff --git a/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.cpp b/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.cpp index 412c2f456..1baf2d894 100644 --- a/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.cpp +++ b/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.cpp @@ -80,6 +80,7 @@ QString VShortcutEditWidget::getShortcutAsString() const return CurrentKeySequence.toString(); } +// cppcheck-suppress unusedFunction QKeySequence VShortcutEditWidget::getShortcut() { return CurrentKeySequence; diff --git a/src/libs/vpropertyexplorer/plugins/vstringproperty.cpp b/src/libs/vpropertyexplorer/plugins/vstringproperty.cpp index 08341ded4..4b7af2947 100644 --- a/src/libs/vpropertyexplorer/plugins/vstringproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vstringproperty.cpp @@ -123,6 +123,7 @@ void VStringProperty::UpdateParent(const QVariant &value) emit childChanged(value, typeForParent); } +// cppcheck-suppress unusedFunction int VStringProperty::getTypeForParent() const { return typeForParent; diff --git a/src/libs/vpropertyexplorer/vproperty.cpp b/src/libs/vpropertyexplorer/vproperty.cpp index a89cb160b..b0867627b 100644 --- a/src/libs/vpropertyexplorer/vproperty.cpp +++ b/src/libs/vpropertyexplorer/vproperty.cpp @@ -186,6 +186,7 @@ QVariant VProperty::getValue() const return d_ptr->VariantValue; } +// cppcheck-suppress unusedFunction QString VProperty::serialize() const { return getValue().toString(); diff --git a/src/libs/vpropertyexplorer/vpropertyfactorymanager.cpp b/src/libs/vpropertyexplorer/vpropertyfactorymanager.cpp index 95f16804a..1abc151cb 100644 --- a/src/libs/vpropertyexplorer/vpropertyfactorymanager.cpp +++ b/src/libs/vpropertyexplorer/vpropertyfactorymanager.cpp @@ -137,6 +137,7 @@ VProperty* VPropertyFactoryManager::createProperty(const QString& type, const QS return tmpResult; } +// cppcheck-suppress unusedFunction VPropertyFactoryManager *VPropertyFactoryManager::getDefaultManager() { if (!DefaultManager) @@ -148,6 +149,7 @@ VPropertyFactoryManager *VPropertyFactoryManager::getDefaultManager() return DefaultManager; } +// cppcheck-suppress unusedFunction QStringList VPropertyFactoryManager::getSupportedTypes() { return d_ptr->Factories.keys(); diff --git a/src/libs/vpropertyexplorer/vpropertyset.cpp b/src/libs/vpropertyexplorer/vpropertyset.cpp index 4cdc420e3..dc217bf90 100644 --- a/src/libs/vpropertyexplorer/vpropertyset.cpp +++ b/src/libs/vpropertyexplorer/vpropertyset.cpp @@ -177,6 +177,7 @@ QString VPropertySet::getPropertyID(const VProperty *prop, bool look_for_parent_ return tmpResult; } +// cppcheck-suppress unusedFunction const QMap &VPropertySet::getPropertiesMap() const { return d_ptr->Properties; diff --git a/src/test/ValentinaTest/tst_vposter.cpp b/src/test/ValentinaTest/tst_vposter.cpp index 31c95aa13..78c053261 100644 --- a/src/test/ValentinaTest/tst_vposter.cpp +++ b/src/test/ValentinaTest/tst_vposter.cpp @@ -40,6 +40,7 @@ TST_VPoster::TST_VPoster(QObject *parent) : } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction void TST_VPoster::BigPoster() { QPrinter printer; @@ -59,6 +60,7 @@ void TST_VPoster::BigPoster() } //--------------------------------------------------------------------------------------------------------------------- +// cppcheck-suppress unusedFunction void TST_VPoster::SmallPoster() { QPrinter printer;