Modified Action.h and created ActionPtrList based on ListsDeclaration…

….inc and ListsBody.inc. Implemented clear() in ListsDeclaration.inc and ListsBody.inc for std::vector and std::list code compatibility. For #102
end2endzone · Dec 30, 2021 · 7904429 · 7904429
1 parent 9b6d925
commit 7904429
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 33 deletions.
diff --git a/include/shellanything/Action.h b/include/shellanything/Action.h
@@ -26,7 +26,6 @@
 #define SA_ACTION_H
 
 #include "shellanything/Context.h"
-#include <vector>
 
 namespace shellanything
 {
@@ -37,11 +36,6 @@ namespace shellanything
   class Action
   {
   public:
-    /// <summary>
-    /// A list of Action class pointers.
-    /// </summary>
-    typedef std::vector<Action*> ActionPtrList;
-
     Action();
     virtual ~Action();
 
@@ -62,4 +56,13 @@ namespace shellanything
 
 } //namespace shellanything
 
+/// <summary>
+/// A list of Action pointer.
+/// </summary>
+#define SA_LISTS_CLASS_NAME ActionPtrList
+#define SA_LISTS_BASE_TYPE  Action *
+#include "shellanything/ListsDeclaration.inc"
+#undef SA_LISTS_BASE_TYPE
+#undef SA_LISTS_CLASS_NAME
+
 #endif //SA_ACTION_H
diff --git a/include/shellanything/DefaultSettings.h b/include/shellanything/DefaultSettings.h
@@ -27,7 +27,6 @@
 
 #include "shellanything/Action.h"
 #include <string>
-#include <vector>
 #include <stdint.h>
 
 namespace shellanything
@@ -58,10 +57,10 @@ namespace shellanything
     /// <summary>
     /// Get the list of action of the menu.
     /// </summary>
-    const Action::ActionPtrList & GetActions() const;
+    const ActionPtrList & GetActions() const;
 
   private:
-    Action::ActionPtrList mActions;
+    ActionPtrList mActions;
   };
 
 } //namespace shellanything

diff --git a/include/shellanything/ListsBody.inc b/include/shellanything/ListsBody.inc
@@ -22,6 +22,8 @@
 * SOFTWARE.
 *********************************************************************************/
 
+#include <vector>
+
 namespace shellanything
 {
 

diff --git a/include/shellanything/ListsDeclaration.inc b/include/shellanything/ListsDeclaration.inc
@@ -60,6 +60,7 @@
     /// Remove all elements in the list.
     /// </summary>
     void Clear();
+    inline void clear() { Clear(); } // for std::vector and std::list code compatibility.
 
     /// <summary>
     /// Get an element from an index.

diff --git a/include/shellanything/Menu.h b/include/shellanything/Menu.h
@@ -257,7 +257,7 @@ namespace shellanything
     /// <summary>
     /// Get the list of action of the menu.
     /// </summary>
-    const Action::ActionPtrList & GetActions() const;
+    const ActionPtrList & GetActions() const;
 
     /// <summary>
     /// Add a new sub menu to the menu. The menu instance takes ownership of the sub menu.
@@ -282,7 +282,7 @@ namespace shellanything
     std::string mName;
     int mNameMaxLength;
     std::string mDescription;
-    Action::ActionPtrList mActions;
+    ActionPtrList mActions;
     MenuPtrList2 mSubMenus;
   };
 

diff --git a/src/Action.cpp b/src/Action.cpp
@@ -36,3 +36,12 @@ namespace shellanything
   }
 
 } //namespace shellanything
+
+/// <summary>
+/// A list of Action pointer.
+/// </summary>
+#define SA_LISTS_CLASS_NAME ActionPtrList
+#define SA_LISTS_BASE_TYPE  Action *
+#include "shellanything/ListsBody.inc"
+#undef SA_LISTS_BASE_TYPE
+#undef SA_LISTS_CLASS_NAME
diff --git a/src/Configuration.cpp b/src/Configuration.cpp
@@ -49,15 +49,6 @@
 
 using namespace tinyxml2;
 
