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

Build doesn't work, if include this headers on Windows.

Browse Source 
--HG--
branch : DialogTools
This commit is contained in:
dismine 2014-05-31 13:00:19 +04:00
parent cc7f257081
commit 42091c2611
16 changed files with 68 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/dialogs/app/dialogaboutapp.cpp
View File

@ -29,6 +29,9 @@
#include "dialogaboutapp.h"
#include "ui_dialogaboutapp.h"
#include "../../version.h"
#include <QDate>
#include <QDesktopServices>
#include <QMessageBox>
DialogAboutApp::DialogAboutApp(QWidget *parent) :
QDialog(parent),

1
src/app/exception/vexception.cpp
View File

@ -31,6 +31,7 @@
#include <QSpacerItem>
#include <QGridLayout>
#include "../options.h"
#include <QApplication>
//---------------------------------------------------------------------------------------------------------------------
VException::VException(const QString &what):QException(), what(what), moreInfo(QString())

1
src/app/geometry/varc.cpp
View File

@ -30,6 +30,7 @@
#include "vspline.h"
#include "../exception/vexception.h"
#include <QDebug>
#include <QtMath>
class QRectF;

2
src/app/geometry/vspline.cpp
View File

@ -27,8 +27,8 @@
*************************************************************************/
#include "vspline.h"
#include <QDebug>
#include <QtMath>
//---------------------------------------------------------------------------------------------------------------------
VSpline::VSpline()

26
src/app/options.h
View File

@ -36,7 +36,7 @@
#include <csignal>
#ifdef Q_OS_WIN32
#include WinBase.h
#include <Windows.h>
#endif /*Q_OS_WIN32*/
#define SceneSize 50000
@ -305,15 +305,30 @@ extern const QString in_Oprt;
*/
#ifndef QT_NO_DEBUG
#ifdef Q_OS_WIN32
#ifdef Q_CC_MSVC
#define SCASSERT(cond) \
{ \
if (!(cond)) \
{ \
qDebug("ASSERT: %s in %s (%s:%u)", \
#cond, __FUNCSIG__, __FILE__, __LINE__); \
void WINAPI DebugBreak(void); \ \
DebugBreak(); \
} \
}
} \
#else
#define SCASSERT(cond) \
{ \
if (!(cond)) \
{ \
qDebug("ASSERT: %s in %s (%s:%u)", \
#cond, __PRETTY_FUNCTION__, __FILE__, __LINE__);\
DebugBreak(); \
} \
} \
#endif /*Q_CC_MSVC*/
#else
#define SCASSERT(cond) \
{ \
@ -321,9 +336,10 @@ extern const QString in_Oprt;
{ \
qDebug("ASSERT: %s in %s (%s:%u)", \
#cond, __PRETTY_FUNCTION__, __FILE__, __LINE__);\
std::raise(SIGTRAP); \
std::raise(SIGTRAP); \
} \
}
} \
#endif /* Q_OS_WIN32 */
#endif /* QT_NO_DEBUG */

32
src/app/stable.h
View File

@ -36,42 +36,42 @@
#if defined __cplusplus
/* Add C++ includes here */
#ifdef Q_CC_MSVC
#define _USE_MATH_DEFINES
#endif
#ifdef QT_CORE_LIB
#include <QtCore>
# include <QtCore>
#endif
#ifdef QT_GUI_LIB
#include <QtGui>
# include <QtGui>
#endif
#ifdef QT_WIDGETS_LIB
#include <QtWidgets>
# include <QtWidgets>
#endif
#ifdef QT_XML_LIB
#include <QtXml>
# include <QtXml>
#endif
#ifdef QT_SVG_LIB
#include <QtSvg/QtSvg>
# include <QtSvg/QtSvg>
#endif
#ifdef QT_PRINTSUPPORT_LIB
#include <QtPrintSupport>
# include <QtPrintSupport>
#endif
#ifdef QT_XMLPATTERNS_LIB
#include <QtXmlPatterns>
#endif
//Build doesn't work, if include this headers on Windows.
#ifndef Q_OS_WIN
# ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns>
# endif
#ifdef QT_NETWORK_LIB
#include <QtNetwork>
#endif
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
#endif /*Q_OS_WIN*/
#endif
#endif /*__cplusplus*/
#endif // STABLE_H

2
src/app/tools/drawTools/vdrawtool.h
View File

@ -30,9 +30,9 @@
#define VDRAWTOOL_H
#include "../vabstracttool.h"
#include <QMenu>
#include <QGraphicsSceneContextMenuEvent>
#include <QGraphicsView>
#include "../../dialogs/tools/dialogtool.h"
/**

1
src/app/tools/vtooldetail.cpp
View File

@ -32,6 +32,7 @@
#include <QKeyEvent>
#include <QGraphicsSceneMouseEvent>
#include <QMenu>
#include <QGraphicsView>
const QString VToolDetail::TagName = QStringLiteral("detail");
const QString VToolDetail::TagNode = QStringLiteral("node");

2
src/app/widgets/vapplication.cpp
View File

@ -37,8 +37,8 @@
#include <QDebug>
#include <QDir>
#include <QSettings>
#include <container/calculator.h>
#include <QtMath>
const qreal VApplication::PrintDPI = 96.0;

1
src/app/widgets/vsimplespline.cpp
View File

@ -28,6 +28,7 @@
#include "vsimplespline.h"
#include "../widgets/vapplication.h"
#include <QGraphicsSceneMouseEvent>
#include <QPen>
//---------------------------------------------------------------------------------------------------------------------

14
src/libs/qmuparser/qmuparserbase.cpp
View File

@ -23,6 +23,7 @@
#include "qmuparserbase.h"
#include <QTextStream>
#include <QtMath>
#include <QDebug>
#ifdef QMUP_USE_OPENMP
#include <omp.h>
#endif
@ -2086,4 +2087,17 @@ void QmuParserBase::Eval(qreal *results, int nBulkSize) const
}
#endif
}
//---------------------------------------------------------------------------------------------------------------------
/**
* @brief Set a function that can create variable pointer for unknown expression variables.
* @param a_pFactory A pointer to the variable factory.
* @param pUserData A user defined context pointer.
*/
// cppcheck-suppress unusedFunction
void qmu::QmuParserBase::SetVarFactory(facfun_type a_pFactory, void *pUserData)
{
m_pTokenReader->SetVarCreator(a_pFactory, pUserData);
}
} // namespace qmu

