QCAPlugin is now not a QObject, but subclasses are

svn path=/trunk/kdesupport/qca/; revision=653255

include/QtCrypto/qca_core.h

@@ -431,6 +431,7 @@ namespace QCA
 				l->logBinaryMessage (blob, s); \
 			} \
 		} while (false)
+
 	/**
 	   Test if QCA can access the root CA certificates
 

include/QtCrypto/qcaprovider.h

@@ -33,10 +33,10 @@
 
 #include <limits>
 
-class QCA_EXPORT QCAPlugin : public QObject
+class QCA_EXPORT QCAPlugin
 {
-	Q_OBJECT
 public:
+	virtual ~QCAPlugin() {}
 	virtual QCA::Provider *createProvider() = 0;
 };
 

plugins/qca-botan/qca-botan.cpp

@@ -458,7 +458,7 @@ private:
 
 };
 
-class botanPlugin : public QCAPlugin
+class botanPlugin : public QObject, public QCAPlugin
 {
 	Q_OBJECT
 	Q_INTERFACES(QCAPlugin)

plugins/qca-cyrus-sasl/qca-cyrus-sasl.cpp

@@ -895,7 +895,7 @@ using namespace saslQCAPlugin;
 // saslPlugin
 //----------------------------------------------------------------------------
 
-class saslPlugin : public QCAPlugin
+class saslPlugin : public QObject, public QCAPlugin
 {
 	Q_OBJECT
 	Q_INTERFACES(QCAPlugin)

plugins/qca-gcrypt/qca-gcrypt.cpp

@@ -574,7 +574,7 @@ public:
     }
 };
 
-class gcryptPlugin : public QCAPlugin
+class gcryptPlugin : public QObject, public QCAPlugin
 {
     Q_OBJECT
     Q_INTERFACES(QCAPlugin)

plugins/qca-gnupg/qca-gnupg.cpp

@@ -1001,7 +1001,7 @@ public:
 	}
 };
 
-class gnupgPlugin : public QCAPlugin
+class gnupgPlugin : public QObject, public QCAPlugin
 {
 	Q_OBJECT
 	Q_INTERFACES(QCAPlugin)

plugins/qca-nss/qca-nss.cpp

@@ -497,7 +497,7 @@ public:
     }
 };
 
-class nssPlugin : public QCAPlugin
+class nssPlugin : public QObject, public QCAPlugin
 {
 	Q_OBJECT
 	Q_INTERFACES( QCAPlugin )

plugins/qca-openssl/qca-openssl.cpp

@@ -6223,7 +6223,7 @@ public:
 	}
 };
 
-class opensslPlugin : public QCAPlugin
+class opensslPlugin : public QObject, public QCAPlugin
 {
 	Q_OBJECT
 	Q_INTERFACES(QCAPlugin)

plugins/qca-pkcs11/qca-pkcs11.cpp

@@ -2812,7 +2812,7 @@ pkcs11Provider::pinPromptHook (
 	return ret; //krazy:exclude=captruefalse
 }
 
-class pkcs11Plugin : public QCAPlugin
+class pkcs11Plugin : public QObject, public QCAPlugin
 {
 	Q_OBJECT
 	Q_INTERFACES(QCAPlugin)