palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-07-03 09:38:11 +02:00
Code Issues Projects Releases Wiki Activity

GCC warnings.

Browse source 
--HG--
branch : develop
This commit is contained in:
dismine 2014-06-10 12:49:14 +03:00
parent e1797f3033
commit efdc947768
11 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/app/dialogs/app/dialogpatternxmledit.cpp
View file

@ -1196,9 +1196,9 @@ const short int VXMLTreeElement::TypeRoot=3;
//TODO warning: conversion to 'short int' from 'int' may alter its value [-Wconversion] //TODO warning: conversion to 'short int' from 'int' may alter its value [-Wconversion]
//treeNodeValueSet(false), treeNodeName(name) //treeNodeValueSet(false), treeNodeName(name)
// ^ // ^
VXMLTreeElement::VXMLTreeElement(QString name, int nodetype, QDomNode source, bool editor) VXMLTreeElement::VXMLTreeElement(QString name, short int nodetype, QDomNode source, bool editor)
: QStandardItem(name), DocNode(source), addedNode(editor), elementType(nodetype), treeNodeValue("<empty>"), : QStandardItem(name), DocNode(source), parentnode(nullptr), addedNode(editor), elementType(nodetype),
treeNodeValueSet(false), treeNodeName(name), selectable(true), parentnode(nullptr) treeNodeValue("<empty>"), treeNodeValueSet(false), treeNodeName(name), selectable(true)
{ {
if (editor == false) if (editor == false)
{ {

2
src/app/dialogs/app/dialogpatternxmledit.h
View file

@ -51,7 +51,7 @@ public:
* @param nodetype : node type (node, attribute, root) * @param nodetype : node type (node, attribute, root)
* @param source : the source dom node * @param source : the source dom node
*/ */
explicit VXMLTreeElement (QString name, int nodetype, QDomNode source, bool editor); explicit VXMLTreeElement (QString name, short int nodetype, QDomNode source, bool editor);
explicit VXMLTreeElement (QString name, int nodetype); explicit VXMLTreeElement (QString name, int nodetype);

4
src/app/dialogs/tools/dialogalongline.cpp
View file

@ -38,8 +38,8 @@
* @param parent parent widget * @param parent parent widget
*/ */
DialogAlongLine::DialogAlongLine(const VContainer *data, QWidget *parent) DialogAlongLine::DialogAlongLine(const VContainer *data, QWidget *parent)
:DialogTool(data, parent), ui(new Ui::DialogAlongLine), number(0), pointName(QString()), :DialogTool(data, parent), ui(new Ui::DialogAlongLine), number(0), pointName(QString()), typeLine(QString()),
typeLine(QString()), formula(QString()), firstPointId(0), secondPointId(0) formula(QString()), firstPointId(0), secondPointId(0), formulaBaseHeight(0)
{ {
ui->setupUi(this); ui->setupUi(this);
labelResultCalculation = ui->labelResultCalculation; labelResultCalculation = ui->labelResultCalculation;

3
src/app/dialogs/tools/dialogarc.cpp
View file

@ -40,7 +40,8 @@
*/ */
DialogArc::DialogArc(const VContainer *data, QWidget *parent) DialogArc::DialogArc(const VContainer *data, QWidget *parent)
:DialogTool(data, parent), ui(new Ui::DialogArc), flagRadius(false), flagF1(false), flagF2(false), :DialogTool(data, parent), ui(new Ui::DialogArc), flagRadius(false), flagF1(false), flagF2(false),
timerRadius(nullptr), timerF1(nullptr), timerF2(nullptr), center(0), radius(QString()), f1(QString()), f2(QString()) timerRadius(nullptr), timerF1(nullptr), timerF2(nullptr), center(0), radius(QString()), f1(QString()),
f2(QString()), formulaBaseHeight(0)
{ {
ui->setupUi(this); ui->setupUi(this);

4
src/app/dialogs/tools/dialogbisector.cpp
View file

@ -38,8 +38,8 @@
* @param parent parent widget * @param parent parent widget
*/ */
DialogBisector::DialogBisector(const VContainer *data, QWidget *parent) DialogBisector::DialogBisector(const VContainer *data, QWidget *parent)
:DialogTool(data, parent), ui(new Ui::DialogBisector), number(0), pointName(QString()), :DialogTool(data, parent), ui(new Ui::DialogBisector), number(0), pointName(QString()), typeLine(QString()),
typeLine(QString()), formula(QString()), firstPointId(0), secondPointId(0), thirdPointId(0) formula(QString()), firstPointId(0), secondPointId(0), thirdPointId(0), formulaBaseHeight(0)
{ {
ui->setupUi(this); ui->setupUi(this);
InitVariables(ui); InitVariables(ui);

5
src/app/dialogs/tools/dialogcutarc.cpp
View file

@ -35,8 +35,9 @@
* @param data container with data * @param data container with data
* @param parent parent widget * @param parent parent widget
*/ */
DialogCutArc::DialogCutArc(const VContainer *data, QWidget *parent) : DialogCutArc::DialogCutArc(const VContainer *data, QWidget *parent)
DialogTool(data, parent), ui(new Ui::DialogCutArc), pointName(QString()), formula(QString()), arcId(0) : DialogTool(data, parent), ui(new Ui::DialogCutArc), pointName(QString()), formula(QString()), arcId(0),
formulaBaseHeight(0)
{ {
ui->setupUi(this); ui->setupUi(this);
InitVariables(ui); InitVariables(ui);

4
src/app/dialogs/tools/dialogendline.cpp
View file

@ -38,8 +38,8 @@
* @param parent parent widget * @param parent parent widget
*/ */
DialogEndLine::DialogEndLine(const VContainer *data, QWidget *parent) DialogEndLine::DialogEndLine(const VContainer *data, QWidget *parent)
:DialogTool(data, parent), ui(new Ui::DialogEndLine), pointName(QString()), typeLine(QString()), :DialogTool(data, parent), ui(new Ui::DialogEndLine), pointName(QString()), typeLine(QString()), formula(QString()),
formula(QString()), angle(0), basePointId(0) angle(0), basePointId(0), formulaBaseHeight(0)
{ {
ui->setupUi(this); ui->setupUi(this);
InitVariables(ui); InitVariables(ui);

4
src/app/dialogs/tools/dialognormal.cpp
View file

@ -38,8 +38,8 @@
* @param parent parent widget * @param parent parent widget
*/ */
DialogNormal::DialogNormal(const VContainer *data, QWidget *parent) DialogNormal::DialogNormal(const VContainer *data, QWidget *parent)
:DialogTool(data, parent), ui(new Ui::DialogNormal), number(0), pointName(QString()), :DialogTool(data, parent), ui(new Ui::DialogNormal), number(0), pointName(QString()), typeLine(QString()),
typeLine(QString()), formula(QString()), angle(0), firstPointId(0), secondPointId(0) formula(QString()), angle(0), firstPointId(0), secondPointId(0), formulaBaseHeight(0)
{ {
ui->setupUi(this); ui->setupUi(this);
InitVariables(ui); InitVariables(ui);

1
src/app/dialogs/tools/dialognormal.h
View file

@ -105,6 +105,7 @@ private:
/** @brief secondPointId id second point of line */ /** @brief secondPointId id second point of line */
quint32 secondPointId; quint32 secondPointId;
/** @brief formulaBaseHeight base height defined by dialogui */ /** @brief formulaBaseHeight base height defined by dialogui */
int formulaBaseHeight; int formulaBaseHeight;

4
src/app/dialogs/tools/dialogpointofcontact.cpp
View file

@ -37,8 +37,8 @@
* @param parent parent widget * @param parent parent widget
*/ */
DialogPointOfContact::DialogPointOfContact(const VContainer *data, QWidget *parent) DialogPointOfContact::DialogPointOfContact(const VContainer *data, QWidget *parent)
:DialogTool(data, parent), ui(new Ui::DialogPointOfContact), number(0), pointName(QString()), radius(QString()), center(0), :DialogTool(data, parent), ui(new Ui::DialogPointOfContact), number(0), pointName(QString()), radius(QString()),
firstPoint(0), secondPoint(0) center(0), firstPoint(0), secondPoint(0), formulaBaseHeight(0)
{ {
ui->setupUi(this); ui->setupUi(this);
InitVariables(ui); InitVariables(ui);

2
src/app/dialogs/tools/dialogshoulderpoint.cpp
View file

@ -39,7 +39,7 @@
*/ */
DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, QWidget *parent) DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, QWidget *parent)
:DialogTool(data, parent), ui(new Ui::DialogShoulderPoint), number(0), pointName(QString()), :DialogTool(data, parent), ui(new Ui::DialogShoulderPoint), number(0), pointName(QString()),
typeLine(QString()), formula(QString()), p1Line(0), p2Line(0), pShoulder(0) typeLine(QString()), formula(QString()), p1Line(0), p2Line(0), pShoulder(0), formulaBaseHeight(0)
{ {
ui->setupUi(this); ui->setupUi(this);
number = 0; number = 0;