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

Fixed MSVC build

Browse source 
--HG--
branch : feature
This commit is contained in:
Valentina Zhuravska 2015-10-22 12:28:17 +03:00
parent 38541c78c9
commit 36f0e1dc44
3 changed files with 58 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/libs/vmisc/vabstractapplication.cpp
View file

@ -74,6 +74,62 @@ VAbstractApplication::VAbstractApplication(int &argc, char **argv)
VAbstractApplication::~VAbstractApplication() VAbstractApplication::~VAbstractApplication()
{} {}
//---------------------------------------------------------------------------------------------------------------------
MeasurementsType VAbstractApplication::patternType() const
{
return _patternType;
}
//---------------------------------------------------------------------------------------------------------------------
void VAbstractApplication::setPatternType(const MeasurementsType &patternType)
{
_patternType = patternType;
}
//---------------------------------------------------------------------------------------------------------------------
void VAbstractApplication::setCurrentDocument(VAbstractPattern *doc)
{
this->doc = doc;
}
//---------------------------------------------------------------------------------------------------------------------
VAbstractPattern *VAbstractApplication::getCurrentDocument() const
{
SCASSERT(doc != nullptr)
return doc;
}
//---------------------------------------------------------------------------------------------------------------------
bool VAbstractApplication::getOpeningPattern() const
{
return openingPattern;
}
//---------------------------------------------------------------------------------------------------------------------
void VAbstractApplication::setOpeningPattern()
{
openingPattern = !openingPattern;
}
//---------------------------------------------------------------------------------------------------------------------
QWidget *VAbstractApplication::getMainWindow() const
{
return mainWindow;
}
//---------------------------------------------------------------------------------------------------------------------
void VAbstractApplication::setMainWindow(QWidget *value)
{
SCASSERT(value != nullptr)
mainWindow = value;
}
//---------------------------------------------------------------------------------------------------------------------
QUndoStack *VAbstractApplication::getUndoStack() const
{
return undoStack;
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
Unit VAbstractApplication::patternUnit() const Unit VAbstractApplication::patternUnit() const
{ {

57
src/libs/vmisc/vabstractapplication.h
View file

@ -36,9 +36,9 @@
#include "def.h" #include "def.h"
#include "vsettings.h" #include "vsettings.h"
#include "vlockguard.h" #include "vlockguard.h"
#include "../vpatterndb/vtranslatevars.h"
class VAbstractApplication;// use in define class VAbstractApplication;// use in define
class VTranslateVars;
class VAbstractPattern; class VAbstractPattern;
class VMainGraphicsView; class VMainGraphicsView;
class QUndoStack; class QUndoStack;
@ -137,17 +137,6 @@ private:
void ClearTranslation(); void ClearTranslation();
}; };
//---------------------------------------------------------------------------------------------------------------------
inline MeasurementsType VAbstractApplication::patternType() const
{
return _patternType;
}
//---------------------------------------------------------------------------------------------------------------------
inline void VAbstractApplication::setPatternType(const MeasurementsType &patternType)
{
_patternType = patternType;
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
template <typename T> template <typename T>
@ -158,48 +147,4 @@ inline QString VAbstractApplication::LocaleToString(const T &value)
return loc.toString(value); return loc.toString(value);
} }
//---------------------------------------------------------------------------------------------------------------------
inline void VAbstractApplication::setCurrentDocument(VAbstractPattern *doc)
{
this->doc = doc;
}
//---------------------------------------------------------------------------------------------------------------------
inline VAbstractPattern *VAbstractApplication::getCurrentDocument() const
{
SCASSERT(doc != nullptr)
return doc;
}
//---------------------------------------------------------------------------------------------------------------------
inline bool VAbstractApplication::getOpeningPattern() const
{
return openingPattern;
}
//---------------------------------------------------------------------------------------------------------------------
inline void VAbstractApplication::setOpeningPattern()
{
openingPattern = !openingPattern;
}
//---------------------------------------------------------------------------------------------------------------------
inline QWidget *VAbstractApplication::getMainWindow() const
{
return mainWindow;
}
//---------------------------------------------------------------------------------------------------------------------
inline void VAbstractApplication::setMainWindow(QWidget *value)
{
SCASSERT(value != nullptr)
mainWindow = value;
}
//---------------------------------------------------------------------------------------------------------------------
inline QUndoStack *VAbstractApplication::getUndoStack() const
{
return undoStack;
}
#endif // VABSTRACTAPPLICATION_H #endif // VABSTRACTAPPLICATION_H

3
src/libs/vpatterndb/vcontainer.h
View file

@ -34,14 +34,13 @@
#include "../vgeometry/vgobject.h" #include "../vgeometry/vgobject.h"
#include "../ifc/exception/vexceptionbadid.h" #include "../ifc/exception/vexceptionbadid.h"
#include "../vgeometry/vabstractcurve.h" #include "../vgeometry/vabstractcurve.h"
#include "vtranslatevars.h"
#include <QCoreApplication> #include <QCoreApplication>
#include <QHash> #include <QHash>
#include <QSet> #include <QSet>
#include <QSharedPointer> #include <QSharedPointer>
class VTranslateVars;
#if defined(Q_CC_INTEL) #if defined(Q_CC_INTEL)
#pragma warning( push ) #pragma warning( push )
#pragma warning( disable: 2021 ) #pragma warning( disable: 2021 )