[auth] Strip translated display name from auth method plugins

dakcarto · dakcarto · commit ee5e12062760 · 2015-09-24T12:53:05.000-06:00
diff --git a/python/core/auth/qgsauthmethod.sip b/python/core/auth/qgsauthmethod.sip
@@ -22,8 +22,6 @@ class QgsAuthMethod : QObject
 
     virtual QString description() const = 0;
 
-    virtual QString displayName() const = 0;
-
     virtual QString displayDescription() const = 0;
 
     int version() const;
diff --git a/src/auth/basic/qgsauthbasicmethod.cpp b/src/auth/basic/qgsauthbasicmethod.cpp
@@ -53,11 +53,6 @@ QString QgsAuthBasicMethod::description() const
   return AUTH_METHOD_DESCRIPTION;
 }
 
-QString QgsAuthBasicMethod::displayName() const
-{
-  return tr( "Basic" );
-}
-
 QString QgsAuthBasicMethod::displayDescription() const
 {
   return tr( "Basic authentication" );
diff --git a/src/auth/basic/qgsauthbasicmethod.h b/src/auth/basic/qgsauthbasicmethod.h
@@ -36,8 +36,6 @@ class QgsAuthBasicMethod : public QgsAuthMethod
 
     QString description() const override;
 
-    QString displayName() const override;
-
     QString displayDescription() const override;
 
     bool updateNetworkRequest( QNetworkRequest &request, const QString &authcfg,
diff --git a/src/auth/identcert/qgsauthidentcertmethod.cpp b/src/auth/identcert/qgsauthidentcertmethod.cpp
@@ -62,11 +62,6 @@ QString QgsAuthIdentCertMethod::description() const
   return AUTH_METHOD_DESCRIPTION;
 }
 
-QString QgsAuthIdentCertMethod::displayName() const
-{
-  return tr( "Identity-Cert" );
-}
-
 QString QgsAuthIdentCertMethod::displayDescription() const
 {
   return tr( "PKI stored identity certificate" );
diff --git a/src/auth/identcert/qgsauthidentcertmethod.h b/src/auth/identcert/qgsauthidentcertmethod.h
@@ -36,8 +36,6 @@ class QgsAuthIdentCertMethod : public QgsAuthMethod
 
     QString description() const override;
 
-    QString displayName() const override;
-
     QString displayDescription() const override;
 
     bool updateNetworkRequest( QNetworkRequest &request, const QString &authcfg,
diff --git a/src/auth/pkipaths/qgsauthpkipathsmethod.cpp b/src/auth/pkipaths/qgsauthpkipathsmethod.cpp
@@ -62,11 +62,6 @@ QString QgsAuthPkiPathsMethod::description() const
   return AUTH_METHOD_DESCRIPTION;
 }
 
-QString QgsAuthPkiPathsMethod::displayName() const
-{
-  return tr( "PKI-Paths" );
-}
-
 QString QgsAuthPkiPathsMethod::displayDescription() const
 {
   return tr( "PKI paths authentication" );
diff --git a/src/auth/pkipaths/qgsauthpkipathsmethod.h b/src/auth/pkipaths/qgsauthpkipathsmethod.h
@@ -36,8 +36,6 @@ class QgsAuthPkiPathsMethod : public QgsAuthMethod
 
     QString description() const override;
 
-    QString displayName() const override;
-
     QString displayDescription() const override;
 
     bool updateNetworkRequest( QNetworkRequest &request, const QString &authcfg,
diff --git a/src/auth/pkipkcs12/qgsauthpkcs12method.cpp b/src/auth/pkipkcs12/qgsauthpkcs12method.cpp
@@ -62,11 +62,6 @@ QString QgsAuthPkcs12Method::description() const
   return AUTH_METHOD_DESCRIPTION;
 }
 
-QString QgsAuthPkcs12Method::displayName() const
-{
-  return tr( "PKI-PKCS#12" );
-}
-
 QString QgsAuthPkcs12Method::displayDescription() const
 {
   return tr( "PKI PKCS#12 authentication" );
diff --git a/src/auth/pkipkcs12/qgsauthpkcs12method.h b/src/auth/pkipkcs12/qgsauthpkcs12method.h
@@ -36,8 +36,6 @@ class QgsAuthPkcs12Method : public QgsAuthMethod
 
     QString description() const override;
 
-    QString displayName() const override;
-
     QString displayDescription() const override;
 
     bool updateNetworkRequest( QNetworkRequest &request, const QString &authcfg,
diff --git a/src/core/auth/qgsauthmethod.h b/src/core/auth/qgsauthmethod.h
@@ -62,9 +62,6 @@ class CORE_EXPORT QgsAuthMethod : public QObject
     /** A non-translated short description representing the auth method for use in debug output and About dialog */
     virtual QString description() const = 0;
 
-    /** Translatable display version of the 'key()' */
-    virtual QString displayName() const = 0;
-
     /** Translatable display version of the 'description()' */
     virtual QString displayDescription() const = 0;
 

Original file line number	Diff line number	Diff line change
`@@ -53,11 +53,6 @@ QString QgsAuthBasicMethod::description() const`
`53`	`53`	`return AUTH_METHOD_DESCRIPTION;`
`54`	`54`	`}`
`55`	`55`
`56`		`-QString QgsAuthBasicMethod::displayName() const`
`57`		`-{`
`58`		`- return tr( "Basic" );`
`59`		`-}`
`60`		`-`
`61`	`56`	`QString QgsAuthBasicMethod::displayDescription() const`
`62`	`57`	`{`
`63`	`58`	`return tr( "Basic authentication" );`
Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,6 @@ QString QgsAuthIdentCertMethod::description() const`
`62`	`62`	`return AUTH_METHOD_DESCRIPTION;`
`63`	`63`	`}`
`64`	`64`
`65`		`-QString QgsAuthIdentCertMethod::displayName() const`
`66`		`-{`
`67`		`- return tr( "Identity-Cert" );`
`68`		`-}`
`69`		`-`
`70`	`65`	`QString QgsAuthIdentCertMethod::displayDescription() const`
`71`	`66`	`{`
`72`	`67`	`return tr( "PKI stored identity certificate" );`
Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,6 @@ QString QgsAuthPkiPathsMethod::description() const`
`62`	`62`	`return AUTH_METHOD_DESCRIPTION;`
`63`	`63`	`}`
`64`	`64`
`65`		`-QString QgsAuthPkiPathsMethod::displayName() const`
`66`		`-{`
`67`		`- return tr( "PKI-Paths" );`
`68`		`-}`
`69`		`-`
`70`	`65`	`QString QgsAuthPkiPathsMethod::displayDescription() const`
`71`	`66`	`{`
`72`	`67`	`return tr( "PKI paths authentication" );`
Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,6 @@ QString QgsAuthPkcs12Method::description() const`
`62`	`62`	`return AUTH_METHOD_DESCRIPTION;`
`63`	`63`	`}`
`64`	`64`
`65`		`-QString QgsAuthPkcs12Method::displayName() const`
`66`		`-{`
`67`		`- return tr( "PKI-PKCS#12" );`
`68`		`-}`
`69`		`-`
`70`	`65`	`QString QgsAuthPkcs12Method::displayDescription() const`
`71`	`66`	`{`
`72`	`67`	`return tr( "PKI PKCS#12 authentication" );`