mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-07 13:20:25 +00:00
Code Issues Projects Releases Wiki Activity

Use std::unique_ptr in MainMenu

Browse Source
This commit is contained in:
Evil Eye 2022-08-31 19:05:32 +02:00
parent 59fab4c9e2
commit 30d320f651
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/openmw/mwgui/mainmenu.cpp
View File

@ -28,7 +28,6 @@ namespace MWGui
, mBackground(nullptr) , mBackground(nullptr)
, mVideoBackground(nullptr) , mVideoBackground(nullptr)
, mVideo(nullptr) , mVideo(nullptr)
, mSaveGameDialog(nullptr)
{ {
getWidget(mVersionText, "VersionText"); getWidget(mVersionText, "VersionText");
mVersionText->setCaption(versionDescription); mVersionText->setCaption(versionDescription);
@ -38,11 +37,6 @@ namespace MWGui
updateMenu(); updateMenu();
} }
MainMenu::~MainMenu()
{
delete mSaveGameDialog;
}
void MainMenu::onResChange(int w, int h) void MainMenu::onResChange(int w, int h)
{ {
mWidth = w; mWidth = w;
@ -133,7 +127,7 @@ namespace MWGui
else else
{ {
if (!mSaveGameDialog) if (!mSaveGameDialog)
mSaveGameDialog = new SaveGameDialog(); mSaveGameDialog = std::make_unique<SaveGameDialog>();
if (name == "loadgame") if (name == "loadgame")
mSaveGameDialog->setLoadOrSave(true); mSaveGameDialog->setLoadOrSave(true);
else if (name == "savegame") else if (name == "savegame")

5
apps/openmw/mwgui/mainmenu.hpp
View File

@ -1,6 +1,8 @@
#ifndef OPENMW_GAME_MWGUI_MAINMENU_H #ifndef OPENMW_GAME_MWGUI_MAINMENU_H
#define OPENMW_GAME_MWGUI_MAINMENU_H #define OPENMW_GAME_MWGUI_MAINMENU_H
#include <memory>
#include "windowbase.hpp" #include "windowbase.hpp"
namespace Gui namespace Gui
@ -30,7 +32,6 @@ namespace MWGui
public: public:
MainMenu(int w, int h, const VFS::Manager* vfs, const std::string& versionDescription); MainMenu(int w, int h, const VFS::Manager* vfs, const std::string& versionDescription);
~MainMenu();
void onResChange(int w, int h) override; void onResChange(int w, int h) override;
@ -61,7 +62,7 @@ namespace MWGui
void updateMenu(); void updateMenu();
SaveGameDialog* mSaveGameDialog; std::unique_ptr<SaveGameDialog> mSaveGameDialog;
}; };
} }