Introduce Core namespace

Author: juzzlin

src/CMakeLists.txt

@@ -28,34 +28,34 @@ set(HEIMER_LIB_SRC
     editor_scene.cpp
     editor_view.cpp
     grid.cpp
-    hash_seed.cpp
     image.cpp
     image_manager.cpp
     item_filter.cpp
     layout_optimizer.cpp
     magic_zoom.cpp
     main_window.cpp
     mediator.cpp
-    mind_map_data.cpp
-    mind_map_data_base.cpp
     mouse_action.cpp
     node_action.hpp
     recent_files_manager.cpp
     selection_group.cpp
     state_machine.cpp
-    test_mode.cpp
     types.hpp
     undo_stack.cpp
-    user_exception.hpp
     utils.cpp
-    version.hpp
-    version_checker.cpp
 
     core/graph.cpp
+    core/hash_seed.cpp
+    core/mind_map_data.cpp
+    core/mind_map_data_base.cpp
     core/settings.cpp
     core/settings_proxy.cpp
     core/shadow_effect_params.hpp
     core/single_instance_container.cpp
+    core/test_mode.cpp
+    core/user_exception.hpp
+    core/version.hpp
+    core/version_checker.cpp
 
     dialogs/about_dialog.cpp
     dialogs/color_dialog.cpp

src/application.cpp

@@ -25,12 +25,12 @@
 #include "node_action.hpp"
 #include "recent_files_manager.hpp"
 #include "state_machine.hpp"
-#include "user_exception.hpp"
-#include "version_checker.hpp"
 
 #include "core/settings.hpp"
 #include "core/settings_proxy.hpp"
 #include "core/single_instance_container.hpp"
+#include "core/user_exception.hpp"
+#include "core/version_checker.hpp"
 
 #include "dialogs/layout_optimization_dialog.hpp"
 #include "dialogs/png_export_dialog.hpp"
@@ -144,7 +144,7 @@ void Application::parseArgs(int argc, char ** argv)
 Application::Application(int & argc, char ** argv)
   : m_app(argc, argv)
   , m_stateMachine(std::make_unique<StateMachine>())
-  , m_versionChecker(std::make_unique<VersionChecker>())
+  , m_versionChecker(std::make_unique<Core::VersionChecker>())
 {
     parseArgs(argc, argv);
 
@@ -211,7 +211,7 @@ Application::Application(int & argc, char ** argv)
         }
     }
 
