Use olm::Account instead of olm::Account::Account

Makefile

@@ -9,7 +9,6 @@ debug:
 		-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl \
 		-DBUILD_OLM=1
 	@cmake --build build
-	@cp build/compile_commands.json .
 
 release:
 	@cmake -GNinja -H. -Bbuild -DCMAKE_BUILD_TYPE=Release

src/crypto.cpp

@@ -2,10 +2,10 @@
 
 using json = nlohmann::json;
 
-std::shared_ptr<olm::Account::Account>
+std::shared_ptr<olm::Account>
 mtx::client::crypto::olm_new_account()
 {
-        auto olm_account    = std::make_shared<olm::Account::Account>();
+        auto olm_account    = std::make_shared<olm::Account>();
         const auto buf_size = olm_account->new_account_random_length();
         auto account_buf    = std::make_unique<uint8_t[]>(buf_size);
 
@@ -18,7 +18,7 @@ mtx::client::crypto::olm_new_account()
 }
 
 json
-mtx::client::crypto::identity_keys(std::shared_ptr<olm::Account::Account> account)
+mtx::client::crypto::identity_keys(std::shared_ptr<olm::Account> account)
 {
         const auto buf_size = account->get_identity_json_length();
         auto json_buf       = std::make_unique<uint8_t[]>(buf_size);
@@ -34,7 +34,7 @@ mtx::client::crypto::identity_keys(std::shared_ptr<olm::Account::Account> accoun
 }
 
 json
-mtx::client::crypto::one_time_keys(std::shared_ptr<olm::Account::Account> account)
+mtx::client::crypto::one_time_keys(std::shared_ptr<olm::Account> account)
 {
         const auto buf_size = account->get_one_time_keys_json_length();
         auto json_buf       = std::make_unique<uint8_t[]>(buf_size);

src/crypto.hpp

@@ -30,16 +30,16 @@ private:
 };
 
 //! Create a new olm Account.
-std::shared_ptr<olm::Account::Account>
+std::shared_ptr<olm::Account>
 olm_new_account();
 
 //! Retrieve the json representation of the identity keys for the given account.
 nlohmann::json
-identity_keys(std::shared_ptr<olm::Account::Account> user);
+identity_keys(std::shared_ptr<olm::Account> user);
 
 //! Retrieve the json representation of the one time keys for the given account.
 nlohmann::json
-one_time_keys(std::shared_ptr<olm::Account::Account> user);
+one_time_keys(std::shared_ptr<olm::Account> user);
 
 } // namespace crypto
 } // namespace client