Split initialization to 2 phases. initialize() and connectToServer()

2 files changed, 4 insertions, 1 deletions

diff --git a/include/resource-factory.h b/include/resource-factory.h
index 90131c9..2e544fe 100644
--- a/include/resource-factory.h
+++ b/include/resource-factory.h
@@ -5,12 +5,12 @@
 #include <QDBusConnection>
 #include "resource-types.h"
 
-class ResourceLibrary;
 class Resource;
 
 class ResourceFactory: public QObject
 {
    Q_OBJECT
+   Q_DISABLE_COPY( ResourceFactory );
 private:
    QDBusConnection sessionBusConnection;
 public:
diff --git a/include/resource.h b/include/resource.h
index 1cec065..3cdf8b8 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -9,6 +9,7 @@
 class Resource: public QObject
 {
    Q_OBJECT
+   Q_DISABLE_COPY( Resource );
    friend class ResourceFactory;
    friend class TestResource;
 private:
@@ -24,6 +25,8 @@ public:
    enum ResourceClass getResourceClass();
    quint16 getResourceFlags();
 
+   bool connectToServer();
+
    virtual bool requestExclusiveAccess();
    virtual bool releaseExclusiveAccess();
    virtual bool getExclusiveAccessState();