Renamed manager_old.hpp back to manager.hpp

There isn't anything obsolete in manager.hpp.
Hence having _old in its name is unnecessary and misleading.

projectfiles/VC12/wesnoth.vcxproj

@@ -515,7 +515,7 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Addon\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Addon\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\src\addon\manager_old.cpp">
+    <ClCompile Include="..\..\src\addon\manager.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)Addon\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Addon\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Addon\</ObjectFileName>
@@ -3907,7 +3907,7 @@
     <ClInclude Include="..\..\src\actions\vision.hpp" />
     <ClInclude Include="..\..\src\addon\client.hpp" />
     <ClInclude Include="..\..\src\addon\info.hpp" />
-    <ClInclude Include="..\..\src\addon\manager_old.hpp" />
+    <ClInclude Include="..\..\src\addon\manager.hpp" />
     <ClInclude Include="..\..\src\addon\manager_ui.hpp" />
     <ClInclude Include="..\..\src\addon\state.hpp" />
     <ClInclude Include="..\..\src\addon\validation.hpp" />

projectfiles/VC12/wesnoth.vcxproj.filters

@@ -188,7 +188,7 @@
     <ClCompile Include="..\..\src\addon\info.cpp">
       <Filter>Addon</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\addon\manager_old.cpp">
+    <ClCompile Include="..\..\src\addon\manager.cpp">
       <Filter>Addon</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\addon\manager_ui.cpp">
@@ -1527,7 +1527,7 @@
     <ClInclude Include="..\..\src\addon\info.hpp">
       <Filter>Addon</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\addon\manager_old.hpp">
+    <ClInclude Include="..\..\src\addon\manager.hpp">
       <Filter>Addon</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\addon\manager_ui.hpp">

source_lists/wesnoth

@@ -16,7 +16,7 @@ actions/unit_creator.cpp
 actions/vision.cpp
 addon/client.cpp
 addon/info.cpp
-addon/manager_old.cpp
+addon/manager.cpp
 addon/manager_ui.cpp
 addon/state.cpp
 addon/validation.cpp

src/addon/client.cpp

@@ -14,7 +14,7 @@
 */
 
 #include "addon/info.hpp"
-#include "addon/manager_old.hpp"
+#include "addon/manager.hpp"
 #include "addon/validation.hpp"
 #include "cursor.hpp"
 #include "formula/string_utils.hpp"

src/addon/info.cpp

@@ -14,7 +14,7 @@
 
 #include "addon/info.hpp"
 
-#include "addon/manager_old.hpp"
+#include "addon/manager.hpp"
 #include "game_config.hpp"
 #include "config.hpp"
 #include "gettext.hpp"

src/addon/manager.cpp

@@ -13,7 +13,7 @@
    See the COPYING file for more details.
 */
 
-#include "addon/manager_old.hpp"
+#include "addon/manager.hpp"
 #include "addon/manager_ui.hpp"
 #include "filesystem.hpp"
 #include "formatter.hpp"

src/addon/manager_ui.cpp

@@ -16,7 +16,7 @@
 #include "addon/manager_ui.hpp"
 
 #include "addon/info.hpp"
-#include "addon/manager_old.hpp"
+#include "addon/manager.hpp"
 #include "addon/state.hpp"
 #include "filesystem.hpp"
 #include "formatter.hpp"

src/addon/state.cpp

@@ -15,7 +15,7 @@
 #include "addon/state.hpp"
 #include "config.hpp"
 
-#include "addon/manager_old.hpp"
+#include "addon/manager.hpp"
 #include "log.hpp"
 
 static lg::log_domain log_addons_client("addons-client");

src/game_config_manager.cpp

@@ -14,7 +14,7 @@
 #include "game_config_manager.hpp"
 
 #include "about.hpp"
-#include "addon/manager_old.hpp"
+#include "addon/manager.hpp"
 #include "ai/configuration.hpp"
 #include "cursor.hpp"
 #include "events.hpp"

src/game_initialization/multiplayer.cpp

@@ -13,7 +13,7 @@
 */
 #include "game_initialization/multiplayer.hpp"
 
-#include "addon/manager_old.hpp" // for get_installed_addons
+#include "addon/manager.hpp" // for get_installed_addons
 #include "config_assign.hpp"
 #include "font/sdl_ttf.hpp"
 #include "formula/string_utils.hpp"

src/gui/dialogs/addon/manager.cpp

@@ -395,6 +395,8 @@ void addon_manager::load_addon_list(window& window)
 	listbox& list = find_widget<listbox>(&window, "addons", false);
 	list.clear();
 
+	ids_.clear();
+
 	for(const auto & c : cfg_.child_range("campaign"))
 	{
 		ids_.push_back(c["name"]);

src/gui/dialogs/wml_error.cpp

@@ -17,7 +17,8 @@
 #include "gui/dialogs/wml_error.hpp"
 
 #include "addon/info.hpp"
-#include "addon/manager_old.hpp"
+// Needs the full path to avoid confusion with gui/dialogs/addon/manager.hpp.
+#include "../../addon/manager.hpp"
 #include "desktop/clipboard.hpp"
 #include "filesystem.hpp"
 #include "gui/auxiliary/find_widget.hpp"

src/wesnoth.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "addon/manager_old.hpp"
+#include "addon/manager.hpp"
 #include "build_info.hpp"
 #include "commandline_options.hpp"      // for commandline_options, etc
 #include "config.hpp"                   // for config, config::error, etc