diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-12-03 16:59:30 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-12-10 05:26:05 +0000 |
commit | 1289bc8172a6829884a670a2f91ee863add5d042 (patch) | |
tree | ac72a4da3d5b84d1c2fa09582a1f545ce4bae15b /tests/auto/network/ssl | |
parent | 872b9b231ef966ce7b2b40785ee92a0d4a8d2851 (diff) |
Tests: Remove empty init/cleanup slots, constructors and destructors.
Move some code (like registrations of meta types) from init() to
initTestCase() in the process.
Change-Id: I57db5156647cfadab554fbed853b2e68b2815f3b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Diffstat (limited to 'tests/auto/network/ssl')
4 files changed, 1 insertions, 56 deletions
diff --git a/tests/auto/network/ssl/qsslcipher/tst_qsslcipher.cpp b/tests/auto/network/ssl/qsslcipher/tst_qsslcipher.cpp index 37c3762eec..f5e58e03ca 100644 --- a/tests/auto/network/ssl/qsslcipher/tst_qsslcipher.cpp +++ b/tests/auto/network/ssl/qsslcipher/tst_qsslcipher.cpp @@ -42,44 +42,14 @@ class tst_QSslCipher : public QObject { Q_OBJECT -public: - tst_QSslCipher(); - virtual ~tst_QSslCipher(); - -public slots: - void initTestCase_data(); - void init(); - void cleanup(); - #ifndef QT_NO_SSL private slots: void constructing(); -#endif +#endif // QT_NO_SSL }; -tst_QSslCipher::tst_QSslCipher() -{ -} - -tst_QSslCipher::~tst_QSslCipher() -{ - -} - -void tst_QSslCipher::initTestCase_data() -{ -} - -void tst_QSslCipher::init() -{ -} - -void tst_QSslCipher::cleanup() -{ -} - #ifndef QT_NO_SSL void tst_QSslCipher::constructing() diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index c7d655af3d..fc2848e488 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -102,7 +102,6 @@ class tst_QSslSocket : public QObject public: tst_QSslSocket(); - virtual ~tst_QSslSocket(); static void enterLoop(int secs) { @@ -290,10 +289,6 @@ tst_QSslSocket::tst_QSslSocket() #endif } -tst_QSslSocket::~tst_QSslSocket() -{ -} - enum ProxyTests { NoProxy = 0x00, Socks5Proxy = 0x01, diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp index 0608461e74..a2b2af008c 100644 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp @@ -57,8 +57,6 @@ class tst_QSslSocket_onDemandCertificates_member : public QObject int proxyAuthCalled; public: - tst_QSslSocket_onDemandCertificates_member(); - virtual ~tst_QSslSocket_onDemandCertificates_member(); #ifndef QT_NO_OPENSSL QSslSocketPtr newSocket(); @@ -80,14 +78,6 @@ private: #endif // QT_NO_OPENSSL }; -tst_QSslSocket_onDemandCertificates_member::tst_QSslSocket_onDemandCertificates_member() -{ -} - -tst_QSslSocket_onDemandCertificates_member::~tst_QSslSocket_onDemandCertificates_member() -{ -} - enum ProxyTests { NoProxy = 0x00, Socks5Proxy = 0x01, diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp index 877cc5c12b..ed6a0bd52f 100644 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp @@ -53,8 +53,6 @@ class tst_QSslSocket_onDemandCertificates_static : public QObject int proxyAuthCalled; public: - tst_QSslSocket_onDemandCertificates_static(); - virtual ~tst_QSslSocket_onDemandCertificates_static(); #ifndef QT_NO_OPENSSL QSslSocketPtr newSocket(); @@ -76,14 +74,6 @@ private: #endif // QT_NO_OPENSSL }; -tst_QSslSocket_onDemandCertificates_static::tst_QSslSocket_onDemandCertificates_static() -{ -} - -tst_QSslSocket_onDemandCertificates_static::~tst_QSslSocket_onDemandCertificates_static() -{ -} - enum ProxyTests { NoProxy = 0x00, Socks5Proxy = 0x01, |