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

Using macros QT_WARNING_DISABLE_*.

Browse source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-08-06 21:42:40 +03:00
parent 88be00fe42
commit c9cdd2cd8d
61 changed files with 266 additions and 522 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/app/tape/mapplication.cpp
View file

@ -36,6 +36,7 @@
#include "../ifc/exception/vexceptionwrongid.h" #include "../ifc/exception/vexceptionwrongid.h"
#include "../vmisc/logging.h" #include "../vmisc/logging.h"
#include "../vmisc/vsysexits.h" #include "../vmisc/vsysexits.h"
#include "../vmisc/diagnostic.h"
#include "../qmuparser/qmuparsererror.h" #include "../qmuparser/qmuparsererror.h"
#include <QDir> #include <QDir>
@ -51,21 +52,13 @@
#include <QSpacerItem> #include <QSpacerItem>
#include <QThread> #include <QThread>
#if defined(Q_CC_CLANG) QT_WARNING_PUSH
#pragma clang diagnostic push QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
#pragma clang diagnostic ignored "-Wmissing-prototypes" QT_WARNING_DISABLE_INTEL(1418)
#elif defined(Q_CC_INTEL)
#pragma warning( push )
#pragma warning( disable: 1418 )
#endif
Q_LOGGING_CATEGORY(mApp, "m.application") Q_LOGGING_CATEGORY(mApp, "m.application")
#if defined(Q_CC_CLANG) QT_WARNING_POP
#pragma clang diagnostic pop
#elif defined(Q_CC_INTEL)
#pragma warning( pop )
#endif
#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
# include "../vmisc/backport/qcommandlineparser.h" # include "../vmisc/backport/qcommandlineparser.h"

16
src/app/tape/tmainwindow.cpp
View file

@ -62,21 +62,13 @@
#define DIALOG_MAX_FORMULA_HEIGHT 64 #define DIALOG_MAX_FORMULA_HEIGHT 64
#if defined(Q_CC_CLANG) QT_WARNING_PUSH
#pragma clang diagnostic push QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
#pragma clang diagnostic ignored "-Wmissing-prototypes" QT_WARNING_DISABLE_INTEL(1418)
#elif defined(Q_CC_INTEL)
#pragma warning( push )
#pragma warning( disable: 1418 )
#endif
Q_LOGGING_CATEGORY(tMainWindow, "t.mainwindow") Q_LOGGING_CATEGORY(tMainWindow, "t.mainwindow")
#if defined(Q_CC_CLANG) QT_WARNING_POP
#pragma clang diagnostic pop
#elif defined(Q_CC_INTEL)
#pragma warning( pop )
#endif
// We need this enum in case we will add or delete a column. And also make code more readable. // We need this enum in case we will add or delete a column. And also make code more readable.
enum {ColumnName = 0, ColumnFullName, ColumnCalcValue, ColumnFormula, ColumnBaseValue, ColumnInSizes, ColumnInHeights}; enum {ColumnName = 0, ColumnFullName, ColumnCalcValue, ColumnFormula, ColumnBaseValue, ColumnInSizes, ColumnInHeights};

16
src/app/valentina/core/vapplication.cpp
View file

@ -53,21 +53,13 @@
#include <QtXmlPatterns> #include <QtXmlPatterns>
#include <QIcon> #include <QIcon>
#if defined(Q_CC_CLANG) QT_WARNING_PUSH
#pragma clang diagnostic push QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
#pragma clang diagnostic ignored "-Wmissing-prototypes" QT_WARNING_DISABLE_INTEL(1418)
#elif defined(Q_CC_INTEL)
#pragma warning( push )
#pragma warning( disable: 1418 )
#endif
Q_LOGGING_CATEGORY(vApp, "v.application") Q_LOGGING_CATEGORY(vApp, "v.application")
#if defined(Q_CC_CLANG) QT_WARNING_POP
#pragma clang diagnostic pop
#elif defined(Q_CC_INTEL)
#pragma warning( pop )
#endif
Q_DECL_CONSTEXPR auto DAYS_TO_KEEP_LOGS = 3; Q_DECL_CONSTEXPR auto DAYS_TO_KEEP_LOGS = 3;

11
src/app/valentina/dialogs/dialoghistory.cpp
View file

