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

Move QT_WARNING_DISABLE inside Qt namespace.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-02-22 09:48:51 +02:00
parent a66b050ecd
commit 41bcc2a4b4
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libs/qmuparser/text.h
View File

@ -37,18 +37,19 @@
#include "qmudef.h" #include "qmudef.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Wunused-variable")
namespace Qt namespace Qt
{ {
//static auto endl = ::endl; QT_WARNING_PUSH
//static auto flush = ::flush; QT_WARNING_DISABLE_GCC("-Wunused-variable")
static auto dec = ::dec; QT_WARNING_DISABLE_CLANG("-Wunused-variable")
//static auto SkipEmptyParts = QString::SkipEmptyParts;
} //static auto endl = ::endl; // NOLINT
//static auto flush = ::flush; // NOLINT
static auto dec = ::dec; // NOLINT
//static auto SkipEmptyParts = QString::SkipEmptyParts; // NOLINT
QT_WARNING_POP QT_WARNING_POP
} // namespace Qt
#endif #endif

20
src/libs/vmisc/backport/text.h
View File

@ -31,24 +31,26 @@
#include <QtGlobal> #include <QtGlobal>
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
#include <QString> #include <QTextStream>
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/diagnostic.h" #include "../vmisc/diagnostic.h"
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Wunused-variable")
namespace Qt namespace Qt
{ {
static auto endl = ::endl; QT_WARNING_PUSH
static auto flush = ::flush; QT_WARNING_DISABLE_GCC("-Wunused-variable")
static auto dec = ::dec; QT_WARNING_DISABLE_CLANG("-Wunused-variable")
static auto SkipEmptyParts = QString::SkipEmptyParts;
} static auto endl = ::endl; // NOLINT
static auto flush = ::flush; // NOLINT
static auto dec = ::dec; // NOLINT
static auto SkipEmptyParts = QString::SkipEmptyParts; // NOLINT
QT_WARNING_POP QT_WARNING_POP
} // namespace Qt
#endif #endif
#endif // TEXT_H #endif // TEXT_H