Changeset 200 for trunk/src

Timestamp:

05/04/2009 08:56:21 AM (3 years ago)

Author:

guyru

Message:

Make use of boost::scoped_pointer in MainFrame?

Location:

trunk/src

Files:

• MainFrame.cpp (modified) (6 diffs)
• MainFrame.h (modified) (2 diffs)

trunk/src/MainFrame.cpp

@@ -94 +94 @@
         std::string config_file_str;
         config_file_str = config_file.utf8_str();
-        m_config = new configuration::Configuration(config_file_str);
-        m_stats = new statistics::Statistics(m_config);
+        m_config.reset(new configuration::Configuration(config_file_str));
+        m_stats.reset(new statistics::Statistics(m_config.get()));
 
         m_evt_handler = new MainFrameEvtHandler(this);
@@ -521 +521 @@
 void MainFrame::OnShowHighscore(wxCommandEvent& event)
 {
-        highscores_dialog::HighscoresDialog *dialog = new highscores_dialog::HighscoresDialog(this,m_config);
+        highscores_dialog::HighscoresDialog *dialog = new highscores_dialog::HighscoresDialog(this, m_config.get());
 
         dialog->ShowModal();
@@ -530 +530 @@
 void MainFrame::OnStatistics(wxCommandEvent &event)
 {
-        statistics_dialog::StatisticsDialog *dialog = new statistics_dialog::StatisticsDialog(this, m_stats);
+        statistics_dialog::StatisticsDialog *dialog = new statistics_dialog::StatisticsDialog(this, m_stats.get());
         dialog->ShowModal();
         delete dialog;
@@ -542 +542 @@
 void MainFrame::OnSettings( wxCommandEvent& event)
 {
-        settings_dialog::SettingsDialog* settings_dialog = new settings_dialog::SettingsDialog(this, m_config);
+        settings_dialog::SettingsDialog* settings_dialog = new settings_dialog::SettingsDialog(this, m_config.get());
 
         if (settings_dialog->ShowModal()!=wxID_OK) {
@@ -1032 +1032 @@
 
         //now show the high score table
-        highscores_dialog::HighscoresDialog *dialog = new highscores_dialog::HighscoresDialog(this,m_config,rank);
+        highscores_dialog::HighscoresDialog *dialog = new highscores_dialog::HighscoresDialog(this, m_config.get(),rank);
 
         dialog->ShowModal();
@@ -1355 +1355 @@
 MainFrame::~MainFrame() {
         // free pointers
-        delete m_stats;
-        delete m_config;
         delete m_evt_handler;
 

trunk/src/MainFrame.h

@@ -27 +27 @@
 #ifndef OPENYAHTZEE_MAIN_FRAME_INC
 #define OPENYAHTZEE_MAIN_FRAME_INC
+#include <memory>
+#include <boost/scoped_ptr.hpp>
 #include "ScoreDice.h"
 #include "configuration.h"
@@ -82 +84 @@
         ScoreDice m_score_dice;
 
-        configuration::Configuration *m_config;
-        statistics::Statistics *m_stats;
+        boost::scoped_ptr<configuration::Configuration> m_config;
+        boost::scoped_ptr<statistics::Statistics> m_stats;
 
 private: