Fixed merge error in NewLevelDialog

This commit is contained in:
John Jones-Steele
2021-06-22 11:25:53 +01:00
parent 1ec238685d
commit 66c4541e14
3 changed files with 62 additions and 239 deletions
+6 -8
View File
@@ -34,7 +34,6 @@
#include <vector>
#include <QAbstractButton>
#include <QDialog>
#endif
@@ -51,29 +50,28 @@ public:
CNewLevelDialog(QWidget* pParent = nullptr); // standard constructor
~CNewLevelDialog();
QString GetLevel() const;
void IsResize(bool bIsResize);
bool ValidateLevel();
protected:
void UpdateData(bool fromUi = true);
void OnInitDialog();
void ReloadLevelFolder();
void ReloadLevelFolders();
void ReloadLevelFoldersRec(const QString& currentFolder);
void showEvent(QShowEvent* event);
QString GetLevelsFolder() const;
protected slots:
void OnCbnSelendokLevelFolders();
void OnLevelNameChange();
void OnClearButtonClicked();
void PopupAssetPicker();
void OnStartup();
public:
QString m_level;
QString m_levelFolders;
int m_ilevelFolders;
bool m_bIsResize;
bool m_bUpdate;