Skip to content

Commit

Permalink
Changed GetYamlFIlePath to GetConfigurationFilePath.
Browse files Browse the repository at this point in the history
  • Loading branch information
Peguen committed Jan 17, 2025
1 parent 1d8fb01 commit a8213ae
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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())
{
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/include/ecal/config/configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/config/configuration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ namespace eCAL

Configuration::Configuration() = default;

std::string Configuration::GetYamlFilePath() const
std::string Configuration::GetConfigurationFilePath() const
{
return ecal_yaml_file_path;
}
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/config/ecal_config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/config/ecal_config_initializer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ namespace eCAL

Configuration::Configuration() = default;

std::string Configuration::GetYamlFilePath() const
std::string Configuration::GetConfigurationFilePath() const
{
return ecal_yaml_file_path;
}
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/config/ecal_path_processing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<std::string> log_paths = {
dir_provider_.eCALEnvVar(ECAL_LOG_VAR),
Expand Down

0 comments on commit a8213ae

Please sign in to comment.