diff --git a/app/sys/sys_gui/src/widgets/import_from_cloud_widget/import_from_cloud_widget.cpp b/app/sys/sys_gui/src/widgets/import_from_cloud_widget/import_from_cloud_widget.cpp index 023cd6aae2..3a3b5bc6de 100644 --- a/app/sys/sys_gui/src/widgets/import_from_cloud_widget/import_from_cloud_widget.cpp +++ b/app/sys/sys_gui/src/widgets/import_from_cloud_widget/import_from_cloud_widget.cpp @@ -923,7 +923,7 @@ void ImportFromCloudWidget::import() void ImportFromCloudWidget::loadExcludeTasksFilter() { - const std::string default_cfg_file_path = eCAL::GetConfiguration().GetYamlFilePath(); + const std::string default_cfg_file_path = eCAL::GetConfiguration().GetConfigurationFilePath(); QFile default_cfg_file(default_cfg_file_path.c_str()); if (default_cfg_file.exists()) { diff --git a/ecal/core/include/ecal/config/configuration.h b/ecal/core/include/ecal/config/configuration.h index 3f9e65b371..c947c4d147 100644 --- a/ecal/core/include/ecal/config/configuration.h +++ b/ecal/core/include/ecal/config/configuration.h @@ -58,7 +58,7 @@ namespace eCAL ECAL_API void InitFromConfig(); ECAL_API void InitFromFile(const std::string& yaml_path_); - ECAL_API std::string GetYamlFilePath() const; + ECAL_API std::string GetConfigurationFilePath() const; protected: std::string ecal_yaml_file_path; diff --git a/ecal/core/src/config/configuration.cpp b/ecal/core/src/config/configuration.cpp index b06e5968f2..5716d25c85 100644 --- a/ecal/core/src/config/configuration.cpp +++ b/ecal/core/src/config/configuration.cpp @@ -62,7 +62,7 @@ namespace eCAL Configuration::Configuration() = default; - std::string Configuration::GetYamlFilePath() const + std::string Configuration::GetConfigurationFilePath() const { return ecal_yaml_file_path; } diff --git a/ecal/core/src/config/ecal_config.cpp b/ecal/core/src/config/ecal_config.cpp index e6763316bb..bd0581ebe1 100644 --- a/ecal/core/src/config/ecal_config.cpp +++ b/ecal/core/src/config/ecal_config.cpp @@ -31,7 +31,7 @@ namespace eCAL // common ///////////////////////////////////// - std::string GetLoadedEcalIniPath () { return GetConfiguration().GetYamlFilePath(); } + std::string GetLoadedEcalIniPath () { return GetConfiguration().GetConfigurationFilePath(); } int GetRegistrationTimeoutMs () { return GetConfiguration().registration.registration_timeout; } int GetRegistrationRefreshMs () { return GetConfiguration().registration.registration_refresh; } diff --git a/ecal/core/src/config/ecal_config_initializer.cpp b/ecal/core/src/config/ecal_config_initializer.cpp index 12e9ba619f..034491b517 100644 --- a/ecal/core/src/config/ecal_config_initializer.cpp +++ b/ecal/core/src/config/ecal_config_initializer.cpp @@ -236,7 +236,7 @@ namespace eCAL Configuration::Configuration() = default; - std::string Configuration::GetYamlFilePath() const + std::string Configuration::GetConfigurationFilePath() const { return ecal_yaml_file_path; } diff --git a/ecal/core/src/config/ecal_path_processing.cpp b/ecal/core/src/config/ecal_path_processing.cpp index 7f5634bc1f..8e5f007ce4 100644 --- a/ecal/core/src/config/ecal_path_processing.cpp +++ b/ecal/core/src/config/ecal_path_processing.cpp @@ -339,7 +339,7 @@ namespace eCAL { std::string GeteCALLogDirImpl(const Util::IDirProvider& dir_provider_ /* = Util::DirProvider() */, const Util::IDirManager& dir_manager_ /* = Util::DirManager() */, const eCAL::Configuration& config_ /* = eCAL::GetConfiguration() */) { - std::string config_file_dir = dir_manager_.getDirectoryPath(eCAL::GetConfiguration().GetYamlFilePath()); + std::string config_file_dir = dir_manager_.getDirectoryPath(eCAL::GetConfiguration().GetConfigurationFilePath()); const std::vector log_paths = { dir_provider_.eCALEnvVar(ECAL_LOG_VAR),