QuasarApp/qca
4
0
Fork 0
mirror of https://github.com/QuasarApp/qca.git synced 2025-04-27 03:54:31 +00:00
Code Issues Projects Releases Wiki Activity

Finish port to Qt5: plugins. Patch by Ivan Romanov.

Browse Source 
svn path=/trunk/kdesupport/qca/; revision=1347518
This commit is contained in:
David Faure 2013-04-02 12:41:12 +00:00
parent e00ed4ce20
commit 7d073db453
12 changed files with 62 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/qca-botan/qca-botan.cpp
View File

@ -500,6 +500,9 @@ private:
class botanPlugin : public QObject, public QCAPlugin
{
Q_OBJECT
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.psi-im.qca-botan")
#endif
Q_INTERFACES(QCAPlugin)
public:
virtual QCA::Provider *createProvider() { return new botanProvider; }
@ -507,5 +510,6 @@ public:
#include "qca-botan.moc"
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2(qca_botan, botanPlugin);
#endif

6
plugins/qca-cyrus-sasl/qca-cyrus-sasl.cpp
View File

@ -937,6 +937,9 @@ using namespace saslQCAPlugin;
class saslPlugin : public QObject, public QCAPlugin
{
Q_OBJECT
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.psi-im.qca-cyrus-sasl")
#endif
Q_INTERFACES(QCAPlugin)
public:
virtual Provider *createProvider() { return new saslProvider; }
@ -944,5 +947,6 @@ public:
#include "qca-cyrus-sasl.moc"
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2(qca_cyrus_sasl, saslPlugin)
#endif

6
plugins/qca-gcrypt/qca-gcrypt.cpp
View File

@ -583,6 +583,9 @@ public:
class gcryptPlugin : public QObject, public QCAPlugin
{
Q_OBJECT
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.psi-im.qca-gcrypt")
#endif
Q_INTERFACES(QCAPlugin)
public:
virtual QCA::Provider *createProvider() { return new gcryptProvider; }
@ -590,5 +593,6 @@ class gcryptPlugin : public QObject, public QCAPlugin
#include "qca-gcrypt.moc"
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2(qca_gcrypt, gcryptPlugin)
#endif

6
plugins/qca-gnupg/qca-gnupg.cpp
View File

@ -1785,11 +1785,15 @@ public:
class gnupgPlugin : public QObject, public QCAPlugin
{
Q_OBJECT
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.psi-im.qca-gnupg")
#endif
Q_INTERFACES(QCAPlugin)
public:
virtual QCA::Provider *createProvider() { return new gnupgProvider; }
};
#include "qca-gnupg.moc"
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2(qca_gnupg, gnupgPlugin)
#endif

5
plugins/qca-logger/qca-logger.cpp
View File

@ -211,6 +211,9 @@ private:
class loggerPlugin : public QObject, public QCAPlugin
{
Q_OBJECT
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.psi-im.qca-logger")
#endif
Q_INTERFACES(QCAPlugin)
public:
@ -219,4 +222,6 @@ public:
#include "qca-logger.moc"
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2(qca_logger, loggerPlugin)
#endif

6
plugins/qca-nss/qca-nss.cpp
View File

@ -503,6 +503,9 @@ public:
class nssPlugin : public QObject, public QCAPlugin
{
Q_OBJECT
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.psi-im.qca-nss")
#endif
Q_INTERFACES( QCAPlugin )
public:
virtual QCA::Provider *createProvider() { return new nssProvider; }
@ -510,5 +513,6 @@ public:
#include "qca-nss.moc"
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2(qca_nss, nssPlugin)
#endif

12
plugins/qca-ossl/qca-ossl.cpp
View File

@ -3099,7 +3099,7 @@ QDateTime ASN1_UTCTIME_QDateTime(ASN1_UTCTIME *tm, int *isGmt)
s = (v[10]-'0')*10+(v[11]-'0');
// localize the date and display it.
qdate.setYMD(y+1900, M, d);
qdate.setDate(y+1900, M, d);
qtime.setHMS(h,m,s);
qdt.setDate(qdate); qdt.setTime(qtime);
auq_err:
@ -4549,7 +4549,7 @@ public:
int aliasLength;
char *aliasData = (char*)X509_alias_get0(cert, &aliasLength);
*name = QString::fromAscii(aliasData, aliasLength);
*name = QString::fromLatin1(aliasData, aliasLength);
MyPKeyContext *pk = new MyPKeyContext(provider());
PKeyBase *k = pk->pkeyToBase(pkey, true); // does an EVP_PKEY_free()
@ -5743,7 +5743,7 @@ public:
if ( targetHostName.isEmpty() == false ) {
// we have a target
// this might fail, but we ignore that for now
char *hostname = targetHostName.toAscii().data();
char *hostname = targetHostName.toLatin1().data();
SSL_set_tlsext_host_name( ssl, hostname );
}
#endif
@ -7124,6 +7124,9 @@ public:
class opensslPlugin : public QObject, public QCAPlugin
{
Q_OBJECT
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.psi-im.qca-ossl")
#endif
Q_INTERFACES(QCAPlugin)
public:
virtual Provider *createProvider() { return new opensslProvider; }
@ -7131,5 +7134,6 @@ public:
#include "qca-ossl.moc"
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2(qca_ossl, opensslPlugin)
#endif

5
plugins/qca-pkcs11/qca-pkcs11.cpp
View File

@ -3097,6 +3097,9 @@ pkcs11Provider::_pinPromptHook (
class pkcs11Plugin : public QObject, public QCAPlugin
{
Q_OBJECT
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.psi-im.qca-pkcs11")
#endif
Q_INTERFACES(QCAPlugin)
public:
@ -3105,4 +3108,6 @@ public:
#include "qca-pkcs11.moc"
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2(qca_pkcs11, pkcs11Plugin)
#endif

4
plugins/qca-softstore/qca-softstore.cpp
View File

@ -1503,7 +1503,9 @@ const int softstoreProvider::_CONFIG_MAX_ENTRIES = 50;
class softstorePlugin : public QObject, public QCAPlugin
{
Q_OBJECT
#if QT_VERSION >= 0x050000
Q_INTERFACES(QCAPlugin)
#endif
public:
virtual Provider *createProvider() { return new softstoreProvider; }
@ -1511,4 +1513,6 @@ public:
#include "qca-softstore.moc"
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2(qca_softstore, softstorePlugin)
#endif

5
plugins/qca-test/qca-test.cpp
View File

@ -807,6 +807,9 @@ Provider::Context *TestProvider::createContext(const QString &type)
class TestPlugin : public QObject, public QCAPlugin
{
Q_OBJECT
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.psi-im.qca-test")
#endif
Q_INTERFACES(QCAPlugin)
public:
virtual Provider *createProvider() { return new TestProvider; }
@ -814,4 +817,6 @@ public:
#include "qca-test.moc"
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2(qca_test, TestPlugin);
#endif

5
plugins/qca-wincrypto/qca-wincrypto.cpp
View File

@ -102,13 +102,18 @@ public:
class WinCryptoPlugin : public QObject, public QCAPlugin
{
Q_OBJECT
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.psi-im.qca-wincrypto")
#endif
Q_INTERFACES(QCAPlugin)
public:
virtual QCA::Provider *createProvider() { return new WinCryptoProvider; }
};
#if QT_VERSION < 0x050000
#include "qca-wincrypto.moc"
#endif
Q_EXPORT_PLUGIN2(qca_wincrypto, WinCryptoPlugin);

5
plugins/qca-wingss/qca-wingss.cpp
View File

@ -2336,6 +2336,9 @@ using namespace wingssQCAPlugin;
class wingssPlugin : public QObject, public QCAPlugin
{
Q_OBJECT
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.psi-im.qca-wingss")
#endif
Q_INTERFACES(QCAPlugin)
public:
@ -2344,4 +2347,6 @@ public:
#include "qca-wingss.moc"
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2(qca_wingss, wingssPlugin)
#endif