some refactoring

Author: rostam

CGTeaFrame.cpp

@@ -77,7 +77,7 @@ CGTeaFrame::CGTeaFrame(const wxString& title, const wxPoint& pos, const wxSize&
     availableActions.emplace_back(std::make_unique<Coloring>());
     availableActions.emplace_back(std::make_unique<LineGraph>());
 
-    auto menuFile = new wxMenu;
+    auto menuFile = std::make_unique<wxMenu>();
     menuFile->Append(1000, "&Open");
     menuFile->Append(1001, "&Save");
     menuFile->AppendSeparator();
@@ -87,7 +87,7 @@ CGTeaFrame::CGTeaFrame(const wxString& title, const wxPoint& pos, const wxSize&
     Connect(1001, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CGTeaFrame::Save));
     Connect(wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CGTeaFrame::OnExit));
 
-    auto menuGenerate = new wxMenu;
+    auto menuGenerate = std::make_unique<wxMenu>();
     int i = 1;
 //    std::apply([&](auto&&... args) {((menuGenerate->Append(i, wxString(args.name().c_str(), wxConvUTF8), wxString(args.description().c_str(), wxConvUTF8)),i++), ...);}, availableGenerators);
     for (auto& gi : availableGenerators) {
@@ -97,38 +97,38 @@ CGTeaFrame::CGTeaFrame(const wxString& title, const wxPoint& pos, const wxSize&
         i++;
     }
 
-    auto menuReport = new wxMenu;
+    auto menuReport = std::make_unique<wxMenu>();
     for (auto& ri : availableReports) {
         menuReport->Append(i, wxString(ri->name().c_str(), wxConvUTF8),
                 wxString(ri->description().c_str(), wxConvUTF8));
         Connect(i, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CGTeaFrame::Report));
         i++;
     }
 
-    auto menuAction = new wxMenu;
+    auto menuAction = std::make_unique<wxMenu>();
     for (auto& ai : availableActions) {
         menuAction->Append(i, wxString(ai->name().c_str(), wxConvUTF8),
                            wxString(ai->description().c_str(), wxConvUTF8));
         Connect(i, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CGTeaFrame::Action));
         i++;
     }
 
-    auto *menuLayout = new wxMenu;
+    auto menuLayout = std::make_unique<wxMenu>();
     menuLayout->Append(i, "Force-directed drawing", "Force-directed drawing");
     Connect(i, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CGTeaFrame::Layout));
     i++;
     menuLayout->Append(i, "&Fit Width", "Fit Graph to Width");
     Connect(i, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CGTeaFrame::OnFitWidth));
-    auto menuHelp = new wxMenu;
+    auto menuHelp = std::make_unique<wxMenu>();
     menuHelp->Append(wxID_ABOUT);
-    wxMenuBar *menuBar = new wxMenuBar;
-    menuBar->Append(menuFile, "&File");
-    menuBar->Append(menuGenerate, "&Generate");
-    menuBar->Append(menuReport, "&Report");
-    menuBar->Append(menuAction, "&Action");
-    menuBar->Append(menuLayout, "&Layout");
-    menuBar->Append(menuHelp, "&Help");
-    SetMenuBar(menuBar);
+    auto menuBar = std::make_unique<wxMenuBar>();
+    menuBar->Append(menuFile.release(), "&File");
+    menuBar->Append(menuGenerate.release(), "&Generate");
+    menuBar->Append(menuReport.release(), "&Report");
+    menuBar->Append(menuAction.release(), "&Action");
+    menuBar->Append(menuLayout.release(), "&Layout");
+    menuBar->Append(menuHelp.release(), "&Help");
+    SetMenuBar(menuBar.release());
     CreateStatusBar();
     SetStatusText("Welcome to CGTea!");
 
@@ -147,11 +147,11 @@ CGTeaFrame::CGTeaFrame(const wxString& title, const wxPoint& pos, const wxSize&
     }
 }
 
