fixup 8bf312e

After the above change, the Project Properties dialog was changing the
current project directly, while the dialog features OK/Cancel buttons and
changes are only expected to be applied when pressing OK.

src/tiled/projectpropertiesdialog.cpp

@@ -52,28 +52,26 @@ ProjectPropertiesDialog::ProjectPropertiesDialog(Project &project, QWidget *pare
     : QDialog(parent)
     , ui(new Ui::ProjectPropertiesDialog)
     , mProject(project)
-    , mPropertiesProjectDocument(new ProjectDocument(std::make_unique<Project>(), this))
+    , mLocalProjectDocument(new ProjectDocument(std::make_unique<Project>(project), this))
 {
     ui->setupUi(this);
 
-    mPropertiesProjectDocument->project().setProperties(project.properties());
-
     mCompatibilityVersionProperty = new EnumProperty<CompatibilityVersion>(
                 tr("Compatibility Version"),
                 [=] {
-                    return mProject.mCompatibilityVersion;
+                    return localProject().mCompatibilityVersion;
                 },
                 [=](CompatibilityVersion value) {
-                    mProject.mCompatibilityVersion = value;
+                    localProject().mCompatibilityVersion = value;
                 });
 
     mExtensionPathProperty = new UrlProperty(
                 tr("Extensions Directory"),
                 [=] {
-                    return QUrl::fromLocalFile(mProject.mExtensionsPath);
+                    return QUrl::fromLocalFile(localProject().mExtensionsPath);
                 },
                 [=](const QUrl &value) {
-                    mProject.mExtensionsPath = value.toLocalFile();
+                    localProject().mExtensionsPath = value.toLocalFile();
                 });
     mExtensionPathProperty->setIsDirectory(true);
 
@@ -83,10 +81,10 @@ ProjectPropertiesDialog::ProjectPropertiesDialog(Project &project, QWidget *pare
     mAutomappingRulesFileProperty = new UrlProperty(
                 tr("Automapping rules"),
                 [=] {
-                    return QUrl::fromLocalFile(mProject.mAutomappingRulesFile);
+                    return QUrl::fromLocalFile(localProject().mAutomappingRulesFile);
                 },
                 [=](const QUrl &value) {
-                    mProject.mAutomappingRulesFile = value.toLocalFile();
+                    localProject().mAutomappingRulesFile = value.toLocalFile();
                 });
     mAutomappingRulesFileProperty->setFilter(helper.filter());
 
@@ -109,7 +107,7 @@ ProjectPropertiesDialog::ProjectPropertiesDialog(Project &project, QWidget *pare
     const auto margin = Utils::dpiScaled(3);
     ui->propertiesWidget->propertiesView()->widget()->setContentsMargins(0, margin, 0, margin);
 
-    ui->propertiesWidget->setDocument(mPropertiesProjectDocument);
+    ui->propertiesWidget->setDocument(mLocalProjectDocument);
 }
 
 ProjectPropertiesDialog::~ProjectPropertiesDialog()
@@ -119,14 +117,21 @@ ProjectPropertiesDialog::~ProjectPropertiesDialog()
 
 void ProjectPropertiesDialog::accept()
 {
-    mProject.setProperties(mPropertiesProjectDocument->project().properties());
-    mProject.mCompatibilityVersion = static_cast<CompatibilityVersion>(mCompatibilityVersionProperty->value());
-    mProject.mExtensionsPath = mExtensionPathProperty->value().toLocalFile();
-    mProject.mAutomappingRulesFile = mAutomappingRulesFileProperty->value().toLocalFile();
+    auto &project = localProject();
+
+    mProject.setProperties(project.properties());
+    mProject.mCompatibilityVersion = project.mCompatibilityVersion;
+    mProject.mExtensionsPath = project.mExtensionsPath;
+    mProject.mAutomappingRulesFile = project.mAutomappingRulesFile;
 
     QDialog::accept();
 }
 
+Project &ProjectPropertiesDialog::localProject()
+{
+    return mLocalProjectDocument->project();
+}
+
 } // namespace Tiled
 
 #include "moc_projectpropertiesdialog.cpp"

src/tiled/projectpropertiesdialog.h

@@ -44,10 +44,12 @@ class ProjectPropertiesDialog : public QDialog
     void accept() override;
 
 private:
+    Project &localProject();
+
     Ui::ProjectPropertiesDialog *ui;
 
     Project &mProject;
-    ProjectDocument *mPropertiesProjectDocument;
+    ProjectDocument *mLocalProjectDocument;
     IntProperty *mCompatibilityVersionProperty;
     UrlProperty *mExtensionPathProperty;
     UrlProperty *mAutomappingRulesFileProperty;