mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-29 04:06:40 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_warnings' into 'master'

Browse source 
Enable and fix new warnings

See merge request OpenMW/openmw!2679
This commit is contained in:
psi29a 2023-02-04 23:40:06 +00:00
commit 822c6ac6a7
11 changed files with 32 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -594,7 +594,7 @@ endif()
if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang) if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
set(OPENMW_CXX_FLAGS "-Wall -Wextra -Wundef -Wextra-semi -Wno-unused-parameter -pedantic -Wno-long-long ${OPENMW_CXX_FLAGS}") set(OPENMW_CXX_FLAGS "-Wall -Wextra -Wundef -Wextra-semi -Wno-unused-parameter -pedantic -Wno-long-long -Wnon-virtual-dtor -Wunused ${OPENMW_CXX_FLAGS}")
add_definitions( -DBOOST_NO_CXX11_SCOPED_ENUMS=ON ) add_definitions( -DBOOST_NO_CXX11_SCOPED_ENUMS=ON )
if (APPLE) if (APPLE)
@ -604,12 +604,12 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
if (CMAKE_CXX_COMPILER_ID STREQUAL Clang AND NOT APPLE) if (CMAKE_CXX_COMPILER_ID STREQUAL Clang AND NOT APPLE)
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.6 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 3.6) if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.6 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 3.6)
set(${OPENMW_CXX_FLAGS} "${OPENMW_CXX_FLAGS} -Wno-potentially-evaluated-expression") set(OPENMW_CXX_FLAGS "${OPENMW_CXX_FLAGS} -Wno-potentially-evaluated-expression")
endif () endif ()
endif() endif()
if (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.6 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.6) if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
set(${OPENMW_CXX_FLAGS} "${OPENMW_CXX_FLAGS} -Wno-unused-but-set-parameter") set(OPENMW_CXX_FLAGS "${OPENMW_CXX_FLAGS} -Wno-unused-but-set-parameter -Wduplicated-branches -Wduplicated-cond -Wlogical-op")
endif() endif()
endif (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang) endif (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)

2
apps/openmw/mwgui/statswatcher.hpp
View file

