From 37541b600ecd8746b3e29475f638b7b7e2532dcf Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 8 Mar 2023 18:45:42 +0200 Subject: [PATCH] Fix MSVC warnings. --- qbs/modules/buildconfig/buildconfig.qbs | 7 ++++++- src/app/puzzle/vpmainwindow.cpp | 4 ++-- src/app/tape/tmainwindow.cpp | 4 ++-- src/app/valentina/mainwindow.cpp | 4 ++-- src/libs/qmuparser/qmuformulabase.h | 1 - src/libs/qmuparser/qmuparsercallback_p.h | 8 +++++--- src/libs/qmuparser/qmuparsererror.h | 1 - src/libs/qmuparser/qmuparsertest.h | 1 - src/libs/qmuparser/qmutokenparser.h | 1 - src/libs/qmuparser/qmutranslation.h | 2 +- src/libs/vlayout/vbestsquare_p.h | 2 ++ src/libs/vmisc/fpm/math.hpp | 1 + src/libs/vmisc/vabstractapplication.cpp | 5 +++-- src/libs/vtools/tools/nodeDetails/vnodepoint.cpp | 1 + 14 files changed, 25 insertions(+), 17 deletions(-) diff --git a/qbs/modules/buildconfig/buildconfig.qbs b/qbs/modules/buildconfig/buildconfig.qbs index 9802d9b35..b656ed100 100644 --- a/qbs/modules/buildconfig/buildconfig.qbs +++ b/qbs/modules/buildconfig/buildconfig.qbs @@ -808,8 +808,13 @@ Module { "-wd5204", // class has virtual functions, but its trivial destructor is not virtual; instances of objects derived // from this class may not be destructed correctly "-wd5219", // implicit conversion from '' to '', possible loss of data - "-wd5243" // 'type-name': using incomplete class 'class-name' can cause potential one definition rule violation due + "-wd5243", // 'type-name': using incomplete class 'class-name' can cause potential one definition rule violation due // to ABI limitation + "-wd4464", // relative include path contains '..' + "-wd4458", // declaration of 'X' hides class member + "-wd4456", // declaration of 'X' hides previous local declaration + "-wd4459", // declaration of 'X' hides global declaration + "-wd4457" // declaration of 'X' hides function parameter ) } return debugFlags; diff --git a/src/app/puzzle/vpmainwindow.cpp b/src/app/puzzle/vpmainwindow.cpp index b18ada2f6..159cc9d1d 100644 --- a/src/app/puzzle/vpmainwindow.cpp +++ b/src/app/puzzle/vpmainwindow.cpp @@ -1672,7 +1672,7 @@ void VPMainWindow::ReadSettings() if (settings->status() == QSettings::NoError) { restoreGeometry(settings->GetGeometry()); - restoreState(settings->GetToolbarsState(), AppVersion()); + restoreState(settings->GetToolbarsState(), static_cast(AppVersion())); // Text under tool buton icon ToolBarStyles(); @@ -1697,7 +1697,7 @@ void VPMainWindow::WriteSettings() { VPSettings *settings = VPApplication::VApp()->PuzzleSettings(); settings->SetGeometry(saveGeometry()); - settings->SetToolbarsState(saveState(AppVersion())); + settings->SetToolbarsState(saveState(static_cast(AppVersion()))); settings->SetDockWidgetPropertiesActive(ui->dockWidgetProperties->isEnabled()); settings->SetDockWidgetPropertiesContentsActive(ui->dockWidgetPropertiesContents->isEnabled()); diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index 197f7f81c..0e41d43c0 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -3611,7 +3611,7 @@ void TMainWindow::ReadSettings() if (settings->status() == QSettings::NoError) { restoreGeometry(settings->GetGeometry()); - restoreState(settings->GetToolbarsState(), AppVersion()); + restoreState(settings->GetToolbarsState(), static_cast(AppVersion())); // Text under tool buton icon ToolBarStyles(); @@ -3630,7 +3630,7 @@ void TMainWindow::WriteSettings() { VTapeSettings *settings = MApplication::VApp()->TapeSettings(); settings->SetGeometry(saveGeometry()); - settings->SetToolbarsState(saveState(AppVersion())); + settings->SetToolbarsState(saveState(static_cast(AppVersion()))); settings->SetTapeSearchOptionMatchCase(m_search->IsMatchCase()); settings->SetTapeSearchOptionWholeWord(m_search->IsMatchWord()); diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 03017e24a..ad2b9a661 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -5204,7 +5204,7 @@ void MainWindow::ReadSettings() if (settings->status() == QSettings::NoError) { restoreGeometry(settings->GetGeometry()); - restoreState(settings->GetToolbarsState(), AppVersion()); + restoreState(settings->GetToolbarsState(), static_cast(AppVersion())); m_groupsActive = settings->IsDockWidgetGroupsActive(); m_toolOptionsActive = settings->IsDockWidgetToolOptionsActive(); @@ -5248,7 +5248,7 @@ void MainWindow::WriteSettings() VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings(); settings->SetGeometry(saveGeometry()); - settings->SetToolbarsState(saveState(AppVersion())); + settings->SetToolbarsState(saveState(static_cast(AppVersion()))); settings->SetDockWidgetGroupsActive(ui->dockWidgetGroups->isVisible()); settings->SetDockWidgetToolOptionsActive(ui->dockWidgetToolOptions->isVisible()); diff --git a/src/libs/qmuparser/qmuformulabase.h b/src/libs/qmuparser/qmuformulabase.h index bbcc43a13..8a11faae1 100644 --- a/src/libs/qmuparser/qmuformulabase.h +++ b/src/libs/qmuparser/qmuformulabase.h @@ -26,7 +26,6 @@ #include #include -#include "../qmuparser/qmuparser_global.h" #include "qmuparser.h" #include "qmuparser_global.h" diff --git a/src/libs/qmuparser/qmuparsercallback_p.h b/src/libs/qmuparser/qmuparsercallback_p.h index 5b402080b..9a86ee28b 100644 --- a/src/libs/qmuparser/qmuparsercallback_p.h +++ b/src/libs/qmuparser/qmuparsercallback_p.h @@ -32,13 +32,13 @@ #endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #include "../vmisc/defglobal.h" +namespace qmu +{ + QT_WARNING_PUSH QT_WARNING_DISABLE_GCC("-Weffc++") QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor") -namespace qmu -{ - class QmuParserCallbackData : public QSharedData { public: @@ -94,5 +94,7 @@ private: Q_DISABLE_ASSIGN(QmuParserCallbackData) }; +QT_WARNING_POP + } #endif // QMUPARSERCALLBACK_P_H diff --git a/src/libs/qmuparser/qmuparsererror.h b/src/libs/qmuparser/qmuparsererror.h index 5017473c2..f0b53600c 100644 --- a/src/libs/qmuparser/qmuparsererror.h +++ b/src/libs/qmuparser/qmuparsererror.h @@ -31,7 +31,6 @@ #include #include -#include "../qmuparser/qmuparser_global.h" #include "qmuparser_global.h" #include "qmuparserdef.h" #include "qmutranslation.h" diff --git a/src/libs/qmuparser/qmuparsertest.h b/src/libs/qmuparser/qmuparsertest.h index 908f05f1c..8e7963dc1 100644 --- a/src/libs/qmuparser/qmuparsertest.h +++ b/src/libs/qmuparser/qmuparsertest.h @@ -34,7 +34,6 @@ # include #endif -#include "../qmuparser/qmuparser_global.h" #include "qmuparser.h" #include "qmuparser_global.h" #include "qmuparserdef.h" diff --git a/src/libs/qmuparser/qmutokenparser.h b/src/libs/qmuparser/qmutokenparser.h index 3f939fc1b..eb10e8737 100644 --- a/src/libs/qmuparser/qmutokenparser.h +++ b/src/libs/qmuparser/qmutokenparser.h @@ -26,7 +26,6 @@ #include #include -#include "../qmuparser/qmuparser_global.h" #include "qmuformulabase.h" #include "qmuparser_global.h" diff --git a/src/libs/qmuparser/qmutranslation.h b/src/libs/qmuparser/qmutranslation.h index 4b5106a5f..add66def3 100644 --- a/src/libs/qmuparser/qmutranslation.h +++ b/src/libs/qmuparser/qmutranslation.h @@ -22,7 +22,7 @@ #ifndef QMUTRANSLATION_H #define QMUTRANSLATION_H -#include "../qmuparser/qmuparser_global.h" +#include "qmuparser_global.h" #include namespace qmu diff --git a/src/libs/vlayout/vbestsquare_p.h b/src/libs/vlayout/vbestsquare_p.h index 905fb4d4d..f34710175 100644 --- a/src/libs/vlayout/vbestsquare_p.h +++ b/src/libs/vlayout/vbestsquare_p.h @@ -83,4 +83,6 @@ private: Q_DISABLE_ASSIGN(VBestSquareData) }; +QT_WARNING_POP + #endif // VBESTSQUARE_P_H diff --git a/src/libs/vmisc/fpm/math.hpp b/src/libs/vmisc/fpm/math.hpp index 0f37503d3..70cf00786 100644 --- a/src/libs/vmisc/fpm/math.hpp +++ b/src/libs/vmisc/fpm/math.hpp @@ -26,6 +26,7 @@ namespace detail QT_WARNING_PUSH QT_WARNING_DISABLE_CLANG("-Wsign-conversion") QT_WARNING_DISABLE_GCC("-Wconversion") +QT_WARNING_DISABLE_MSVC(4365) // Returns the index of the most-signifcant set bit inline auto find_highest_bit(unsigned long long value) noexcept -> long diff --git a/src/libs/vmisc/vabstractapplication.cpp b/src/libs/vmisc/vabstractapplication.cpp index 71ed41b99..2abfe8808 100644 --- a/src/libs/vmisc/vabstractapplication.cpp +++ b/src/libs/vmisc/vabstractapplication.cpp @@ -262,8 +262,9 @@ void VAbstractApplication::WinAttachConsole() auto stdout_type = GetFileType(GetStdHandle(STD_OUTPUT_HANDLE)); if (stdout_type == FILE_TYPE_UNKNOWN && AttachConsole(ATTACH_PARENT_PROCESS)) { - freopen("CONOUT$", "w", stdout); - freopen("CONOUT$", "w", stderr); + FILE *fp = nullptr; + freopen_s(&fp, "CONOUT$", "w", stdout); + freopen_s(&fp, "CONOUT$", "w", stderr); } } #endif diff --git a/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp b/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp index b8e915cd2..a4fd6b7d0 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp @@ -591,6 +591,7 @@ QT_WARNING_DISABLE_GCC("-Wswitch-default") { case ContextMenuOption::LAST_ONE_DO_NOT_USE: Q_UNREACHABLE(); + break; case ContextMenuOption::NoSelection: return; case ContextMenuOption::Option: