Make rootgrid an unique_ptr

aardappel · Nov 26, 2024 · 50e307c · 50e307c
1 parent 4b27fa4
commit 50e307c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 20 deletions.
diff --git a/src/document.h b/src/document.h
@@ -13,7 +13,7 @@ struct UndoItem {
 
 struct Document {
     TSCanvas *sw {nullptr};
-    Cell *rootgrid {nullptr};
+    unique_ptr<Cell> rootgrid;
     Selection hover;
     Selection selected;
     Selection begindrag;
@@ -91,7 +91,7 @@ struct Document {
         CollectCells(par);      \
         loopv(_i, itercells) for (Cell *c = itercells[_i]; c; c = nullptr)
     #define loopallcells(c)     \
-        CollectCells(rootgrid); \
+        CollectCells(rootgrid.get()); \
         for (Cell *c : itercells)
     #define loopallcellssel(c, rec) \
         CollectCellsSel(rec);     \
@@ -107,8 +107,6 @@ struct Document {
         dndobjc->Add(dndobjf);
     }
 
-    ~Document() { DELETEP(rootgrid); }
-
     uint Background() { return rootgrid ? rootgrid->cellcolor : 0xFFFFFF; }
 
     void InitCellSelect(Cell *ics, int xs, int ys) {
@@ -127,7 +125,7 @@ struct Document {
     }
 
     void InitWith(Cell *r, const wxString &filename, Cell *ics, int xs, int ys) {
-        rootgrid = r;
+        rootgrid.reset(r);
         InitCellSelect(ics, xs, ys);
         ChangeFileName(filename, false);
     }
@@ -570,7 +568,7 @@ struct Document {
         ResetFont();
         dc.SetUserScale(1, 1);
         curdrawroot = WalkPath(drawpath);
-        int psb = curdrawroot == rootgrid ? 0 : curdrawroot->MinRelsize();
+        int psb = curdrawroot == rootgrid.get() ? 0 : curdrawroot->MinRelsize();
         if (psb < 0 || psb == INT_MAX) psb = 0;
         if (psb != pathscalebias) curdrawroot->ResetChildren();
         pathscalebias = psb;
@@ -813,7 +811,7 @@ struct Document {
     }
 
     const wxChar *ExportFile(const wxString &fn, int k, bool currentview) {
-        auto root = currentview ? curdrawroot : rootgrid;
+        auto root = currentview ? curdrawroot : rootgrid.get();
         if (k == A_EXPCSV) {
             int maxdepth = 0, leaves = 0;
             root->MaxDepthLeaves(0, maxdepth, leaves);
@@ -978,7 +976,7 @@ struct Document {
 
         switch (k) {
             case wxID_EXECUTE:
-                sys->ev.Eval(rootgrid);
+                sys->ev.Eval(rootgrid.get());
                 rootgrid->ResetChildren();
                 ClearSelectionRefresh();
                 return _(L"Evaluation finished.");
@@ -2147,7 +2145,7 @@ struct Document {
     }
 
     Cell *WalkPath(vector<Selection> &path) {
-        Cell *c = rootgrid;
+        Cell *c = rootgrid.get();
         loopvrev(i, path) {
             Selection &s = path[i];
             Grid *g = c->grid;
@@ -2218,7 +2216,7 @@ struct Document {
             c->parent->grid->ReplaceCell(c, clone);
             clone->parent = c->parent;
         } else
-            rootgrid = clone;
+            rootgrid.reset(clone);
         clone->ResetLayout();
         SetSelect(ui->sel);
         if (selected.g) selected.g = WalkPath(ui->selpath)->grid;
@@ -2305,7 +2303,7 @@ struct Document {
         searchfilter = false;
         scrolltoselection = true;
         editfilter = min(max(editfilter, 1), 99);
-        CollectCells(rootgrid);
+        CollectCells(rootgrid.get());
         std::sort(itercells.begin(), itercells.end(), [](Cell *a, Cell *b) {
             // sort in descending order
             return a->text.lastedit > b->text.lastedit;
@@ -2318,7 +2316,7 @@ struct Document {
     void ApplyEditRangeFilter(wxDateTime &rangebegin, wxDateTime &rangeend) {
         searchfilter = false;
         scrolltoselection = true;
-        CollectCells(rootgrid);
+        CollectCells(rootgrid.get());
         for (auto *c : itercells) {
             c->text.filtered = !c->text.lastedit.IsBetween(rangebegin, rangeend);
         }

diff --git a/src/grid.h b/src/grid.h
@@ -608,7 +608,7 @@ struct Grid {
         const int root_grid_spacing = 2;  // Can't be adjusted in editor, so use a default.
         const int font_size = 14 - indent / 2;
         const int grid_border_width =
-            cell == doc->rootgrid ? root_grid_spacing : user_grid_outer_spacing - 1;
+            cell == doc->rootgrid.get() ? root_grid_spacing : user_grid_outer_spacing - 1;
 
         wxString xmlstr(L"<grid");
         if (folded) xmlstr.Append(wxString::Format(wxT(" folded=\"%d\""), folded));

diff --git a/src/system.h b/src/system.h
@@ -210,7 +210,7 @@ struct System {
 
     void LoadOpRef() { LoadDB(frame->GetDocPath(L"examples/operation-reference.cts")); }
 
-    Cell *&InitDB(int sizex, int sizey = 0) {
+    unique_ptr<Cell> &InitDB(int sizex, int sizey = 0) {
         Cell *c = new Cell(nullptr, nullptr, CT_DATA, new Grid(sizex, sizey ? sizey : sizex));
         c->cellcolor = 0xCCDCE2;
         c->grid->InitCells();
@@ -464,13 +464,12 @@ struct System {
                 case A_IMPXMLA: {
                     wxXmlDocument doc;
                     if (!doc.Load(fn)) goto problem;
-                    Cell *&r = InitDB(1);
+                    unique_ptr<Cell> &r = InitDB(1);
                     Cell *c = *r->grid->cells;
                     FillXML(c, doc.GetRoot(), k == A_IMPXMLA);
                     if (!c->HasText() && c->grid) {
                         *r->grid->cells = nullptr;
-                        delete r;
-                        r = c;
+                        r.reset(c);
                         c->parent = nullptr;
                     }
                     break;
@@ -487,7 +486,7 @@ struct System {
 
                     if (as.size()) switch (k) {
                             case A_IMPTXTI: {
-                                Cell *r = InitDB(1);
+                                Cell *r = InitDB(1).get();
                                 FillRows(r->grid, as, CountCol(as[0]), 0, 0);
                             }; break;
                             case A_IMPTXTC:

diff --git a/src/treesheets_impl.h b/src/treesheets_impl.h
@@ -8,7 +8,7 @@ struct TreeSheetsScriptImpl : public ScriptInterface {
 
     void SwitchToCurrentDoc() {
         doc = sys->frame->GetCurTab()->doc;
-        cur = doc->rootgrid;
+        cur = doc->rootgrid.get();
 
         doc->AddUndo(cur);
     }
@@ -42,7 +42,7 @@ struct TreeSheetsScriptImpl : public ScriptInterface {
         return true;
     }
 
-    void GoToRoot() { cur = doc->rootgrid; }
+    void GoToRoot() { cur = doc->rootgrid.get(); }
     void GoToView() { cur = doc->curdrawroot; }
     bool HasSelection() { return doc->selected.g; }
     void GoToSelection() {