3 files changed, 13 insertions, 4 deletions

diff --git a/client/main.cpp b/client/main.cpp
index 1748331..4f86792 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -9,9 +9,8 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    new Console("Akonadi2 Client");
+    new Akonadi2::Console("Akonadi2 Client");
 
-    ResourceAccess *resAccess = 0;
     QCommandLineParser cliOptions;
     cliOptions.addPositionalArgument(QObject::tr("[resource]"),
                                      QObject::tr("A resource to connect to"));
@@ -22,9 +21,9 @@ int main(int argc, char *argv[])
     }
 
     for (const QString &resource: resources) {
-        resAccess = new ResourceAccess(resource);
+        Akonadi2::ResourceAccess *resAccess = new Akonadi2::ResourceAccess(resource);
         QObject::connect(&app, &QCoreApplication::aboutToQuit,
-                        resAccess, &ResourceAccess::close);
+                        resAccess, &Akonadi2::ResourceAccess::close);
         resAccess->open();
     }
 
diff --git a/client/resourceaccess.cpp b/client/resourceaccess.cpp
index bbc7f8b..82490ca 100644
--- a/client/resourceaccess.cpp
+++ b/client/resourceaccess.cpp
@@ -8,6 +8,9 @@
 #include <QDebug>
 #include <QProcess>
 
+namespace Akonadi2
+{
+
 ResourceAccess::ResourceAccess(const QString &resourceName, QObject *parent)
     : QObject(parent),
       m_resourceName(resourceName),
@@ -154,3 +157,5 @@ void ResourceAccess::log(const QString &message)
 {
     Console::main()->log(m_resourceName + ": " + message);
 }
+
+}
diff --git a/client/resourceaccess.h b/client/resourceaccess.h
index a77fe48..5877b1d 100644
--- a/client/resourceaccess.h
+++ b/client/resourceaccess.h
@@ -6,6 +6,9 @@
 
 #include <flatbuffers/flatbuffers.h>
 
+namespace Akonadi2
+{
+
 class ResourceAccess : public QObject
 {
     Q_OBJECT
@@ -41,3 +44,5 @@ private:
     QByteArray m_partialMessageBuffer;
     flatbuffers::FlatBufferBuilder m_fbb;
 };
+
+}