@ -15,6 +15,8 @@ namespace MWGui
class StatsListener class StatsListener
{ {
public: public:
virtual ~StatsListener() = default;
/// Set value for the given ID. /// Set value for the given ID.
virtual void setValue(std::string_view id, const MWMechanics::AttributeValue& value) {} virtual void setValue(std::string_view id, const MWMechanics::AttributeValue& value) {}
virtual void setValue(std::string_view id, const MWMechanics::DynamicStat<float>& value) {} virtual void setValue(std::string_view id, const MWMechanics::DynamicStat<float>& value) {}

2
apps/openmw/mwphysics/raycasting.hpp
View file

@ -21,6 +21,8 @@ namespace MWPhysics
class RayCastingInterface class RayCastingInterface
{ {
public: public:
virtual ~RayCastingInterface() = default;
/// Get distance from \a point to the collision shape of \a target. Uses a raycast to find where the /// Get distance from \a point to the collision shape of \a target. Uses a raycast to find where the
/// target vector hits the collision shape and then calculates distance from the intersection point. /// target vector hits the collision shape and then calculates distance from the intersection point.
/// This can be used to find out how much nearer we need to move to the target for a "getHitContact" to be /// This can be used to find out how much nearer we need to move to the target for a "getHitContact" to be

9
apps/openmw/mwsound/ffmpeg_decoder.cpp
View file

@ -248,12 +248,11 @@ namespace MWSound
mFrame = av_frame_alloc(); mFrame = av_frame_alloc();
if (mCodecCtx->sample_fmt == AV_SAMPLE_FMT_FLT || mCodecCtx->sample_fmt == AV_SAMPLE_FMT_FLTP) if (mCodecCtx->sample_fmt == AV_SAMPLE_FMT_U8P)
mOutputSampleFormat = AV_SAMPLE_FMT_S16; // FIXME: Check for AL_EXT_FLOAT32 support
else if (mCodecCtx->sample_fmt == AV_SAMPLE_FMT_U8P)
mOutputSampleFormat = AV_SAMPLE_FMT_U8; mOutputSampleFormat = AV_SAMPLE_FMT_U8;
else if (mCodecCtx->sample_fmt == AV_SAMPLE_FMT_S16P) // FIXME: Check for AL_EXT_FLOAT32 support
mOutputSampleFormat = AV_SAMPLE_FMT_S16; // else if (mCodecCtx->sample_fmt == AV_SAMPLE_FMT_FLT || mCodecCtx->sample_fmt == AV_SAMPLE_FMT_FLTP)
// mOutputSampleFormat = AV_SAMPLE_FMT_S16;
else else
mOutputSampleFormat = AV_SAMPLE_FMT_S16; mOutputSampleFormat = AV_SAMPLE_FMT_S16;

9
apps/openmw/mwsound/movieaudiofactory.cpp
View file

@ -64,10 +64,11 @@ namespace MWSound
{ {
if (sampleFormat == AV_SAMPLE_FMT_U8P || sampleFormat == AV_SAMPLE_FMT_U8) if (sampleFormat == AV_SAMPLE_FMT_U8P || sampleFormat == AV_SAMPLE_FMT_U8)
sampleFormat = AV_SAMPLE_FMT_U8; sampleFormat = AV_SAMPLE_FMT_U8;
else if (sampleFormat == AV_SAMPLE_FMT_S16P || sampleFormat == AV_SAMPLE_FMT_S16) // else if (sampleFormat == AV_SAMPLE_FMT_S16P || sampleFormat == AV_SAMPLE_FMT_S16)
sampleFormat = AV_SAMPLE_FMT_S16; // sampleFormat = AV_SAMPLE_FMT_S16;
else if (sampleFormat == AV_SAMPLE_FMT_FLTP || sampleFormat == AV_SAMPLE_FMT_FLT) // FIXME: check for AL_EXT_FLOAT32 support
sampleFormat = AV_SAMPLE_FMT_S16; // FIXME: check for AL_EXT_FLOAT32 support // else if (sampleFormat == AV_SAMPLE_FMT_FLTP || sampleFormat == AV_SAMPLE_FMT_FLT)
// sampleFormat = AV_SAMPLE_FMT_S16;
else else
sampleFormat = AV_SAMPLE_FMT_S16; sampleFormat = AV_SAMPLE_FMT_S16;

5
components/esm3/objectstate.hpp
View file

@ -56,9 +56,8 @@ namespace ESM
virtual void save(ESMWriter& esm, bool inInventory = false) const; virtual void save(ESMWriter& esm, bool inInventory = false) const;
virtual /// Initialize to default state /// Initialize to default state
void virtual void blank();
blank();
virtual ~ObjectState(); virtual ~ObjectState();

4
components/esm4/loadland.hpp
View file

@ -123,8 +123,8 @@ namespace ESM4
Texture mTextures[4]; // 0 = bottom left, 1 = bottom right, 2 = top left, 3 = top right Texture mTextures[4]; // 0 = bottom left, 1 = bottom right, 2 = top left, 3 = top right
std::vector<FormId> mIds; // land texture (LTEX) formids std::vector<FormId> mIds; // land texture (LTEX) formids
virtual void load(Reader& reader); void load(Reader& reader);
// virtual void save(Writer& writer) const; // void save(Writer& writer) const;
// void blank(); // void blank();
}; };

10
components/esm4/loadrace.cpp
View file

@ -344,11 +344,11 @@ void ESM4::Race::load(ESM4::Reader& reader)
// TES5 seems to have no body parts at all, instead keep EGT models // TES5 seems to have no body parts at all, instead keep EGT models
} }
else if (curr_part == 2) // egt // else if (curr_part == 2) // egt
{ // {
// std::cout << mEditorId << " egt " << currentIndex << std::endl; // FIXME // // std::cout << mEditorId << " egt " << currentIndex << std::endl; // FIXME
reader.skipSubRecordData(); // FIXME TES5 egt // reader.skipSubRecordData(); // FIXME TES5 egt
} // }
else else
{ {
// std::cout << mEditorId << " hkx " << currentIndex << std::endl; // FIXME // std::cout << mEditorId << " hkx " << currentIndex << std::endl; // FIXME

4
components/esm4/loadsbsp.hpp
View file

@ -51,8 +51,8 @@ namespace ESM4
std::string mEditorId; std::string mEditorId;
Dimension mDimension; Dimension mDimension;
virtual void load(Reader& reader); void load(Reader& reader);
// virtual void save(Writer& writer) const; // void save(Writer& writer) const;
// void blank(); // void blank();
}; };

1
components/lua/storage.hpp
View file

@ -42,6 +42,7 @@ namespace LuaUtil
class Listener class Listener
{ {
public: public:
virtual ~Listener() = default;
virtual void valueChanged( virtual void valueChanged(
std::string_view section, std::string_view key, const sol::object& value) const = 0; std::string_view section, std::string_view key, const sol::object& value) const = 0;
virtual void sectionReplaced(std::string_view section, const sol::optional<sol::table>& values) const = 0; virtual void sectionReplaced(std::string_view section, const sol::optional<sol::table>& values) const = 0;

3
components/lua_ui/widget.hpp
View file

@ -22,6 +22,9 @@ namespace LuaUi
{ {
public: public:
WidgetExtension(); WidgetExtension();
virtual ~WidgetExtension() = default;
// must be called after creating the underlying MyGUI::Widget // must be called after creating the underlying MyGUI::Widget
void initialize(lua_State* lua, MyGUI::Widget* self); void initialize(lua_State* lua, MyGUI::Widget* self);
// must be called after before destroying the underlying MyGUI::Widget // must be called after before destroying the underlying MyGUI::Widget