14
src/libs/qmuparser/qmuparserbase.h
View File

@ -284,18 +284,6 @@ inline void QmuParserBase::AddValIdent(identfun_type a_pCallback)
m_pTokenReader->AddValIdent(a_pCallback);
}
//---------------------------------------------------------------------------------------------------------------------
/**
* @brief Set a function that can create variable pointer for unknown expression variables.
* @param a_pFactory A pointer to the variable factory.
* @param pUserData A user defined context pointer.
*/
// cppcheck-suppress unusedFunction
inline void QmuParserBase::SetVarFactory(facfun_type a_pFactory, void *pUserData)
{
m_pTokenReader->SetVarCreator(a_pFactory, pUserData);
}
//---------------------------------------------------------------------------------------------------------------------
/**
* @brief Get the default symbols used for the built in operators.
@ -306,11 +294,13 @@ inline const QStringList &QmuParserBase::GetOprtDef()
return c_DefaultOprt;
}
//---------------------------------------------------------------------------------------------------------------------
inline QMap<int, QString> QmuParserBase::GetTokens() const
{
return m_Tokens;
}
//---------------------------------------------------------------------------------------------------------------------
inline QMap<int, QString> QmuParserBase::GetNumbers() const
{
return m_Numbers;

7
src/libs/qmuparser/qmuparserbytecode.cpp
View File

@ -22,11 +22,10 @@
#include "qmuparserbytecode.h"
#include <cassert>
#include <string>
#include <stack>
#include <iostream>
#include <QStack>
#include <QString>
#include <QtMath>
#include <QDebug>
#include "qmuparserdef.h"
#include "qmuparsererror.h"

1
src/libs/qmuparser/qmuparsererror.h
View File

@ -26,6 +26,7 @@
#include "qmuparser_global.h"
#include <sstream>
#include <QException>
#include <QVector>
#include "qmuparserdef.h"

2
src/libs/qmuparser/qmuparsertokenreader.cpp
View File

@ -22,8 +22,8 @@
#include "qmuparsertokenreader.h"
#include "qmuparserbase.h"
#include <QStringList>
#include <QDebug>
/**
* @file

3
src/libs/qmuparser/stable.h
View File

@ -36,9 +36,6 @@
#if defined __cplusplus
/* Add C++ includes here */
#ifdef Q_CC_MSVC
#define _USE_MATH_DEFINES
#endif
#ifdef QT_CORE_LIB
#include <QtCore>