From 04b86758fa0b7bb4e5542444926084c53ba46680 Mon Sep 17 00:00:00 2001 From: heck Date: Fri, 9 Apr 2021 00:10:57 +0200 Subject: [PATCH] Tests: framework.hh - no using directives in headers.... --- test/framework/framework.hh | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/test/framework/framework.hh b/test/framework/framework.hh index 6052cec..1bc3a37 100644 --- a/test/framework/framework.hh +++ b/test/framework/framework.hh @@ -10,20 +10,18 @@ #include -using namespace std; - namespace pEp { namespace Test { // manually set up test - void setup(vector &args); + void setup(std::vector &args); // call this in main() for auto set up void setup(int argc = 1, char **argv = nullptr); - void import_key_from_file(string filename); + void import_key_from_file(std::string filename); - using Message = shared_ptr<::message>; - using Identity = shared_ptr<::pEp_identity>; + using Message = std::shared_ptr<::message>; + using Identity = std::shared_ptr<::pEp_identity>; // use this instead of constructor to auto assign ::free_message as // deleter @@ -34,20 +32,20 @@ namespace pEp { Identity make_identity(::pEp_identity *ident); // MIME parser - Message mime_parse(string text); + Message mime_parse(std::string text); // MIME composer - string mime_compose(Message msg); + std::string mime_compose(Message msg); // Sync and Distribution decoder - string make_pEp_msg(Message msg); + std::string make_pEp_msg(Message msg); // wait until Sync has shut down void join_sync_thread(); struct Transport { - string inbox_path = "inbox"; - string outbox_path = "outbox"; + std::string inbox_path = "inbox"; + std::string outbox_path = "outbox"; // reads next message from inbox Message recv(); @@ -57,7 +55,7 @@ namespace pEp { }; extern Transport transport; - extern string path; + extern std::string path; }; // namespace Test }; // namespace pEp