diff --git a/src/gui/command_line.cpp b/src/gui/command_line.cpp index 8ad9f48..8f9e80a 100644 --- a/src/gui/command_line.cpp +++ b/src/gui/command_line.cpp @@ -20,7 +20,7 @@ #include "app_config.h" #include -namespace mc { +namespace duck { CommandLineResult::CommandLineResult() : should_quit(false) { @@ -54,4 +54,4 @@ CommandLineResult parse_command_line (int argc, char* argv[]) { return retval; } -} //namespace mc +} //namespace duck diff --git a/src/gui/command_line.hpp b/src/gui/command_line.hpp index bee4d53..47eccc9 100644 --- a/src/gui/command_line.hpp +++ b/src/gui/command_line.hpp @@ -17,7 +17,7 @@ #pragma once -namespace mc { +namespace duck { struct CommandLineResult { CommandLineResult(); @@ -25,4 +25,4 @@ namespace mc { }; CommandLineResult parse_command_line (int argc, char* argv[]); -} //namespace mc +} //namespace duck diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 7dfa06f..401edc9 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -31,11 +31,11 @@ int main(int argc, char* argv[]) { std::cout << "Starting program\n"; #endif - auto command = mc::parse_command_line(argc, argv); + auto command = duck::parse_command_line(argc, argv); if (command.should_quit) return 0; - const int retval = mc::run_gui(g_def_icon_size, g_def_icon_fps); + const int retval = duck::run_gui(g_def_icon_size, g_def_icon_fps); #if !defined(NDEBUG) std::cout << "Leaving program with return code " << retval << '\n'; diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp index 6b719e7..e127646 100644 --- a/src/gui/main_window.cpp +++ b/src/gui/main_window.cpp @@ -6,7 +6,7 @@ #include #include -namespace mc { +namespace duck { MainWindow::MainWindow (int icon_size, int icon_fps, const std::string& caption) : m_grid1(*this, 3, true), m_grid2(*this, 3, true), @@ -61,4 +61,4 @@ void MainWindow::init_menu() { win.modality(); }); } -} //namespace mc +} //namespace duck diff --git a/src/gui/main_window.hpp b/src/gui/main_window.hpp index 2cad5d5..3c6ac23 100644 --- a/src/gui/main_window.hpp +++ b/src/gui/main_window.hpp @@ -6,7 +6,8 @@ #include #include -namespace mc { +namespace duck { + class MainWindow : public nana::form { public: MainWindow (int icon_size, int icon_fps, const std::string& caption); @@ -23,4 +24,4 @@ private: int m_icon_size; int m_icon_fps; }; -} //namespace mc +} //namespace duck diff --git a/src/gui/run_gui.cpp b/src/gui/run_gui.cpp index 9ae131f..295da35 100644 --- a/src/gui/run_gui.cpp +++ b/src/gui/run_gui.cpp @@ -2,7 +2,7 @@ #include "main_window.hpp" #include "app_config.h" -namespace mc { +namespace duck { int run_gui(int icon_size, int icon_fps) { MainWindow win(icon_size, icon_fps, APP_NAME); win.show(); @@ -10,4 +10,4 @@ int run_gui(int icon_size, int icon_fps) { nana::exec(); return 0; } -} //namespace mc +} //namespace duck diff --git a/src/gui/run_gui.hpp b/src/gui/run_gui.hpp index 3033ea1..118d858 100644 --- a/src/gui/run_gui.hpp +++ b/src/gui/run_gui.hpp @@ -1,5 +1,5 @@ #pragma once -namespace mc { +namespace duck { int run_gui(int icon_size, int icon_fps); -} //namespace mc +} //namespace duck diff --git a/src/gui/version_window.cpp b/src/gui/version_window.cpp index 0a3e793..214b62a 100644 --- a/src/gui/version_window.cpp +++ b/src/gui/version_window.cpp @@ -4,7 +4,7 @@ #include "git_version.h" #include -namespace mc { +namespace duck { namespace { const constexpr char g_gpl_text[] = APP_SHORT_DESC "\n" @@ -70,4 +70,4 @@ VersionWindow::VersionWindow(nana::window owner) : this->collocate(); } -} //namespace mc +} //namespace duck diff --git a/src/gui/version_window.hpp b/src/gui/version_window.hpp index 7154f6b..78c3a32 100644 --- a/src/gui/version_window.hpp +++ b/src/gui/version_window.hpp @@ -5,7 +5,7 @@ #include #include -namespace mc { +namespace duck { class VersionWindow : public nana::form { public: VersionWindow(nana::window owner); @@ -20,4 +20,4 @@ private: nana::textbox m_main_text; nana::button m_close; }; -} //namespace mc +} //namespace duck