@ -38,6 +38,7 @@
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h" #include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h"
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h" #include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h"
#include "../xml/vpattern.h" #include "../xml/vpattern.h"
#include "../vmisc/diagnostic.h"
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
/** /**
@ -196,10 +197,8 @@ void DialogHistory::FillTable()
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
#if defined(Q_CC_GNU) QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Wswitch-default")
#pragma GCC diagnostic ignored "-Wswitch-default"
#endif
/** /**
* @brief Record return description for record * @brief Record return description for record
* @param tool record data * @param tool record data
@ -400,9 +399,7 @@ QString DialogHistory::Record(const VToolRecord &tool)
return tr("Can't create record."); return tr("Can't create record.");
} }
#if defined(Q_CC_GNU) QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
/** /**

36
src/app/valentina/mainwindow.cpp
View file

@ -83,21 +83,13 @@
#include <QDrag> #include <QDrag>
#endif //defined(Q_OS_MAC) #endif //defined(Q_OS_MAC)
#if defined(Q_CC_CLANG) QT_WARNING_PUSH
#pragma clang diagnostic push QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
#pragma clang diagnostic ignored "-Wmissing-prototypes" QT_WARNING_DISABLE_INTEL(1418)
#elif defined(Q_CC_INTEL)
#pragma warning( push )
#pragma warning( disable: 1418 )
#endif
Q_LOGGING_CATEGORY(vMainWindow, "v.mainwindow") Q_LOGGING_CATEGORY(vMainWindow, "v.mainwindow")
#if defined(Q_CC_CLANG) QT_WARNING_POP
#pragma clang diagnostic pop
#elif defined(Q_CC_INTEL)
#pragma warning( pop )
#endif
const QString autosavePrefix = QStringLiteral(".autosave"); const QString autosavePrefix = QStringLiteral(".autosave");
@ -1730,10 +1722,8 @@ void MainWindow::MouseMove(const QPointF &scenePos)
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
#if defined(Q_CC_GNU) QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Wswitch-default")
#pragma GCC diagnostic ignored "-Wswitch-default"
#endif
/** /**
* @brief CancelTool cancel tool. * @brief CancelTool cancel tool.
*/ */
@ -1889,9 +1879,7 @@ void MainWindow::CancelTool()
redoAction->setEnabled(qApp->getUndoStack()->canRedo()); redoAction->setEnabled(qApp->getUndoStack()->canRedo());
} }
#if defined(Q_CC_GNU) QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
/** /**
@ -3235,10 +3223,8 @@ void MainWindow::CreateMenus()
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
#if defined(Q_CC_GNU) QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Wswitch-default")
#pragma GCC diagnostic ignored "-Wswitch-default"
#endif
void MainWindow::LastUsedTool() void MainWindow::LastUsedTool()
{ {
// This check helps to find missed tools in the switch // This check helps to find missed tools in the switch
@ -3411,9 +3397,7 @@ void MainWindow::LastUsedTool()
} }
} }
#if defined(Q_CC_GNU) QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void MainWindow::AddDocks() void MainWindow::AddDocks()

10
src/app/valentina/mainwindowsnogui.cpp
View file

@ -757,10 +757,8 @@ void MainWindowsNoGUI::ObjFile(const QString &name, int i) const
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
#if defined(Q_CC_GNU) QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Wswitch-default")
#pragma GCC diagnostic ignored "-Wswitch-default"
#endif
void MainWindowsNoGUI::DxfFile(const QString &name, int i) const void MainWindowsNoGUI::DxfFile(const QString &name, int i) const
{ {
@ -796,9 +794,7 @@ void MainWindowsNoGUI::DxfFile(const QString &name, int i) const
} }
} }
#if defined(Q_CC_GNU) QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void MainWindowsNoGUI::PreparePaper(int index) const void MainWindowsNoGUI::PreparePaper(int index) const

10
src/app/valentina/xml/vpattern.cpp
View file

@ -3295,10 +3295,8 @@ void VPattern::ToolsCommonAttributes(const QDomElement &domElement, quint32 &id)
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
#if defined(Q_CC_GNU) QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Wswitch-default")
#pragma GCC diagnostic ignored "-Wswitch-default"
#endif
QRectF VPattern::ActiveDrawBoundingRect() const QRectF VPattern::ActiveDrawBoundingRect() const
{ {
@ -3430,9 +3428,7 @@ QRectF VPattern::ActiveDrawBoundingRect() const
return rec; return rec;
} }
#if defined(Q_CC_GNU) QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
template <typename T> template <typename T>

11
src/libs/ifc/xml/vdomdocument.h
View file

@ -36,13 +36,12 @@
#include "../ifc/ifcdef.h" #include "../ifc/ifcdef.h"
#include "../vmisc/def.h" #include "../vmisc/def.h"
#include "../vmisc/logging.h" #include "../vmisc/logging.h"
#include "../vmisc/diagnostic.h"
Q_DECLARE_LOGGING_CATEGORY(vXML) Q_DECLARE_LOGGING_CATEGORY(vXML)
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
/** /**
* @brief The VDomDocument class represents a Valentina document (.val file). * @brief The VDomDocument class represents a Valentina document (.val file).
@ -166,8 +165,6 @@ inline void VDomDocument::SetAttribute<MeasurementsType>(QDomElement &domElement
QStringLiteral("individual")); QStringLiteral("individual"));
} }
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VDOMDOCUMENT_H #endif // VDOMDOCUMENT_H

10
src/libs/qmuparser/qmudef.h
View file

@ -84,10 +84,8 @@
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Wattributes")
#pragma GCC diagnostic ignored "-Wattributes"
#endif
#ifdef Q_CC_MSVC #ifdef Q_CC_MSVC
#include <ciso646> #include <ciso646>
@ -99,9 +97,7 @@ inline QString NameRegExp()
return QStringLiteral("^([^0-9*/^+\\-=\\s()?%:;!.,`'\"]){1,1}([^*/^+\\-=\\s()?%:;!.,`'\"]){0,}$"); return QStringLiteral("^([^0-9*/^+\\-=\\s()?%:;!.,`'\"]){1,1}([^*/^+\\-=\\s()?%:;!.,`'\"]){0,}$");
} }
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
static inline bool QmuFuzzyComparePossibleNulls(double p1, double p2) Q_REQUIRED_RESULT; static inline bool QmuFuzzyComparePossibleNulls(double p1, double p2) Q_REQUIRED_RESULT;
static inline bool QmuFuzzyComparePossibleNulls(double p1, double p2) static inline bool QmuFuzzyComparePossibleNulls(double p1, double p2)

20
src/libs/qmuparser/qmuparserbase.cpp
View file

@ -1026,25 +1026,17 @@ qreal QmuParserBase::ParseCmdCodeBulk(int nOffset, int nThreadID) const
continue; continue;
case cmLAND: case cmLAND:
--sidx; --sidx;
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Wfloat-equal")
#pragma GCC diagnostic ignored "-Wfloat-equal"
#endif
Stack[sidx] = static_cast<bool>(Stack[sidx]) && static_cast<bool>(Stack[sidx+1]); Stack[sidx] = static_cast<bool>(Stack[sidx]) && static_cast<bool>(Stack[sidx+1]);
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
continue; continue;
case cmLOR: case cmLOR:
--sidx; --sidx;
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Wfloat-equal")
#pragma GCC diagnostic ignored "-Wfloat-equal"
#endif
Stack[sidx] = static_cast<bool>(Stack[sidx]) || static_cast<bool>(Stack[sidx+1]); Stack[sidx] = static_cast<bool>(Stack[sidx]) || static_cast<bool>(Stack[sidx+1]);
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
continue; continue;
case cmASSIGN: case cmASSIGN:
// Bugfix for Bulkmode: // Bugfix for Bulkmode:

11
src/libs/qmuparser/qmuparserbytecode.h
View file

