Remove GuiDataRepository that was Qt specific -> will need to include it to the Qt gui plugin

Author: bakpaul

Sofa/GUI/Common/CMakeLists.txt

@@ -35,7 +35,6 @@ set(HEADER_FILES
     ${SOFAGUICOMMON_ROOT}/BaseViewer.h
     ${SOFAGUICOMMON_ROOT}/ColourPickingVisitor.h
     ${SOFAGUICOMMON_ROOT}/FilesRecentlyOpenedManager.h
-    ${SOFAGUICOMMON_ROOT}/GuiDataRepository.h
     ${SOFAGUICOMMON_ROOT}/GUIManager.h
     ${SOFAGUICOMMON_ROOT}/MouseOperations.h
     ${SOFAGUICOMMON_ROOT}/OperationFactory.h
@@ -50,7 +49,6 @@ set(SOURCE_FILES
     ${SOFAGUICOMMON_ROOT}/BaseViewer.cpp
     ${SOFAGUICOMMON_ROOT}/ColourPickingVisitor.cpp
     ${SOFAGUICOMMON_ROOT}/FilesRecentlyOpenedManager.cpp
-    ${SOFAGUICOMMON_ROOT}/GuiDataRepository.cpp
     ${SOFAGUICOMMON_ROOT}/GUIManager.cpp
     ${SOFAGUICOMMON_ROOT}/MouseOperations.cpp
     ${SOFAGUICOMMON_ROOT}/PickHandler.cpp

Sofa/GUI/Common/src/sofa/gui/common/GuiDataRepository.cpp

@@ -78,9 +78,8 @@ using  sofa::helper::logging::RichConsoleStyleMessageFormatter ;
 using  sofa::helper::logging::MainPerComponentLoggingMessageHandler ;
 
 #include <sofa/helper/AdvancedTimer.h>
+#include <sofa/helper/system/FileRepository.h>
 
-#include <sofa/gui/common/GuiDataRepository.h>
-using sofa::gui::common::GuiDataRepository ;
 
 using sofa::helper::system::DataRepository;
 using sofa::helper::system::PluginRepository;
@@ -115,18 +114,15 @@ static std::string appName { "runSofa" };
 // ---------------------------------------------------------------------
 int main(int argc, char** argv)
 {
-    // Add resources dir to GuiDataRepository
-    const std::string runSofaIniFilePath = Utils::getSofaPathTo("/etc/runSofa.ini");
-    std::map<std::string, std::string> iniFileValues = Utils::readBasicIniFile(runSofaIniFilePath);
-    if (iniFileValues.find("RESOURCES_DIR") != iniFileValues.end())
-    {
-        std::string dir = iniFileValues["RESOURCES_DIR"];
-        dir = SetDirectory::GetRelativeFromProcess(dir.c_str());
-        if(FileSystem::isDirectory(dir))
-        {
-            sofa::gui::common::GuiDataRepository.addFirstPath(dir);
-        }
-    }
+    sofa::helper::system::FileRepository runSofaDataRepository(
+            "RUNSOFA_DATA_PATH",
+            {
+                    Utils::getSofaPathTo("share/sofa/gui/runSofa")
+            },
+            {
+                    { Utils::getSofaPathTo("etc/runSofa.ini").c_str(), {"RESOURCES_DIR"} }
+            }
+    );
 
     sofa::helper::BackTrace::autodump();
 
@@ -371,7 +367,7 @@ int main(int argc, char** argv)
     // Output FileRepositories
     msg_info(appName) << "PluginRepository paths = " << PluginRepository.getPathsJoined();
     msg_info(appName) << "DataRepository paths = " << DataRepository.getPathsJoined();
-    msg_info(appName) << "GuiDataRepository paths = " << GuiDataRepository.getPathsJoined();
+    msg_info(appName) << "runSofaDataRepository paths = " << runSofaDataRepository.getPathsJoined();
 
     // Initialise paths
     BaseGUI::setConfigDirectoryPath(Utils::getSofaPathPrefix() + "/config", true);