napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamares] Use Qt helper macros for compiler warnings

Browse Source
This commit is contained in:
Adriaan de Groot 2024-12-21 10:04:22 +01:00
parent b6b09d0bc2
commit 419bedf661
7 changed files with 54 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libcalamares/PythonHelper.cpp
View File

@ -26,10 +26,8 @@ namespace CalamaresPython
boost::python::object boost::python::object
variantToPyObject( const QVariant& variant ) variantToPyObject( const QVariant& variant )
{ {
#ifdef __clang__ QT_WARNING_PUSH
#pragma clang diagnostic push QT_WARNING_DISABLE_CLANG( "-Wswitch-enum" )
#pragma clang diagnostic ignored "-Wswitch-enum"
#endif
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) #if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
const auto IntVariantType = QVariant::Int; const auto IntVariantType = QVariant::Int;
@ -82,9 +80,7 @@ variantToPyObject( const QVariant& variant )
default: default:
return bp::object(); return bp::object();
} }
#ifdef __clang__ QT_WARNING_POP
#pragma clang diagnostic pop
#endif
} }
QVariant QVariant

10
src/libcalamares/PythonJob.cpp
View File

@ -28,10 +28,8 @@ static const char* s_preScript = nullptr;
namespace bp = boost::python; namespace bp = boost::python;
#ifdef __clang__ QT_WARNING_PUSH
#pragma clang diagnostic push QT_WARNING_DISABLE_CLANG( "-Wdisabled-macro-expansion" )
#pragma clang diagnostic ignored "-Wdisabled-macro-expansion"
#endif
BOOST_PYTHON_FUNCTION_OVERLOADS( mount_overloads, CalamaresPython::mount, 2, 4 ); BOOST_PYTHON_FUNCTION_OVERLOADS( mount_overloads, CalamaresPython::mount, 2, 4 );
BOOST_PYTHON_FUNCTION_OVERLOADS( target_env_call_str_overloads, CalamaresPython::target_env_call, 1, 3 ); BOOST_PYTHON_FUNCTION_OVERLOADS( target_env_call_str_overloads, CalamaresPython::target_env_call, 1, 3 );
@ -52,9 +50,7 @@ BOOST_PYTHON_FUNCTION_OVERLOADS( target_env_process_output_overloads,
4 ); 4 );
BOOST_PYTHON_FUNCTION_OVERLOADS( host_env_process_output_overloads, CalamaresPython::host_env_process_output, 1, 4 ); BOOST_PYTHON_FUNCTION_OVERLOADS( host_env_process_output_overloads, CalamaresPython::host_env_process_output, 1, 4 );
#ifdef __clang__ QT_WARNING_POP
#pragma clang diagnostic pop
#endif
BOOST_PYTHON_MODULE( libcalamares ) BOOST_PYTHON_MODULE( libcalamares )
{ {

18
src/libcalamares/partition/KPMHelper.h
View File

@ -16,18 +16,18 @@
#ifndef PARTITION_KPMHELPER_H #ifndef PARTITION_KPMHELPER_H
#define PARTITION_KPMHELPER_H #define PARTITION_KPMHELPER_H
#include <qglobal.h>
// The kpmcore headers are not C++17 warning-proof, especially // The kpmcore headers are not C++17 warning-proof, especially
// with picky compilers like Clang 10. Since we use Clang for the // with picky compilers like Clang 10. Since we use Clang for the
// find-all-the-warnings case, switch those warnings off for // find-all-the-warnings case, switch those warnings off for
// the we-can't-change-them system headers. // the we-can't-change-them system headers.
#ifdef __clang__ QT_WARNING_PUSH
#pragma clang diagnostic push QT_WARNING_DISABLE_CLANG( "-Wdocumentation" )
#pragma clang diagnostic ignored "-Wdocumentation" QT_WARNING_DISABLE_CLANG( "-Wsuggest-destructor-override" )
#pragma clang diagnostic ignored "-Wsuggest-destructor-override" QT_WARNING_DISABLE_CLANG( "-Winconsistent-missing-destructor-override" )
#pragma clang diagnostic ignored "-Winconsistent-missing-destructor-override"
// Because of __lastType // Because of __lastType
#pragma clang diagnostic ignored "-Wreserved-identifier" QT_WARNING_DISABLE_CLANG( "-Wreserved-identifier" )
#endif
#include <backend/corebackend.h> #include <backend/corebackend.h>
#include <core/device.h> #include <core/device.h>
@ -38,8 +38,6 @@
#include <fs/filesystem.h> #include <fs/filesystem.h>
#include <fs/filesystemfactory.h> #include <fs/filesystemfactory.h>
#ifdef __clang__ QT_WARNING_POP
#pragma clang diagnostic pop
#endif
#endif #endif

10
src/libcalamares/python/Api.cpp
View File

@ -43,10 +43,8 @@ Calamares::Python::Dictionary variantHashToPyDict( const QVariantHash& variantHa
py::object py::object
variantToPyObject( const QVariant& variant ) variantToPyObject( const QVariant& variant )
{ {
#ifdef __clang__ QT_WARNING_PUSH
#pragma clang diagnostic push QT_WARNING_DISABLE_CLANG( "-Wswitch-enum" )
#pragma clang diagnostic ignored "-Wswitch-enum"
#endif
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) #if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
const auto IntVariantType = QVariant::Int; const auto IntVariantType = QVariant::Int;
@ -99,9 +97,7 @@ variantToPyObject( const QVariant& variant )
default: default:
return py::none(); return py::none();
} }
#ifdef __clang__ QT_WARNING_POP
#pragma clang diagnostic pop
#endif
} }
Calamares::Python::List Calamares::Python::List

