From 3ed0c63b40198df6ecf3da9c1f935bc8d24ec620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 14 Dec 2023 18:49:55 -0500
Subject: [PATCH] AccountConfig: use std::filesystem::path
Change-Id: I344c6aa24aad4d0763d8b9dedab100467832920f
---
src/jamidht/jamiaccount.h | 2 +-
src/jamidht/jamiaccount_config.h | 2 +-
src/sip/sipaccount_config.h | 2 +-
src/sip/sipaccountbase_config.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/jamidht/jamiaccount.h b/src/jamidht/jamiaccount.h
index 78b2436904..1b0ab95202 100644
--- a/src/jamidht/jamiaccount.h
+++ b/src/jamidht/jamiaccount.h
@@ -147,7 +147,7 @@ public:
std::unique_ptr<AccountConfig> buildConfig() const override
{
- return std::make_unique<JamiAccountConfig>(getAccountID(), idPath_.string());
+ return std::make_unique<JamiAccountConfig>(getAccountID(), idPath_);
}
/**
diff --git a/src/jamidht/jamiaccount_config.h b/src/jamidht/jamiaccount_config.h
index afd0abb5b2..e50d013147 100644
--- a/src/jamidht/jamiaccount_config.h
+++ b/src/jamidht/jamiaccount_config.h
@@ -26,7 +26,7 @@ constexpr static const char* DEFAULT_TURN_PWD = "ring";
constexpr static const char* DEFAULT_TURN_REALM = "ring";
struct JamiAccountConfig : public SipAccountBaseConfig {
- JamiAccountConfig(const std::string& id = {}, const std::string& path = {})
+ JamiAccountConfig(const std::string& id = {}, const std::filesystem::path& path = {})
: SipAccountBaseConfig(std::string(ACCOUNT_TYPE_JAMI), id, path)
{
// Default values specific to Jami accounts
diff --git a/src/sip/sipaccount_config.h b/src/sip/sipaccount_config.h
index 5f0e2b7bd8..9d74269ea8 100644
--- a/src/sip/sipaccount_config.h
+++ b/src/sip/sipaccount_config.h
@@ -21,7 +21,7 @@ namespace jami {
constexpr static std::string_view ACCOUNT_TYPE_SIP = "SIP";
struct SipAccountConfig : public SipAccountBaseConfig {
- SipAccountConfig(const std::string& id = {}, const std::string& path = {}): SipAccountBaseConfig(std::string(ACCOUNT_TYPE_SIP), id, path) {}
+ SipAccountConfig(const std::string& id = {}, const std::filesystem::path& path = {}): SipAccountBaseConfig(std::string(ACCOUNT_TYPE_SIP), id, path) {}
void serialize(YAML::Emitter& out) const override;
void unserialize(const YAML::Node& node) override;
std::map<std::string, std::string> toMap() const override;
diff --git a/src/sip/sipaccountbase_config.h b/src/sip/sipaccountbase_config.h
index 3aaa3cfd65..318024542d 100644
--- a/src/sip/sipaccountbase_config.h
+++ b/src/sip/sipaccountbase_config.h
@@ -24,7 +24,7 @@ constexpr static unsigned MAX_PORT {65536};
constexpr static unsigned HALF_MAX_PORT {MAX_PORT / 2};
struct SipAccountBaseConfig: public AccountConfig {
- SipAccountBaseConfig(const std::string& type, const std::string& id, const std::string& path)
+ SipAccountBaseConfig(const std::string& type, const std::string& id, const std::filesystem::path& path)
: AccountConfig(type, id, path) {}
void serializeDiff(YAML::Emitter& out, const SipAccountBaseConfig& def) const;
--
GitLab