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

Fixed extra / found in include, changed Tool/Vis enums to use strict valid static_cast to make all kinds of tools happy

Browse Source 
--HG--
branch : develop
This commit is contained in:
Alex 2015-08-28 19:38:02 +03:00
parent 8fabf871d8
commit 605fb6ad8f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@
*************************************************************************/ *************************************************************************/
#include "vapplication.h" #include "vapplication.h"
#include "..//ifc/exception/vexceptionobjecterror.h" #include "../ifc/exception/vexceptionobjecterror.h"
#include "../ifc/exception/vexceptionbadid.h" #include "../ifc/exception/vexceptionbadid.h"
#include "../ifc/exception/vexceptionconversionerror.h" #include "../ifc/exception/vexceptionconversionerror.h"
#include "../ifc/exception/vexceptionemptyparameter.h" #include "../ifc/exception/vexceptionemptyparameter.h"
@ -51,7 +51,6 @@
#include <QDateTime> #include <QDateTime>
#include <QtXmlPatterns> #include <QtXmlPatterns>
Q_LOGGING_CATEGORY(vApp, "v.application") Q_LOGGING_CATEGORY(vApp, "v.application")
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

7
src/libs/vmisc/def.h
View File

@ -42,7 +42,8 @@ enum class MeasurementsType : char { Standard, Individual , Unknown};
enum class Unit : char { Mm = 0, Cm, Inch, Px, LAST_UNIT_DO_NOT_USE}; enum class Unit : char { Mm = 0, Cm, Inch, Px, LAST_UNIT_DO_NOT_USE};
enum class Source : char { FromGui, FromFile, FromTool }; enum class Source : char { FromGui, FromFile, FromTool };
enum class Tool : unsigned char typedef unsigned char ToolVisHolderType;
enum class Tool : ToolVisHolderType
{ {
Arrow, Arrow,
SinglePoint, SinglePoint,
@ -85,9 +86,9 @@ enum class Tool : unsigned char
LAST_ONE_DO_NOT_USE //add new stuffs above this, this constant must be last and never used LAST_ONE_DO_NOT_USE //add new stuffs above this, this constant must be last and never used
}; };
enum class Vis : unsigned char enum class Vis : ToolVisHolderType
{ {
ControlPointSpline = static_cast<Vis>(Tool::LAST_ONE_DO_NOT_USE), ControlPointSpline = static_cast<ToolVisHolderType>(Tool::LAST_ONE_DO_NOT_USE),
GraphicsSimpleTextItem, GraphicsSimpleTextItem,
SimpleSplinePath, SimpleSplinePath,
SimplePoint, SimplePoint,