aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

did a hg merge and it now wants me to commit. These are lots of changes that I don't know where they are from...

Browse Source 
--HG--
branch : develop
This commit is contained in:
Curious One 2016-05-04 21:37:49 +10:00
commit 533968fca0
66 changed files with 123 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.txt
View File

@ -2,6 +2,7 @@ Pattern making program
Author Roman Telezhynskyi <dismine(at)gmail.com>
Copyright (C) 2013-2015 Valentina project
Valentina Web page: http://www.valentina-project.org/
Wiki: https://wiki.valentinaproject.org
Valentina user manual https://bitbucket.org/dismine/valentina/wiki/manual/Content
Valentina main repository: https://bitbucket.org/dismine/valentina/overview
Valentina mail list (forum) https://groups.google.com/forum/#!forum/valentina-project-list

2
common.pri
View File

@ -301,6 +301,7 @@ CLANG_DEBUG_CXXFLAGS += \
-Wbad-array-new-length \
-Wbad-function-cast \
-Wbind-to-temporary-copy \
-Wno-c++98-compat-bind-to-temporary-copy \
-Wbitfield-constant-conversion \
-Wbitwise-op-parentheses \
-Wbool-conversion \
@ -446,6 +447,7 @@ CLANG_DEBUG_CXXFLAGS += \
-Wliteral-conversion \
-Wliteral-range \
-Wlocal-type-template-args \
-Wno-c++98-compat-local-type-template-args \
-Wlogical-not-parentheses \
-Wlogical-op-parentheses \
-Wlong-long \

8
share/translations/valentina.ts
View File

@ -5007,8 +5007,8 @@ Do you want to save your changes?</translation>
<translation>Print</translation>
</message>
<message>
<source>Print tiled</source>
<translation>Print tiled</translation>
<source>Print tiled PDF</source>
<translation>Print tiled PDF</translation>
</message>
<message>
<source>Split and print a layout into smaller pages (for regular printers)</source>
@ -5216,8 +5216,8 @@ Do you want to save your changes?</translation>
<translation>Print an original layout</translation>
</message>
<message>
<source>Print preview tiled</source>
<translation>Print preview tiled</translation>
<source>Preview tiled PDF</source>
<translation>Preview tiled PDF</translation>
</message>
<message>
<source>Print preview tiled layout</source>

4
share/translations/valentina_cs_CZ.ts
View File

@ -4851,7 +4851,7 @@ Chcete uložit své změny?</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Print tiled</source>
<source>Print tiled PDF</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -5060,7 +5060,7 @@ Chcete uložit své změny?</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Print preview tiled</source>
<source>Preview tiled PDF</source>
<translation type="unfinished"></translation>
</message>
<message>

4
share/translations/valentina_de_DE.ts
View File

@ -5007,7 +5007,7 @@ Sollen die Änderungen gespeichert werden?</translation>
<translation>Drucken</translation>
</message>
<message>
<source>Print tiled</source>
<source>Print tiled PDF</source>
<translation>Gekachelt drucken</translation>
</message>
<message>
@ -5216,7 +5216,7 @@ Sollen die Änderungen gespeichert werden?</translation>
<translation>Originales Layout drucken</translation>
</message>
<message>
<source>Print preview tiled</source>
<source>Preview tiled PDF</source>
<translation>Druckvorschau gekachelt</translation>
</message>
<message>

8
share/translations/valentina_en_CA.ts
View File

@ -4999,8 +4999,8 @@ Do you want to save your changes?</translation>
<translation>Print</translation>
</message>
<message>
<source>Print tiled</source>
<translation>Print tiled</translation>
<source>Print tiled PDF</source>
<translation>Print tiled PDF</translation>
</message>
<message>
<source>Split and print a layout into smaller pages (for regular printers)</source>
@ -5208,8 +5208,8 @@ Do you want to save your changes?</translation>
<translation>Print an original layout</translation>
</message>
<message>
<source>Print preview tiled</source>
<translation>Print preview tiled</translation>
<source>Preview tiled PDF</source>
<translation>Preview tiled PDF</translation>
</message>
<message>
<source>Print preview tiled layout</source>

8
share/translations/valentina_en_IN.ts
View File

@ -4999,8 +4999,8 @@ Do you want to save your changes?</translation>
<translation>Print</translation>
</message>
<message>
<source>Print tiled</source>
<translation>Print tiled</translation>
<source>Print tiled PDF</source>
<translation>Print tiled PDF</translation>
</message>
<message>
<source>Split and print a layout into smaller pages (for regular printers)</source>
@ -5208,8 +5208,8 @@ Do you want to save your changes?</translation>
<translation>Print an original layout</translation>
</message>
<message>
<source>Print preview tiled</source>
<translation>Print preview tiled</translation>
<source>Preview tiled PDF</source>
<translation>Preview tiled PDF</translation>
</message>
<message>
<source>Print preview tiled layout</source>

