summaryrefslogtreecommitdiffstats
path: root/src/network/ssl/qsslcertificate.cpp
diff options
context:
space:
mode:
authorAlejandro Exojo <suy@badopi.org>2014-11-21 12:44:33 +0100
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2014-11-24 08:50:05 +0100
commitf88ab80c8a7510ff01410631eeaec81d48365316 (patch)
tree60d514452e50319252ea5f150ad4d97250a0c904 /src/network/ssl/qsslcertificate.cpp
parent78c43ce8ea882839bb507ebb2a71ec6752697d8e (diff)
Use camel case in PKCS#12 function
This makes it follow the coding style, which says to camel case acronyms too, and makes it consistent with the rest of the class. Change-Id: I4a1b21de1815530e476fc5aa8a0d41c724fc8021 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/network/ssl/qsslcertificate.cpp')
-rw-r--r--src/network/ssl/qsslcertificate.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index 13bddcb3ea..125a7a0250 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -575,12 +575,12 @@ QList<QSslError> QSslCertificate::verify(QList<QSslCertificate> certificateChain
\note The \a device must be open and ready to be read from.
*/
-bool QSslCertificate::importPKCS12(QIODevice *device,
+bool QSslCertificate::importPkcs12(QIODevice *device,
QSslKey *key, QSslCertificate *certificate,
QList<QSslCertificate> *caCertificates,
const QByteArray &passPhrase)
{
- return QSslSocketBackendPrivate::importPKCS12(device, key, certificate, caCertificates, passPhrase);
+ return QSslSocketBackendPrivate::importPkcs12(device, key, certificate, caCertificates, passPhrase);
}
// These certificates are known to be fraudulent and were created during the comodo