@ -24,16 +24,15 @@
#include "qmuparserdef.h" #include "qmuparserdef.h"
#include "qmuparsertoken.h" #include "qmuparsertoken.h"
#include "qmudef.h"
/** /**
* @file * @file
* @brief Definition of the parser bytecode class. * @brief Definition of the parser bytecode class.
*/ */
#ifdef Q_CC_CLANG QT_WARNING_PUSH
#pragma clang diagnostic push QT_WARNING_DISABLE_CLANG("-Wnested-anon-types")
#pragma clang diagnostic ignored "-Wnested-anon-types"
#endif
namespace qmu namespace qmu
{ {
struct SToken struct SToken
@ -69,9 +68,7 @@ struct SToken
}; };
}; };
#ifdef Q_CC_CLANG QT_WARNING_POP
#pragma clang diagnostic pop
#endif
/** /**
* @brief Bytecode implementation of the Math Parser. * @brief Bytecode implementation of the Math Parser.

10
src/libs/qmuparser/qmuparsertest.cpp
View file

@ -1392,14 +1392,10 @@ int QmuParserTester::EqnTest ( const QString &a_str, double a_fRes, bool a_fPass
// The tests equations never result in infinity, if they do thats a bug. // The tests equations never result in infinity, if they do thats a bug.
// reference: // reference:
// http://sourceforge.net/projects/muparser/forums/forum/462843/topic/5037825 // http://sourceforge.net/projects/muparser/forums/forum/462843/topic/5037825
#if defined(Q_CC_MSVC) QT_WARNING_PUSH
#pragma warning(push) QT_WARNING_DISABLE_MSVC(4127)
#pragma warning(disable:4127)
#endif
if (std::numeric_limits<qreal>::has_infinity) if (std::numeric_limits<qreal>::has_infinity)
#if defined(Q_CC_MSVC) QT_WARNING_POP
#pragma warning(pop)
#endif
{ {
bCloseEnough &= (not QmuFuzzyComparePossibleNulls( fabs ( fVal[i] ), bCloseEnough &= (not QmuFuzzyComparePossibleNulls( fabs ( fVal[i] ),
std::numeric_limits<qreal>::infinity()) ); std::numeric_limits<qreal>::infinity()) );

5
src/libs/vdxf/dxflib/dl_codes.h
View file

@ -31,6 +31,7 @@
#define DXF_CODES_H #define DXF_CODES_H
#include "dl_global.h" #include "dl_global.h"
#include "../vmisc/diagnostic.h"
#if defined(Q_CC_MSVC) #if defined(Q_CC_MSVC)
#if (_MSC_VER > 1000) #if (_MSC_VER > 1000)
@ -50,9 +51,7 @@
#ifdef _WIN32 #ifdef _WIN32
#undef M_PI #undef M_PI
#define M_PI 3.14159265358979323846 #define M_PI 3.14159265358979323846
#if defined(Q_CC_MSVC) QT_WARNING_DISABLE_MSVC(4800)
#pragma warning(disable : 4800)
#endif // Q_CC_MSVC
#endif #endif
#ifndef M_PI #ifndef M_PI

12
src/libs/vdxf/dxflib/dl_entities.h
View file

@ -27,6 +27,7 @@
#include "dl_global.h" #include "dl_global.h"
#include "../dxfdef.h" #include "../dxfdef.h"
#include "../vmisc/diagnostic.h"
#include <string> #include <string>
#include <vector> #include <vector>
@ -809,11 +810,8 @@ struct DXFLIB_EXPORT DL_MTextData
double angle; double angle;
}; };
QT_WARNING_PUSH
#ifdef Q_CC_CLANG QT_WARNING_DISABLE_CLANG("-Wweak-vtables")
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wweak-vtables"
#endif
/** /**
* Text Data. * Text Data.
@ -945,9 +943,7 @@ struct DXFLIB_EXPORT DL_AttributeData : public DL_TextData
std::string tag; std::string tag;
}; };
#ifdef Q_CC_CLANG QT_WARNING_POP
#pragma clang diagnostic pop
#endif
/** /**
* Generic Dimension Data. * Generic Dimension Data.

26
src/libs/vdxf/vdxfengine.cpp
View file

@ -39,13 +39,9 @@
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
static inline QPaintEngine::PaintEngineFeatures svgEngineFeatures() static inline QPaintEngine::PaintEngineFeatures svgEngineFeatures()
{ {
#if defined(Q_CC_CLANG) QT_WARNING_PUSH
#pragma clang diagnostic push QT_WARNING_DISABLE_CLANG("-Wsign-conversion")
#pragma clang diagnostic ignored "-Wsign-conversion" QT_WARNING_DISABLE_INTEL(68)
#elif defined (Q_CC_INTEL)
#pragma warning( push )
#pragma warning( disable: 68 )
#endif
return QPaintEngine::PaintEngineFeatures( return QPaintEngine::PaintEngineFeatures(
QPaintEngine::AllFeatures QPaintEngine::AllFeatures
@ -54,11 +50,7 @@ static inline QPaintEngine::PaintEngineFeatures svgEngineFeatures()
& ~QPaintEngine::ConicalGradientFill & ~QPaintEngine::ConicalGradientFill
& ~QPaintEngine::PorterDuff); & ~QPaintEngine::PorterDuff);
#if defined(Q_CC_CLANG) QT_WARNING_POP
#pragma clang diagnostic pop
#elif defined(Q_CC_INTEL)
#pragma warning( pop )
#endif
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -566,10 +558,8 @@ void VDxfEngine::setInsunits(const VarInsunits &var)
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
#if defined(Q_CC_GNU) QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Wswitch-default")
#pragma GCC diagnostic ignored "-Wswitch-default"
#endif
double VDxfEngine::FromPixel(double pix, const VarInsunits &unit) const double VDxfEngine::FromPixel(double pix, const VarInsunits &unit) const
{ {
@ -585,6 +575,4 @@ double VDxfEngine::FromPixel(double pix, const VarInsunits &unit) const
return 0; return 0;
} }
#if defined(Q_CC_GNU) QT_WARNING_POP
#pragma GCC diagnostic pop
#endif

9
src/libs/vgeometry/vabstractarc_p.h
View file

@ -32,12 +32,11 @@
#include <QSharedData> #include <QSharedData>
#include "vgeometrydef.h" #include "vgeometrydef.h"
#include "../vmisc/vabstractapplication.h" #include "../vmisc/vabstractapplication.h"
#include "../vmisc/diagnostic.h"
#include "vpointf.h" #include "vpointf.h"
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VAbstractArcData : public QSharedData class VAbstractArcData : public QSharedData
{ {
@ -145,4 +144,6 @@ VAbstractArcData::VAbstractArcData(const VAbstractArcData &arc)
VAbstractArcData::~VAbstractArcData() VAbstractArcData::~VAbstractArcData()
{} {}
QT_WARNING_POP
#endif // VABSTRACTARCDATA_H #endif // VABSTRACTARCDATA_H

11
src/libs/vgeometry/vabstractcurve_p.h
View file

@ -32,11 +32,10 @@
#include <QSharedData> #include <QSharedData>
#include "../ifc/ifcdef.h" #include "../ifc/ifcdef.h"
#include "../vmisc/diagnostic.h"
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VAbstractCurveData : public QSharedData class VAbstractCurveData : public QSharedData
{ {
@ -64,8 +63,6 @@ private:
VAbstractCurveData::~VAbstractCurveData() VAbstractCurveData::~VAbstractCurveData()
{} {}
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VABSTRACTCURVE_P_H #endif // VABSTRACTCURVE_P_H

11
src/libs/vgeometry/varc_p.h
View file

@ -32,11 +32,10 @@
#include <QSharedData> #include <QSharedData>
#include "vgeometrydef.h" #include "vgeometrydef.h"
#include "../vmisc/vabstractapplication.h" #include "../vmisc/vabstractapplication.h"
#include "../vmisc/diagnostic.h"
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VArcData : public QSharedData class VArcData : public QSharedData
{ {
@ -86,8 +85,6 @@ VArcData::VArcData(const VArcData &arc)
VArcData::~VArcData() VArcData::~VArcData()
{} {}
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VARC_P_H #endif // VARC_P_H

11
src/libs/vgeometry/vcubicbezier_p.h
View file

@ -35,11 +35,10 @@
#include "vpointf.h" #include "vpointf.h"
#include "../vmisc/vabstractapplication.h" #include "../vmisc/vabstractapplication.h"
#include "../vmisc/diagnostic.h"
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VCubicBezierData : public QSharedData class VCubicBezierData : public QSharedData
{ {
@ -98,8 +97,6 @@ VCubicBezierData::~VCubicBezierData()
{ {
} }
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VCUBICBEZIER_P_H #endif // VCUBICBEZIER_P_H

11
src/libs/vgeometry/vcubicbezierpath_p.h
View file

@ -32,11 +32,10 @@
#include <QSharedData> #include <QSharedData>
#include "vpointf.h" #include "vpointf.h"
#include "../vmisc/diagnostic.h"
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VCubicBezierPathData : public QSharedData class VCubicBezierPathData : public QSharedData
{ {
@ -63,8 +62,6 @@ private:
VCubicBezierPathData::~VCubicBezierPathData() VCubicBezierPathData::~VCubicBezierPathData()
{} {}
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VCUBICBEZIERPATH_P_H #endif // VCUBICBEZIERPATH_P_H

11
src/libs/vgeometry/vellipticalarc_p.h
View file

@ -3,12 +3,11 @@
#include <QSharedData> #include <QSharedData>
#include "../vmisc/vabstractapplication.h" #include "../vmisc/vabstractapplication.h"
#include "../vmisc/diagnostic.h"
#include "vpointf.h" #include "vpointf.h"
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VEllipticalArcData : public QSharedData class VEllipticalArcData : public QSharedData
{ {
@ -78,9 +77,7 @@ VEllipticalArcData::VEllipticalArcData(const VEllipticalArcData &arc)
VEllipticalArcData::~VEllipticalArcData() VEllipticalArcData::~VEllipticalArcData()
{} {}
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VELLIPTICALARC_P #endif // VELLIPTICALARC_P

11
src/libs/vgeometry/vgobject_p.h
View file

@ -32,11 +32,10 @@
#include <QSharedData> #include <QSharedData>
#include "vgeometrydef.h" #include "vgeometrydef.h"
#include "../ifc/ifcdef.h" #include "../ifc/ifcdef.h"
#include "../vmisc/diagnostic.h"
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VGObjectData : public QSharedData class VGObjectData : public QSharedData
{ {
@ -77,8 +76,6 @@ private:
VGObjectData::~VGObjectData() VGObjectData::~VGObjectData()
{} {}
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VGOBJECT_P_H #endif // VGOBJECT_P_H

12
src/libs/vgeometry/vpointf.h
View file

@ -33,14 +33,14 @@
#include <QMetaType> #include <QMetaType>
#include "../vmisc/diagnostic.h"
class QPointF; class QPointF;
class QString; class QString;
class VPointFData; class VPointFData;
#if defined (Q_CC_INTEL) QT_WARNING_PUSH
#pragma warning(push) QT_WARNING_DISABLE_INTEL(2304)
#pragma warning(disable : 2304)
#endif
/** /**
* @brief The VPointF class keep data of point. * @brief The VPointF class keep data of point.
@ -78,8 +78,6 @@ private:
Q_DECLARE_METATYPE(VPointF) Q_DECLARE_METATYPE(VPointF)
Q_DECLARE_TYPEINFO(VPointF, Q_MOVABLE_TYPE); Q_DECLARE_TYPEINFO(VPointF, Q_MOVABLE_TYPE);
#if defined(Q_CC_INTEL) QT_WARNING_POP
#pragma warning(pop)
#endif
#endif // VPOINTF_H #endif // VPOINTF_H

11
src/libs/vgeometry/vpointf_p.h
View file

@ -31,12 +31,11 @@
#include <QSharedData> #include <QSharedData>
#include "vgeometrydef.h" #include "vgeometrydef.h"
#include "../vmisc/diagnostic.h"
#include <QPointF> #include <QPointF>
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VPointFData : public QSharedData class VPointFData : public QSharedData
{ {
@ -83,8 +82,6 @@ private:
VPointFData::~VPointFData() VPointFData::~VPointFData()
{} {}
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VPOINTF_P_H #endif // VPOINTF_P_H

10
src/libs/vgeometry/vspline_p.h
View file

@ -36,10 +36,8 @@
#include "vpointf.h" #include "vpointf.h"
#include "../vmisc/vabstractapplication.h" #include "../vmisc/vabstractapplication.h"
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VSplineData : public QSharedData class VSplineData : public QSharedData
{ {
@ -209,8 +207,6 @@ qreal VSplineData::GetL(const QPointF &p1, const QPointF &p4, qreal kCurve)
return kCurve * radius * 4 / 3 * qTan( angle * M_PI_4 / 180.0 ); return kCurve * radius * 4 / 3 * qTan( angle * M_PI_4 / 180.0 );
} }
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VSPLINE_P_H #endif // VSPLINE_P_H

10
src/libs/vgeometry/vsplinepath_p.h
View file

@ -32,10 +32,8 @@
#include <QSharedData> #include <QSharedData>
#include "vsplinepoint.h" #include "vsplinepoint.h"
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VSplinePathData : public QSharedData class VSplinePathData : public QSharedData
{ {
@ -64,8 +62,6 @@ private:
VSplinePathData::~VSplinePathData() VSplinePathData::~VSplinePathData()
{} {}
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VSPLINEPATH_P_H #endif // VSPLINEPATH_P_H

10
src/libs/vgeometry/vsplinepoint_p.h
View file

@ -35,10 +35,8 @@
#include "vpointf.h" #include "vpointf.h"
#include "../vmisc/def.h" #include "../vmisc/def.h"
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VFSplinePointData : public QSharedData class VFSplinePointData : public QSharedData
{ {
@ -178,8 +176,6 @@ private:
VSplinePointData::~VSplinePointData() VSplinePointData::~VSplinePointData()
{} {}
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VSPLINEPOINT_P_H #endif // VSPLINEPOINT_P_H

12
src/libs/vlayout/vabstractdetail_p.h
View file

@ -32,10 +32,10 @@
#include <QSharedData> #include <QSharedData>
#include <QString> #include <QString>
#ifdef Q_CC_GNU #include "../vmisc/diagnostic.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Weffc++" QT_WARNING_PUSH
#endif QT_WARNING_DISABLE_GCC("-Weffc++")
class VAbstractDetailData : public QSharedData class VAbstractDetailData : public QSharedData
{ {
@ -68,8 +68,6 @@ private:
VAbstractDetailData &operator=(const VAbstractDetailData &) Q_DECL_EQ_DELETE; VAbstractDetailData &operator=(const VAbstractDetailData &) Q_DECL_EQ_DELETE;
}; };
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VABSTRACTDETAIL_P_H #endif // VABSTRACTDETAIL_P_H

16
src/libs/vlayout/vbank.cpp
View file

@ -34,21 +34,13 @@
#include <climits> #include <climits>
#include <QRectF> #include <QRectF>
#if defined(Q_CC_CLANG) QT_WARNING_PUSH
#pragma clang diagnostic push QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
#pragma clang diagnostic ignored "-Wmissing-prototypes" QT_WARNING_DISABLE_INTEL(1418)
#elif defined(Q_CC_INTEL)
#pragma warning( push )
#pragma warning( disable: 1418 )
#endif
Q_LOGGING_CATEGORY(lBank, "layout.bank") Q_LOGGING_CATEGORY(lBank, "layout.bank")
#if defined(Q_CC_CLANG) QT_WARNING_POP
#pragma clang diagnostic pop
#elif defined(Q_CC_INTEL)
#pragma warning( pop )
#endif
// An annoying char define, from the Windows team in <rpcndr.h> // An annoying char define, from the Windows team in <rpcndr.h>
// #define small char // #define small char

12
src/libs/vlayout/vcontour_p.h
View file

@ -32,10 +32,10 @@
#include <QSharedData> #include <QSharedData>
#include <QPointF> #include <QPointF>
#ifdef Q_CC_GNU #include "../vmisc/diagnostic.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Weffc++" QT_WARNING_PUSH
#endif QT_WARNING_DISABLE_GCC("-Weffc++")
class VContourData : public QSharedData class VContourData : public QSharedData
{ {
@ -70,8 +70,6 @@ private:
VContourData &operator=(const VContourData &) Q_DECL_EQ_DELETE; VContourData &operator=(const VContourData &) Q_DECL_EQ_DELETE;
}; };
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VCONTOUR_P_H #endif // VCONTOUR_P_H

11
src/libs/vlayout/vlayoutdetail_p.h
View file

@ -38,11 +38,8 @@
#include "../vpatterndb/vpatterninfogeometry.h" #include "../vpatterndb/vpatterninfogeometry.h"
#include "vtextmanager.h" #include "vtextmanager.h"
QT_WARNING_PUSH
#ifdef Q_CC_GNU QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VLayoutDetailData : public QSharedData class VLayoutDetailData : public QSharedData
{ {
@ -100,8 +97,6 @@ private:
VLayoutDetailData &operator=(const VLayoutDetailData &) Q_DECL_EQ_DELETE; VLayoutDetailData &operator=(const VLayoutDetailData &) Q_DECL_EQ_DELETE;
}; };
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VLAYOUTDETAIL_P_H #endif // VLAYOUTDETAIL_P_H

10
src/libs/vlayout/vlayoutpaper_p.h
View file

@ -36,10 +36,8 @@
#include "vlayoutdetail.h" #include "vlayoutdetail.h"
#include "vcontour.h" #include "vcontour.h"
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VLayoutPaperData : public QSharedData class VLayoutPaperData : public QSharedData
{ {
@ -79,8 +77,6 @@ private:
VLayoutPaperData &operator=(const VLayoutPaperData &) Q_DECL_EQ_DELETE; VLayoutPaperData &operator=(const VLayoutPaperData &) Q_DECL_EQ_DELETE;
}; };
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VLAYOUTPAPER_P_H #endif // VLAYOUTPAPER_P_H

12
src/libs/vmisc/backport/qcommandlineoption.cpp
View file

@ -25,10 +25,10 @@
#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
#ifdef Q_CC_GNU #include "../vmisc/diagnostic.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Weffc++" QT_WARNING_PUSH
#endif QT_WARNING_DISABLE_GCC("-Weffc++")
class QCommandLineOptionPrivate : public QSharedData class QCommandLineOptionPrivate : public QSharedData
{ {
@ -52,9 +52,7 @@ public:
QStringList defaultValues; QStringList defaultValues;
}; };
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
/*! /*!
\since 5.2 \since 5.2

12
src/libs/vmisc/backport/qcommandlineoption.h
View file

@ -26,10 +26,10 @@
#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
#ifdef Q_CC_GNU #include "../vmisc/diagnostic.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Weffc++" QT_WARNING_PUSH
#endif QT_WARNING_DISABLE_GCC("-Weffc++")
class QCommandLineOptionPrivate; class QCommandLineOptionPrivate;
@ -71,9 +71,7 @@ private:
QSharedDataPointer<QCommandLineOptionPrivate> d; QSharedDataPointer<QCommandLineOptionPrivate> d;
}; };
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
Q_DECLARE_SHARED(QCommandLineOption) Q_DECLARE_SHARED(QCommandLineOption)

17
src/libs/vmisc/backport/qcommandlineparser.cpp
View file

@ -29,12 +29,12 @@
#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
#ifdef Q_CC_GNU #include "../vmisc/diagnostic.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Weffc++" QT_WARNING_PUSH
#pragma GCC diagnostic ignored "-Wswitch-default" QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Wsuggest-attribute=noreturn" QT_WARNING_DISABLE_GCC("-Wswitch-default")
#endif QT_WARNING_DISABLE_GCC("-Wsuggest-attribute=noreturn")
typedef QHash<QString, int> NameHash_t; typedef QHash<QString, int> NameHash_t;
@ -891,9 +891,6 @@ QString QCommandLineParserPrivate::helpText() const
return text; return text;
} }
QT_WARNING_POP
#ifdef Q_CC_GNU
#pragma GCC diagnostic pop
#endif
#endif //QT_VERSION < QT_VERSION_CHECK(5, 2, 0) #endif //QT_VERSION < QT_VERSION_CHECK(5, 2, 0)

12
src/libs/vmisc/backport/qcommandlineparser.h
View file

@ -29,10 +29,10 @@
class QCommandLineParserPrivate; class QCommandLineParserPrivate;
class QCoreApplication; class QCoreApplication;
#ifdef Q_CC_GNU #include "../vmisc/diagnostic.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Weffc++" QT_WARNING_PUSH
#endif QT_WARNING_DISABLE_GCC("-Weffc++")
class QCommandLineParser class QCommandLineParser
{ {
@ -83,9 +83,7 @@ private:
QCommandLineParserPrivate * const d; QCommandLineParserPrivate * const d;
}; };
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif //QT_VERSION < QT_VERSION_CHECK(5, 2, 0) #endif //QT_VERSION < QT_VERSION_CHECK(5, 2, 0)

12
src/libs/vmisc/qxtcsvmodel.cpp
View file

@ -39,6 +39,8 @@
#include <QTextStream> #include <QTextStream>
#include <QDebug> #include <QDebug>
#include "../vmisc/diagnostic.h"
class QxtCsvModelPrivate : public QxtPrivate<QxtCsvModel> class QxtCsvModelPrivate : public QxtPrivate<QxtCsvModel>
{ {
public: public:
@ -52,10 +54,8 @@ public:
QxtCsvModel::QuoteMode quoteMode; QxtCsvModel::QuoteMode quoteMode;
}; };
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
/*! /*!
Creates an empty QxtCsvModel with parent \a parent. Creates an empty QxtCsvModel with parent \a parent.
@ -98,9 +98,7 @@ QxtCsvModel::QxtCsvModel(const QString &filename, QObject *parent, bool withHead
setSource(&src, withHeader, separator); setSource(&src, withHeader, separator);
} }
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
QxtCsvModel::~QxtCsvModel() QxtCsvModel::~QxtCsvModel()
{} {}

12
src/libs/vmisc/vlockguard.h
View file

@ -34,6 +34,8 @@
#include <stdint.h> #include <stdint.h>
#include <memory> #include <memory>
#include "../vmisc/diagnostic.h"
#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
#include <QFileInfo> #include <QFileInfo>
#include <QLockFile> #include <QLockFile>
@ -195,10 +197,8 @@ bool VLockGuard<Guarded>::TryLock(const QString &lockName, int stale, int timeou
//use pointer and function below to persistent things like class-member, because lock is taken by constructor //use pointer and function below to persistent things like class-member, because lock is taken by constructor
//helper functions allow to write shorter creating and setting new lock-pointer //helper functions allow to write shorter creating and setting new lock-pointer
#if defined (Q_CC_INTEL) QT_WARNING_PUSH
#pragma warning( push ) QT_WARNING_DISABLE_INTEL(1418)
#pragma warning( disable: 1418 )
#endif
template <typename Guarded> template <typename Guarded>
void VlpCreateLock(std::shared_ptr<VLockGuard<Guarded>>& r, const QString& lockName, int stale = 0, int timeout = 0) void VlpCreateLock(std::shared_ptr<VLockGuard<Guarded>>& r, const QString& lockName, int stale = 0, int timeout = 0)
@ -220,8 +220,6 @@ void VlpCreateLock(std::shared_ptr<VLockGuard<Guarded>>& r, const QString& lockN
r.reset(new VLockGuard<Guarded>(lockName, a, d, stale, timeout)); r.reset(new VLockGuard<Guarded>(lockName, a, d, stale, timeout));
} }
#if defined(Q_CC_INTEL) QT_WARNING_POP
#pragma warning( pop )
#endif
#endif // VLOCKGUARD_H #endif // VLOCKGUARD_H

13
src/libs/vobj/delaunay.cpp
View file

@ -25,12 +25,11 @@
#include <QtGlobal> #include <QtGlobal>
#include "delaunay.h" #include "delaunay.h"
#include "../vmisc/diagnostic.h"
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Wold-style-cast")
#pragma GCC diagnostic ignored "-Wold-style-cast" QT_WARNING_DISABLE_GCC("-Wcast-qual")
#pragma GCC diagnostic ignored "-Wcast-qual"
#endif
#if PREDICATE == EXACT_PREDICATE #if PREDICATE == EXACT_PREDICATE
extern void exactinit(); extern void exactinit();
@ -1083,6 +1082,4 @@ void delaunay2d_release(delaunay2d_t *del) {
free(del); free(del);
} }
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif

17
src/libs/vobj/vobjengine.cpp
View file

@ -27,6 +27,7 @@
*************************************************************************/ *************************************************************************/
#include "vobjengine.h" #include "vobjengine.h"
#include "../vmisc/diagnostic.h"
#include <QTextStream> #include <QTextStream>
#include <QDebug> #include <QDebug>
@ -44,14 +45,10 @@
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
static inline QPaintEngine::PaintEngineFeatures svgEngineFeatures() static inline QPaintEngine::PaintEngineFeatures svgEngineFeatures()
{ {
#if defined(Q_CC_CLANG) QT_WARNING_PUSH
#pragma clang diagnostic push QT_WARNING_DISABLE_CLANG("-Wsign-conversion")
#pragma clang diagnostic ignored "-Wsign-conversion" QT_WARNING_DISABLE_INTEL(68)
#elif defined (Q_CC_INTEL) QT_WARNING_DISABLE_INTEL(2022)
#pragma warning( push )
#pragma warning( disable: 68 )
#pragma warning( disable: 2022 )
#endif
return QPaintEngine::PaintEngineFeatures( return QPaintEngine::PaintEngineFeatures(
QPaintEngine::AllFeatures QPaintEngine::AllFeatures
@ -60,9 +57,7 @@ static inline QPaintEngine::PaintEngineFeatures svgEngineFeatures()
& ~QPaintEngine::ConicalGradientFill & ~QPaintEngine::ConicalGradientFill
& ~QPaintEngine::PorterDuff); & ~QPaintEngine::PorterDuff);
#if defined(Q_CC_CLANG) QT_WARNING_POP
#pragma clang diagnostic pop
#endif
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vpatterndb/variables/varcradius_p.h
View file

@ -31,10 +31,10 @@
#include <QSharedData> #include <QSharedData>
#ifdef Q_CC_GNU #include "../vmisc/diagnostic.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Weffc++" QT_WARNING_PUSH
#endif QT_WARNING_DISABLE_GCC("-Weffc++")
class VArcRadiusData : public QSharedData class VArcRadiusData : public QSharedData
{ {
@ -63,8 +63,6 @@ private:
VArcRadiusData::~VArcRadiusData() VArcRadiusData::~VArcRadiusData()
{} {}
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VARCRADIUSDATA_H #endif // VARCRADIUSDATA_H

11
src/libs/vpatterndb/variables/vcurvevariable_p.h
View file

@ -32,11 +32,10 @@
#include <QSharedData> #include <QSharedData>
#include "../ifc/ifcdef.h" #include "../ifc/ifcdef.h"
#include "../vmisc/diagnostic.h"
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VCurveVariableData : public QSharedData class VCurveVariableData : public QSharedData
{ {
@ -66,8 +65,6 @@ private:
VCurveVariableData::~VCurveVariableData() VCurveVariableData::~VCurveVariableData()
{} {}
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VCURVELENGTH_P_H #endif // VCURVELENGTH_P_H

11
src/libs/vpatterndb/variables/vincrement_p.h
View file

@ -33,11 +33,10 @@
#include "../ifc/ifcdef.h" #include "../ifc/ifcdef.h"
#include "../vcontainer.h" #include "../vcontainer.h"
#include "../vmisc/diagnostic.h"
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VIncrementData : public QSharedData class VIncrementData : public QSharedData
{ {
@ -70,8 +69,6 @@ private:
VIncrementData::~VIncrementData() VIncrementData::~VIncrementData()
{} {}
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VINCREMENT_P_H #endif // VINCREMENT_P_H

11
src/libs/vpatterndb/variables/vinternalvariable_p.h
View file

@ -31,11 +31,10 @@
#include <QSharedData> #include <QSharedData>
#include "../vmisc/def.h" #include "../vmisc/def.h"
#include "../vmisc/diagnostic.h"
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VInternalVariableData : public QSharedData class VInternalVariableData : public QSharedData
{ {
@ -65,8 +64,6 @@ private:
VInternalVariableData::~VInternalVariableData() VInternalVariableData::~VInternalVariableData()
{} {}
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VINTERNALVARIABLE_P_H #endif // VINTERNALVARIABLE_P_H

11
src/libs/vpatterndb/variables/vlineangle_p.h
View file

@ -32,11 +32,10 @@
#include <QSharedData> #include <QSharedData>
#include "../ifc/ifcdef.h" #include "../ifc/ifcdef.h"
#include "../vmisc/diagnostic.h"
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VLineAngleData : public QSharedData class VLineAngleData : public QSharedData
{ {
@ -66,8 +65,6 @@ private:
VLineAngleData::~VLineAngleData() VLineAngleData::~VLineAngleData()
{} {}
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VLINEANGLE_P_H #endif // VLINEANGLE_P_H

11
src/libs/vpatterndb/variables/vlinelength_p.h
View file

@ -32,11 +32,10 @@
#include <QSharedData> #include <QSharedData>
#include "../ifc/ifcdef.h" #include "../ifc/ifcdef.h"
#include "../vmisc/diagnostic.h"
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VLengthLineData : public QSharedData class VLengthLineData : public QSharedData
{ {
@ -67,8 +66,6 @@ private:
VLengthLineData::~VLengthLineData() VLengthLineData::~VLengthLineData()
{} {}
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VLINELENGTH_P_H #endif // VLINELENGTH_P_H

11
src/libs/vpatterndb/variables/vmeasurement_p.h
View file

@ -32,11 +32,10 @@
#include <QSharedData> #include <QSharedData>
#include "../vcontainer.h" #include "../vcontainer.h"
#include "../vmisc/diagnostic.h"
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VMeasurementData : public QSharedData class VMeasurementData : public QSharedData
{ {
@ -73,8 +72,6 @@ private:
VMeasurementData::~VMeasurementData() VMeasurementData::~VMeasurementData()
{} {}
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VMEASUREMENT_P_H #endif // VMEASUREMENT_P_H

12
src/libs/vpatterndb/variables/vvariable_p.h
View file

@ -31,10 +31,10 @@
#include <QSharedData> #include <QSharedData>
#ifdef Q_CC_GNU #include "../vmisc/diagnostic.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Weffc++" QT_WARNING_PUSH
#endif QT_WARNING_DISABLE_GCC("-Weffc++")
class VVariableData : public QSharedData class VVariableData : public QSharedData
{ {
@ -83,8 +83,6 @@ private:
VVariableData::~VVariableData() VVariableData::~VVariableData()
{} {}
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VVARIABLE_P_H #endif // VVARIABLE_P_H

16
src/libs/vpatterndb/vcontainer.cpp
View file

@ -37,21 +37,13 @@
#include <QtAlgorithms> #include <QtAlgorithms>
#include <QDebug> #include <QDebug>
#if defined(Q_CC_CLANG) QT_WARNING_PUSH
#pragma clang diagnostic push QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
#pragma clang diagnostic ignored "-Wmissing-prototypes" QT_WARNING_DISABLE_INTEL(1418)
#elif defined(Q_CC_INTEL)
#pragma warning( push )
#pragma warning( disable: 1418 )
#endif
Q_LOGGING_CATEGORY(vCon, "v.container") Q_LOGGING_CATEGORY(vCon, "v.container")
#if defined(Q_CC_CLANG) QT_WARNING_POP
#pragma clang diagnostic pop
#elif defined(Q_CC_INTEL)
#pragma warning( pop )
#endif
quint32 VContainer::_id = NULL_ID; quint32 VContainer::_id = NULL_ID;
qreal VContainer::_size = 50; qreal VContainer::_size = 50;

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

@ -35,6 +35,7 @@
#include "../ifc/exception/vexceptionbadid.h" #include "../ifc/exception/vexceptionbadid.h"
#include "../vgeometry/vabstractcurve.h" #include "../vgeometry/vabstractcurve.h"
#include "../vgeometry/vabstractcubicbezierpath.h" #include "../vgeometry/vabstractcubicbezierpath.h"
#include "../vmisc/diagnostic.h"
#include "vtranslatevars.h" #include "vtranslatevars.h"
#include <QCoreApplication> #include <QCoreApplication>
@ -42,13 +43,9 @@
#include <QSet> #include <QSet>
#include <QSharedPointer> #include <QSharedPointer>
#if defined(Q_CC_INTEL) QT_WARNING_PUSH
#pragma warning( push ) QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma warning( disable: 2021 ) QT_WARNING_DISABLE_INTEL(2021)
#elif defined(Q_CC_GNU)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VContainerData : public QSharedData //-V690 class VContainerData : public QSharedData //-V690
{ {
@ -88,11 +85,7 @@ private:
VContainerData &operator=(const VContainerData &) Q_DECL_EQ_DELETE; VContainerData &operator=(const VContainerData &) Q_DECL_EQ_DELETE;
}; };
#if defined(Q_CC_INTEL) QT_WARNING_POP
#pragma warning( pop )
#elif defined(Q_CC_GNU)
#pragma GCC diagnostic pop
#endif
/** /**
* @brief The VContainer class container of all variables. * @brief The VContainer class container of all variables.

11
src/libs/vpatterndb/vdetail_p.h
View file

@ -34,11 +34,10 @@
#include "vpatternpiecedata.h" #include "vpatternpiecedata.h"
#include "vpatterninfogeometry.h" #include "vpatterninfogeometry.h"
#include "../ifc/ifcdef.h" #include "../ifc/ifcdef.h"
#include "../vmisc/diagnostic.h"
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VDetailData : public QSharedData class VDetailData : public QSharedData
{ {
@ -81,8 +80,6 @@ private:
VDetailData &operator=(const VDetailData &) Q_DECL_EQ_DELETE; VDetailData &operator=(const VDetailData &) Q_DECL_EQ_DELETE;
}; };
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VDETAIL_P_H #endif // VDETAIL_P_H

11
src/libs/vpatterndb/vnodedetail_p.h
View file

@ -31,11 +31,10 @@
#include <QSharedData> #include <QSharedData>
#include "../ifc/ifcdef.h" #include "../ifc/ifcdef.h"
#include "../vmisc/diagnostic.h"
#ifdef Q_CC_GNU QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Weffc++")
#pragma GCC diagnostic ignored "-Weffc++"
#endif
class VNodeDetailData : public QSharedData class VNodeDetailData : public QSharedData
{ {
@ -84,8 +83,6 @@ private:
VNodeDetailData &operator=(const VNodeDetailData &) Q_DECL_EQ_DELETE; VNodeDetailData &operator=(const VNodeDetailData &) Q_DECL_EQ_DELETE;
}; };
#ifdef Q_CC_GNU QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
#endif // VNODEDETAIL_P_H #endif // VNODEDETAIL_P_H

11
src/libs/vpropertyexplorer/vabstractpropertyfactory.h
View file

@ -22,6 +22,7 @@
#define VABSTRACTPROPERTYFACTORY_H #define VABSTRACTPROPERTYFACTORY_H
#include "vpropertyexplorer_global.h" #include "vpropertyexplorer_global.h"
#include "../vmisc/diagnostic.h"
#include <QObject> #include <QObject>
namespace VPE namespace VPE
@ -29,10 +30,8 @@ namespace VPE
class VProperty; class VProperty;
#ifdef Q_CC_CLANG QT_WARNING_PUSH
#pragma clang diagnostic push QT_WARNING_DISABLE_CLANG("-Wweak-vtables")
#pragma clang diagnostic ignored "-Wweak-vtables"
#endif
class VPROPERTYEXPLORERSHARED_EXPORT VAbstractPropertyFactory class VPROPERTYEXPLORERSHARED_EXPORT VAbstractPropertyFactory
{ {
@ -47,9 +46,7 @@ public:
virtual VProperty* createProperty(const QString& type, const QString &name) = 0; virtual VProperty* createProperty(const QString& type, const QString &name) = 0;
}; };
#ifdef Q_CC_CLANG QT_WARNING_POP
#pragma clang diagnostic pop
#endif
} }

11
src/libs/vpropertyexplorer/vpropertyformview_p.h
View file

@ -24,6 +24,7 @@
// ONLY INCLUDE THIS IN .CPP FILES // ONLY INCLUDE THIS IN .CPP FILES
#include "vpropertyformwidget_p.h" #include "vpropertyformwidget_p.h"
#include "../vmisc/diagnostic.h"
namespace VPE namespace VPE
{ {
@ -31,10 +32,8 @@ namespace VPE
class VPropertyModel; class VPropertyModel;
class VPropertySet; class VPropertySet;
#ifdef Q_CC_CLANG QT_WARNING_PUSH
#pragma clang diagnostic push QT_WARNING_DISABLE_CLANG("-Wweak-vtables")
#pragma clang diagnostic ignored "-Wweak-vtables"
#endif
class VPropertyFormViewPrivate : public VPropertyFormWidgetPrivate class VPropertyFormViewPrivate : public VPropertyFormWidgetPrivate
{ {
@ -72,9 +71,7 @@ private:
Q_DISABLE_COPY(VPropertyFormViewPrivate) Q_DISABLE_COPY(VPropertyFormViewPrivate)
}; };
#ifdef Q_CC_CLANG QT_WARNING_POP
#pragma clang diagnostic pop
#endif
} }

11
src/libs/vpropertyexplorer/vpropertyformwidget_p.h
View file

@ -25,14 +25,13 @@
#include <QList> #include <QList>
#include "vproperty.h" #include "vproperty.h"
#include "../vmisc/diagnostic.h"
namespace VPE namespace VPE
{ {
#ifdef Q_CC_CLANG QT_WARNING_PUSH
#pragma clang diagnostic push QT_WARNING_DISABLE_CLANG("-Wweak-vtables")
#pragma clang diagnostic ignored "-Wweak-vtables"
#endif
class VPropertyFormWidgetPrivate class VPropertyFormWidgetPrivate
{ {
@ -71,9 +70,7 @@ public:
virtual ~VPropertyFormWidgetPrivate() {} virtual ~VPropertyFormWidgetPrivate() {}
}; };
#ifdef Q_CC_CLANG QT_WARNING_POP
#pragma clang diagnostic pop
#endif
} }

11
src/libs/vpropertyexplorer/vwidgetproperty_p.h
View file

@ -24,6 +24,7 @@
// ONLY INCLUDE THIS IN .CPP FILES // ONLY INCLUDE THIS IN .CPP FILES
#include "vproperty_p.h" #include "vproperty_p.h"
#include "../vmisc/diagnostic.h"
#include <QPointer> #include <QPointer>
#include <QWidget> #include <QWidget>
@ -31,10 +32,8 @@
namespace VPE namespace VPE
{ {
#ifdef Q_CC_CLANG QT_WARNING_PUSH
#pragma clang diagnostic push QT_WARNING_DISABLE_CLANG("-Wweak-vtables")
#pragma clang diagnostic ignored "-Wweak-vtables"
#endif
class VWidgetPropertyPrivate : public VPropertyPrivate class VWidgetPropertyPrivate : public VPropertyPrivate
{ {
@ -60,9 +59,7 @@ public:
} }
}; };
#ifdef Q_CC_CLANG QT_WARNING_POP
#pragma clang diagnostic pop
#endif
} }

30
src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp
View file

@ -68,10 +68,8 @@ VToolRotation::VToolRotation(VAbstractPattern *doc, VContainer *data, quint32 id
// This check helps to find missed objects in the switch // This check helps to find missed objects in the switch
Q_STATIC_ASSERT_X(static_cast<int>(GOType::Unknown) == 7, "Not all objects were handled."); Q_STATIC_ASSERT_X(static_cast<int>(GOType::Unknown) == 7, "Not all objects were handled.");
#if defined(Q_CC_GNU) QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Wswitch-default")
#pragma GCC diagnostic ignored "-Wswitch-default"
#endif
switch(static_cast<GOType>(obj->getType())) switch(static_cast<GOType>(obj->getType()))
{ {
case GOType::Point: case GOType::Point:
@ -124,9 +122,7 @@ VToolRotation::VToolRotation(VAbstractPattern *doc, VContainer *data, quint32 id
case GOType::Unknown: case GOType::Unknown:
break; break;
} }
#if defined(Q_CC_GNU) QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
} }
ToolCreation(typeCreation); ToolCreation(typeCreation);
@ -198,10 +194,8 @@ VToolRotation *VToolRotation::Create(const quint32 _id, const quint32 &origin, Q
// This check helps to find missed objects in the switch // This check helps to find missed objects in the switch
Q_STATIC_ASSERT_X(static_cast<int>(GOType::Unknown) == 7, "Not all objects were handled."); Q_STATIC_ASSERT_X(static_cast<int>(GOType::Unknown) == 7, "Not all objects were handled.");
#if defined(Q_CC_GNU) QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Wswitch-default")
#pragma GCC diagnostic ignored "-Wswitch-default"
#endif
switch(static_cast<GOType>(obj->getType())) switch(static_cast<GOType>(obj->getType()))
{ {
case GOType::Point: case GOType::Point:
@ -229,9 +223,7 @@ VToolRotation *VToolRotation::Create(const quint32 _id, const quint32 &origin, Q
case GOType::Unknown: case GOType::Unknown:
break; break;
} }
#if defined(Q_CC_GNU) QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
} }
} }
else else
@ -244,10 +236,8 @@ VToolRotation *VToolRotation::Create(const quint32 _id, const quint32 &origin, Q
// This check helps to find missed objects in the switch // This check helps to find missed objects in the switch
Q_STATIC_ASSERT_X(static_cast<int>(GOType::Unknown) == 7, "Not all objects were handled."); Q_STATIC_ASSERT_X(static_cast<int>(GOType::Unknown) == 7, "Not all objects were handled.");
#if defined(Q_CC_GNU) QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Wswitch-default")
#pragma GCC diagnostic ignored "-Wswitch-default"
#endif
switch(static_cast<GOType>(obj->getType())) switch(static_cast<GOType>(obj->getType()))
{ {
case GOType::Point: case GOType::Point:
@ -276,9 +266,7 @@ VToolRotation *VToolRotation::Create(const quint32 _id, const quint32 &origin, Q
case GOType::Unknown: case GOType::Unknown:
break; break;
} }
#if defined(Q_CC_GNU) QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
} }
if (parse != Document::FullParse) if (parse != Document::FullParse)
{ {

10
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp
View file

@ -299,10 +299,8 @@ void VToolCurveIntersectAxis::SetVisualization()
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
#if defined(Q_CC_GNU) QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Wswitch-default")
#pragma GCC diagnostic ignored "-Wswitch-default"
#endif
void VToolCurveIntersectAxis::InitSegments(const GOType &curveType, qreal segLength, const VPointF *p, quint32 curveId, void VToolCurveIntersectAxis::InitSegments(const GOType &curveType, qreal segLength, const VPointF *p, quint32 curveId,
VContainer *data) VContainer *data)
{ {
@ -444,6 +442,4 @@ void VToolCurveIntersectAxis::InitSegments(const GOType &curveType, qreal segLen
} }
} }
#if defined(Q_CC_GNU) QT_WARNING_POP
#pragma GCC diagnostic pop
#endif

16
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp
View file

@ -34,21 +34,13 @@
#include <QKeyEvent> #include <QKeyEvent>
#if defined(Q_CC_CLANG) QT_WARNING_PUSH
#pragma clang diagnostic push QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
#pragma clang diagnostic ignored "-Wmissing-prototypes" QT_WARNING_DISABLE_INTEL(1418)
#elif defined(Q_CC_INTEL)
#pragma warning( push )
#pragma warning( disable: 1418 )
#endif
Q_LOGGING_CATEGORY(vToolSinglePoint, "v.toolSinglePoint") Q_LOGGING_CATEGORY(vToolSinglePoint, "v.toolSinglePoint")
#if defined(Q_CC_CLANG) QT_WARNING_POP
#pragma clang diagnostic pop
#elif defined(Q_CC_INTEL)
#pragma warning( pop )
#endif
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
/** /**

16
src/libs/vtools/tools/vtooluniondetails.cpp
View file

@ -49,21 +49,13 @@ const QString VToolUnionDetails::AttrNodeType = QStringLiteral("nodeType");
const QString VToolUnionDetails::NodeTypeContour = QStringLiteral("Contour"); const QString VToolUnionDetails::NodeTypeContour = QStringLiteral("Contour");
const QString VToolUnionDetails::NodeTypeModeling = QStringLiteral("Modeling"); const QString VToolUnionDetails::NodeTypeModeling = QStringLiteral("Modeling");
#if defined(Q_CC_CLANG) QT_WARNING_PUSH
#pragma clang diagnostic push QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
#pragma clang diagnostic ignored "-Wmissing-prototypes" QT_WARNING_DISABLE_INTEL(1418)
#elif defined(Q_CC_INTEL)
#pragma warning( push )
#pragma warning( disable: 1418 )
#endif
Q_LOGGING_CATEGORY(vToolUnion, "v.toolUnion") Q_LOGGING_CATEGORY(vToolUnion, "v.toolUnion")
#if defined(Q_CC_CLANG) QT_WARNING_POP
#pragma clang diagnostic pop
#elif defined(Q_CC_INTEL)
#pragma warning( pop )
#endif
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
/** /**

10
src/libs/vtools/visualization/line/vistoolrotation.cpp
View file

@ -63,10 +63,8 @@ VisToolRotation::~VisToolRotation()
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
#if defined(Q_CC_GNU) QT_WARNING_PUSH
#pragma GCC diagnostic push QT_WARNING_DISABLE_GCC("-Wswitch-default")
#pragma GCC diagnostic ignored "-Wswitch-default"
#endif
void VisToolRotation::RefreshGeometry() void VisToolRotation::RefreshGeometry()
{ {
@ -178,9 +176,7 @@ void VisToolRotation::RefreshGeometry()
} }
} }
#if defined(Q_CC_GNU) QT_WARNING_POP
#pragma GCC diagnostic pop
#endif
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VisToolRotation::SetObjects(QVector<quint32> objects) void VisToolRotation::SetObjects(QVector<quint32> objects)