59
src/libcalamares/utils/BoostPython.h
View File

@ -5,7 +5,6 @@
* *
* Calamares is Free Software: see the License-Identifier above. * Calamares is Free Software: see the License-Identifier above.
* *
*
*/ */
/* /*
@ -20,36 +19,34 @@
#ifndef UTILS_BOOSTPYTHON_H #ifndef UTILS_BOOSTPYTHON_H
#define UTILS_BOOSTPYTHON_H #define UTILS_BOOSTPYTHON_H
#ifdef __clang__ QT_WARNING_PUSH
#pragma clang diagnostic push QT_WARNING_DISABLE_CLANG( "-Wreserved-id-macro" )
#pragma clang diagnostic ignored "-Wreserved-id-macro" QT_WARNING_DISABLE_CLANG( "-Wold-style-cast" )
#pragma clang diagnostic ignored "-Wold-style-cast" QT_WARNING_DISABLE_CLANG( "-Wzero-as-null-pointer-constant" )
#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" QT_WARNING_DISABLE_CLANG( "-Wextra-semi-stmt" )
#pragma clang diagnostic ignored "-Wextra-semi-stmt" QT_WARNING_DISABLE_CLANG( "-Wall" )
#pragma clang diagnostic ignored "-Wall" QT_WARNING_DISABLE_CLANG( "-Wimplicit-float-conversion" )
#pragma clang diagnostic ignored "-Wimplicit-float-conversion" QT_WARNING_DISABLE_CLANG( "-Wundef" )
#pragma clang diagnostic ignored "-Wundef" QT_WARNING_DISABLE_CLANG( "-Wdeprecated-dynamic-exception-spec" )
#pragma clang diagnostic ignored "-Wdeprecated-dynamic-exception-spec" QT_WARNING_DISABLE_CLANG( "-Wshadow-field-in-constructor" )
#pragma clang diagnostic ignored "-Wshadow-field-in-constructor" QT_WARNING_DISABLE_CLANG( "-Wshadow" )
#pragma clang diagnostic ignored "-Wshadow" QT_WARNING_DISABLE_CLANG( "-Wmissing-noreturn" )
#pragma clang diagnostic ignored "-Wmissing-noreturn" QT_WARNING_DISABLE_CLANG( "-Wcast-qual" )
#pragma clang diagnostic ignored "-Wcast-qual" QT_WARNING_DISABLE_CLANG( "-Wcast-align" )
#pragma clang diagnostic ignored "-Wcast-align" QT_WARNING_DISABLE_CLANG( "-Wsign-conversion" )
#pragma clang diagnostic ignored "-Wsign-conversion" QT_WARNING_DISABLE_CLANG( "-Wdouble-promotion" )
#pragma clang diagnostic ignored "-Wdouble-promotion" QT_WARNING_DISABLE_CLANG( "-Wredundant-parens" )
#pragma clang diagnostic ignored "-Wredundant-parens" QT_WARNING_DISABLE_CLANG( "-Wweak-vtables" )
#pragma clang diagnostic ignored "-Wweak-vtables" QT_WARNING_DISABLE_CLANG( "-Wdeprecated" )
#pragma clang diagnostic ignored "-Wdeprecated" QT_WARNING_DISABLE_CLANG( "-Wmissing-field-initializers" )
#pragma clang diagnostic ignored "-Wmissing-field-initializers" QT_WARNING_DISABLE_CLANG( "-Wdisabled-macro-expansion" )
#pragma clang diagnostic ignored "-Wdisabled-macro-expansion" QT_WARNING_DISABLE_CLANG( "-Wdocumentation" )
#pragma clang diagnostic ignored "-Wdocumentation" QT_WARNING_DISABLE_CLANG( "-Wcomma" )
#pragma clang diagnostic ignored "-Wcomma" QT_WARNING_DISABLE_CLANG( "-Wunused-parameter" )
#pragma clang diagnostic ignored "-Wunused-parameter" QT_WARNING_DISABLE_CLANG( "-Wunused-template" )
#pragma clang diagnostic ignored "-Wunused-template"
// Actually for Python headers // Actually for Python headers
#pragma clang diagnostic ignored "-Wreserved-id-macro" QT_WARNING_DISABLE_CLANG( "-Wreserved-id-macro" )
#endif
#undef slots #undef slots
#include <boost/python.hpp> #include <boost/python.hpp>
@ -58,8 +55,6 @@
#include <boost/python/list.hpp> #include <boost/python/list.hpp>
#include <boost/python/object.hpp> #include <boost/python/object.hpp>
#ifdef __clang__ QT_WARNING_POP
#pragma clang diagnostic pop
#endif
#endif #endif

19
src/libcalamares/utils/Yaml.h
View File

@ -4,11 +4,8 @@
* SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot <groot@kde.org> * SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot <groot@kde.org>
* SPDX-License-Identifier: GPL-3.0-or-later * SPDX-License-Identifier: GPL-3.0-or-later
* *
*
* Calamares is Free Software: see the License-Identifier above. * Calamares is Free Software: see the License-Identifier above.
* *
*
*
*/ */
/* /*
@ -35,19 +32,15 @@ class QFileInfo;
// with picky compilers like Clang 8. Since we use Clang for the // with picky compilers like Clang 8. Since we use Clang for the
// find-all-the-warnings case, switch those warnings off for // find-all-the-warnings case, switch those warnings off for
// the we-can't-change-them system headers. // the we-can't-change-them system headers.
#ifdef __clang__ QT_WARNING_PUSH
#pragma clang diagnostic push QT_WARNING_DISABLE_CLANG( "-Wzero-as-null-pointer-constant" )
#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" QT_WARNING_DISABLE_CLANG( "-Wshadow" )
#pragma clang diagnostic ignored "-Wshadow" QT_WARNING_DISABLE_CLANG( "-Wfloat-equal" )
#pragma clang diagnostic ignored "-Wfloat-equal" QT_WARNING_DISABLE_CLANG( "-Wsuggest-destructor-override" )
#pragma clang diagnostic ignored "-Wsuggest-destructor-override"
#endif
#include <yaml-cpp/yaml.h> #include <yaml-cpp/yaml.h>
#ifdef __clang__ QT_WARNING_POP
#pragma clang diagnostic pop
#endif
/// @brief Appends all the elements of @p node to the string list @p v /// @brief Appends all the elements of @p node to the string list @p v
DLLEXPORT void operator>>( const ::YAML::Node& node, QStringList& v ); DLLEXPORT void operator>>( const ::YAML::Node& node, QStringList& v );

8
src/libcalamares/utils/moc-warnings.h
View File

@ -22,11 +22,11 @@
* automoc does all the work for us. * automoc does all the work for us.
*/ */
#ifdef __clang__ #ifdef __clang__
#pragma clang diagnostic ignored "-Wextra-semi-stmt" QT_WARNING_DISABLE_CLANG( "-Wextra-semi-stmt" )
#pragma clang diagnostic ignored "-Wredundant-parens" QT_WARNING_DISABLE_CLANG( "-Wredundant-parens" )
#pragma clang diagnostic ignored "-Wreserved-identifier" QT_WARNING_DISABLE_CLANG( "-Wreserved-identifier" )
#if __clang_major__ >= 17 #if __clang_major__ >= 17
#pragma clang diagnostic ignored "-Wunsafe-buffer-usage" QT_WARNING_DISABLE_CLANG( "-Wunsafe-buffer-usage" )
#endif #endif
#endif #endif