8
share/translations/valentina_en_US.ts
View File

@ -4999,8 +4999,8 @@ Do you want to save your changes?</translation>
<translation>Print</translation>
</message>
<message>
<source>Print tiled</source>
<translation>Print tiled</translation>
<source>Print tiled PDF</source>
<translation>Print tiled PDF</translation>
</message>
<message>
<source>Split and print a layout into smaller pages (for regular printers)</source>
@ -5208,8 +5208,8 @@ Do you want to save your changes?</translation>
<translation>Print an original layout</translation>
</message>
<message>
<source>Print preview tiled</source>
<translation>Print preview tiled</translation>
<source>Preview tiled PDF</source>
<translation>Preview tiled PDF</translation>
</message>
<message>
<source>Print preview tiled layout</source>

4
share/translations/valentina_es_ES.ts
View File

@ -4899,7 +4899,7 @@ Quiere guardar los cambios?</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Print tiled</source>
<source>Print tiled PDF</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -5108,7 +5108,7 @@ Quiere guardar los cambios?</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Print preview tiled</source>
<source>Preview tiled PDF</source>
<translation type="unfinished"></translation>
</message>
<message>

4
share/translations/valentina_fi_FI.ts
View File

@ -4851,7 +4851,7 @@ Haluatko tallentaa muutokset?</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Print tiled</source>
<source>Print tiled PDF</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -5060,7 +5060,7 @@ Haluatko tallentaa muutokset?</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Print preview tiled</source>
<source>Preview tiled PDF</source>
<translation type="unfinished"></translation>
</message>
<message>

4
share/translations/valentina_fr_FR.ts
View File

@ -4986,7 +4986,7 @@ Voulez-vous sauvegarder les changements ? </translation>
<translation>Imprimer</translation>
</message>
<message>
<source>Print tiled</source>
<source>Print tiled PDF</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -5195,7 +5195,7 @@ Voulez-vous sauvegarder les changements ? </translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Print preview tiled</source>
<source>Preview tiled PDF</source>
<translation type="unfinished"></translation>
</message>
<message>

4
share/translations/valentina_he_IL.ts
View File

@ -4330,7 +4330,7 @@ Do you want to save your changes?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Print tiled</source>
<source>Print tiled PDF</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -4539,7 +4539,7 @@ Do you want to save your changes?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Print preview tiled</source>
<source>Preview tiled PDF</source>
<translation type="unfinished"></translation>
</message>
<message>

4
share/translations/valentina_id_ID.ts
View File

@ -4572,7 +4572,7 @@ Apakah anda ingin menyimpan perubahan anda?</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Print tiled</source>
<source>Print tiled PDF</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -4781,7 +4781,7 @@ Apakah anda ingin menyimpan perubahan anda?</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Print preview tiled</source>
<source>Preview tiled PDF</source>
<translation type="unfinished"></translation>
</message>
<message>

4
share/translations/valentina_it_IT.ts
View File

@ -5000,7 +5000,7 @@ Vuoi salvare i cambiamenti?</translation>
<translation>Stampa</translation>
</message>
<message>
<source>Print tiled</source>
<source>Print tiled PDF</source>
<translation>Stampa porzionato</translation>
</message>
<message>
@ -5209,7 +5209,7 @@ Vuoi salvare i cambiamenti?</translation>
<translation>Stampa un layout originale</translation>
</message>
<message>
<source>Print preview tiled</source>
<source>Preview tiled PDF</source>
<translation>Anteprima di stampa piastrellata</translation>
</message>
<message>

4
share/translations/valentina_nl_NL.ts
View File

@ -4981,7 +4981,7 @@ Do you want to save your changes?</source>
<translation>Print</translation>
</message>
<message>
<source>Print tiled</source>
<source>Print tiled PDF</source>
<translation>Print A0 in A4 formaat</translation>
</message>
<message>
@ -5190,7 +5190,7 @@ Do you want to save your changes?</source>
<translation>Print een originele opmaak</translation>
</message>
<message>
<source>Print preview tiled</source>
<source>Preview tiled PDF</source>
<translation>Print voorbeeldweergave papierformaatindeling</translation>
</message>
<message>

4
share/translations/valentina_pt_BR.ts
View File

