[auth] Change static members prefix from 'm' to 's' as per coding standards

elpaso · elpaso · commit 79837b04f557 · 2017-10-11T14:05:57.000+02:00
diff --git a/src/auth/basic/qgsauthbasicmethod.cpp b/src/auth/basic/qgsauthbasicmethod.cpp
@@ -26,7 +26,7 @@
 static const QString AUTH_METHOD_KEY = "Basic";
 static const QString AUTH_METHOD_DESCRIPTION = "Basic authentication";
 
-QMap<QString, QgsAuthMethodConfig> QgsAuthBasicMethod::mAuthConfigCache = QMap<QString, QgsAuthMethodConfig>();
+QMap<QString, QgsAuthMethodConfig> QgsAuthBasicMethod::sAuthConfigCache = QMap<QString, QgsAuthMethodConfig>();
 
 
 QgsAuthBasicMethod::QgsAuthBasicMethod()
@@ -156,9 +156,9 @@ QgsAuthMethodConfig QgsAuthBasicMethod::getMethodConfig( const QString &authcfg,
   QgsAuthMethodConfig mconfig;
 
   // check if it is cached
-  if ( mAuthConfigCache.contains( authcfg ) )
+  if ( sAuthConfigCache.contains( authcfg ) )
   {
-    mconfig = mAuthConfigCache.value( authcfg );
+    mconfig = sAuthConfigCache.value( authcfg );
     QgsDebugMsg( QString( "Retrieved config for authcfg: %1" ).arg( authcfg ) );
     return mconfig;
   }
@@ -181,15 +181,15 @@ void QgsAuthBasicMethod::putMethodConfig( const QString &authcfg, const QgsAuthM
 {
   QMutexLocker locker( &mConfigMutex );
   QgsDebugMsg( QString( "Putting basic config for authcfg: %1" ).arg( authcfg ) );
-  mAuthConfigCache.insert( authcfg, mconfig );
+  sAuthConfigCache.insert( authcfg, mconfig );
 }
 
 void QgsAuthBasicMethod::removeMethodConfig( const QString &authcfg )
 {
   QMutexLocker locker( &mConfigMutex );
   if ( sAuthConfigCache.contains( authcfg ) )
   {
-    mAuthConfigCache.remove( authcfg );
+    sAuthConfigCache.remove( authcfg );
     QgsDebugMsg( QString( "Removed basic config for authcfg: %1" ).arg( authcfg ) );
   }
 }
diff --git a/src/auth/identcert/qgsauthidentcertmethod.cpp b/src/auth/identcert/qgsauthidentcertmethod.cpp
@@ -34,7 +34,7 @@
 static const QString AUTH_METHOD_KEY = "Identity-Cert";
 static const QString AUTH_METHOD_DESCRIPTION = "Identity certificate authentication";
 
-QMap<QString, QgsPkiConfigBundle *> QgsAuthIdentCertMethod::mPkiConfigBundleCache = QMap<QString, QgsPkiConfigBundle *>();
+QMap<QString, QgsPkiConfigBundle *> QgsAuthIdentCertMethod::sPkiConfigBundleCache = QMap<QString, QgsPkiConfigBundle *>();
 
 
 QgsAuthIdentCertMethod::QgsAuthIdentCertMethod()
@@ -226,9 +226,9 @@ QgsPkiConfigBundle *QgsAuthIdentCertMethod::getPkiConfigBundle( const QString &a
   QgsPkiConfigBundle *bundle = nullptr;
 
   // check if it is cached
-  if ( mPkiConfigBundleCache.contains( authcfg ) )
+  if ( sPkiConfigBundleCache.contains( authcfg ) )
   {
-    bundle = mPkiConfigBundleCache.value( authcfg );
+    bundle = sPkiConfigBundleCache.value( authcfg );
     if ( bundle )
     {
       QgsDebugMsg( QString( "Retrieved PKI bundle for authcfg %1" ).arg( authcfg ) );
@@ -278,15 +278,15 @@ void QgsAuthIdentCertMethod::putPkiConfigBundle( const QString &authcfg, QgsPkiC
 {
   QMutexLocker locker( &mConfigMutex );
   QgsDebugMsg( QString( "Putting PKI bundle for authcfg %1" ).arg( authcfg ) );
-  mPkiConfigBundleCache.insert( authcfg, pkibundle );
+  sPkiConfigBundleCache.insert( authcfg, pkibundle );
 }
 
 void QgsAuthIdentCertMethod::removePkiConfigBundle( const QString &authcfg )
 {
   QMutexLocker locker( &mConfigMutex );
   if ( sPkiConfigBundleCache.contains( authcfg ) )
   {
-    QgsPkiConfigBundle * pkibundle = mPkiConfigBundleCache.take( authcfg );
+    QgsPkiConfigBundle * pkibundle = sPkiConfigBundleCache.take( authcfg );
     delete pkibundle;
     pkibundle = nullptr;
     QgsDebugMsg( QString( "Removed PKI bundle for authcfg: %1" ).arg( authcfg ) );
diff --git a/src/auth/pkipaths/qgsauthpkipathsmethod.cpp b/src/auth/pkipaths/qgsauthpkipathsmethod.cpp
@@ -35,7 +35,7 @@
 static const QString AUTH_METHOD_KEY = "PKI-Paths";
 static const QString AUTH_METHOD_DESCRIPTION = "PKI paths authentication";
 
-QMap<QString, QgsPkiConfigBundle *> QgsAuthPkiPathsMethod::mPkiConfigBundleCache = QMap<QString, QgsPkiConfigBundle *>();
+QMap<QString, QgsPkiConfigBundle *> QgsAuthPkiPathsMethod::sPkiConfigBundleCache = QMap<QString, QgsPkiConfigBundle *>();
 
 
 QgsAuthPkiPathsMethod::QgsAuthPkiPathsMethod()
@@ -230,9 +230,9 @@ QgsPkiConfigBundle *QgsAuthPkiPathsMethod::getPkiConfigBundle( const QString &au
   QgsPkiConfigBundle *bundle = nullptr;
 
   // check if it is cached
-  if ( mPkiConfigBundleCache.contains( authcfg ) )
+  if ( sPkiConfigBundleCache.contains( authcfg ) )
   {
-    bundle = mPkiConfigBundleCache.value( authcfg );
+    bundle = sPkiConfigBundleCache.value( authcfg );
     if ( bundle )
     {
       QgsDebugMsg( QString( "Retrieved PKI bundle for authcfg %1" ).arg( authcfg ) );
@@ -280,15 +280,15 @@ void QgsAuthPkiPathsMethod::putPkiConfigBundle( const QString &authcfg, QgsPkiCo
 {
   QMutexLocker locker( &mConfigMutex );
   QgsDebugMsg( QString( "Putting PKI bundle for authcfg %1" ).arg( authcfg ) );
-  mPkiConfigBundleCache.insert( authcfg, pkibundle );
+  sPkiConfigBundleCache.insert( authcfg, pkibundle );
 }
 
 void QgsAuthPkiPathsMethod::removePkiConfigBundle( const QString &authcfg )
 {
   QMutexLocker locker( &mConfigMutex );
   if ( sPkiConfigBundleCache.contains( authcfg ) )
   {
-    QgsPkiConfigBundle * pkibundle = mPkiConfigBundleCache.take( authcfg );
+    QgsPkiConfigBundle * pkibundle = sPkiConfigBundleCache.take( authcfg );
     delete pkibundle;
     pkibundle = nullptr;
     QgsDebugMsg( QString( "Removed PKI bundle for authcfg: %1" ).arg( authcfg ) );
diff --git a/src/auth/pkipkcs12/qgsauthpkcs12method.cpp b/src/auth/pkipkcs12/qgsauthpkcs12method.cpp
@@ -35,7 +35,7 @@
 static const QString AUTH_METHOD_KEY = "PKI-PKCS#12";
 static const QString AUTH_METHOD_DESCRIPTION = "PKI PKCS#12 authentication";
 
-QMap<QString, QgsPkiConfigBundle *> QgsAuthPkcs12Method::mPkiConfigBundleCache = QMap<QString, QgsPkiConfigBundle *>();
+QMap<QString, QgsPkiConfigBundle *> QgsAuthPkcs12Method::sPkiConfigBundleCache = QMap<QString, QgsPkiConfigBundle *>();
 
 
 QgsAuthPkcs12Method::QgsAuthPkcs12Method()
@@ -228,9 +228,9 @@ QgsPkiConfigBundle *QgsAuthPkcs12Method::getPkiConfigBundle( const QString &auth
   QgsPkiConfigBundle *bundle = nullptr;
 
   // check if it is cached
-  if ( mPkiConfigBundleCache.contains( authcfg ) )
+  if ( sPkiConfigBundleCache.contains( authcfg ) )
   {
-    bundle = mPkiConfigBundleCache.value( authcfg );
+    bundle = sPkiConfigBundleCache.value( authcfg );
     if ( bundle )
     {
       QgsDebugMsg( QString( "Retrieved PKI bundle for authcfg %1" ).arg( authcfg ) );
@@ -286,15 +286,15 @@ void QgsAuthPkcs12Method::putPkiConfigBundle( const QString &authcfg, QgsPkiConf
 {
   QMutexLocker locker( &mConfigMutex );
   QgsDebugMsg( QString( "Putting PKI bundle for authcfg %1" ).arg( authcfg ) );
-  mPkiConfigBundleCache.insert( authcfg, pkibundle );
+  sPkiConfigBundleCache.insert( authcfg, pkibundle );
 }
 
 void QgsAuthPkcs12Method::removePkiConfigBundle( const QString &authcfg )
 {
   QMutexLocker locker( &mConfigMutex );
   if ( sPkiConfigBundleCache.contains( authcfg ) )
   {
-    QgsPkiConfigBundle * pkibundle = mPkiConfigBundleCache.take( authcfg );
+    QgsPkiConfigBundle * pkibundle = sPkiConfigBundleCache.take( authcfg );
     delete pkibundle;
     pkibundle = nullptr;
     QgsDebugMsg( QString( "Removed PKI bundle for authcfg: %1" ).arg( authcfg ) );

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`static const QString AUTH_METHOD_KEY = "Basic";`
`27`	`27`	`static const QString AUTH_METHOD_DESCRIPTION = "Basic authentication";`
`28`	`28`
`29`		`-QMap<QString, QgsAuthMethodConfig> QgsAuthBasicMethod::mAuthConfigCache = QMap<QString, QgsAuthMethodConfig>();`
	`29`	`+QMap<QString, QgsAuthMethodConfig> QgsAuthBasicMethod::sAuthConfigCache = QMap<QString, QgsAuthMethodConfig>();`
`30`	`30`
`31`	`31`
`32`	`32`	`QgsAuthBasicMethod::QgsAuthBasicMethod()`
`@@ -156,9 +156,9 @@ QgsAuthMethodConfig QgsAuthBasicMethod::getMethodConfig( const QString &authcfg,`
`156`	`156`	`QgsAuthMethodConfig mconfig;`
`157`	`157`
`158`	`158`	`// check if it is cached`
`159`		`- if ( mAuthConfigCache.contains( authcfg ) )`
	`159`	`+ if ( sAuthConfigCache.contains( authcfg ) )`
`160`	`160`	`{`
`161`		`- mconfig = mAuthConfigCache.value( authcfg );`
	`161`	`+ mconfig = sAuthConfigCache.value( authcfg );`
`162`	`162`	`QgsDebugMsg( QString( "Retrieved config for authcfg: %1" ).arg( authcfg ) );`
`163`	`163`	`return mconfig;`
`164`	`164`	`}`
`@@ -181,15 +181,15 @@ void QgsAuthBasicMethod::putMethodConfig( const QString &authcfg, const QgsAuthM`
`181`	`181`	`{`
`182`	`182`	`QMutexLocker locker( &mConfigMutex );`
`183`	`183`	`QgsDebugMsg( QString( "Putting basic config for authcfg: %1" ).arg( authcfg ) );`
`184`		`- mAuthConfigCache.insert( authcfg, mconfig );`
	`184`	`+ sAuthConfigCache.insert( authcfg, mconfig );`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`void QgsAuthBasicMethod::removeMethodConfig( const QString &authcfg )`
`188`	`188`	`{`
`189`	`189`	`QMutexLocker locker( &mConfigMutex );`
`190`	`190`	`if ( sAuthConfigCache.contains( authcfg ) )`
`191`	`191`	`{`
`192`		`- mAuthConfigCache.remove( authcfg );`
	`192`	`+ sAuthConfigCache.remove( authcfg );`
`193`	`193`	`QgsDebugMsg( QString( "Removed basic config for authcfg: %1" ).arg( authcfg ) );`
`194`	`194`	`}`
`195`	`195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`static const QString AUTH_METHOD_KEY = "Identity-Cert";`
`35`	`35`	`static const QString AUTH_METHOD_DESCRIPTION = "Identity certificate authentication";`
`36`	`36`
`37`		`-QMap<QString, QgsPkiConfigBundle > QgsAuthIdentCertMethod::mPkiConfigBundleCache = QMap<QString, QgsPkiConfigBundle >();`
	`37`	`+QMap<QString, QgsPkiConfigBundle > QgsAuthIdentCertMethod::sPkiConfigBundleCache = QMap<QString, QgsPkiConfigBundle >();`
`38`	`38`
`39`	`39`
`40`	`40`	`QgsAuthIdentCertMethod::QgsAuthIdentCertMethod()`
`@@ -226,9 +226,9 @@ QgsPkiConfigBundle *QgsAuthIdentCertMethod::getPkiConfigBundle( const QString &a`
`226`	`226`	`QgsPkiConfigBundle *bundle = nullptr;`
`227`	`227`
`228`	`228`	`// check if it is cached`
`229`		`- if ( mPkiConfigBundleCache.contains( authcfg ) )`
	`229`	`+ if ( sPkiConfigBundleCache.contains( authcfg ) )`
`230`	`230`	`{`
`231`		`- bundle = mPkiConfigBundleCache.value( authcfg );`
	`231`	`+ bundle = sPkiConfigBundleCache.value( authcfg );`
`232`	`232`	`if ( bundle )`
`233`	`233`	`{`
`234`	`234`	`QgsDebugMsg( QString( "Retrieved PKI bundle for authcfg %1" ).arg( authcfg ) );`
`@@ -278,15 +278,15 @@ void QgsAuthIdentCertMethod::putPkiConfigBundle( const QString &authcfg, QgsPkiC`
`278`	`278`	`{`
`279`	`279`	`QMutexLocker locker( &mConfigMutex );`
`280`	`280`	`QgsDebugMsg( QString( "Putting PKI bundle for authcfg %1" ).arg( authcfg ) );`
`281`		`- mPkiConfigBundleCache.insert( authcfg, pkibundle );`
	`281`	`+ sPkiConfigBundleCache.insert( authcfg, pkibundle );`
`282`	`282`	`}`
`283`	`283`
`284`	`284`	`void QgsAuthIdentCertMethod::removePkiConfigBundle( const QString &authcfg )`
`285`	`285`	`{`
`286`	`286`	`QMutexLocker locker( &mConfigMutex );`
`287`	`287`	`if ( sPkiConfigBundleCache.contains( authcfg ) )`
`288`	`288`	`{`
`289`		`- QgsPkiConfigBundle * pkibundle = mPkiConfigBundleCache.take( authcfg );`
	`289`	`+ QgsPkiConfigBundle * pkibundle = sPkiConfigBundleCache.take( authcfg );`
`290`	`290`	`delete pkibundle;`
`291`	`291`	`pkibundle = nullptr;`
`292`	`292`	`QgsDebugMsg( QString( "Removed PKI bundle for authcfg: %1" ).arg( authcfg ) );`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`static const QString AUTH_METHOD_KEY = "PKI-Paths";`
`36`	`36`	`static const QString AUTH_METHOD_DESCRIPTION = "PKI paths authentication";`
`37`	`37`
`38`		`-QMap<QString, QgsPkiConfigBundle > QgsAuthPkiPathsMethod::mPkiConfigBundleCache = QMap<QString, QgsPkiConfigBundle >();`
	`38`	`+QMap<QString, QgsPkiConfigBundle > QgsAuthPkiPathsMethod::sPkiConfigBundleCache = QMap<QString, QgsPkiConfigBundle >();`
`39`	`39`
`40`	`40`
`41`	`41`	`QgsAuthPkiPathsMethod::QgsAuthPkiPathsMethod()`
`@@ -230,9 +230,9 @@ QgsPkiConfigBundle *QgsAuthPkiPathsMethod::getPkiConfigBundle( const QString &au`
`230`	`230`	`QgsPkiConfigBundle *bundle = nullptr;`
`231`	`231`
`232`	`232`	`// check if it is cached`
`233`		`- if ( mPkiConfigBundleCache.contains( authcfg ) )`
	`233`	`+ if ( sPkiConfigBundleCache.contains( authcfg ) )`
`234`	`234`	`{`
`235`		`- bundle = mPkiConfigBundleCache.value( authcfg );`
	`235`	`+ bundle = sPkiConfigBundleCache.value( authcfg );`
`236`	`236`	`if ( bundle )`
`237`	`237`	`{`
`238`	`238`	`QgsDebugMsg( QString( "Retrieved PKI bundle for authcfg %1" ).arg( authcfg ) );`
`@@ -280,15 +280,15 @@ void QgsAuthPkiPathsMethod::putPkiConfigBundle( const QString &authcfg, QgsPkiCo`
`280`	`280`	`{`
`281`	`281`	`QMutexLocker locker( &mConfigMutex );`
`282`	`282`	`QgsDebugMsg( QString( "Putting PKI bundle for authcfg %1" ).arg( authcfg ) );`
`283`		`- mPkiConfigBundleCache.insert( authcfg, pkibundle );`
	`283`	`+ sPkiConfigBundleCache.insert( authcfg, pkibundle );`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`void QgsAuthPkiPathsMethod::removePkiConfigBundle( const QString &authcfg )`
`287`	`287`	`{`
`288`	`288`	`QMutexLocker locker( &mConfigMutex );`
`289`	`289`	`if ( sPkiConfigBundleCache.contains( authcfg ) )`
`290`	`290`	`{`
`291`		`- QgsPkiConfigBundle * pkibundle = mPkiConfigBundleCache.take( authcfg );`
	`291`	`+ QgsPkiConfigBundle * pkibundle = sPkiConfigBundleCache.take( authcfg );`
`292`	`292`	`delete pkibundle;`
`293`	`293`	`pkibundle = nullptr;`
`294`	`294`	`QgsDebugMsg( QString( "Removed PKI bundle for authcfg: %1" ).arg( authcfg ) );`