CWorldInfoSidebar: Make use of in-class initializers where applicable

This commit is contained in:
Lioncash 2020-06-28 06:27:16 -04:00
parent 548e4ca708
commit 9b2bfd5bcd
2 changed files with 6 additions and 7 deletions

View File

@ -5,7 +5,7 @@
CWorldInfoSidebar::CWorldInfoSidebar(CWorldEditor *pEditor) CWorldInfoSidebar::CWorldInfoSidebar(CWorldEditor *pEditor)
: CWorldEditorSidebar(pEditor) : CWorldEditorSidebar(pEditor)
, mpUI(new Ui::CWorldInfoSidebar) , mpUI(std::make_unique<Ui::CWorldInfoSidebar>())
, mModel(pEditor) , mModel(pEditor)
{ {
mpUI->setupUi(this); mpUI->setupUi(this);
@ -45,10 +45,7 @@ CWorldInfoSidebar::CWorldInfoSidebar(CWorldEditor *pEditor)
mpUI->AreaNameSelector->SetEditable(false); mpUI->AreaNameSelector->SetEditable(false);
} }
CWorldInfoSidebar::~CWorldInfoSidebar() CWorldInfoSidebar::~CWorldInfoSidebar() = default;
{
delete mpUI;
}
// ************ SLOTS ************ // ************ SLOTS ************
void CWorldInfoSidebar::OnActiveProjectChanged(CGameProject *pProj) void CWorldInfoSidebar::OnActiveProjectChanged(CGameProject *pProj)

View File

@ -6,6 +6,8 @@
#include "CWorldEditorSidebar.h" #include "CWorldEditorSidebar.h"
#include "CWorldTreeModel.h" #include "CWorldTreeModel.h"
#include <memory>
class CWorldEditor; class CWorldEditor;
namespace Ui { namespace Ui {
@ -16,13 +18,13 @@ class CWorldInfoSidebar : public CWorldEditorSidebar
{ {
Q_OBJECT Q_OBJECT
Ui::CWorldInfoSidebar *mpUI; std::unique_ptr<Ui::CWorldInfoSidebar> mpUI;
CWorldTreeModel mModel; CWorldTreeModel mModel;
CWorldTreeProxyModel mProxyModel; CWorldTreeProxyModel mProxyModel;
public: public:
explicit CWorldInfoSidebar(CWorldEditor *pEditor); explicit CWorldInfoSidebar(CWorldEditor *pEditor);
~CWorldInfoSidebar(); ~CWorldInfoSidebar() override;
public slots: public slots:
void OnActiveProjectChanged(CGameProject *pProj); void OnActiveProjectChanged(CGameProject *pProj);