Skip to content

Commit ee5e120

Browse files
committedSep 24, 2015
[auth] Strip translated display name from auth method plugins
1 parent 264d2eb commit ee5e120

File tree

10 files changed

+0
-33
lines changed

10 files changed

+0
-33
lines changed
 

‎python/core/auth/qgsauthmethod.sip

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ class QgsAuthMethod : QObject
2222

2323
virtual QString description() const = 0;
2424

25-
virtual QString displayName() const = 0;
26-
2725
virtual QString displayDescription() const = 0;
2826

2927
int version() const;

‎src/auth/basic/qgsauthbasicmethod.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ QString QgsAuthBasicMethod::description() const
5353
return AUTH_METHOD_DESCRIPTION;
5454
}
5555

56-
QString QgsAuthBasicMethod::displayName() const
57-
{
58-
return tr( "Basic" );
59-
}
60-
6156
QString QgsAuthBasicMethod::displayDescription() const
6257
{
6358
return tr( "Basic authentication" );

‎src/auth/basic/qgsauthbasicmethod.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ class QgsAuthBasicMethod : public QgsAuthMethod
3636

3737
QString description() const override;
3838

39-
QString displayName() const override;
40-
4139
QString displayDescription() const override;
4240

4341
bool updateNetworkRequest( QNetworkRequest &request, const QString &authcfg,

‎src/auth/identcert/qgsauthidentcertmethod.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@ QString QgsAuthIdentCertMethod::description() const
6262
return AUTH_METHOD_DESCRIPTION;
6363
}
6464

65-
QString QgsAuthIdentCertMethod::displayName() const
66-
{
67-
return tr( "Identity-Cert" );
68-
}
69-
7065
QString QgsAuthIdentCertMethod::displayDescription() const
7166
{
7267
return tr( "PKI stored identity certificate" );

‎src/auth/identcert/qgsauthidentcertmethod.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ class QgsAuthIdentCertMethod : public QgsAuthMethod
3636

3737
QString description() const override;
3838

39-
QString displayName() const override;
40-
4139
QString displayDescription() const override;
4240

4341
bool updateNetworkRequest( QNetworkRequest &request, const QString &authcfg,

‎src/auth/pkipaths/qgsauthpkipathsmethod.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@ QString QgsAuthPkiPathsMethod::description() const
6262
return AUTH_METHOD_DESCRIPTION;
6363
}
6464

65-
QString QgsAuthPkiPathsMethod::displayName() const
66-
{
67-
return tr( "PKI-Paths" );
68-
}
69-
7065
QString QgsAuthPkiPathsMethod::displayDescription() const
7166
{
7267
return tr( "PKI paths authentication" );

‎src/auth/pkipaths/qgsauthpkipathsmethod.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ class QgsAuthPkiPathsMethod : public QgsAuthMethod
3636

3737
QString description() const override;
3838

39-
QString displayName() const override;
40-
4139
QString displayDescription() const override;
4240

4341
bool updateNetworkRequest( QNetworkRequest &request, const QString &authcfg,

‎src/auth/pkipkcs12/qgsauthpkcs12method.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@ QString QgsAuthPkcs12Method::description() const
6262
return AUTH_METHOD_DESCRIPTION;
6363
}
6464

65-
QString QgsAuthPkcs12Method::displayName() const
66-
{
67-
return tr( "PKI-PKCS#12" );
68-
}
69-
7065
QString QgsAuthPkcs12Method::displayDescription() const
7166
{
7267
return tr( "PKI PKCS#12 authentication" );

‎src/auth/pkipkcs12/qgsauthpkcs12method.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ class QgsAuthPkcs12Method : public QgsAuthMethod
3636

3737
QString description() const override;
3838

39-
QString displayName() const override;
40-
4139
QString displayDescription() const override;
4240

4341
bool updateNetworkRequest( QNetworkRequest &request, const QString &authcfg,

‎src/core/auth/qgsauthmethod.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ class CORE_EXPORT QgsAuthMethod : public QObject
6262
/** A non-translated short description representing the auth method for use in debug output and About dialog */
6363
virtual QString description() const = 0;
6464

65-
/** Translatable display version of the 'key()' */
66-
virtual QString displayName() const = 0;
67-
6865
/** Translatable display version of the 'description()' */
6966
virtual QString displayDescription() const = 0;
7067

0 commit comments

Comments
 (0)
Please sign in to comment.