Put everything in Gambit::GUI namespace

Author: tturocy

src/gui/analysis.cc

@@ -32,30 +32,27 @@
 #include "analysis.h"
 #include "gamedoc.h"
 
-using namespace Gambit;
-
+namespace Gambit::GUI {
 //=========================================================================
 //                     class AnalysisProfileList
 //=========================================================================
 
 // Use anonymous namespace to make these helpers private
 namespace {
 
-class gbtNotNashException final : public std::runtime_error {
+class NotNashException final : public std::runtime_error {
 public:
-  gbtNotNashException() : std::runtime_error("Output line does not contain a Nash equilibrium") {}
-  ~gbtNotNashException() noexcept override = default;
+  NotNashException() : std::runtime_error("Output line does not contain a Nash equilibrium") {}
+  ~NotNashException() noexcept override = default;
 };
 
 template <class T>
 MixedStrategyProfile<T> OutputToMixedProfile(GameDocument *p_doc, const wxString &p_text)
 {
-  MixedStrategyProfile<T> profile(p_doc->GetGame()->NewMixedStrategyProfile((T)0.0));
-
-  wxStringTokenizer tok(p_text, wxT(","));
+  MixedStrategyProfile<T> profile(p_doc->GetGame()->NewMixedStrategyProfile(static_cast<T>(0.0)));
 
-  if (tok.GetNextToken() == wxT("NE")) {
-    if (tok.CountTokens() == (unsigned int)profile.MixedProfileLength()) {
+  if (wxStringTokenizer tok(p_text, wxT(",")); tok.GetNextToken() == wxT("NE")) {
+    if (tok.CountTokens() == static_cast<unsigned int>(profile.MixedProfileLength())) {
       for (size_t i = 1; i <= profile.MixedProfileLength(); i++) {
         profile[i] =
             lexical_cast<Rational>(std::string((const char *)tok.GetNextToken().mb_str()));
@@ -64,7 +61,7 @@ MixedStrategyProfile<T> OutputToMixedProfile(GameDocument *p_doc, const wxString
     }
   }
 
-  throw gbtNotNashException();
+  throw NotNashException();
 }
 
 template <class T>
@@ -75,16 +72,15 @@ MixedBehaviorProfile<T> OutputToBehavProfile(GameDocument *p_doc, const wxString
   wxStringTokenizer tok(p_text, wxT(","));
 
   if (tok.GetNextToken() == wxT("NE")) {
-    if (tok.CountTokens() == (unsigned int)profile.BehaviorProfileLength()) {
+    if (tok.CountTokens() == static_cast<unsigned int>(profile.BehaviorProfileLength())) {
       for (size_t i = 1; i <= profile.BehaviorProfileLength(); i++) {
-        profile[i] =
-            lexical_cast<Rational>(std::string((const char *)tok.GetNextToken().mb_str()));
+        profile[i] = lexical_cast<Rational>(std::string(tok.GetNextToken().mb_str()));
       }
       return profile;
     }
   }
 
-  throw gbtNotNashException();
+  throw NotNashException();
 }
 
 } // end anonymous namespace
@@ -110,7 +106,7 @@ template <class T> void AnalysisProfileList<T>::AddOutput(const wxString &p_outp
       m_current = m_mixedProfiles.size();
     }
   }
-  catch (gbtNotNashException &) {
+  catch (NotNashException &) {
   }
 }
 
@@ -124,12 +120,7 @@ template <class T> void AnalysisProfileList<T>::BuildNfg()
 
 template <class T> int AnalysisProfileList<T>::NumProfiles() const
 {
-  if (m_doc->IsTree()) {
-    return m_behavProfiles.size();
-  }
-  else {
-    return m_mixedProfiles.size();
-  }
+  return (m_doc->IsTree()) ? m_behavProfiles.size() : m_mixedProfiles.size();
 }
 
 template <class T> void AnalysisProfileList<T>::Clear()
@@ -149,12 +140,12 @@ namespace {
 template <class T>
 MixedStrategyProfile<T> TextToMixedProfile(GameDocument *p_doc, const wxString &p_text)
 {
-  MixedStrategyProfile<T> profile(p_doc->GetGame()->NewMixedStrategyProfile((T)0));
+  MixedStrategyProfile<T> profile(p_doc->GetGame()->NewMixedStrategyProfile(static_cast<T>(0)));
 
   wxStringTokenizer tok(p_text, wxT(","));
 
   for (size_t i = 1; i <= profile.MixedProfileLength(); i++) {
-    profile[i] = lexical_cast<Rational>(std::string((const char *)tok.GetNextToken().mb_str()));
+    profile[i] = lexical_cast<Rational>(std::string(tok.GetNextToken().mb_str()));
   }
 
   return profile;
@@ -167,7 +158,7 @@ MixedBehaviorProfile<T> TextToBehavProfile(GameDocument *p_doc, const wxString &
 
   wxStringTokenizer tok(p_text, wxT(","));
   for (size_t i = 1; i <= profile.BehaviorProfileLength(); i++) {
-    profile[i] = lexical_cast<Rational>(std::string((const char *)tok.GetNextToken().mb_str()));
+    profile[i] = lexical_cast<Rational>(std::string(tok.GetNextToken().mb_str()));
   }
 
   return profile;
@@ -183,15 +174,13 @@ template <class T> void AnalysisProfileList<T>::Load(TiXmlNode *p_analysis)
 {
   Clear();
 
-  TiXmlNode *description = p_analysis->FirstChild("description");
-  if (description) {
+  if (TiXmlNode *description = p_analysis->FirstChild("description")) {
     m_description = wxString(description->FirstChild()->Value(), *wxConvCurrent);
   }
 
   for (TiXmlNode *node = p_analysis->FirstChild("profile"); node;
        node = node->NextSiblingElement()) {
-    const char *type = node->ToElement()->Attribute("type");
-    if (!strcmp(type, "behav")) {
+    if (const char *type = node->ToElement()->Attribute("type"); !strcmp(type, "behav")) {
       const MixedBehaviorProfile<T> profile =
           TextToBehavProfile<T>(m_doc, wxString(node->FirstChild()->Value(), *wxConvCurrent));
       m_behavProfiles.push_back(std::make_shared<MixedBehaviorProfile<T>>(profile));
@@ -217,10 +206,8 @@ template <class T> std::string AnalysisProfileList<T>::GetPayoff(int pl, int p_i
       return lexical_cast<std::string>(m_behavProfiles[index]->GetPayoff(pl),
                                        m_doc->GetStyle().NumDecimals());
     }
-    else {
-      return lexical_cast<std::string>(m_mixedProfiles[index]->GetPayoff(pl),
-                                       m_doc->GetStyle().NumDecimals());
-    }
+    return lexical_cast<std::string>(m_mixedProfiles[index]->GetPayoff(pl),
+                                     m_doc->GetStyle().NumDecimals());
   }
   catch (std::out_of_range &) {
     return "";
@@ -255,10 +242,8 @@ std::string AnalysisProfileList<T>::GetBeliefProb(const GameNode &p_node, int p_
       return lexical_cast<std::string>(m_behavProfiles[index]->GetBeliefProb(p_node),
                                        m_doc->GetStyle().NumDecimals());
     }
-    else {
-      // We don't compute assessments yet!
-      return "*";
-    }
+    // We don't compute assessments yet!
+    return "*";
   }
   catch (std::out_of_range &) {
     return "";
@@ -312,10 +297,8 @@ std::string AnalysisProfileList<T>::GetInfosetValue(const GameNode &p_node, int
       return lexical_cast<std::string>(m_behavProfiles[index]->GetPayoff(p_node->GetInfoset()),
                                        m_doc->GetStyle().NumDecimals());
     }
-    else {
-      // In the absence of beliefs, this is not well-defined in general
-      return "*";
-    }
+    // In the absence of beliefs, this is not well-defined in general
+    return "*";
   }
   catch (std::out_of_range &) {
     return "";
@@ -387,10 +370,8 @@ std::string AnalysisProfileList<T>::GetActionValue(const GameNode &p_node, int p
           m_behavProfiles[index]->GetPayoff(p_node->GetInfoset()->GetAction(p_act)),
           m_doc->GetStyle().NumDecimals());
     }
-    else {
-      // In the absence of beliefs, this is not well-defined
-      return "*";
-    }
+    // In the absence of beliefs, this is not well-defined
+    return "*";
   }
   catch (std::out_of_range &) {
     return "";
@@ -431,7 +412,7 @@ template <class T> void AnalysisProfileList<T>::Save(std::ostream &p_file) const
   p_file << "<analysis type=\"list\">\n";
 
   p_file << "<description>\n";
-  p_file << (const char *)m_description.mb_str() << "\n";
+  p_file << static_cast<const char *>(m_description.mb_str()) << "\n";
   p_file << "</description>\n";
 
   if (m_doc->IsTree()) {
@@ -472,3 +453,5 @@ template <class T> void AnalysisProfileList<T>::Save(std::ostream &p_file) const
 // Explicit instantiations
 template class AnalysisProfileList<double>;
 template class AnalysisProfileList<Rational>;
+
+} // namespace Gambit::GUI

src/gui/analysis.h

@@ -20,11 +20,10 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#ifndef ANALYSIS_H
-#define ANALYSIS_H
+#ifndef GAMBIT_GUI_ANALYSIS_H
+#define GAMBIT_GUI_ANALYSIS_H
 
 class TiXmlNode;
-class GameDocument;
 
 //
 // This file contains classes which manage the output of analysis tools.
@@ -34,7 +33,9 @@ class GameDocument;
 // output of stable sets or convex components of equilibria, etc.)
 //
 
-using namespace Gambit;
+namespace Gambit::GUI {
+
+class GameDocument;
 
 class AnalysisOutput {
 protected:
@@ -187,4 +188,6 @@ template <class T> class AnalysisProfileList final : public AnalysisOutput {
   //@}
 };
 
-#endif // ANALYSIS_H
+} // namespace Gambit::GUI
+
+#endif // GAMBIT_GUI_ANALYSIS_H

src/gui/app.cc

@@ -34,7 +34,7 @@
 #include "app.h"
 #include "gameframe.h"
 
-Application::Application() : m_fileHistory(10) {}
+namespace Gambit::GUI {
 
 bool Application::OnInit()
 {
@@ -74,7 +74,7 @@ bool Application::OnInit()
     // If we don't have any game files -- whether because none were
     // specified on the command line, or because those specified couldn't
     // be read -- create a default document.
-    const Gambit::Game efg = Gambit::NewTree();
+    const Game efg = NewTree();
     efg->NewPlayer()->SetLabel("Player 1");
     efg->NewPlayer()->SetLabel("Player 2");
     efg->SetTitle("Untitled Extensive Game");
@@ -96,7 +96,7 @@ AppLoadResult Application::LoadFile(const wxString &p_filename)
     return GBT_APP_OPEN_FAILED;
   }
 
-  auto *doc = new GameDocument(Gambit::NewTree());
+  auto *doc = new GameDocument(NewTree());
   if (doc->LoadDocument(p_filename)) {
     doc->SetFilename(p_filename);
     m_fileHistory.AddFileToHistory(p_filename);
@@ -109,7 +109,7 @@ AppLoadResult Application::LoadFile(const wxString &p_filename)
   }
 
   try {
-    const Gambit::Game nfg = Gambit::ReadGame(infile);
+    const Game nfg = ReadGame(infile);
 
     m_fileHistory.AddFileToHistory(p_filename);
     m_fileHistory.Save(*wxConfigBase::Get());
@@ -118,7 +118,7 @@ AppLoadResult Application::LoadFile(const wxString &p_filename)
     (void)new GameFrame(nullptr, doc);
     return GBT_APP_FILE_OK;
   }
-  catch (Gambit::InvalidFileException &) {
+  catch (InvalidFileException &) {
     return GBT_APP_PARSE_FAILED;
   }
 }
@@ -135,4 +135,6 @@ bool Application::AreDocumentsModified() const
                      std::mem_fn(&GameDocument::IsModified));
 }
 
-IMPLEMENT_APP(Application)
+} // namespace Gambit::GUI
+
+IMPLEMENT_APP(Gambit::GUI::Application)

src/gui/app.h

@@ -20,28 +20,28 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#ifndef GAMBIT_APP_H
-#define GAMBIT_APP_H
+#ifndef GAMBIT_GUI_APP_H
+#define GAMBIT_GUI_APP_H
 
 #include <wx/wx.h>
 #include <wx/config.h>  // for wxConfig
 #include <wx/docview.h> // for wxFileHistory
 
-using namespace Gambit;
+namespace Gambit::GUI {
 
 class GameDocument;
 
 enum AppLoadResult { GBT_APP_FILE_OK = 0, GBT_APP_OPEN_FAILED = 1, GBT_APP_PARSE_FAILED = 2 };
 
 class Application final : public wxApp {
   wxString m_currentDir; /* Current position in directory tree. */
-  wxFileHistory m_fileHistory;
+  wxFileHistory m_fileHistory{10};
   std::list<GameDocument *> m_documents;
 
   bool OnInit() override;
 
 public:
-  Application();
+  Application() = default;
   ~Application() override = default;
 
   const wxString &GetCurrentDir() { return m_currentDir; }
@@ -73,6 +73,8 @@ class Application final : public wxApp {
   //@}
 };
 
-DECLARE_APP(Application)
+} // namespace Gambit::GUI
 
-#endif // GAMBIT_APP_H
+DECLARE_APP(Gambit::GUI::Application)
+
+#endif // GAMBIT_GUI_APP_H

src/gui/dlabout.cc

@@ -29,6 +29,7 @@
 #include "dlabout.h"
 #include "bitmaps/gambitbig.xpm"
 
+namespace Gambit::GUI {
 static wxStaticText *FormattedText(wxWindow *p_parent, const wxString &p_label,
                                    const wxFont &p_font)
 {
@@ -40,7 +41,7 @@ static wxStaticText *FormattedText(wxWindow *p_parent, const wxString &p_label,
 AboutDialog::AboutDialog(wxWindow *p_parent)
   : wxDialog(p_parent, wxID_ANY, _T("About Gambit..."), wxDefaultPosition, wxDefaultSize)
 {
-  SetFont(wxFont(12, wxFONTFAMILY_ROMAN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD));
+  wxWindow::SetFont(wxFont(12, wxFONTFAMILY_ROMAN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD));
   auto *topSizer = new wxBoxSizer(wxVERTICAL);
 
   topSizer->Add(new wxStaticBitmap(this, wxID_STATIC, wxBitmap(gambitbig_xpm)), 0,
@@ -61,7 +62,7 @@ AboutDialog::AboutDialog(wxWindow *p_parent)
                     wxFont(12, wxFONTFAMILY_ROMAN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)),
       0, wxTOP | wxALIGN_CENTER, 20);
   topSizer->Add(
-      FormattedText(this, _T("http://www.wxwidgets.org"),
+      FormattedText(this, _T("https://www.wxwidgets.org"),
                     wxFont(12, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)),
       0, wxALIGN_CENTER, 5);
 
@@ -99,6 +100,7 @@ AboutDialog::AboutDialog(wxWindow *p_parent)
   topSizer->Fit(this);
   topSizer->SetSizeHints(this);
 
-  Layout();
+  wxTopLevelWindowBase::Layout();
   CenterOnParent();
 }
+} // namespace Gambit::GUI

src/gui/dlabout.h

@@ -20,13 +20,15 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#ifndef DLABOUT_H
-#define DLABOUT_H
+#ifndef GAMBIT_GUI_DLABOUT_H
+#define GAMBIT_GUI_DLABOUT_H
 
-class AboutDialog : public wxDialog {
+namespace Gambit::GUI {
+class AboutDialog final : public wxDialog {
 public:
   explicit AboutDialog(wxWindow *p_parent);
   ~AboutDialog() override = default;
 };
+} // namespace Gambit::GUI
 
-#endif // DLABOUT_H
+#endif // GAMBIT_GUI_DLABOUT_H