-    connect(m_versionChecker.get(), &VersionChecker::newVersionFound, this, [this](Version version, QString downloadUrl) {
+    connect(m_versionChecker.get(), &Core::VersionChecker::newVersionFound, this, [this](Core::Version version, QString downloadUrl) {
         m_mainWindow->showStatusText(QString(tr("A new version %1 available at <a href='%2'>%2</a>")).arg(version.toString(), downloadUrl));
     });
     m_versionChecker->checkForNewReleases();

src/application.hpp

@@ -30,8 +30,10 @@ class EditorView;
 class ImageManager;
 class MainWindow;
 class Mediator;
-class Node;
+
+namespace Core {
 class VersionChecker;
+}
 
 namespace Dialogs {
 class PngExportDialog;
@@ -120,7 +122,7 @@ public slots:
 
     std::unique_ptr<Dialogs::SvgExportDialog> m_svgExportDialog;
 
-    std::unique_ptr<VersionChecker> m_versionChecker;
+    std::unique_ptr<Core::VersionChecker> m_versionChecker;
 };
 
 #endif // APPLICATION_HPP

src/core/graph.cpp

@@ -15,7 +15,7 @@
 
 #include "graph.hpp"
 
-#include "../test_mode.hpp"
+#include "test_mode.hpp"
 
 #include "simple_logger.hpp"
 
@@ -27,6 +27,8 @@
 #include <stdexcept>
 #include <string>
 
+namespace Core {
+
 namespace rv = ranges::views;
 
 namespace {
@@ -180,3 +182,5 @@ Graph::~Graph()
 
     juzzlin::L().debug() << "Graph deleted";
 }
+
+} // namespace Core

src/core/graph.hpp

@@ -25,6 +25,8 @@
 #include <unordered_map>
 #include <vector>
 
+namespace Core {
+
 class Graph
 {
 public:
@@ -95,4 +97,6 @@ class Graph
     int m_count = 0;
 };
 
+} // namespace Core
+
 #endif // GRAPH_HPP

src/hash_seed.cpp renamed to src/core/hash_seed.cpp

@@ -15,6 +15,8 @@
 
 #include "hash_seed.hpp"
 
+namespace Core {
+
 void HashSeed::init()
 {
 #if QT_VERSION >= 0x50600
@@ -23,3 +25,5 @@ void HashSeed::init()
     qt_qhash_seed.store(0);
 #endif
 }
+
+} // namespace Core

src/hash_seed.hpp renamed to src/core/hash_seed.hpp

@@ -22,10 +22,10 @@
 extern Q_CORE_EXPORT QBasicAtomicInt qt_qhash_seed;
 #endif
 
-namespace HashSeed {
+namespace Core::HashSeed {
 
 void init();
 
-}
+} // namespace Core::HashSeed
 
 #endif // HASH_SEED_HPP

src/mind_map_data.cpp renamed to src/core/mind_map_data.cpp

@@ -15,15 +15,17 @@
 
 #include "mind_map_data.hpp"
 
-#include "grid.hpp"
-#include "image_manager.hpp"
+#include "graph.hpp"
+#include "settings_proxy.hpp"
+#include "shadow_effect_params.hpp"
+#include "single_instance_container.hpp"
 
-#include "core/settings_proxy.hpp"
-#include "core/shadow_effect_params.hpp"
-#include "core/single_instance_container.hpp"
+#include "../grid.hpp"
+#include "../image_manager.hpp"
 
-#include "core/graph.hpp"
-#include "scene_items/node.hpp"
+#include "../scene_items/node.hpp"
+
+namespace Core {
 
 struct MindMapData::Style
 {
@@ -307,3 +309,5 @@ void MindMapData::setVersion(const QString & version)
 }
 
 MindMapData::~MindMapData() = default;
+
+} // namespace Core

src/mind_map_data.hpp renamed to src/core/mind_map_data.hpp

@@ -24,12 +24,15 @@
 #include "constants.hpp"
 #include "mind_map_data_base.hpp"
 
-class Graph;
 class Grid;
 class ImageManager;
 class ObjectModelLoader;
 struct ShadowEffectParams;
 
+namespace Core {
+
+class Graph;
+
 class MindMapData : public MindMapDataBase
 {
 public:
@@ -125,6 +128,6 @@ class MindMapData : public MindMapDataBase
     LayoutOptimizerParameters m_layoutOptimizerParameters;
 };
 
-typedef std::shared_ptr<MindMapData> MindMapDataPtr;
+} // namespace Core
 
 #endif // MIND_MAP_DATA_HPP

src/mind_map_data_base.cpp renamed to src/core/mind_map_data_base.cpp

@@ -14,8 +14,11 @@
 // along with Heimer. If not, see <http://www.gnu.org/licenses/>.
 
 #include "test_mode.hpp"
+
 #include "simple_logger.hpp"
 
+namespace Core {
+
 bool TestMode::m_enabled = false;
 
 bool TestMode::enabled()
@@ -32,3 +35,5 @@ void TestMode::logDisabledCode(const std::string & message)
 {
     juzzlin::L().debug() << "TestMode: '" << message << "' disabled";
 }
+
+} // namespace Core

src/mind_map_data_base.hpp renamed to src/core/mind_map_data_base.hpp

@@ -18,6 +18,8 @@
 
 #include <string>
 
+namespace Core {
+
 class TestMode
 {
 public:
@@ -31,4 +33,6 @@ class TestMode
     static bool m_enabled;
 };
 
+} // namespace Core
+
 #endif // TEST_MODE_HPP

src/test_mode.cpp renamed to src/core/test_mode.cpp

@@ -19,6 +19,8 @@
 #include <stdexcept>
 #include <string>
 
+namespace Core {
+
 class UserException : public std::runtime_error
 {
 public:
@@ -28,4 +30,6 @@ class UserException : public std::runtime_error
     }
 };
 
+} // namespace Core
+
 #endif // USER_EXCEPTION_HPP

src/test_mode.hpp renamed to src/core/test_mode.hpp

@@ -26,6 +26,8 @@
 #undef minor
 #undef patch
 
+namespace Core {
+
 struct Version
 {
     Version()
@@ -120,4 +122,6 @@ inline std::ostream & operator<<(std::ostream & os, const Version & version)
     return os;
 }
 
+} // namespace Core
+
 #endif // VERSION_HPP

src/user_exception.hpp renamed to src/core/user_exception.hpp

@@ -23,6 +23,8 @@
 
 using juzzlin::L;
 
+namespace Core {
+
 VersionChecker::VersionChecker(QObject * parent)
   : QObject(parent)
 {
@@ -64,3 +66,5 @@ void VersionChecker::checkForNewReleases()
             });
     manager->get(QNetworkRequest({ Constants::Application::RELEASES_URL }));
 }
