diff options
| -rw-r--r-- | src/linguist/lupdate/clangtoolastreader.h | 17 | ||||
| -rw-r--r-- | src/linguist/lupdate/cpp_clang.h | 16 | ||||
| -rw-r--r-- | src/linguist/lupdate/lupdatepreprocessoraction.h | 16 |
3 files changed, 19 insertions, 30 deletions
diff --git a/src/linguist/lupdate/clangtoolastreader.h b/src/linguist/lupdate/clangtoolastreader.h index 3a5ea7dfb..4032bb60d 100644 --- a/src/linguist/lupdate/clangtoolastreader.h +++ b/src/linguist/lupdate/clangtoolastreader.h @@ -30,22 +30,19 @@ #define CLANG_TOOL_AST_READER_H #include "cpp_clang.h" -#if defined(Q_CC_MSVC) -# pragma warning(push) -# pragma warning(disable: 4100) -# pragma warning(disable: 4146) -# pragma warning(disable: 4267) -# pragma warning(disable: 4624) -#endif + +QT_WARNING_PUSH +QT_WARNING_DISABLE_MSVC(4100) +QT_WARNING_DISABLE_MSVC(4146) +QT_WARNING_DISABLE_MSVC(4267) +QT_WARNING_DISABLE_MSVC(4624) #include <clang/AST/RecursiveASTVisitor.h> #include <clang/Frontend/CompilerInstance.h> #include <clang/Frontend/FrontendActions.h> #include <clang/Tooling/Tooling.h> -#if defined(Q_CC_MSVC) -# pragma warning(pop) -#endif +QT_WARNING_POP #include <iostream> #include <memory> diff --git a/src/linguist/lupdate/cpp_clang.h b/src/linguist/lupdate/cpp_clang.h index f27ee2bb0..f66e2c858 100644 --- a/src/linguist/lupdate/cpp_clang.h +++ b/src/linguist/lupdate/cpp_clang.h @@ -36,22 +36,18 @@ #include <QtCore/qregularexpression.h> #include <QtCore/qstring.h> -#if defined(Q_CC_MSVC) -# pragma warning(push) -# pragma warning(disable: 4100) -# pragma warning(disable: 4146) -# pragma warning(disable: 4267) -# pragma warning(disable: 4624) -#endif +QT_WARNING_PUSH +QT_WARNING_DISABLE_MSVC(4100) +QT_WARNING_DISABLE_MSVC(4146) +QT_WARNING_DISABLE_MSVC(4267) +QT_WARNING_DISABLE_MSVC(4624) #include <llvm/ADT/StringRef.h> #include <clang/Basic/SourceLocation.h> #include <clang/Basic/SourceManager.h> #include <clang/Basic/FileManager.h> -#if defined(Q_CC_MSVC) -# pragma warning(pop) -#endif +QT_WARNING_POP #include <vector> #include <iostream> diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.h b/src/linguist/lupdate/lupdatepreprocessoraction.h index 01caed52d..3cb443c9c 100644 --- a/src/linguist/lupdate/lupdatepreprocessoraction.h +++ b/src/linguist/lupdate/lupdatepreprocessoraction.h @@ -32,13 +32,11 @@ #include "cpp_clang.h" #include "synchronized.h" -#if defined(Q_CC_MSVC) -# pragma warning(push) -# pragma warning(disable: 4100) -# pragma warning(disable: 4146) -# pragma warning(disable: 4267) -# pragma warning(disable: 4624) -#endif +QT_WARNING_PUSH +QT_WARNING_DISABLE_MSVC(4100) +QT_WARNING_DISABLE_MSVC(4146) +QT_WARNING_DISABLE_MSVC(4267) +QT_WARNING_DISABLE_MSVC(4624) #include <clang/Frontend/CompilerInstance.h> #include <clang/Frontend/FrontendActions.h> @@ -46,9 +44,7 @@ #include <clang/Lex/PPCallbacks.h> #include <clang/Lex/Preprocessor.h> -#if defined(Q_CC_MSVC) -# pragma warning(pop) -#endif +QT_WARNING_POP #include <memory> |