[qtaround] qtaround library is wrapped into namespace

Signed-off-by: Denis Zalevskiy <denis.zalevskiy@jolla.com>
sailfishos · Oct 7, 2014 · 7a63509 · 7a63509
1 parent 615e9be
commit 7a63509
Show file tree

Hide file tree

Showing 16 changed files with 61 additions and 7 deletions.
diff --git a/examples/test_cutes.cpp b/examples/test_cutes.cpp
@@ -7,6 +7,12 @@
 #include <QCoreApplication>
 #include <QDebug>
 
+namespace os = qtaround::os;
+namespace error = qtaround::error;
+namespace sys = qtaround::sys;
+namespace json = qtaround::json;
+namespace debug = qtaround::debug;
+
 int main(int argc, char *argv[])
 {
     QCoreApplication app(argc, argv);

diff --git a/include/vault/config.hpp b/include/vault/config.hpp
@@ -22,6 +22,8 @@ namespace vault { namespace config {
 
 namespace {
 
+namespace os = qtaround::os;
+
 const QString prefix = ".f8b52b7481393a3e6ade051ecfb549fa";
 
 static inline QString units_path(QString const &vaultDir)

diff --git a/include/vault/unit.hpp b/include/vault/unit.hpp
@@ -11,13 +11,14 @@
 #include <vault/config.hpp>
 #include <memory>
 
-namespace sys { class GetOpt; }
+namespace qtaround { namespace sys { class GetOpt; }}
 
 namespace vault { namespace unit {
 
-std::unique_ptr<sys::GetOpt> getopt();
+typedef std::unique_ptr<qtaround::sys::GetOpt> options_uptr;
+options_uptr getopt();
 
-int execute(std::unique_ptr<sys::GetOpt>, QVariantMap const &info);
+int execute(options_uptr, QVariantMap const &info);
 
 }}
 

diff --git a/qml/Vault/vault.cpp b/qml/Vault/vault.cpp
@@ -8,6 +8,10 @@
 
 #include "vault.hpp"
 
+namespace os = qtaround::os;
+namespace error = qtaround::error;
+namespace debug = qtaround::debug;
+
 Q_DECLARE_METATYPE(Vault::Operation)
 static const int _vault_operation_ __attribute__((unused))
 = qRegisterMetaType<Vault::Operation>();

diff --git a/src/transfer.cpp b/src/transfer.cpp
@@ -18,6 +18,12 @@
 #include "QVariant"
 #include "QMap"
 
+namespace os = qtaround::os;
+namespace subprocess = qtaround::subprocess;
+namespace error = qtaround::error;
+namespace debug = qtaround::debug;
+using qtaround::subprocess::Process;
+
 namespace {
 
 using vault::File;

diff --git a/src/transfer.hpp b/src/transfer.hpp
@@ -62,7 +62,7 @@ class CardTransfer : public QObject
 signals:
     void vaultChanged();
 private:
-    static subprocess::Process doIO(IoCmd const &info);
+    static qtaround::subprocess::Process doIO(IoCmd const &info);
     static void validateDump(QString const &archive, QVariantMap const &err);
     void estimateSpace();
     void exportStorage(progressCallback);

diff --git a/src/unit.cpp b/src/unit.cpp
@@ -15,6 +15,13 @@
 
 #include <QString>
 
+namespace os = qtaround::os;
+namespace error = qtaround::error;
+namespace sys = qtaround::sys;
+namespace util = qtaround::util;
+namespace json = qtaround::json;
+namespace debug = qtaround::debug;
+
 namespace vault { namespace unit {
 
 static const unsigned current_version = 1;

diff --git a/src/vault-cli.cpp b/src/vault-cli.cpp
@@ -13,6 +13,8 @@
 #include <vault/vault.hpp>
 #include <qtaround/debug.hpp>
 
+namespace debug = qtaround::debug;
+
 void set(QVariantMap &map, const QCommandLineParser &parser, const QString &option, bool optional = false)
 {
     if (!optional || parser.isSet(option)) {

diff --git a/src/vault.cpp b/src/vault.cpp
@@ -24,6 +24,12 @@
 #include <QDateTime>
 #include <QDir>
 
+namespace os = qtaround::os;
+namespace subprocess = qtaround::subprocess;
+namespace error = qtaround::error;
+namespace debug = qtaround::debug;
+
+
 namespace vault {
 
 static const QMap<File, QString> fileNames = {

diff --git a/src/vault_config.cpp b/src/vault_config.cpp
@@ -18,6 +18,11 @@
 #include <qtaround/debug.hpp>
 #include <qtaround/json.hpp>
 
+namespace os = qtaround::os;
+namespace error = qtaround::error;
+namespace json = qtaround::json;
+namespace debug = qtaround::debug;
+
 namespace vault { namespace config {
 
 Unit::Unit()

diff --git a/tests/transfer.cpp b/tests/transfer.cpp
@@ -22,6 +22,8 @@
 #include <iostream>
 #include <unistd.h>
 
+namespace subprocess = qtaround::subprocess;
+
 namespace tut
 {
 

diff --git a/tests/unit.cpp b/tests/unit.cpp
@@ -13,6 +13,11 @@
 #include <iostream>
 #include <unistd.h>
 
+namespace os = qtaround::os;
+namespace subprocess = qtaround::subprocess;
+namespace error = qtaround::error;
+namespace sys = qtaround::sys;
+
 namespace tut
 {
 
@@ -77,7 +82,7 @@ void setup()
         auto root_path = it.value();
 
         mkdir(root_path);
-        using os::path;
+        namespace path = os::path;
         auto dir_content = path::join(root_path, "content");
         mkdir(dir_content);
         mkdir(path::join(dir_content, "content_subdir"));

diff --git a/tests/unit1_vault_test.cpp b/tests/unit1_vault_test.cpp
@@ -21,7 +21,7 @@ int main(int argc, char *argv[])
         QCoreApplication app(argc, argv);
         using namespace vault::unit;
         execute(getopt(), info);
-    } catch (error::Error const &e) {
+    } catch (qtaround::error::Error const &e) {
         qDebug() << e;
     } catch (std::exception const &e) {
         qDebug() << e.what();

diff --git a/tests/unit_all.cpp b/tests/unit_all.cpp
@@ -31,7 +31,7 @@ int main(int argc, char *argv[])
         QCoreApplication app(argc, argv);
         using namespace vault::unit;
         execute(getopt(), info);
-    } catch (error::Error const &e) {
+    } catch (qtaround::error::Error const &e) {
         qDebug() << e;
     } catch (std::exception const &e) {
         qDebug() << e.what();

diff --git a/tests/vault.cpp b/tests/vault.cpp
@@ -16,6 +16,9 @@
 #include <iostream>
 #include <unistd.h>
 
+namespace os = qtaround::os;
+namespace error = qtaround::error;
+
 namespace tut
 {
 

diff --git a/tests/vault_context.hpp b/tests/vault_context.hpp
@@ -10,6 +10,11 @@
 
 namespace {
 
+using qtaround::subprocess::Process;
+namespace os = qtaround::os;
+namespace error = qtaround::error;
+namespace util = qtaround::util;
+
 QSet<QString> get_ftree(QString const &root)
 {
     Process ps;