- move functions to namespace snapper

diff --git a/client/proxy/errors.cc b/client/proxy/errors.cc
index c9c81f7e0bdc29f13d9e4d774fd579702037e0f7..bef7dd1322e89ae525f19f842eed9d3bb260cb00 100644 (file)
--- a/client/proxy/errors.cc
+++ b/client/proxy/errors.cc
@@ -29,9 +29,8 @@
 #include "errors.h"
 
 
-using namespace std;
-using namespace snapper;
-
+namespace snapper
+{
 
 void
 convert_exception(const DBus::ErrorException& e)
@@ -121,3 +120,5 @@ error_description(const DBus::ErrorException& e)
 
     return sformat(_("Failure (%s)."), name.c_str());
 }
+
+}

diff --git a/client/proxy/errors.h b/client/proxy/errors.h
index 0b6dc7331a6e3648b409c602ad00add2d7e8c267..259bc167d67e523154ddc4e47ad877ab9fff5d0a 100644 (file)
--- a/client/proxy/errors.h
+++ b/client/proxy/errors.h
@@ -21,9 +21,17 @@
  */
 
 
+#include <string>
+
 #include "dbus/DBusConnection.h"
 
 
+namespace snapper
+{
+
+    using std::string;
+
+
 /**
  * Translate an DBus exception to the corresponding snapper exception
  * (iff such exists). Unfinished.
@@ -40,3 +48,4 @@ convert_exception(const DBus::ErrorException& e) __attribute__ ((__noreturn__));
 string
 error_description(const DBus::ErrorException& e);
 
+}