Use applicationName() for window titles, clean up some remaining TODO items

include/core/map.h

@@ -107,7 +107,7 @@ public:
 private:
     QString m_name;
     QString m_constantName;
-    QString m_layoutId; // TODO: Why do we do half this->layout()->id and half this->layoutId. Should these ever be different?
+    QString m_layoutId;
     QString m_sharedEventsMap = "";
     QString m_sharedScriptsMap = "";
 

include/core/maplayout.h

@@ -14,8 +14,6 @@ class LayoutPixmapItem;
 class CollisionPixmapItem;
 class BorderMetatilesPixmapItem;
 
-// TODO: Privatize members as appropriate
-
 class Layout : public QObject {
     Q_OBJECT
 public:

include/lib/collapsiblesection.h

@@ -41,7 +41,7 @@ public:
     explicit CollapsibleSection(const QString& title = "",  const bool expanded = false, const int animationDuration = 0, QWidget* parent = 0);
 
     void setContentLayout(QLayout* contentLayout);
-    void setTitle(QString title);
+    void setTitle(const QString &title);
     bool isExpanded() const { return this->expanded; }
 
 public slots:

include/mainwindow.h

@@ -31,6 +31,7 @@
 #include "updatepromoter.h"
 #include "aboutporymap.h"
 #include "mapheaderform.h"
+#include "newlayoutdialog.h"
 
 
 
@@ -350,8 +351,11 @@ private:
 
     void openNewMapDialog();
     void openDuplicateMapDialog(const QString &mapName);
+    NewLayoutDialog* createNewLayoutDialog(const Layout *layoutToCopy = nullptr);
     void openNewLayoutDialog();
     void openDuplicateLayoutDialog(const QString &layoutId);
+    void openNewMapGroupDialog();
+    void openNewAreaDialog();
     void openSubWindow(QWidget * window);
     void scrollMapList(MapTree *list, const QString &itemName);
     void scrollMapListToCurrentMap(MapTree *list);
@@ -370,8 +374,6 @@ private:
     void refreshRecentProjectsMenu();
 
     void updateMapList();
-    void mapListAddGroup();
-    void mapListAddArea();
     void openMapListItem(const QModelIndex &index);
     void saveMapListTab(int index);
 

include/project.h

@@ -111,7 +111,7 @@ public:
     QStringList secondaryTilesetLabels;
     QStringList tilesetLabelsOrdered;
 
-    Blockdata readBlockdata(QString);
+    Blockdata readBlockdata(QString, bool *ok = nullptr);
     bool loadBlockdata(Layout *);
     bool loadLayoutBorder(Layout *);
 
@@ -121,6 +121,7 @@ public:
 
     bool readMapGroups();
     void addNewMapGroup(const QString &groupName);
+    QString mapNameToMapGroup(const QString &mapName);
 
     struct NewMapSettings {
         QString name;
@@ -141,6 +142,8 @@ public:
     Layout *createNewLayout(const Layout::Settings &layoutSettings, const Layout* toDuplicate = nullptr);
     Tileset *createNewTileset(const QString &friendlyName, bool secondary, bool checkerboardFill);
     bool isIdentifierUnique(const QString &identifier) const;
+    bool isValidNewIdentifier(const QString &identifier) const;
+    QString toUniqueIdentifier(const QString &identifier) const;
     QString getProjectTitle();
 
     bool readWildMonData();