Modified ConfigManager and Configuration classes.

Removed usage of the Node class. For #102.
end2endzone · Jan 1, 2022 · aacb482 · aacb482
1 parent b94ea0c
commit aacb482
Show file tree

Hide file tree

Showing 19 changed files with 125 additions and 829 deletions.
diff --git a/include/shellanything/Action.h b/include/shellanything/Action.h
@@ -25,7 +25,6 @@
 #ifndef SA_ACTION_H
 #define SA_ACTION_H
 
-#include "shellanything/Node.h"
 #include "shellanything/Context.h"
 #include <vector>
 

diff --git a/include/shellanything/ConfigManager.h b/include/shellanything/ConfigManager.h
@@ -25,7 +25,6 @@
 #ifndef SA_CONFIGMANAGER_H
 #define SA_CONFIGMANAGER_H
 
-#include "shellanything/Node.h"
 #include "shellanything/Configuration.h"
 #include "shellanything/Context.h"
 
@@ -111,9 +110,13 @@ namespace shellanything
     void AddSearchPath(const std::string & path);
 
   private:
+    //methods
+    void DeleteChildren();
+    void DeleteChild(Configuration * config);
+
     //attributes
     PathList mPaths;
-    Node mConfigurations;
+    Configuration::ConfigurationPtrList mConfigurations;
   };
 
 } //namespace shellanything

diff --git a/include/shellanything/Configuration.h b/include/shellanything/Configuration.h
@@ -25,7 +25,6 @@
 #ifndef SA_CONFIGURATION_H
 #define SA_CONFIGURATION_H
 
-#include "shellanything/Node.h"
 #include "shellanything/Menu.h"
 #include "shellanything/DefaultSettings.h"
 #include <stdint.h>
@@ -36,7 +35,7 @@ namespace shellanything
   /// <summary>
   /// A configuration holds mutiple Menu instances.
   /// </summary>
-  class Configuration : public Node
+  class Configuration
   {
   public:
     /// <summary>
@@ -129,10 +128,21 @@ namespace shellanything
     /// <returns>Returns the DefaultSettings instance of the Configuration. Returns NULL if no DefaultSettings is set.</returns>
     const DefaultSettings * GetDefaultSettings() const;
 
+    /// <summary>
+    /// Add a Menu to this Configuration. The Configuration takes ownership of the Menu.
+    /// </summary>
+    /// <param name="menu">The Menu to add.</param>
+    void AddMenu(Menu * menu);
+
   private:
+    //methods
+    void DeleteChildren();
+    void DeleteChild(Menu* menu);
+
     DefaultSettings * mDefaults;
     uint64_t mFileModifiedDate;
     std::string mFilePath;
+    Menu::MenuPtrList mMenus;
   };
 
 } //namespace shellanything

diff --git a/include/shellanything/DefaultSettings.h b/include/shellanything/DefaultSettings.h
@@ -26,9 +26,6 @@
 #define SA_DEFAULTSETTINGS_H
 
 #include "shellanything/Action.h"
-#include <string>
-#include <vector>
-#include <stdint.h>
 
 namespace shellanything
 {

diff --git a/include/shellanything/Menu.h b/include/shellanything/Menu.h
@@ -25,7 +25,6 @@
 #ifndef SA_MENU_H
 #define SA_MENU_H
 
-#include "shellanything/Node.h"
 #include "shellanything/Icon.h"
 #include "shellanything/Validator.h"
 #include "shellanything/Action.h"
@@ -39,7 +38,7 @@ namespace shellanything
   /// <summary>
   /// The Menu class defines a displayed menu option.
   /// </summary>
-  class Menu : public Node
+  class Menu
   {
   public:
     /// <summary>
@@ -247,6 +246,12 @@ namespace shellanything
     /// </summary>
     const Action::ActionPtrList & GetActions() const;
 
+    /// <summary>
+    /// Add a new sub menu to the menu. The menu instance takes ownership of the sub menu.
+    /// </summary>
+    /// <param name="menu">The given menu to add as a sub menu</param>
+    void AddMenu(Menu* menu);
+
     /// <summary>
     /// Get the list of submenu of the menu.
     /// </summary>
@@ -265,6 +270,7 @@ namespace shellanything
     int mNameMaxLength;
     std::string mDescription;
     Action::ActionPtrList mActions;
+    MenuPtrList mSubMenus;
   };
 
 } //namespace shellanything

diff --git a/include/shellanything/Node.h b/include/shellanything/Node.h
diff --git a/include/shellanything/Validator.h b/include/shellanything/Validator.h
@@ -25,7 +25,6 @@
 #ifndef SA_VALIDATION_H
 #define SA_VALIDATION_H
 
-#include "shellanything/Node.h"
 #include "shellanything/Context.h"
 #include <string>
 #include <vector>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -41,7 +41,6 @@ set(SHELLANYTHING_HEADER_FILES ""
   ${CMAKE_SOURCE_DIR}/include/shellanything/DefaultSettings.h
   ${CMAKE_SOURCE_DIR}/include/shellanything/Icon.h
   ${CMAKE_SOURCE_DIR}/include/shellanything/Menu.h
-  ${CMAKE_SOURCE_DIR}/include/shellanything/Node.h
   ${CMAKE_SOURCE_DIR}/include/shellanything/Validator.h
 )
 
@@ -70,7 +69,6 @@ add_library(shellanything STATIC
   InputBox.h
   InputBox.cpp
   Menu.cpp
-  Node.cpp
   ObjectFactory.h
   ObjectFactory.cpp
   Unicode.h