Fixed MSVC build
--HG-- branch : feature
This commit is contained in:
parent
38541c78c9
commit
36f0e1dc44
|
@ -74,6 +74,62 @@ VAbstractApplication::VAbstractApplication(int &argc, char **argv)
|
|||
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
|
||||
{
|
||||
|
|
|
@ -36,9 +36,9 @@
|
|||
#include "def.h"
|
||||
#include "vsettings.h"
|
||||
#include "vlockguard.h"
|
||||
#include "../vpatterndb/vtranslatevars.h"
|
||||
|
||||
class VAbstractApplication;// use in define
|
||||
class VTranslateVars;
|
||||
class VAbstractPattern;
|
||||
class VMainGraphicsView;
|
||||
class QUndoStack;
|
||||
|
@ -137,17 +137,6 @@ private:
|
|||
void ClearTranslation();
|
||||
};
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
inline MeasurementsType VAbstractApplication::patternType() const
|
||||
{
|
||||
return _patternType;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
inline void VAbstractApplication::setPatternType(const MeasurementsType &patternType)
|
||||
{
|
||||
_patternType = patternType;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
template <typename T>
|
||||
|
@ -158,48 +147,4 @@ inline QString VAbstractApplication::LocaleToString(const T &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
|
||||
|
|
|
@ -34,14 +34,13 @@
|
|||
#include "../vgeometry/vgobject.h"
|
||||
#include "../ifc/exception/vexceptionbadid.h"
|
||||
#include "../vgeometry/vabstractcurve.h"
|
||||
#include "vtranslatevars.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QHash>
|
||||
#include <QSet>
|
||||
#include <QSharedPointer>
|
||||
|
||||
class VTranslateVars;
|
||||
|
||||
#if defined(Q_CC_INTEL)
|
||||
#pragma warning( push )
|
||||
#pragma warning( disable: 2021 )
|
||||
|
|
Loading…
Reference in New Issue
Block a user