Modified ConfigManager to always return a copy of the internal Config…

…urations.
end2endzone · Dec 28, 2021 · 01fc6fb · 01fc6fb
1 parent deccf01
commit 01fc6fb
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 29 deletions.
diff --git a/include/shellanything/ConfigManager.h b/include/shellanything/ConfigManager.h
@@ -57,7 +57,7 @@ namespace shellanything
     /// <summary>
     /// Get the list of Configuration pointers handled by the manager
     /// </summary>
-    ConfigurationPtrList & GetConfigurations();
+    ConfigurationPtrList GetConfigurations();
 
     /// <summary>
     /// Returns true if the given path is a Configuration loaded by the manager.

diff --git a/src/ConfigManager.cpp b/src/ConfigManager.cpp
@@ -62,10 +62,10 @@ namespace shellanything
     LOG(INFO) << __FUNCTION__ << "()";
 
     //validate existing configurations
-    ConfigurationPtrList configs_copy = GetConfigurations();
-    for(size_t i=0; i< configs_copy.size(); i++)
+    ConfigurationPtrList configs = GetConfigurations();
+    for(size_t i=0; i< configs.size(); i++)
     {
-      Configuration * config = configs_copy[i];
+      Configuration * config = configs[i];
 
       //compare the file's date at the load time and the current date
       const std::string & file_path = config->GetFilePath();
@@ -143,7 +143,7 @@ namespace shellanything
   void ConfigManager::Update(const Context & context)
   {
     //for each child
-    ConfigurationPtrList & configurations = ConfigManager::GetConfigurations();
+    ConfigurationPtrList configurations = ConfigManager::GetConfigurations();
     for(size_t i=0; i<configurations.size(); i++)
     {
       Configuration * config = configurations[i];
@@ -154,7 +154,7 @@ namespace shellanything
   Menu * ConfigManager::FindMenuByCommandId(const uint32_t & command_id)
   {
     //for each child
-    ConfigurationPtrList & configurations = ConfigManager::GetConfigurations();
+    ConfigurationPtrList configurations = ConfigManager::GetConfigurations();
     for(size_t i=0; i<configurations.size(); i++)
     {
       Configuration * config = configurations[i];
@@ -171,7 +171,7 @@ namespace shellanything
     uint32_t nextCommandId = first_command_id;
 
     //for each child
-    ConfigurationPtrList & configurations = ConfigManager::GetConfigurations();
+    ConfigurationPtrList configurations = ConfigManager::GetConfigurations();
     for(size_t i=0; i<configurations.size(); i++)
     {
       Configuration * config = configurations[i];
@@ -181,7 +181,7 @@ namespace shellanything
     return nextCommandId;
   }
 
-  ConfigurationPtrList & ConfigManager::GetConfigurations()
+  ConfigurationPtrList ConfigManager::GetConfigurations()
   {
     return mConfigurations;
   }

diff --git a/src/shellext.cpp b/src/shellext.cpp
@@ -449,7 +449,7 @@ void CContextMenu::BuildMenuTree(HMENU hMenu)
 
   //for each configuration
   shellanything::ConfigManager & cmgr = shellanything::ConfigManager::GetInstance();
-  shellanything::ConfigurationPtrList & configs = cmgr.GetConfigurations();
+  shellanything::ConfigurationPtrList configs = cmgr.GetConfigurations();
   UINT insert_pos = 0;
   for(size_t i=0; i<configs.size(); i++)
   {

diff --git a/test/TestConfigManager.cpp b/test/TestConfigManager.cpp
@@ -133,7 +133,7 @@ namespace shellanything { namespace test
     cmgr.Refresh();
 
     //Delete the source file of all remaining Configuration instance
-    ConfigurationPtrList & configs = cmgr.GetConfigurations();
+    ConfigurationPtrList configs = cmgr.GetConfigurations();
     for(size_t i=0; i<configs.size(); i++)
     {
       Configuration * config = configs[i];
@@ -177,7 +177,7 @@ namespace shellanything { namespace test
     cmgr.Refresh();
 
     //ASSERT the file is loaded
-    ConfigurationPtrList & configs = cmgr.GetConfigurations();
+    ConfigurationPtrList configs = cmgr.GetConfigurations();
     ASSERT_EQ( 1, configs.size() );
 
     //ASSERT a single menu is available
@@ -232,7 +232,7 @@ namespace shellanything { namespace test
     cmgr.Refresh();
 
     //ASSERT the file is loaded
-    ConfigurationPtrList & configs = cmgr.GetConfigurations();
+    ConfigurationPtrList configs = cmgr.GetConfigurations();
     ASSERT_EQ( 1, configs.size() );
 
     //ASSERT a single menu is available
@@ -302,7 +302,7 @@ namespace shellanything { namespace test
     cmgr.Refresh();
 
     //ASSERT the files are loaded
-    ConfigurationPtrList & configs = cmgr.GetConfigurations();
+    ConfigurationPtrList configs = cmgr.GetConfigurations();
     ASSERT_EQ( 2, configs.size() );
 
     //Assign unique command ids
@@ -384,7 +384,7 @@ namespace shellanything { namespace test
     cmgr.Refresh();
 
     //ASSERT the file is loaded
-    ConfigurationPtrList & configs = cmgr.GetConfigurations();
+    ConfigurationPtrList configs = cmgr.GetConfigurations();
     ASSERT_EQ( 1, configs.size() );
 
     //act
@@ -421,7 +421,7 @@ namespace shellanything { namespace test
     cmgr.Refresh();
 
     //ASSERT the file is loaded
-    ConfigurationPtrList & configs = cmgr.GetConfigurations();
+    ConfigurationPtrList configs = cmgr.GetConfigurations();
     ASSERT_EQ( 1, configs.size() );
 
     //Query first menu
@@ -485,7 +485,7 @@ namespace shellanything { namespace test
     cmgr.Refresh();
 
     //ASSERT the file is loaded
-    ConfigurationPtrList & configs = cmgr.GetConfigurations();
+    ConfigurationPtrList configs = cmgr.GetConfigurations();
     ASSERT_EQ( 1, configs.size() );
 
     //Query all menus

diff --git a/test/TestConfiguration.cpp b/test/TestConfiguration.cpp
@@ -290,7 +290,7 @@ namespace shellanything { namespace test
     cmgr.Refresh();
 
     //ASSERT the file is loaded
-    ConfigurationPtrList & configs = cmgr.GetConfigurations();
+    ConfigurationPtrList configs = cmgr.GetConfigurations();
     ASSERT_EQ( 1, configs.size() );
 
     //ASSERT that properties was applied

diff --git a/test/TestObjectFactory.cpp b/test/TestObjectFactory.cpp
@@ -152,7 +152,7 @@ namespace shellanything { namespace test
     cmgr.Refresh();
 
     //Delete the source file of all remaining Configuration instance
-    ConfigurationPtrList & configs = cmgr.GetConfigurations();
+    ConfigurationPtrList configs = cmgr.GetConfigurations();
     for(size_t i=0; i<configs.size(); i++)
     {
       Configuration * config = configs[i];
@@ -197,7 +197,7 @@ namespace shellanything { namespace test
     cmgr.Refresh();
 
     //ASSERT the file is loaded
-    ConfigurationPtrList & configs = cmgr.GetConfigurations();
+    ConfigurationPtrList configs = cmgr.GetConfigurations();
     ASSERT_EQ( 1, configs.size() );
 
     //ASSERT all menus are available
@@ -289,7 +289,7 @@ namespace shellanything { namespace test
     cmgr.Refresh();
 
     //ASSERT the file is loaded
-    ConfigurationPtrList & configs = cmgr.GetConfigurations();
+    ConfigurationPtrList configs = cmgr.GetConfigurations();
     ASSERT_EQ( 1, configs.size() );
 
     //ASSERT all 3 menus are available
@@ -342,7 +342,7 @@ namespace shellanything { namespace test
     cmgr.Refresh();
 
     //ASSERT the file is loaded
-    ConfigurationPtrList & configs = cmgr.GetConfigurations();
+    ConfigurationPtrList configs = cmgr.GetConfigurations();
     ASSERT_EQ( 1, configs.size() );
 
     //ASSERT all 5 menus are available
@@ -383,7 +383,7 @@ namespace shellanything { namespace test
     cmgr.Refresh();
 
     //ASSERT the file is loaded
-    ConfigurationPtrList & configs = cmgr.GetConfigurations();
+    ConfigurationPtrList configs = cmgr.GetConfigurations();
     ASSERT_EQ( 1, configs.size() );
 
     //ASSERT all menus are available
@@ -447,7 +447,7 @@ namespace shellanything { namespace test
     cmgr.Refresh();
 
     //ASSERT the file is loaded
-    ConfigurationPtrList & configs = cmgr.GetConfigurations();
+    ConfigurationPtrList configs = cmgr.GetConfigurations();
     ASSERT_EQ( 1, configs.size() );
 
     //ASSERT a 13 menus are available
@@ -515,7 +515,7 @@ namespace shellanything { namespace test
     cmgr.Refresh();
 
     //ASSERT the file is loaded
-    ConfigurationPtrList & configs = cmgr.GetConfigurations();
+    ConfigurationPtrList configs = cmgr.GetConfigurations();
     ASSERT_EQ( 1, configs.size() );
 
     //ASSERT a 3 menus are available
@@ -573,7 +573,7 @@ namespace shellanything { namespace test
     cmgr.Refresh();
 
     //ASSERT the file is loaded
-    ConfigurationPtrList & configs = cmgr.GetConfigurations();
+    ConfigurationPtrList configs = cmgr.GetConfigurations();
     ASSERT_EQ( 1, configs.size() );
 
     //ASSERT a multiple menus are available
@@ -649,7 +649,7 @@ namespace shellanything { namespace test
     cmgr.Refresh();
 
     //ASSERT the file is loaded
-    ConfigurationPtrList & configs = cmgr.GetConfigurations();
+    ConfigurationPtrList configs = cmgr.GetConfigurations();
     ASSERT_EQ( 1, configs.size() );
 
     //ASSERT a multiple menus are available
@@ -709,7 +709,7 @@ namespace shellanything { namespace test
     cmgr.Refresh();
 
     //ASSERT the file is loaded
-    ConfigurationPtrList & configs = cmgr.GetConfigurations();
+    ConfigurationPtrList configs = cmgr.GetConfigurations();
     ASSERT_EQ( 1, configs.size() );
 
     //ASSERT a multiple menus are available
@@ -775,7 +775,7 @@ namespace shellanything { namespace test
     cmgr.Refresh();
 
     //ASSERT the file is loaded
-    ConfigurationPtrList & configs = cmgr.GetConfigurations();
+    ConfigurationPtrList configs = cmgr.GetConfigurations();
     ASSERT_EQ( 1, configs.size() );
 
     //ASSERT a DefaultSettings section is available
@@ -822,7 +822,7 @@ namespace shellanything { namespace test
     cmgr.Refresh();
 
     //ASSERT the file is loaded
-    ConfigurationPtrList & configs = cmgr.GetConfigurations();
+    ConfigurationPtrList configs = cmgr.GetConfigurations();
     ASSERT_EQ( 1, configs.size() );
 
     //ASSERT a multiple menus are available