@ -4425,7 +4425,7 @@ Do you want to save your changes?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Print tiled</source>
<source>Print tiled PDF</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -4634,7 +4634,7 @@ Do you want to save your changes?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Print preview tiled</source>
<source>Preview tiled PDF</source>
<translation type="unfinished"></translation>
</message>
<message>

4
share/translations/valentina_ro_RO.ts
View File

@ -4834,7 +4834,7 @@ Do you want to save your changes?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Print tiled</source>
<source>Print tiled PDF</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -5043,7 +5043,7 @@ Do you want to save your changes?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Print preview tiled</source>
<source>Preview tiled PDF</source>
<translation type="unfinished"></translation>
</message>
<message>

8
share/translations/valentina_ru_RU.ts
View File

@ -4998,8 +4998,8 @@ Do you want to save your changes?</source>
<translation>Печать</translation>
</message>
<message>
<source>Print tiled</source>
<translation>Печать плиткой</translation>
<source>Print tiled PDF</source>
<translation>Печать плиткой PDF</translation>
</message>
<message>
<source>Split and print a layout into smaller pages (for regular printers)</source>
@ -5208,8 +5208,8 @@ Do you want to save your changes?</source>
<translation>Печать оригинальной расскладки</translation>
</message>
<message>
<source>Print preview tiled</source>
<translation>Предварительный просмотр плиткой</translation>
<source>Preview tiled PDF</source>
<translation>Предварительный просмотр плиткой PDF</translation>
</message>
<message>
<source>Print preview tiled layout</source>

8
share/translations/valentina_uk_UA.ts
View File

@ -5000,8 +5000,8 @@ Do you want to save your changes?</source>
<translation>Друк</translation>
</message>
<message>
<source>Print tiled</source>
<translation>Друк плиткою</translation>
<source>Print tiled PDF</source>
<translation>Друк плиткою PDF</translation>
</message>
<message>
<source>Split and print a layout into smaller pages (for regular printers)</source>
@ -5209,8 +5209,8 @@ Do you want to save your changes?</source>
<translation>Друк оригінальної розкладки</translation>
</message>
<message>
<source>Print preview tiled</source>
<translation>Попередній перегляд плитки</translation>
<source>Preview tiled PDF</source>
<translation>Попередній перегляд плитки PDF</translation>
</message>
<message>
<source>Print preview tiled layout</source>

4
share/translations/valentina_zh_CN.ts
View File

@ -4222,7 +4222,7 @@ Do you want to save your changes?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Print tiled</source>
<source>Print tiled PDF</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -4431,7 +4431,7 @@ Do you want to save your changes?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Print preview tiled</source>
<source>Preview tiled PDF</source>
<translation type="unfinished"></translation>
</message>
<message>

2
src/app/tape/mapplication.h
View File

@ -57,7 +57,7 @@ public:
virtual bool notify(QObject * receiver, QEvent * event) Q_DECL_OVERRIDE;
bool IsTestMode() const;
virtual bool IsAppInGUIMode() const;
virtual bool IsAppInGUIMode() const Q_DECL_OVERRIDE;
TMainWindow *MainWindow();
QList<TMainWindow*> MainWindows();

2
src/app/tape/tape.pro
View File

