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

Make NormalizedView constructor from const char* explicit

Browse source
This commit is contained in:
elsid 2024-04-19 22:34:40 +02:00
parent e4c70b7861
commit 82931059fd
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
6 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwgui/mainmenu.cpp
View file

@ -6,6 +6,7 @@
#include <components/settings/values.hpp> #include <components/settings/values.hpp>
#include <components/vfs/manager.hpp> #include <components/vfs/manager.hpp>
#include <components/vfs/pathutil.hpp>
#include <components/widgets/imagebutton.hpp> #include <components/widgets/imagebutton.hpp>
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
@ -37,7 +38,9 @@ namespace MWGui
getWidget(mVersionText, "VersionText"); getWidget(mVersionText, "VersionText");
mVersionText->setCaption(versionDescription); mVersionText->setCaption(versionDescription);
mHasAnimatedMenu = mVFS->exists("video/menu_background.bik"); constexpr VFS::Path::NormalizedView menuBackgroundVideo("video/menu_background.bik");
mHasAnimatedMenu = mVFS->exists(menuBackgroundVideo);
updateMenu(); updateMenu();
} }

3
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -356,7 +356,8 @@ namespace MWGui
mWindows.push_back(std::move(console)); mWindows.push_back(std::move(console));
trackWindow(mConsole, makeConsoleWindowSettingValues()); trackWindow(mConsole, makeConsoleWindowSettingValues());
bool questList = mResourceSystem->getVFS()->exists("textures/tx_menubook_options_over.dds"); constexpr VFS::Path::NormalizedView menubookOptionsOverTexture("textures/tx_menubook_options_over.dds");
const bool questList = mResourceSystem->getVFS()->exists(menubookOptionsOverTexture);
auto journal = JournalWindow::create(JournalViewModel::create(), questList, mEncoding); auto journal = JournalWindow::create(JournalViewModel::create(), questList, mEncoding);
mGuiModeStates[GM_Journal] = GuiModeState(journal.get()); mGuiModeStates[GM_Journal] = GuiModeState(journal.get());
mWindows.push_back(std::move(journal)); mWindows.push_back(std::move(journal));

9
apps/openmw_test_suite/misc/test_resourcehelpers.cpp
View file

@ -8,19 +8,22 @@ namespace
TEST(CorrectSoundPath, wav_files_not_overridden_with_mp3_in_vfs_are_not_corrected) TEST(CorrectSoundPath, wav_files_not_overridden_with_mp3_in_vfs_are_not_corrected)
{ {
std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({ { "sound/bar.wav", nullptr } }); std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({ { "sound/bar.wav", nullptr } });
EXPECT_EQ(correctSoundPath("sound/bar.wav", *mVFS), "sound/bar.wav"); constexpr VFS::Path::NormalizedView path("sound/bar.wav");
EXPECT_EQ(correctSoundPath(path, *mVFS), "sound/bar.wav");
} }
TEST(CorrectSoundPath, wav_files_overridden_with_mp3_in_vfs_are_corrected) TEST(CorrectSoundPath, wav_files_overridden_with_mp3_in_vfs_are_corrected)
{ {
std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({ { "sound/foo.mp3", nullptr } }); std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({ { "sound/foo.mp3", nullptr } });
EXPECT_EQ(correctSoundPath("sound/foo.wav", *mVFS), "sound/foo.mp3"); constexpr VFS::Path::NormalizedView path("sound/foo.wav");
EXPECT_EQ(correctSoundPath(path, *mVFS), "sound/foo.mp3");
} }
TEST(CorrectSoundPath, corrected_path_does_not_check_existence_in_vfs) TEST(CorrectSoundPath, corrected_path_does_not_check_existence_in_vfs)
{ {
std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({}); std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({});
EXPECT_EQ(correctSoundPath("sound/foo.wav", *mVFS), "sound/foo.mp3"); constexpr VFS::Path::NormalizedView path("sound/foo.wav");
EXPECT_EQ(correctSoundPath(path, *mVFS), "sound/foo.mp3");
} }
namespace namespace

2
apps/openmw_test_suite/vfs/testpathutil.cpp
View file

@ -39,7 +39,7 @@ namespace VFS::Path
TEST(NormalizedTest, shouldSupportConstructorFromNormalizedView) TEST(NormalizedTest, shouldSupportConstructorFromNormalizedView)
{ {
const NormalizedView view = "foo/bar/baz"; const NormalizedView view("foo/bar/baz");
const Normalized value(view); const Normalized value(view);
EXPECT_EQ(value.view(), "foo/bar/baz"); EXPECT_EQ(value.view(), "foo/bar/baz");
} }

3
components/resource/scenemanager.cpp
View file

@ -865,7 +865,8 @@ namespace Resource
<< ", using embedded marker_error instead"; << ", using embedded marker_error instead";
} }
Files::IMemStream file(ErrorMarker::sValue.data(), ErrorMarker::sValue.size()); Files::IMemStream file(ErrorMarker::sValue.data(), ErrorMarker::sValue.size());
return loadNonNif("error_marker.osgt", file, mImageManager); constexpr VFS::Path::NormalizedView errorMarker("error_marker.osgt");
return loadNonNif(errorMarker, file, mImageManager);
} }
osg::ref_ptr<osg::Node> SceneManager::cloneErrorMarker() osg::ref_ptr<osg::Node> SceneManager::cloneErrorMarker()

2
components/vfs/pathutil.hpp
View file

@ -79,7 +79,7 @@ namespace VFS::Path
public: public:
constexpr NormalizedView() noexcept = default; constexpr NormalizedView() noexcept = default;
constexpr NormalizedView(const char* value) constexpr explicit NormalizedView(const char* value)
: mValue(value) : mValue(value)
{ {
if (!isNormalized(mValue)) if (!isNormalized(mValue))