atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Use QPointer when we need to set a nullptr on destruction

Browse source
This commit is contained in:
BigBahss 2021-02-15 02:45:38 -05:00 committed by Tyler Dennis
parent c103142c65
commit fe5d4982f7
2 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/mainwindow.h
View file

@ -238,14 +238,14 @@ private slots:
private: private:
Ui::MainWindow *ui; Ui::MainWindow *ui;
QLabel *label_MapRulerStatus; QLabel *label_MapRulerStatus = nullptr;
TilesetEditor *tilesetEditor = nullptr; QPointer<TilesetEditor> tilesetEditor = nullptr;
RegionMapEditor *regionMapEditor = nullptr; QPointer<RegionMapEditor> regionMapEditor = nullptr;
ShortcutsEditor *shortcutsEditor = nullptr; QPointer<ShortcutsEditor> shortcutsEditor = nullptr;
MapImageExporter *mapImageExporter = nullptr; QPointer<MapImageExporter> mapImageExporter = nullptr;
QPointer<NewMapPopup> newmapprompt = nullptr;
QPointer<PreferenceEditor> preferenceEditor = nullptr;
FilterChildrenProxyModel *mapListProxyModel; FilterChildrenProxyModel *mapListProxyModel;
NewMapPopup *newmapprompt = nullptr;
PreferenceEditor *preferenceEditor = nullptr;
QStandardItemModel *mapListModel; QStandardItemModel *mapListModel;
QList<QStandardItem*> *mapGroupItemsList; QList<QStandardItem*> *mapGroupItemsList;
QMap<QString, QModelIndex> mapListIndexes; QMap<QString, QModelIndex> mapListIndexes;

9
src/mainwindow.cpp
View file

@ -40,7 +40,6 @@
MainWindow::MainWindow(QWidget *parent) : MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
ui(new Ui::MainWindow), ui(new Ui::MainWindow),
label_MapRulerStatus(nullptr),
selectedObject(nullptr), selectedObject(nullptr),
selectedWarp(nullptr), selectedWarp(nullptr),
selectedTrigger(nullptr), selectedTrigger(nullptr),
@ -1158,8 +1157,7 @@ void MainWindow::openNewMapPopupWindow(int type, QVariant data) {
break; break;
} }
connect(this->newmapprompt, &NewMapPopup::applied, this, &MainWindow::onNewMapCreated); connect(this->newmapprompt, &NewMapPopup::applied, this, &MainWindow::onNewMapCreated);
connect(this->newmapprompt, &QObject::destroyed, [=](QObject *) { this->newmapprompt = nullptr; }); this->newmapprompt->setAttribute(Qt::WA_DeleteOnClose);
this->newmapprompt->setAttribute(Qt::WA_DeleteOnClose);
} }
void MainWindow::on_action_NewMap_triggered() { void MainWindow::on_action_NewMap_triggered() {
@ -1496,7 +1494,6 @@ void MainWindow::initShortcutsEditor() {
shortcutsEditor = new ShortcutsEditor(this); shortcutsEditor = new ShortcutsEditor(this);
connect(shortcutsEditor, &ShortcutsEditor::shortcutsSaved, connect(shortcutsEditor, &ShortcutsEditor::shortcutsSaved,
this, &MainWindow::applyUserShortcuts); this, &MainWindow::applyUserShortcuts);
connect(shortcutsEditor, &QObject::destroyed, [=](QObject *) { shortcutsEditor = nullptr; });
connectSubEditorsToShortcutsEditor(); connectSubEditorsToShortcutsEditor();
@ -2462,7 +2459,6 @@ void MainWindow::showExportMapImageWindow(ImageExporterMode mode) {
delete this->mapImageExporter; delete this->mapImageExporter;
this->mapImageExporter = new MapImageExporter(this, this->editor, mode); this->mapImageExporter = new MapImageExporter(this, this->editor, mode);
connect(this->mapImageExporter, &QObject::destroyed, [=](QObject *) { this->mapImageExporter = nullptr; });
this->mapImageExporter->setAttribute(Qt::WA_DeleteOnClose); this->mapImageExporter->setAttribute(Qt::WA_DeleteOnClose);
if (!this->mapImageExporter->isVisible()) { if (!this->mapImageExporter->isVisible()) {
@ -2669,7 +2665,6 @@ void MainWindow::on_actionTileset_Editor_triggered()
void MainWindow::initTilesetEditor() { void MainWindow::initTilesetEditor() {
this->tilesetEditor = new TilesetEditor(this->editor->project, this->editor->map, this); this->tilesetEditor = new TilesetEditor(this->editor->project, this->editor->map, this);
connect(this->tilesetEditor, &TilesetEditor::tilesetsSaved, this, &MainWindow::onTilesetsSaved); connect(this->tilesetEditor, &TilesetEditor::tilesetsSaved, this, &MainWindow::onTilesetsSaved);
connect(this->tilesetEditor, &QObject::destroyed, [=](QObject *) { this->tilesetEditor = nullptr; });
} }
void MainWindow::on_toolButton_ExpandAll_clicked() void MainWindow::on_toolButton_ExpandAll_clicked()
@ -2712,7 +2707,6 @@ void MainWindow::on_actionEdit_Preferences_triggered() {
editor, &Editor::maskNonVisibleConnectionTiles); editor, &Editor::maskNonVisibleConnectionTiles);
connect(preferenceEditor, &PreferenceEditor::preferencesSaved, connect(preferenceEditor, &PreferenceEditor::preferencesSaved,
this, &MainWindow::togglePreferenceSpecificUi); this, &MainWindow::togglePreferenceSpecificUi);
connect(preferenceEditor, &QObject::destroyed, [=](QObject *) { preferenceEditor = nullptr; });
} }
if (!preferenceEditor->isVisible()) { if (!preferenceEditor->isVisible()) {
@ -2827,7 +2821,6 @@ bool MainWindow::initRegionMapEditor() {
return false; return false;
} }
connect(this->regionMapEditor, &QObject::destroyed, [=](QObject *) { this->regionMapEditor = nullptr; });
return true; return true;
} }