-void CGTeaFrame::OnExit(wxCommandEvent& event) {
+void CGTeaFrame::OnExit(wxCommandEvent&) {
     Close(true);
 }
 
-void CGTeaFrame::OnAbout(wxCommandEvent& event) {
+void CGTeaFrame::OnAbout(wxCommandEvent&) {
     wxMessageBox("CGTea is a C++-version of GraphTea, a software for working with graphs.",
                  "CGTea 1.0", wxOK | wxICON_INFORMATION);
 }
@@ -220,7 +220,7 @@ void CGTeaFrame::Report(wxCommandEvent& event) {
     const int id = event.GetId();
     const std::string report_results = availableReports[id - availableGenerators.size() - 1]->report(currentGraph);
     const std::string report_name = availableReports[id - availableGenerators.size() - 1]->name();
-    ((CGTeaSidebar*)this->GetSizer()->GetChildren()[0]->GetWindow())->statistics_text->SetValue(report_name + ": " +report_results);
+    static_cast<CGTeaSidebar*>(this->GetSizer()->GetChildren()[0]->GetWindow())->statistics_text->SetValue(report_name + ": " +report_results);
 }
 
 void CGTeaFrame::Action(wxCommandEvent& event) {

generators/Antiprism.h

@@ -31,7 +31,7 @@ class Antiprism : public GeneratorInterface {
         std::vector<cgtea_geometry::Point> pos2 = position_generators::circle(width, height, 200.0, n);
         pos1.insert(pos1.end(), pos2.begin(), pos2.end());
         int i = 0;
-        for_each_v(g, [&](Ver v) {
+        for_each_v(g, [&](const Ver v) {
             boost::put(boost::vertex_distance, g, v, pos1[i]);
             i++;
         });

generators/Banana.h

@@ -23,7 +23,7 @@ class Banana : public GeneratorInterface {
         Graph g = generate(n, k);
         std::vector<cgtea_geometry::Point> pos = position_generators::circle(width, height, 100.0, n);
         int i = 0;
-        for_each_v(g, [&](Ver v) {
+        for_each_v(g, [&](const Ver v) {
             boost::put(boost::vertex_distance, g, v, pos[i]);
             i++;
         });

generators/CocktailParty.h

@@ -33,7 +33,7 @@ class CocktailParty : public GeneratorInterface {
         }
         std::vector<cgtea_geometry::Point> pos = position_generators::circle(width, height, 200.0, 2*n);
 
-        for_each_v(g, [&](Ver v) {boost::put(boost::vertex_distance, g, v, pos[v]);});
+        for_each_v(g, [&](const Ver v) {boost::put(boost::vertex_distance, g, v, pos[v]);});
         return g;
     }
 

generators/Complete.h

@@ -20,7 +20,7 @@ class Complete : public GeneratorInterface {
 
     Graph generate_with_positions(unsigned int n, unsigned int k, double width, double height) override {
         Graph g = generate(n, k);
-        std::vector<cgtea_geometry::Point> pos = position_generators::circle(width, height, 100.0, n);
+        const std::vector<cgtea_geometry::Point> pos = position_generators::circle(width, height, 100.0, n);
         int i = 0;
         for_each_v(g, [&](Ver v) {
             boost::put(boost::vertex_distance, g, v, pos[i]);

generators/GeneratorInterface.h

@@ -18,11 +18,11 @@ class GeneratorInterface {
     virtual Graph
     generate_with_positions(unsigned int n, unsigned int k, double width, double height) { return Graph(); };
 
-    Graph generate_with_force_directed(unsigned int n, unsigned int k, double width, double height) {
+    Graph generate_with_force_directed(const unsigned int n, const unsigned int k, const double width, const double height) {
         Graph g = generate(n, k);
-        std::vector<cgtea_geometry::Point> pos = compute_force_directed(50, 50, width, height, g);
+        const std::vector<cgtea_geometry::Point> pos = compute_force_directed(50, 50, width, height, g);
         int i = 0;
-        for_each_v(g, [&](Ver v) {
+        for_each_v(g, [&](const Ver v) {
             boost::put(boost::vertex_distance, g, v, pos[i]);
             i++;
         });