-/// <summary>
-/// A list of Configuration pointer.
-/// </summary>
-#define SA_LISTS_CLASS_NAME ConfigurationPtrList
-#define SA_LISTS_BASE_TYPE  Configuration *
-#include "shellanything/ListsBody.inc"
-#undef SA_LISTS_BASE_TYPE
-#undef SA_LISTS_CLASS_NAME
-
 namespace shellanything
 {
   std::string GetXmlEncoding(XMLDocument & doc, std::string & error)
@@ -301,7 +292,7 @@ namespace shellanything
       //configuration have default properties assigned
       LOG(INFO) << __FUNCTION__ << "(), initializing default properties of configuration file '" << mFilePath.c_str() << "'...";
 
-      const shellanything::Action::ActionPtrList & actions = mDefaults->GetActions();
+      const shellanything::ActionPtrList & actions = mDefaults->GetActions();
 
       //convert 'actions' to a list of <const shellanything::ActionProperty *>
       typedef std::vector<const ActionProperty *> ActionPropertyPtrList;
@@ -384,4 +375,13 @@ namespace shellanything
     mMenus.AddElement(menu);
   }
 
-} //namespace shellanything
+} //namespace shellanything
+
+/// <summary>
+/// A list of Configuration pointer.
+/// </summary>
+#define SA_LISTS_CLASS_NAME ConfigurationPtrList
+#define SA_LISTS_BASE_TYPE  Configuration *
+#include "shellanything/ListsBody.inc"
+#undef SA_LISTS_BASE_TYPE
+#undef SA_LISTS_CLASS_NAME
diff --git a/src/DefaultSettings.cpp b/src/DefaultSettings.cpp
@@ -43,10 +43,10 @@ namespace shellanything
 
   void DefaultSettings::AddAction(Action * action)
   {
-    mActions.push_back(action);
+    mActions.AddElement(action);
   }
 
-  const Action::ActionPtrList & DefaultSettings::GetActions() const
+  const ActionPtrList & DefaultSettings::GetActions() const
   {
     return mActions;
   }

diff --git a/src/Menu.cpp b/src/Menu.cpp
@@ -364,10 +364,10 @@ namespace shellanything
 
   void Menu::AddAction(Action * action)
   {
-    mActions.push_back(action);
+    mActions.AddElement(action);
   }
 
-  const Action::ActionPtrList & Menu::GetActions() const
+  const ActionPtrList & Menu::GetActions() const
   {
     return mActions;
   }

diff --git a/src/shellext.cpp b/src/shellext.cpp
@@ -688,7 +688,7 @@ HRESULT STDMETHODCALLTYPE CContextMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcm
   LOG(INFO) << __FUNCTION__ << "(), executing action(s) for menu '" << title.c_str() << "'...";
 
   //execute actions
-  const shellanything::Action::ActionPtrList & actions = menu->GetActions();
+  const shellanything::ActionPtrList & actions = menu->GetActions();
   for(size_t i=0; i<actions.size(); i++)
   {
     LOG(INFO) << __FUNCTION__ << "(), executing action " << (i+1) << " of " << actions.size() << ".";

diff --git a/test/TestObjectFactory.cpp b/test/TestObjectFactory.cpp
@@ -48,7 +48,7 @@ namespace shellanything { namespace test
     if (!m)
       return NULL;
 
-    Action::ActionPtrList actions = m->GetActions();
+    ActionPtrList actions = m->GetActions();
     for(size_t i=0; i<actions.size(); i++)
     {
       Action * action = actions[i];
@@ -65,7 +65,7 @@ namespace shellanything { namespace test
     if (!m)
       return NULL;
 
-    Action::ActionPtrList actions = m->GetActions();
+    ActionPtrList actions = m->GetActions();
     for(size_t i=0; i<actions.size(); i++)
     {
       Action * action = actions[i];
@@ -82,7 +82,7 @@ namespace shellanything { namespace test
     if (!m)
       return NULL;
 
-    Action::ActionPtrList actions = m->GetActions();
+    ActionPtrList actions = m->GetActions();
     for(size_t i=0; i<actions.size(); i++)
     {
       Action * action = actions[i];
@@ -99,7 +99,7 @@ namespace shellanything { namespace test
     if (!m)
       return NULL;
 
-    Action::ActionPtrList actions = m->GetActions();
+    ActionPtrList actions = m->GetActions();
     for(size_t i=0; i<actions.size(); i++)
     {
       Action * action = actions[i];
@@ -116,7 +116,7 @@ namespace shellanything { namespace test
     if (!m)
       return NULL;
 
-    Action::ActionPtrList actions = m->GetActions();
+    ActionPtrList actions = m->GetActions();
     for(size_t i=0; i<actions.size(); i++)
     {
       Action * action = actions[i];
@@ -133,7 +133,7 @@ namespace shellanything { namespace test
     if (!m)
       return NULL;
 
-    Action::ActionPtrList actions = m->GetActions();
+    ActionPtrList actions = m->GetActions();
     for(size_t i=0; i<actions.size(); i++)
     {
       Action * action = actions[i];