Compiler warnings.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-09-20 14:05:41 +03:00
parent c004f0fbad
commit 17394e8259
4 changed files with 19 additions and 2 deletions

View File

@ -43,6 +43,9 @@
class VCubicBezier; class VCubicBezier;
template <class T> class QSharedPointer; template <class T> class QSharedPointer;
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Weffc++")
struct VToolCubicBezierInitData : public VAbstractToolInitData struct VToolCubicBezierInitData : public VAbstractToolInitData
{ {
VToolCubicBezierInitData() VToolCubicBezierInitData()
@ -53,6 +56,8 @@ struct VToolCubicBezierInitData : public VAbstractToolInitData
VCubicBezier *spline; VCubicBezier *spline;
}; };
QT_WARNING_POP
class VToolCubicBezier : public VAbstractSpline class VToolCubicBezier : public VAbstractSpline
{ {
Q_OBJECT Q_OBJECT

View File

@ -43,6 +43,9 @@
class VCubicBezierPath; class VCubicBezierPath;
template <class T> class QSharedPointer; template <class T> class QSharedPointer;
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Weffc++")
struct VToolCubicBezierPathInitData : public VAbstractToolInitData struct VToolCubicBezierPathInitData : public VAbstractToolInitData
{ {
VToolCubicBezierPathInitData() VToolCubicBezierPathInitData()
@ -53,6 +56,8 @@ struct VToolCubicBezierPathInitData : public VAbstractToolInitData
VCubicBezierPath *path; VCubicBezierPath *path;
}; };
QT_WARNING_POP
class VToolCubicBezierPath:public VAbstractSpline class VToolCubicBezierPath:public VAbstractSpline
{ {
Q_OBJECT Q_OBJECT

View File

@ -611,8 +611,8 @@ QVector<VPieceNode> VAbstractTool::PrepareNodes(const VPiecePath &path, VMainGra
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
quint32 VAbstractTool::PrepareNode(const VPieceNode &node, VMainGraphicsScene *scene, quint32 VAbstractTool::PrepareNode(const VPieceNode &node, VMainGraphicsScene *scene, VAbstractPattern *doc,
VAbstractPattern *doc, VContainer *data) VContainer *data)
{ {
SCASSERT(scene != nullptr) SCASSERT(scene != nullptr)
SCASSERT(doc != nullptr) SCASSERT(doc != nullptr)
@ -624,6 +624,7 @@ quint32 VAbstractTool::PrepareNode(const VPieceNode &node, VMainGraphicsScene *s
initData.data = data; initData.data = data;
initData.parse = Document::FullParse; initData.parse = Document::FullParse;
initData.typeCreation = Source::FromGui; initData.typeCreation = Source::FromGui;
initData.scene = scene;
switch (node.GetTypeTool()) switch (node.GetTypeTool())
{ {

View File

@ -44,11 +44,15 @@
#include "../vmisc/vabstractapplication.h" #include "../vmisc/vabstractapplication.h"
#include "../vmisc/def.h" #include "../vmisc/def.h"
#include "../vwidgets/vmaingraphicsscene.h" #include "../vwidgets/vmaingraphicsscene.h"
#include "../vmisc/diagnostic.h"
#include "vdatatool.h" #include "vdatatool.h"
class VGraphicsSimpleTextItem; class VGraphicsSimpleTextItem;
class VAbstractNode; class VAbstractNode;
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Weffc++")
struct VAbstractToolInitData struct VAbstractToolInitData
{ {
VAbstractToolInitData() VAbstractToolInitData()
@ -69,6 +73,8 @@ struct VAbstractToolInitData
Source typeCreation; Source typeCreation;
}; };
QT_WARNING_POP
/** /**
* @brief The VAbstractTool abstract class for all tools. * @brief The VAbstractTool abstract class for all tools.
*/ */