4 files changed, 61 insertions, 27 deletions

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index fab7708..3431756 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -13,6 +13,7 @@ endif (STORAGE_unqlite)
 set(command_SRCS
     commands.cpp
     console.cpp
+    resource.cpp
     resourceaccess.cpp
     storage_common.cpp
     threadboundary.cpp
diff --git a/common/clientapi.h b/common/clientapi.h
index 3531462..88cdfcb 100644
--- a/common/clientapi.h
+++ b/common/clientapi.h
@@ -435,31 +435,5 @@ public:
     }
 };
 
-class Resource
-{
-public:
-    Resource();
-    virtual ~Resource();
-
-private:
-    class Private;
-    Private * const d;
-};
-
-class ResourceFactory : public QObject
-{
-public:
-    ResourceFactory(QObject *parent);
-    virtual ~ResourceFactory();
-
-    virtual Resource *createResource() = 0;
-    virtual void registerFacade(FacadeFactory &factory) = 0;
-
-private:
-    class Private;
-    Private * const d;
-};
 }
 
-Q_DECLARE_INTERFACE(Akonadi2::ResourceFactory, "org.kde.akonadi2.resourcefactory")
-
diff --git a/common/clientapi.cpp b/common/resource.cpp
index 88797cc..26d57d5 100644
--- a/common/clientapi.cpp
+++ b/common/resource.cpp
@@ -18,7 +18,10 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clientapi.h"
+#include "resource.h"
+
+namespace Akonadi2
+{
 
 Resource::Resource()
     : d(0)
@@ -43,3 +46,4 @@ ResourceFactory::~ResourceFactory()
     //delete d;
 }
 
+} // namespace Akonadi2
diff --git a/common/resource.h b/common/resource.h
new file mode 100644
index 0000000..49ef50b
--- /dev/null
+++ b/common/resource.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2014 Aaron Seigo <aseigo@kde.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) version 3, or any
+ * later version accepted by the membership of KDE e.V. (or its
+ * successor approved by the membership of KDE e.V.), which shall
+ * act as a proxy defined in Section 6 of version 3 of the license.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "clientapi.h"
+
+namespace Akonadi2
+{
+
+class Resource
+{
+public:
+    Resource();
+    virtual ~Resource();
+
+private:
+    class Private;
+    Private * const d;
+};
+
+class ResourceFactory : public QObject
+{
+public:
+    ResourceFactory(QObject *parent);
+    virtual ~ResourceFactory();
+
+    virtual Resource *createResource() = 0;
+    virtual void registerFacade(FacadeFactory &factory) = 0;
+
+private:
+    class Private;
+    Private * const d;
+};
+
+} // namespace Akonadi2
+
+Q_DECLARE_INTERFACE(Akonadi2::ResourceFactory, "org.kde.akonadi2.resourcefactory")
+
+