+
+} // namespace Core

src/version.hpp renamed to src/core/version.hpp

@@ -20,6 +20,8 @@
 
 #include "version.hpp"
 
+namespace Core {
+
 class VersionChecker : public QObject
 {
     Q_OBJECT
@@ -33,4 +35,6 @@ class VersionChecker : public QObject
     void newVersionFound(Version version, QString downloadUrl);
 };
 
+} // namespace Core
+
 #endif // VERSION_CHECKER_HPP

src/version_checker.cpp renamed to src/core/version_checker.cpp

@@ -17,7 +17,8 @@
 
 #include "../constants.hpp"
 #include "../layout_optimizer.hpp"
-#include "../mind_map_data.hpp"
+
+#include "../core/mind_map_data.hpp"
 
 #include "widget_factory.hpp"
 
@@ -35,7 +36,7 @@
 
 namespace Dialogs {
 
-LayoutOptimizationDialog::LayoutOptimizationDialog(QWidget & parent, MindMapData & mindMapData, LayoutOptimizer & layoutOptimizer)
+LayoutOptimizationDialog::LayoutOptimizationDialog(QWidget & parent, MindMapDataR mindMapData, LayoutOptimizer & layoutOptimizer)
   : QDialog(&parent)
   , m_mindMapData(mindMapData)
   , m_layoutOptimizer(layoutOptimizer)
@@ -68,7 +69,7 @@ void LayoutOptimizationDialog::finishOptimization()
     QTimer::singleShot(500, this, &QDialog::accept);
 }
 
-void LayoutOptimizationDialog::initWidgets(const MindMapData & mindMapData)
+void LayoutOptimizationDialog::initWidgets(MindMapDataCR mindMapData)
 {
     const auto mainLayout = new QVBoxLayout(this);
 

src/version_checker.hpp renamed to src/core/version_checker.hpp

@@ -18,8 +18,9 @@
 
 #include <QDialog>
 
+#include "../types.hpp"
+
 class LayoutOptimizer;
-class MindMapData;
 class QDoubleSpinBox;
 class QProgressBar;
 
@@ -31,7 +32,7 @@ class LayoutOptimizationDialog : public QDialog
 
 public:
     //! Constructor.
-    explicit LayoutOptimizationDialog(QWidget & parent, MindMapData & mindMapData, LayoutOptimizer & layoutOptimizer);
+    explicit LayoutOptimizationDialog(QWidget & parent, MindMapDataR mindMapData, LayoutOptimizer & layoutOptimizer);
 
     int exec() override;
 
@@ -44,9 +45,9 @@ private slots:
     void finishOptimization();
 
 private:
-    void initWidgets(const MindMapData & mindMapData);
+    void initWidgets(MindMapDataCR mindMapData);
 
-    MindMapData & m_mindMapData;
+    MindMapDataR m_mindMapData;
 
     LayoutOptimizer & m_layoutOptimizer;