From f88ab80c8a7510ff01410631eeaec81d48365316 Mon Sep 17 00:00:00 2001
From: Alejandro Exojo <suy@badopi.org>
Date: Fri, 21 Nov 2014 12:44:33 +0100
Subject: 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>
---
 src/network/ssl/qsslcertificate.cpp    | 4 ++--
 src/network/ssl/qsslcertificate.h      | 2 +-
 src/network/ssl/qsslsocket_openssl.cpp | 2 +-
 src/network/ssl/qsslsocket_openssl_p.h | 2 +-
 src/network/ssl/qsslsocket_winrt.cpp   | 2 +-
 src/network/ssl/qsslsocket_winrt_p.h   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/network')

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
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h
index e34ea97fc4..6aa7544815 100644
--- a/src/network/ssl/qsslcertificate.h
+++ b/src/network/ssl/qsslcertificate.h
@@ -138,7 +138,7 @@ public:
 
     static QList<QSslError> verify(QList<QSslCertificate> certificateChain, const QString &hostName = QString());
 
-    static bool importPKCS12(QIODevice *device,
+    static bool importPkcs12(QIODevice *device,
                              QSslKey *key, QSslCertificate *cert,
                              QList<QSslCertificate> *caCertificates=0,
                              const QByteArray &passPhrase=QByteArray());
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
index 84b0d9c75e..13fc534259 100644
--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
@@ -1671,7 +1671,7 @@ QList<QSslError> QSslSocketBackendPrivate::verify(QList<QSslCertificate> certifi
     return errors;
 }
 
-bool QSslSocketBackendPrivate::importPKCS12(QIODevice *device,
+bool QSslSocketBackendPrivate::importPkcs12(QIODevice *device,
                                             QSslKey *key, QSslCertificate *cert,
                                             QList<QSslCertificate> *caCertificates,
                                             const QByteArray &passPhrase)
diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h
index 8b02f32be0..29907e9ae7 100644
--- a/src/network/ssl/qsslsocket_openssl_p.h
+++ b/src/network/ssl/qsslsocket_openssl_p.h
@@ -136,7 +136,7 @@ public:
     static QList<QSslCertificate> STACKOFX509_to_QSslCertificates(STACK_OF(X509) *x509);
     static QList<QSslError> verify(QList<QSslCertificate> certificateChain, const QString &hostName);
     static QString getErrorsFromOpenSsl();
-    static bool importPKCS12(QIODevice *device,
+    static bool importPkcs12(QIODevice *device,
                              QSslKey *key, QSslCertificate *cert,
                              QList<QSslCertificate> *caCertificates,
                              const QByteArray &passPhrase);
diff --git a/src/network/ssl/qsslsocket_winrt.cpp b/src/network/ssl/qsslsocket_winrt.cpp
index da4c72be01..418a7416e4 100644
--- a/src/network/ssl/qsslsocket_winrt.cpp
+++ b/src/network/ssl/qsslsocket_winrt.cpp
@@ -661,7 +661,7 @@ QList<QSslError> QSslSocketBackendPrivate::verify(QList<QSslCertificate> certifi
     return errors;
 }
 
-bool QSslSocketBackendPrivate::importPKCS12(QIODevice *device,
+bool QSslSocketBackendPrivate::importPkcs12(QIODevice *device,
                          QSslKey *key, QSslCertificate *cert,
                          QList<QSslCertificate> *caCertificates,
                          const QByteArray &passPhrase)
diff --git a/src/network/ssl/qsslsocket_winrt_p.h b/src/network/ssl/qsslsocket_winrt_p.h
index aa31c85d6e..f0df7c6ef1 100644
--- a/src/network/ssl/qsslsocket_winrt_p.h
+++ b/src/network/ssl/qsslsocket_winrt_p.h
@@ -92,7 +92,7 @@ public:
 
     static QList<QSslCipher> defaultCiphers();
     static QList<QSslError> verify(QList<QSslCertificate> certificateChain, const QString &hostName);
-    static bool importPKCS12(QIODevice *device,
+    static bool importPkcs12(QIODevice *device,
                              QSslKey *key, QSslCertificate *cert,
                              QList<QSslCertificate> *caCertificates,
                              const QByteArray &passPhrase);
-- 
cgit v1.2.3