@ -200,7 +200,7 @@ unix{
# Some macx stuff
QMAKE_MAC_SDK = macosx
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
# Path to resources in app bundle
#RESOURCES_DIR = "Contents/Resources" defined in translation.pri
FRAMEWORKS_DIR = "Contents/Frameworks"

1
src/app/translations.pri
View File

@ -61,6 +61,7 @@ for(_translation_name, INSTALL_TRANSLATIONS) {
}
system(rm -fv $${OUT_PWD}/$$DESTDIR/translations/*.qm)
}
QMAKE_CLEAN += $$shell_path($$_translation_name)
}
}

8
src/app/valentina/core/vapplication.cpp
View File

@ -87,6 +87,14 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con
{
type = QtDebugMsg;
}
// Hide Qt bug 'Assertion when reading an icns file'
// https://bugreports.qt.io/browse/QTBUG-45537
// Remove after Qt fix will be released
if ((type == QtWarningMsg) && msg.contains("QICNSHandler::read()"))
{
type = QtDebugMsg;
}
#endif
// this is another one that doesn't make sense as just a debug message. pretty serious

4
src/app/valentina/core/vapplication.h
View File

@ -71,14 +71,14 @@ public:
void StartLogging();
QTextStream *LogFile();
virtual const VTranslateVars *TrVars();
virtual const VTranslateVars *TrVars() Q_DECL_OVERRIDE;
#if defined(Q_OS_WIN) && defined(Q_CC_GNU)
static void DrMingw();
void CollectReports() const;
#endif // defined(Q_OS_WIN) && defined(Q_CC_GNU)
bool static IsGUIMode();
virtual bool IsAppInGUIMode() const;
virtual bool IsAppInGUIMode() const Q_DECL_OVERRIDE;
virtual void OpenSettings() Q_DECL_OVERRIDE;
VSettings *ValentinaSettings();

2
src/app/valentina/core/vformulaproperty.h
View File

@ -43,7 +43,7 @@ public:
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
//! Returns item flags
Qt::ItemFlags flags(int column = DPC_Name) const;
virtual Qt::ItemFlags flags(int column = DPC_Name) const Q_DECL_OVERRIDE;
//! Returns an editor widget, or NULL if it doesn't supply one
//! \param parent The widget to which the editor will be added as a child

2
src/app/valentina/core/vformulapropertyeditor.h
View File

@ -52,7 +52,7 @@ public:
VFormula GetFormula() const;
//! Needed for proper event handling
bool eventFilter(QObject *obj, QEvent *ev);
virtual bool eventFilter(QObject *obj, QEvent *ev) Q_DECL_OVERRIDE;
signals:
//! This is emitted, when the user changes the color

3
src/app/valentina/mainwindow.cpp
View File

@ -1016,9 +1016,6 @@ void MainWindow::ClosedDialogGroup(int result)
SCASSERT(dialogTool != nullptr);
if (result == QDialog::Accepted)
{
VMainGraphicsScene *scene = qobject_cast<VMainGraphicsScene *>(currentScene);
SCASSERT(scene != nullptr);
DialogGroup *dialog = qobject_cast<DialogGroup*>(dialogTool);
SCASSERT(dialog != nullptr);
const QDomElement group = doc->CreateGroup(pattern->getNextId(), dialog->GetName(), dialog->GetGroup());

4
src/app/valentina/mainwindow.ui
View File

@ -2081,7 +2081,7 @@
</iconset>
</property>
<property name="text">
<string>Print tiled</string>
<string>Print tiled PDF</string>
</property>
<property name="toolTip">
<string>Split and print a layout into smaller pages (for regular printers)</string>
@ -2119,7 +2119,7 @@
</iconset>
</property>
<property name="text">
<string>Print preview tiled</string>
<string>Preview tiled PDF</string>
</property>
<property name="toolTip">
<string>Print preview tiled layout</string>

2
src/app/valentina/valentina.pro
View File

@ -252,7 +252,7 @@ unix{
# Some macx stuff
QMAKE_MAC_SDK = macosx
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
# Path to resources in app bundle
#RESOURCES_DIR = "Contents/Resources" defined in translation.pri
FRAMEWORKS_DIR = "Contents/Frameworks"

2
src/app/valentina/xml/vpattern.h
View File

@ -93,7 +93,7 @@ public:
static const QString AttrReadOnly;
public slots:
void LiteParseTree(const Document &parse);
virtual void LiteParseTree(const Document &parse) Q_DECL_OVERRIDE;
protected:
virtual void customEvent(QEvent * event) Q_DECL_OVERRIDE;

2
src/libs/ifc/exception/vexception.h
View File

@ -54,7 +54,7 @@ public:
QString WhatUtf8() const V_NOEXCEPT_EXPR (true);
void AddMoreInformation(const QString &info);
QString MoreInformation() const;
virtual const char* what() const V_NOEXCEPT_EXPR (true);
virtual const char* what() const V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE;
protected:
/** @brief error string with error */

2
src/libs/ifc/xml/vpatternconverter.h
View File

@ -48,7 +48,7 @@ protected:
virtual QString MinVerStr() const Q_DECL_OVERRIDE;
virtual QString MaxVerStr() const Q_DECL_OVERRIDE;
QString XSDSchema(int ver) const;
virtual QString XSDSchema(int ver) const Q_DECL_OVERRIDE;
virtual void ApplyPatches() Q_DECL_OVERRIDE;
virtual void DowngradeToCurrentMaxVersion() Q_DECL_OVERRIDE;

2
src/libs/ifc/xml/vvitconverter.h
View File

@ -48,7 +48,7 @@ protected:
virtual QString MinVerStr() const Q_DECL_OVERRIDE;
virtual QString MaxVerStr() const Q_DECL_OVERRIDE;
QString XSDSchema(int ver) const;
virtual QString XSDSchema(int ver) const Q_DECL_OVERRIDE;
virtual void ApplyPatches() Q_DECL_OVERRIDE;
virtual void DowngradeToCurrentMaxVersion() Q_DECL_OVERRIDE;

2
src/libs/ifc/xml/vvstconverter.h
View File

@ -48,7 +48,7 @@ protected:
virtual QString MinVerStr() const Q_DECL_OVERRIDE;
virtual QString MaxVerStr() const Q_DECL_OVERRIDE;
QString XSDSchema(int ver) const;
virtual QString XSDSchema(int ver) const Q_DECL_OVERRIDE;
virtual void ApplyPatches() Q_DECL_OVERRIDE;
virtual void DowngradeToCurrentMaxVersion() Q_DECL_OVERRIDE;

13
src/libs/vdxf/dxflib/dl_entities.h
View File

@ -844,6 +844,19 @@ struct DXFLIB_EXPORT DL_TextData
angle(angle)
{}
DL_TextData(const DL_TextData &d)
: ipx(d.ipx), ipy(d.ipy), ipz(d.ipz),
apx(d.apx), apy(d.apy), apz(d.apz),
height(d.height), xScaleFactor(d.xScaleFactor),
textGenerationFlags(d.textGenerationFlags),
hJustification(d.hJustification),
vJustification(d.vJustification),
text(d.text),
style(d.style),
angle(d.angle)
{
}
virtual ~DL_TextData()
{}

4
src/libs/vdxf/dxflib/dl_extrusion.h
View File

@ -67,8 +67,6 @@ public:
/**
* Constructor for DXF extrusion.
*
* @param direction Vector of axis along which the entity shall be extruded
* this is also the Z axis of the Entity coordinate system
* @param elevation Distance of the entities XY plane from the origin of the
* world coordinate system
*/
@ -103,7 +101,7 @@ public:
/**
* @return direction vector.
* @param dir vector.
*/
void getDirection(double dir[]) const
{

2
src/libs/vdxf/dxflib/dl_writer_ascii.cpp
View File

@ -79,7 +79,7 @@ void DL_WriterA::dxfReal(int gc, double value) const
// Cut away those zeros at the end:
bool dot = false;
int end = -1;
for (quint32 i=0, sz = strlen(str); i<sz; ++i)
for (quint32 i=0, sz = static_cast<quint32>(strlen(str)); i<sz; ++i)
{
if (str[i]=='.')
{

2
src/libs/vformat/vmeasurements.h
View File

@ -43,7 +43,7 @@ public:
VMeasurements(Unit unit, int baseSize, int baseHeight, VContainer *data);
virtual ~VMeasurements() Q_DECL_OVERRIDE;
void setXMLContent(const QString &fileName);
virtual void setXMLContent(const QString &fileName) Q_DECL_OVERRIDE;
void AddEmpty(const QString &name, const QString &formula = QString());
void AddEmptyAfter(const QString &after, const QString &name, const QString &formula = QString());

4
src/libs/vgeometry/varc.h
View File

@ -71,12 +71,12 @@ public:
QString GetFormulaLength () const;
void SetFormulaLength (const QString &formula, qreal value);
qreal GetLength () const;
virtual qreal GetLength () const Q_DECL_OVERRIDE;
QPointF GetP1() const;
QPointF GetP2 () const;
qreal AngleArc() const;
QVector<QPointF> GetPoints () const;
virtual QVector<QPointF> GetPoints () const Q_DECL_OVERRIDE;
QPointF CutArc (const qreal &length, VArc &arc1, VArc &arc2) const;
QPointF CutArc (const qreal &length) const;
virtual void setId(const quint32 &id) Q_DECL_OVERRIDE;

4
src/libs/vgeometry/vellipticalarc.h
View File

@ -81,14 +81,14 @@ public:
QString GetFormulaLength () const;
void SetFormulaLength (const QString &formula, qreal value);
qreal GetLength () const;
virtual qreal GetLength () const Q_DECL_OVERRIDE;
QPointF GetP1() const;
QPointF GetP2 () const;
qreal AngleArc() const;
QVector<qreal> GetAngles () const;
QVector<QPointF> GetPoints () const;
virtual QVector<QPointF> GetPoints () const Q_DECL_OVERRIDE;
QPointF CutArc (const qreal &length, VEllipticalArc &arc1, VEllipticalArc &arc2) const;
QPointF CutArc (const qreal &length) const;
virtual void setId(const quint32 &id) Q_DECL_OVERRIDE;

2
src/libs/vgeometry/vspline.cpp
View File

@ -96,8 +96,6 @@ VSpline::VSpline (VPointF p1, QPointF p2, QPointF p3, VPointF p4, quint32 idObje
* @param c1LengthFormula formula length from first point to first control point.
* @param c2Length length from second point to first control point.
* @param c2LengthFormula formula length from second point to first control point.
* @param idObject
* @param mode
*/
VSpline::VSpline(VPointF p1, VPointF p4, qreal angle1, const QString &angle1Formula, qreal angle2,
const QString &angle2Formula, qreal c1Length, const QString &c1LengthFormula, qreal c2Length,

4
src/libs/vlayout/vlayoutgenerator.cpp
View File

@ -299,7 +299,7 @@ void VLayoutGenerator::GatherPages()
VLayoutPaper paper(PageHeight(), PageWidth());
paper.SetShift(shift);
paper.SetLayoutWidth(bank->GetLayoutWidth());
paper.SetPaperIndex(i);
paper.SetPaperIndex(static_cast<quint32>(i));
paper.SetRotate(rotate);
paper.SetRotationIncrease(rotationIncrease);
paper.SetSaveLength(saveLength);
@ -361,7 +361,7 @@ void VLayoutGenerator::UnitePages()
VLayoutPaper paper(qFloor(papersLength.at(i)), PageWidth());
paper.SetShift(shift);
paper.SetLayoutWidth(bank->GetLayoutWidth());
paper.SetPaperIndex(i);
paper.SetPaperIndex(static_cast<quint32>(i));
paper.SetRotate(rotate);
paper.SetRotationIncrease(rotationIncrease);
paper.SetSaveLength(saveLength);

2
src/libs/vlayout/vlayoutpaper.cpp
View File

@ -200,7 +200,7 @@ bool VLayoutPaper::AddToSheet(const VLayoutDetail &detail, volatile bool &stop)
for (int j=1; j <= d->globalContour.GlobalEdgesCount(); ++j)
{
for (int i=1; i<= detail.EdgesCount(); i++)
for (int i=1; i<= detail.EdgesCount(); ++i)
{
VPosition *thread = new VPosition(d->globalContour, j, detail, i, &stop, d->rotate, d->rotationIncrease,
d->saveLength);

2
src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.h
View File

@ -61,7 +61,7 @@ public:
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
//! Returns item flags
Qt::ItemFlags flags(int column = DPC_Name) const;
virtual Qt::ItemFlags flags(int column = DPC_Name) const Q_DECL_OVERRIDE;
//! Returns the Vector3d
virtual Vector3D getVector() const;

2
src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h
View File

@ -59,7 +59,7 @@ public:
static QString GetColorString(const QColor& color);
//! Needed for proper event handling
bool eventFilter(QObject *obj, QEvent *ev);
virtual bool eventFilter(QObject *obj, QEvent *ev) Q_DECL_OVERRIDE;
signals:
//! This is emitted, when the user changes the color

10
src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.h
View File

@ -45,7 +45,7 @@ public:
QString getFile() const;
//! Needed for proper event handling
bool eventFilter(QObject* obj, QEvent* ev);
virtual bool eventFilter(QObject* obj, QEvent* ev) Q_DECL_OVERRIDE;
//! Returns the directory/file setting
//! \return True, if a directory dialog is being shown, false if a file dialog
@ -82,10 +82,10 @@ private slots:
void onToolButtonClicked();
protected:
void dragEnterEvent(QDragEnterEvent* event);
void dragMoveEvent(QDragMoveEvent* event);
void dragLeaveEvent(QDragLeaveEvent* event);
void dropEvent(QDropEvent* event);
virtual void dragEnterEvent(QDragEnterEvent* event) Q_DECL_OVERRIDE;
virtual void dragMoveEvent(QDragMoveEvent* event) Q_DECL_OVERRIDE;
virtual void dragLeaveEvent(QDragLeaveEvent* event) Q_DECL_OVERRIDE;
virtual void dropEvent(QDropEvent* event) Q_DECL_OVERRIDE;
//! This function checks the mime data, if it is compatible with the filters
virtual bool checkMimeData(const QMimeData* data, QString& getFile) const;

2
src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.h
View File

@ -41,7 +41,7 @@ public:
virtual ~VShortcutEditWidget() Q_DECL_OVERRIDE;
//! Needed for proper event handling
bool eventFilter(QObject* obj, QEvent* evenvt);
virtual bool eventFilter(QObject* obj, QEvent* evenvt) Q_DECL_OVERRIDE;
//! Returns the currently set shortcut
QString getShortcutAsString() const;

2
src/libs/vpropertyexplorer/vpropertyformview.h
View File

@ -84,7 +84,7 @@ private slots:
void dataSubmitted(VProperty* property);
protected:
void showEvent(QShowEvent* event);
virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
//! Rebuilds the widegt only if it is visible
void updatePropertyList();

2
src/libs/vpropertyexplorer/vpropertymodel.h
View File

@ -75,7 +75,7 @@ public:
virtual VProperty* getProperty(const QString& id);
//! Returns the item flags for the given index
virtual Qt::ItemFlags flags (const QModelIndex& index) const;
virtual Qt::ItemFlags flags (const QModelIndex& index) const Q_DECL_OVERRIDE;
//! Sets the role data for the item at index to value
virtual bool setData (const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) Q_DECL_OVERRIDE;

4
src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp
View File

@ -192,8 +192,8 @@ void DialogCubicBezier::PointNameChanged()
if (not data->IsUnique(spline.name()))
{
newDuplicate = DNumber(spline.name());
spline.SetDuplicate(newDuplicate);
newDuplicate = static_cast<qint32>(DNumber(spline.name()));
spline.SetDuplicate(static_cast<quint32>(newDuplicate));
}
ui->lineEditSplineName->setText(spline.name());
}

4
src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp
View File

@ -229,8 +229,8 @@ void DialogCubicBezierPath::currentPointChanged(int index)
if (not data->IsUnique(newPath.name()))
{
newDuplicate = DNumber(newPath.name());
newPath.SetDuplicate(newDuplicate);
newDuplicate = static_cast<qint32>(DNumber(newPath.name()));
newPath.SetDuplicate(static_cast<quint32>(newDuplicate));
}
ui->lineEditSplPathName->setText(newPath.name());

4
src/libs/vtools/dialogs/tools/dialogspline.cpp
View File

@ -483,8 +483,8 @@ void DialogSpline::PointNameChanged()
if (not data->IsUnique(spline.name()))
{
newDuplicate = DNumber(spline.name());
spline.SetDuplicate(newDuplicate);
newDuplicate = static_cast<qint32>(DNumber(spline.name()));
spline.SetDuplicate(static_cast<quint32>(newDuplicate));
}
ui->lineEditSplineName->setText(spline.name());
}

4
src/libs/vtools/dialogs/tools/dialogsplinepath.cpp
View File

@ -677,8 +677,8 @@ void DialogSplinePath::currentPointChanged(int index)
if (not data->IsUnique(newPath.name()))
{
newDuplicate = DNumber(newPath.name());
newPath.SetDuplicate(newDuplicate);
newDuplicate = static_cast<qint32>(DNumber(newPath.name()));
newPath.SetDuplicate(static_cast<quint32>(newDuplicate));
}
ui->lineEditSplPathName->setText(newPath.name());

2
src/libs/vtools/dialogs/tools/dialogtool.h
View File

@ -250,7 +250,7 @@ protected:
*/
virtual void SaveData() {}
void MoveCursorToEnd(QPlainTextEdit *plainTextEdit);
bool eventFilter(QObject *object, QEvent *event);
virtual bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
quint32 DNumber(const QString &baseName) const;
private:
void FillList(QComboBox *box, const QMap<QString, quint32> &list)const;

2
src/libs/vtools/dialogs/tools/dialogtriangle.h
View File

@ -63,7 +63,7 @@ public slots:
virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE;
virtual void PointNameChanged() Q_DECL_OVERRIDE;
protected:
virtual void ShowVisualization();
virtual void ShowVisualization() Q_DECL_OVERRIDE;
/**
* @brief SaveData Put dialog data in local variables
*/

2
src/libs/vtools/dialogs/tools/dialoguniondetails.h
View File

@ -51,7 +51,7 @@ public:
int getIndexD1() const;
int getIndexD2() const;
public slots:
void ChosenObject(quint32 id, const SceneObject &type);
virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(DialogUnionDetails)

2
src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp
View File

@ -289,7 +289,7 @@ void VToolSplinePath::SetSplinePathAttributes(QDomElement &domElement, const VSp
/**
* @brief UpdatePathPoints update spline path in pattern file.
* @param doc dom document container.
* @param node tag in file.
* @param element tag in file.
* @param path spline path.
*/
void VToolSplinePath::UpdatePathPoints(VAbstractPattern *doc, QDomElement &element, const VSplinePath &path)

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h
View File

@ -63,7 +63,7 @@ signals:
protected:
virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE;
virtual void AddToFile() Q_DECL_OVERRIDE;
QVariant itemChange ( GraphicsItemChange change, const QVariant &value );
virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) Q_DECL_OVERRIDE;
virtual void DeleteTool(bool ask = true) Q_DECL_OVERRIDE;
virtual void SaveDialog(QDomElement &domElement) Q_DECL_OVERRIDE;
virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE;

2
src/libs/vtools/tools/nodeDetails/vabstractnode.h
View File

@ -69,7 +69,7 @@ protected:
QColor currentColor;
void AddToModeling(const QDomElement &domElement);
virtual void SetVisualization() {}
virtual void SetVisualization() Q_DECL_OVERRIDE {}
virtual void ShowNode()=0;
virtual void HideNode()=0;

2
src/libs/vtools/tools/nodeDetails/vnodearc.cpp
View File

@ -44,7 +44,6 @@ const QString VNodeArc::ToolType = QStringLiteral("modeling");
* @param typeCreation way we create this tool.
* @param idTool tool id.
* @param qoParent QObject parent
* @param parent parent object.
*/
VNodeArc::VNodeArc(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idArc, const Source &typeCreation,
const quint32 &idTool, QObject *qoParent)
@ -63,7 +62,6 @@ VNodeArc::VNodeArc(VAbstractPattern *doc, VContainer *data, quint32 id, quint32
* @param parse parser file mode.
* @param typeCreation way we create this tool.
* @param idTool tool id.
* @param parent QObject parent
*/
void VNodeArc::Create(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idArc,
const Document &parse, const Source &typeCreation, const quint32 &idTool)

1
src/libs/vtools/tools/nodeDetails/vnodepoint.cpp
View File

@ -77,7 +77,6 @@ VNodePoint::VNodePoint(VAbstractPattern *doc, VContainer *data, quint32 id, quin
* @param parse parser file mode.
* @param typeCreation way we create this tool.
* @param idTool tool id.
* @param parent QObject parent
*/
void VNodePoint::Create(VAbstractPattern *doc, VContainer *data, VMainGraphicsScene *scene,
quint32 id, quint32 idPoint, const Document &parse,

1
src/libs/vtools/tools/nodeDetails/vnodespline.cpp
View File

@ -44,7 +44,6 @@ const QString VNodeSpline::ToolType = QStringLiteral("modelingSpline");
* @param typeCreation way we create this tool.
* @param idTool id node.
* @param qoParent QObject parent.
* @param parent QGraphicsItem parent.
*/
VNodeSpline::VNodeSpline(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idSpline,
const Source &typeCreation, const quint32 &idTool, QObject *qoParent)

2
src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp
View File

@ -45,7 +45,6 @@ const QString VNodeSplinePath::ToolType = QStringLiteral("modelingPath");
* @param typeCreation way we create this tool.
* @param idTool tool id.
* @param qoParent QObject parent.
* @param parent parent object.
*/
VNodeSplinePath::VNodeSplinePath(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idSpline,
const Source &typeCreation, const quint32 &idTool, QObject *qoParent)
@ -64,7 +63,6 @@ VNodeSplinePath::VNodeSplinePath(VAbstractPattern *doc, VContainer *data, quint3
* @param parse parser file mode.
* @param typeCreation way we create this tool.
* @param idTool tool id.
* @param parent QObject parent.
*/
void VNodeSplinePath::Create(VAbstractPattern *doc, VContainer *data, quint32 id,
quint32 idSpline, const Document &parse, const Source &typeCreation, const quint32 &idTool)

2
src/libs/vtools/tools/vtooluniondetails.cpp
View File

@ -90,7 +90,6 @@ VToolUnionDetails::VToolUnionDetails(VAbstractPattern *doc, VContainer *data, co
//---------------------------------------------------------------------------------------------------------------------
/**
* @brief AddToNewDetail create united detail adding one node per time.
* @param tool tool that make union.
* @param doc dom document container.
* @param data container with variables.
* @param newDetail united detail.
@ -278,7 +277,6 @@ void VToolUnionDetails::AddToNewDetail(VMainGraphicsScene *scene, VAbstractPatte
//---------------------------------------------------------------------------------------------------------------------
/**
* @brief UpdatePoints update data for united details.
* @param idDetail id united detail.
* @param data container with variables.
* @param det detail what we union.
* @param i index node in detail.

2
src/libs/vwidgets/vgraphicssimpletextitem.h
View File

@ -65,7 +65,7 @@ signals:
void PointChoosed();
void PointSelected(bool selected);
protected:
QVariant itemChange ( GraphicsItemChange change, const QVariant &value );
virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) Q_DECL_OVERRIDE;
virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent *event ) Q_DECL_OVERRIDE;
virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent *event ) Q_DECL_OVERRIDE;
virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent *event ) Q_DECL_OVERRIDE;