Changed the iGenerator interface to a pure abstract class.

diff --git a/src/apps/PswGen/Generator/CMakeLists.txt b/src/apps/PswGen/Generator/CMakeLists.txt
index dbf88efb09d68f9391f751ceb564b94d6703664a..9325fe95dba1965003a34a7d5b9e644fc018b284 100644 (file)
--- a/src/apps/PswGen/Generator/CMakeLists.txt
+++ b/src/apps/PswGen/Generator/CMakeLists.txt
@@ -21,7 +21,6 @@ set(SRCS
 
 # Header files for the meta-object compiler
 set(MOC_HDRS
-    igenerator.h
     module.h
 )
 

diff --git a/src/apps/PswGen/Generator/igenerator.h b/src/apps/PswGen/Generator/igenerator.h
index a702167a3778f8044feca015ce728dd7c911335b..3d1db68b0228640e33993707831a737f4dd21e8e 100644 (file)
--- a/src/apps/PswGen/Generator/igenerator.h
+++ b/src/apps/PswGen/Generator/igenerator.h
@@ -20,8 +20,6 @@
 #ifndef __PSWGEN_GENERATOR_IGENERATOR_H
 #  define __PSWGEN_GENERATOR_IGENERATOR_H
 
-#include "lib.h"
-
 #include <QObject>
 #include <QString>
 
@@ -33,17 +31,8 @@ namespace PswGen {
  *
  * This interface is used to generate strong passwords.
  */
-class PSWGEN_GENERATOR_EXPORT iGenerator : public QObject
+struct iGenerator
 {
-    Q_OBJECT
-
-public:
-
-    /// Interface constructor
-    iGenerator() : QObject() {}
-
-    /// Empty virtual destructor
-    virtual ~iGenerator() {}
 
     /**
      * Flags for the password generator.
@@ -85,4 +74,6 @@ public:
 } // namespace eVaf::PswGen
 } // namespace eVaf
 
+Q_DECLARE_INTERFACE(eVaf::PswGen::iGenerator, "eVaf.PswGen.iGenerator/1.0")
+
 #endif // igenerator.h

diff --git a/src/apps/PswGen/Generator/module.cpp b/src/apps/PswGen/Generator/module.cpp
index 27354f52a630575fa5e9e1ff3f99d3f58b501923..e19933ba4ed8c1fe30599ec6a572aa313a50cdb2 100644 (file)
--- a/src/apps/PswGen/Generator/module.cpp
+++ b/src/apps/PswGen/Generator/module.cpp
@@ -71,7 +71,7 @@ void Module::done()
 using namespace eVaf::PswGen::Generator::Internal;
 
 GeneratorImpl::GeneratorImpl()
-    : iGenerator()
+    : QObject()
 {
     setObjectName(QString("%1.iGenerator").arg(VER_MODULE_NAME_STR));
 

diff --git a/src/apps/PswGen/Generator/module.h b/src/apps/PswGen/Generator/module.h
index a1be474308b283ebf564d29acd66c0dc2692469f..927adc61020dec453bad30f5993fde0876a07c7f 100644 (file)
--- a/src/apps/PswGen/Generator/module.h
+++ b/src/apps/PswGen/Generator/module.h
@@ -74,9 +74,10 @@ namespace Internal {
  * Implements the iGenerator interface using MD5 cryptographic hashes.
  */
 
-class GeneratorImpl : public iGenerator
+class GeneratorImpl : public QObject, public iGenerator
 {
     Q_OBJECT
+    Q_INTERFACES(eVaf::PswGen::iGenerator)
 
 public: