NEW: Add version to factory

smcore/about.cpp

@@ -35,8 +35,8 @@ Version <InsertVersionInfoHere> [InsertBuildInformationHere]
 SourceMonitor Team
 http://www.github.com/SourceMonitor
 © SourceMonitor Team)~~~~";
-
             return aboutText;
         }
+        //******************************************************************************
     }
 }

smcore/factory.cpp

@@ -22,19 +22,29 @@
 
 #include "factory.h"
 
+#include <map>
+#include <unordered_map>
+
 namespace smos
 {
     namespace smcore
     {
         //******************************************************************************
         Options *Factory::getOptions(smos::smcore::SMString optionsfile)
         {
-            static Options *smOptions = nullptr;
-            if (nullptr == smOptions)
+            static std::unordered_map<smos::smcore::SMString, Options *> programOptions;
+            if (programOptions.find(optionsfile) == programOptions.end())
             {
-                smOptions = new Options(optionsfile);
+                programOptions.insert(std::make_pair(optionsfile, new Options(optionsfile)));
             }
-            return smOptions;
+            return programOptions[optionsfile];
         }
+        //******************************************************************************
+        Version *Factory::getVersion(void)
+        {
+            static Version smVersion;
+            return &smVersion;
+        }
+        //******************************************************************************
     }
 }

smcore/factory.h

@@ -22,18 +22,37 @@
 
 #pragma once
 
-#include "options.h"
 #include <memory.h>
+
+#include "options.h"
 #include "smstring.h"
+#include "version.h"
 
 namespace smos
 {
     namespace smcore
     {
+        /**
+         * @brief Factory class to retrieve specific objects from
+         */
         class Factory
         {
         public:
+            /**
+             * @brief Get the options object
+             *
+             * @param optionsfile Name of options file
+             *
+             * @return Options* Pointer to options object
+             */
             static Options *getOptions(smos::smcore::SMString optionsfile);
+
+            /**
+             * @brief Get the version object
+             *
+             * @return Version* Pointer to version object
+             */
+            static Version *getVersion(void);
         };
     }
 }

smcore/license.cpp

@@ -55,5 +55,6 @@ DEALINGS IN THE SOFTWARE.
 )~~~~";
             return licenseText;
         }
+        //******************************************************************************
     }
 }

smcore/options.cpp

@@ -54,5 +54,6 @@ namespace smos
         {
             this->m_logfileName = logfileName;
         }
+        //******************************************************************************
     }
 }

smcore/options.h

@@ -25,9 +25,10 @@
 
 #pragma once
 
-#include "smstring.h"
 #include <memory>
 
+#include "smstring.h"
+
 namespace smos
 {
     namespace smcore

smcore/project.cpp

@@ -21,14 +21,15 @@
 //******************************************************************************
 
 #include "project.h"
+
 #include <filesystem>
 
 namespace smos
 {
     namespace smcore
     {
         //******************************************************************************
-        Project::Project(void)
+        Project::Project(void) : m_ClassVersion(0)
         {
         }
         //******************************************************************************
@@ -73,13 +74,13 @@ namespace smos
         //******************************************************************************
         std::ostream &operator<<(std::ostream &os, const Project &obj)
         {
-            os << obj.m_ProjectName << std::endl;
+            os << obj.m_ClassVersion << obj.m_ProjectName;
             return os;
         }
         //******************************************************************************
         std::istream &operator>>(std::istream &is, Project &obj)
         {
-            is >> obj.m_ProjectName;
+            is >> obj.m_ClassVersion >> obj.m_ProjectName;
             return is;
         }
         //******************************************************************************

smcore/project.h

@@ -22,11 +22,12 @@
 
 #pragma once
 
-#include <iostream>
+#include <ctime>
 #include <fstream>
+#include <iostream>
 
-#include "smstring.h"
 #include "error.h"
+#include "smstring.h"
 
 namespace smos
 {
@@ -101,6 +102,11 @@ namespace smos
             friend std::istream &operator>>(std::istream &is, Project &obj);
 
         private:
+            /**
+             * @brief Number of current class version for versioning
+             */
+            uint16_t m_ClassVersion;
+
             /**
              * @brief Name of project
              */

smcore/smcore.cpp

@@ -30,5 +30,6 @@ namespace smos
         SMCore::SMCore(void)
         {
         }
+        //******************************************************************************
     }
 }

smcore/smstring.cpp

@@ -26,5 +26,6 @@ namespace smos
 {
     namespace smcore
     {
+        //******************************************************************************
     }
 }

smcore/version.cpp

@@ -21,6 +21,7 @@
 //******************************************************************************
 
 #include "version.h"
+
 #include <sstream>
 
 namespace smos
@@ -81,11 +82,28 @@ namespace smos
             return result;
         }
         //******************************************************************************
-        void Version::SetVersion(const short &major, const short &minor, const short &revision)
+        void Version::SetVersion(const uint16_t major, const uint16_t minor, const uint16_t revision)
         {
             this->m_major = major;
             this->m_minor = minor;
             this->m_revision = revision;
         }
+        //******************************************************************************
+        std::ostream &operator<<(std::ostream &os, const Version &obj)
+        {
+            os << obj.m_major;
+            os << obj.m_minor;
+            os << obj.m_revision;
+            return os;
+        }
+        //******************************************************************************
+        std::istream &operator>>(std::istream &is, Version &obj)
+        {
+            is >> obj.m_major;
+            is >> obj.m_minor;
+            is >> obj.m_revision;
+            return is;
+        }
+        //******************************************************************************
     }
 }

smcore/version.h

@@ -22,8 +22,12 @@
 
 #pragma once
 
-#include "smstring.h"
+#include <cstdint>
 #include <ctime>
+#include <fstream>
+#include <iostream>
+
+#include "smstring.h"
 
 namespace smos
 {
@@ -87,21 +91,41 @@ namespace smos
              * @param minor Minor version information
              * @param revision Revision version informationi
              */
-            void SetVersion(const short &major, const short &minor, const short &revision);
+            void SetVersion(const uint16_t major, const uint16_t minor, const uint16_t revision);
+
+            /**
+             * @brief Enable writing to stream
+             *
+             * @param os Outputstream to write to
+             * @param obj Version object to write to stream
+             *
+             * @return std::ostream&
+             */
+            friend std::ostream &operator<<(std::ostream &os, const Version &obj);
+
+            /**
+             * @brief Enable reading from stream
+             *
+             * @param is Inputstream to read from
+             * @param obj Version object to read from stream
+             *
+             * @return std::istream&
+             */
+            friend std::istream &operator>>(std::istream &is, Version &obj);
 
         private:
             /**
              * @brief Major version number
              */
-            short m_major;
+            uint16_t m_major;
             /**
              * @brief Minor version number
              */
-            short m_minor;
+            uint16_t m_minor;
             /**
              * @brief Revision version number
              */
-            short m_revision;
+            uint16_t m_revision;
         };
     }
 }