Skip to content

Commit 79837b0

Browse files
committed
[auth] Change static members prefix from 'm' to 's' as per coding standards
1 parent ee89bf5 commit 79837b0

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

src/auth/basic/qgsauthbasicmethod.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
static const QString AUTH_METHOD_KEY = "Basic";
2727
static const QString AUTH_METHOD_DESCRIPTION = "Basic authentication";
2828

29-
QMap<QString, QgsAuthMethodConfig> QgsAuthBasicMethod::mAuthConfigCache = QMap<QString, QgsAuthMethodConfig>();
29+
QMap<QString, QgsAuthMethodConfig> QgsAuthBasicMethod::sAuthConfigCache = QMap<QString, QgsAuthMethodConfig>();
3030

3131

3232
QgsAuthBasicMethod::QgsAuthBasicMethod()
@@ -156,9 +156,9 @@ QgsAuthMethodConfig QgsAuthBasicMethod::getMethodConfig( const QString &authcfg,
156156
QgsAuthMethodConfig mconfig;
157157

158158
// check if it is cached
159-
if ( mAuthConfigCache.contains( authcfg ) )
159+
if ( sAuthConfigCache.contains( authcfg ) )
160160
{
161-
mconfig = mAuthConfigCache.value( authcfg );
161+
mconfig = sAuthConfigCache.value( authcfg );
162162
QgsDebugMsg( QString( "Retrieved config for authcfg: %1" ).arg( authcfg ) );
163163
return mconfig;
164164
}
@@ -181,15 +181,15 @@ void QgsAuthBasicMethod::putMethodConfig( const QString &authcfg, const QgsAuthM
181181
{
182182
QMutexLocker locker( &mConfigMutex );
183183
QgsDebugMsg( QString( "Putting basic config for authcfg: %1" ).arg( authcfg ) );
184-
mAuthConfigCache.insert( authcfg, mconfig );
184+
sAuthConfigCache.insert( authcfg, mconfig );
185185
}
186186

187187
void QgsAuthBasicMethod::removeMethodConfig( const QString &authcfg )
188188
{
189189
QMutexLocker locker( &mConfigMutex );
190190
if ( sAuthConfigCache.contains( authcfg ) )
191191
{
192-
mAuthConfigCache.remove( authcfg );
192+
sAuthConfigCache.remove( authcfg );
193193
QgsDebugMsg( QString( "Removed basic config for authcfg: %1" ).arg( authcfg ) );
194194
}
195195
}

src/auth/identcert/qgsauthidentcertmethod.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
static const QString AUTH_METHOD_KEY = "Identity-Cert";
3535
static const QString AUTH_METHOD_DESCRIPTION = "Identity certificate authentication";
3636

37-
QMap<QString, QgsPkiConfigBundle *> QgsAuthIdentCertMethod::mPkiConfigBundleCache = QMap<QString, QgsPkiConfigBundle *>();
37+
QMap<QString, QgsPkiConfigBundle *> QgsAuthIdentCertMethod::sPkiConfigBundleCache = QMap<QString, QgsPkiConfigBundle *>();
3838

3939

4040
QgsAuthIdentCertMethod::QgsAuthIdentCertMethod()
@@ -226,9 +226,9 @@ QgsPkiConfigBundle *QgsAuthIdentCertMethod::getPkiConfigBundle( const QString &a
226226
QgsPkiConfigBundle *bundle = nullptr;
227227

228228
// check if it is cached
229-
if ( mPkiConfigBundleCache.contains( authcfg ) )
229+
if ( sPkiConfigBundleCache.contains( authcfg ) )
230230
{
231-
bundle = mPkiConfigBundleCache.value( authcfg );
231+
bundle = sPkiConfigBundleCache.value( authcfg );
232232
if ( bundle )
233233
{
234234
QgsDebugMsg( QString( "Retrieved PKI bundle for authcfg %1" ).arg( authcfg ) );
@@ -278,15 +278,15 @@ void QgsAuthIdentCertMethod::putPkiConfigBundle( const QString &authcfg, QgsPkiC
278278
{
279279
QMutexLocker locker( &mConfigMutex );
280280
QgsDebugMsg( QString( "Putting PKI bundle for authcfg %1" ).arg( authcfg ) );
281-
mPkiConfigBundleCache.insert( authcfg, pkibundle );
281+
sPkiConfigBundleCache.insert( authcfg, pkibundle );
282282
}
283283

284284
void QgsAuthIdentCertMethod::removePkiConfigBundle( const QString &authcfg )
285285
{
286286
QMutexLocker locker( &mConfigMutex );
287287
if ( sPkiConfigBundleCache.contains( authcfg ) )
288288
{
289-
QgsPkiConfigBundle * pkibundle = mPkiConfigBundleCache.take( authcfg );
289+
QgsPkiConfigBundle * pkibundle = sPkiConfigBundleCache.take( authcfg );
290290
delete pkibundle;
291291
pkibundle = nullptr;
292292
QgsDebugMsg( QString( "Removed PKI bundle for authcfg: %1" ).arg( authcfg ) );

src/auth/pkipaths/qgsauthpkipathsmethod.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
static const QString AUTH_METHOD_KEY = "PKI-Paths";
3636
static const QString AUTH_METHOD_DESCRIPTION = "PKI paths authentication";
3737

38-
QMap<QString, QgsPkiConfigBundle *> QgsAuthPkiPathsMethod::mPkiConfigBundleCache = QMap<QString, QgsPkiConfigBundle *>();
38+
QMap<QString, QgsPkiConfigBundle *> QgsAuthPkiPathsMethod::sPkiConfigBundleCache = QMap<QString, QgsPkiConfigBundle *>();
3939

4040

4141
QgsAuthPkiPathsMethod::QgsAuthPkiPathsMethod()
@@ -230,9 +230,9 @@ QgsPkiConfigBundle *QgsAuthPkiPathsMethod::getPkiConfigBundle( const QString &au
230230
QgsPkiConfigBundle *bundle = nullptr;
231231

232232
// check if it is cached
233-
if ( mPkiConfigBundleCache.contains( authcfg ) )
233+
if ( sPkiConfigBundleCache.contains( authcfg ) )
234234
{
235-
bundle = mPkiConfigBundleCache.value( authcfg );
235+
bundle = sPkiConfigBundleCache.value( authcfg );
236236
if ( bundle )
237237
{
238238
QgsDebugMsg( QString( "Retrieved PKI bundle for authcfg %1" ).arg( authcfg ) );
@@ -280,15 +280,15 @@ void QgsAuthPkiPathsMethod::putPkiConfigBundle( const QString &authcfg, QgsPkiCo
280280
{
281281
QMutexLocker locker( &mConfigMutex );
282282
QgsDebugMsg( QString( "Putting PKI bundle for authcfg %1" ).arg( authcfg ) );
283-
mPkiConfigBundleCache.insert( authcfg, pkibundle );
283+
sPkiConfigBundleCache.insert( authcfg, pkibundle );
284284
}
285285

286286
void QgsAuthPkiPathsMethod::removePkiConfigBundle( const QString &authcfg )
287287
{
288288
QMutexLocker locker( &mConfigMutex );
289289
if ( sPkiConfigBundleCache.contains( authcfg ) )
290290
{
291-
QgsPkiConfigBundle * pkibundle = mPkiConfigBundleCache.take( authcfg );
291+
QgsPkiConfigBundle * pkibundle = sPkiConfigBundleCache.take( authcfg );
292292
delete pkibundle;
293293
pkibundle = nullptr;
294294
QgsDebugMsg( QString( "Removed PKI bundle for authcfg: %1" ).arg( authcfg ) );

src/auth/pkipkcs12/qgsauthpkcs12method.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
static const QString AUTH_METHOD_KEY = "PKI-PKCS#12";
3636
static const QString AUTH_METHOD_DESCRIPTION = "PKI PKCS#12 authentication";
3737

38-
QMap<QString, QgsPkiConfigBundle *> QgsAuthPkcs12Method::mPkiConfigBundleCache = QMap<QString, QgsPkiConfigBundle *>();
38+
QMap<QString, QgsPkiConfigBundle *> QgsAuthPkcs12Method::sPkiConfigBundleCache = QMap<QString, QgsPkiConfigBundle *>();
3939

4040

4141
QgsAuthPkcs12Method::QgsAuthPkcs12Method()
@@ -228,9 +228,9 @@ QgsPkiConfigBundle *QgsAuthPkcs12Method::getPkiConfigBundle( const QString &auth
228228
QgsPkiConfigBundle *bundle = nullptr;
229229

230230
// check if it is cached
231-
if ( mPkiConfigBundleCache.contains( authcfg ) )
231+
if ( sPkiConfigBundleCache.contains( authcfg ) )
232232
{
233-
bundle = mPkiConfigBundleCache.value( authcfg );
233+
bundle = sPkiConfigBundleCache.value( authcfg );
234234
if ( bundle )
235235
{
236236
QgsDebugMsg( QString( "Retrieved PKI bundle for authcfg %1" ).arg( authcfg ) );
@@ -286,15 +286,15 @@ void QgsAuthPkcs12Method::putPkiConfigBundle( const QString &authcfg, QgsPkiConf
286286
{
287287
QMutexLocker locker( &mConfigMutex );
288288
QgsDebugMsg( QString( "Putting PKI bundle for authcfg %1" ).arg( authcfg ) );
289-
mPkiConfigBundleCache.insert( authcfg, pkibundle );
289+
sPkiConfigBundleCache.insert( authcfg, pkibundle );
290290
}
291291

292292
void QgsAuthPkcs12Method::removePkiConfigBundle( const QString &authcfg )
293293
{
294294
QMutexLocker locker( &mConfigMutex );
295295
if ( sPkiConfigBundleCache.contains( authcfg ) )
296296
{
297-
QgsPkiConfigBundle * pkibundle = mPkiConfigBundleCache.take( authcfg );
297+
QgsPkiConfigBundle * pkibundle = sPkiConfigBundleCache.take( authcfg );
298298
delete pkibundle;
299299
pkibundle = nullptr;
300300
QgsDebugMsg( QString( "Removed PKI bundle for authcfg: %1" ).arg( authcfg ) );

0 commit comments

Comments
 (0)