AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CGeneratePropertyNamesDialog: Make use of in-class initializers where applicable

This commit is contained in:
Lioncash 2020-06-28 03:21:07 -04:00
parent 69f8ff1200
commit 963b6ccd08
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Editor/CGeneratePropertyNamesDialog.cpp
View File

@ -10,10 +10,8 @@
CGeneratePropertyNamesDialog::CGeneratePropertyNamesDialog(QWidget* pParent)
: QDialog(pParent)
, mpUI( new Ui::CGeneratePropertyNamesDialog )
, mFutureWatcher( this )
, mRunningNameGeneration( false )
, mCanceledNameGeneration( false )
, mpUI(std::make_unique<Ui::CGeneratePropertyNamesDialog>())
, mFutureWatcher(this)
{
mpUI->setupUi(this);
mNotifier.SetProgressBar( mpUI->ProgressBar );
@ -41,10 +39,7 @@ CGeneratePropertyNamesDialog::CGeneratePropertyNamesDialog(QWidget* pParent)
QtConcurrent::run(&mGenerator, &CPropertyNameGenerator::Warmup);
}
CGeneratePropertyNamesDialog::~CGeneratePropertyNamesDialog()
{
delete mpUI;
}
CGeneratePropertyNamesDialog::~CGeneratePropertyNamesDialog() = default;
/** Add a property to the ID pool */
void CGeneratePropertyNamesDialog::AddToIDPool(IProperty* pProperty)

13
src/Editor/CGeneratePropertyNamesDialog.h
View File

@ -13,6 +13,7 @@
#include <QScopedPointer>
#include <QTimer>
#include <QTreeWidgetItem>
#include <memory>
using CNameCasingComboBox = TEnumComboBox<ENameCasing>;
@ -26,7 +27,7 @@ class CGeneratePropertyNamesDialog;
class CGeneratePropertyNamesDialog : public QDialog
{
Q_OBJECT
Ui::CGeneratePropertyNamesDialog* mpUI;
std::unique_ptr<Ui::CGeneratePropertyNamesDialog> mpUI;
/** The name generator */
CPropertyNameGenerator mGenerator;
@ -51,13 +52,13 @@ class CGeneratePropertyNamesDialog : public QDialog
QVector<QTreeWidgetItem*> mCheckedItems;
/** Whether name generation is running */
bool mRunningNameGeneration;
bool mRunningNameGeneration = false;
/** Whether name generation has been canceled */
bool mCanceledNameGeneration;
bool mCanceledNameGeneration = false;
public:
explicit CGeneratePropertyNamesDialog(QWidget *pParent = 0);
explicit CGeneratePropertyNamesDialog(QWidget *pParent = nullptr);
~CGeneratePropertyNamesDialog();
/** Add a property to the ID pool */
@ -71,10 +72,10 @@ public:
public slots:
/** Show event override */
virtual void showEvent(QShowEvent* pEvent);
void showEvent(QShowEvent* pEvent) override;
/** Close event override */
virtual void closeEvent(QCloseEvent* pEvent);
void closeEvent(QCloseEvent* pEvent) override;
/** Add an item to the suffix list */
void AddSuffix();