[Pkg-owncloud-commits] [qtkeychain] 67/115: Avoid code duplication

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository qtkeychain.

commit 57f0a27460b0e0bede0b13b5ab886eb7fd8c8480
Author: Frank Osterfeld <frank.osterfeld at gmail.com>
Date:   Mon Jul 22 20:16:26 2013 +0200

    Avoid code duplication
    
    Also avoids duplication of tr()'d strings
---
 keychain_dbus.cpp | 95 +++++++++++++++++++------------------------------------
 1 file changed, 33 insertions(+), 62 deletions(-)

diff --git a/keychain_dbus.cpp b/keychain_dbus.cpp
index 29d263c..c1a75f2 100644
--- a/keychain_dbus.cpp
+++ b/keychain_dbus.cpp
@@ -184,48 +184,48 @@ void ReadPasswordJobPrivate::scheduledStart() {
     }
 }
 
-void ReadPasswordJobPrivate::gnomeKeyring_cb( int result, const char* string, ReadPasswordJobPrivate* self )
+static QPair<Error, QString> mapGnomeKeyringError( int result )
 {
-    switch ( result ) {
-    case GnomeKeyring::RESULT_OK:
-        if ( self->dataType == ReadPasswordJobPrivate::Text )
-            self->data = string;
-        else
-            self->data = QByteArray::fromBase64( string );
-        self->q->emitFinished();
-        break;
+    Q_ASSERT( result != GnomeKeyring::RESULT_OK );
 
+    switch ( result ) {
     case GnomeKeyring::RESULT_DENIED:
-        self->q->emitFinishedWithError( AccessDenied, tr("Access to keychain denied") );
-        break;
+        return qMakePair( AccessDenied, QObject::tr("Access to keychain denied") );
     case GnomeKeyring::RESULT_NO_KEYRING_DAEMON:
-        self->q->emitFinishedWithError( NoBackendAvailable, tr("No keyring daemon") );
-        break;
+        return qMakePair( NoBackendAvailable, QObject::tr("No keyring daemon") );
     case GnomeKeyring::RESULT_ALREADY_UNLOCKED:
-        self->q->emitFinishedWithError( OtherError, tr("Already unlocked") );
-        break;
+        return qMakePair( OtherError, QObject::tr("Already unlocked") );
     case GnomeKeyring::RESULT_NO_SUCH_KEYRING:
-        self->q->emitFinishedWithError( OtherError, tr("No such keyring") );
-        break;
+        return qMakePair( OtherError, QObject::tr("No such keyring") );
     case GnomeKeyring::RESULT_BAD_ARGUMENTS:
-        self->q->emitFinishedWithError( OtherError, tr("Bad arguments") );
-        break;
+        return qMakePair( OtherError, QObject::tr("Bad arguments") );
     case GnomeKeyring::RESULT_IO_ERROR:
-        self->q->emitFinishedWithError( OtherError, tr("I/O error") );
-        break;
+        return qMakePair( OtherError, QObject::tr("I/O error") );
     case GnomeKeyring::RESULT_CANCELLED:
-        self->q->emitFinishedWithError( OtherError, tr("Cancelled") );
-        break;
+        return qMakePair( OtherError, QObject::tr("Cancelled") );
     case GnomeKeyring::RESULT_KEYRING_ALREADY_EXISTS:
-        self->q->emitFinishedWithError( OtherError, tr("Keyring already exists") );
-        break;
+        return qMakePair( OtherError, QObject::tr("Keyring already exists") );
     case GnomeKeyring::RESULT_NO_MATCH:
-        self->q->emitFinishedWithError(  EntryNotFound, tr("No match") );
-        break;
+        return qMakePair(  EntryNotFound, QObject::tr("No match") );
     default:
-        self->q->emitFinishedWithError( OtherError, tr("Unknown error") );
         break;
     }
+
+    return qMakePair( OtherError, QObject::tr("Unknown error") );
+}
+
+void ReadPasswordJobPrivate::gnomeKeyring_cb( int result, const char* string, ReadPasswordJobPrivate* self )
+{
+    if ( result == GnomeKeyring::RESULT_OK ) {
+        if ( self->dataType == ReadPasswordJobPrivate::Text )
+            self->data = string;
+        else
+            self->data = QByteArray::fromBase64( string );
+        self->q->emitFinished();
+    } else {
+        const QPair<Error, QString> errorResult = mapGnomeKeyringError( result );
+        self->q->emitFinishedWithError( errorResult.first, errorResult.second );
+    }
 }
 
 void ReadPasswordJobPrivate::fallbackOnError(const QDBusError& err )
@@ -399,7 +399,7 @@ void WritePasswordJobPrivate::fallbackOnError(const QDBusError &err)
 
         q->emitFinished();
         return;
-    }
+   }
 
     actual->setValue( QString( "%1/type" ).arg( key ), (int)mode );
     if ( mode == Text )
@@ -413,40 +413,11 @@ void WritePasswordJobPrivate::fallbackOnError(const QDBusError &err)
 
 void WritePasswordJobPrivate::gnomeKeyring_cb( int result, WritePasswordJobPrivate* self )
 {
-    switch ( result ) {
-    case GnomeKeyring::RESULT_OK:
+    if ( result == GnomeKeyring::RESULT_OK ) {
         self->q->emitFinished();
-        break;
-    case GnomeKeyring::RESULT_DENIED:
-        self->q->emitFinishedWithError( AccessDenied, tr("Access to keychain denied") );
-        break;
-    case GnomeKeyring::RESULT_NO_KEYRING_DAEMON:
-        self->q->emitFinishedWithError( NoBackendAvailable, tr("No keyring daemon") );
-        break;
-    case GnomeKeyring::RESULT_ALREADY_UNLOCKED:
-        self->q->emitFinishedWithError( OtherError, tr("Already unlocked") );
-        break;
-    case GnomeKeyring::RESULT_NO_SUCH_KEYRING:
-        self->q->emitFinishedWithError( OtherError, tr("No such keyring") );
-        break;
-    case GnomeKeyring::RESULT_BAD_ARGUMENTS:
-        self->q->emitFinishedWithError( OtherError, tr("Bad arguments") );
-        break;
-    case GnomeKeyring::RESULT_IO_ERROR:
-        self->q->emitFinishedWithError( OtherError, tr("I/O error") );
-        break;
-    case GnomeKeyring::RESULT_CANCELLED:
-        self->q->emitFinishedWithError( OtherError, tr("Cancelled") );
-        break;
-    case GnomeKeyring::RESULT_KEYRING_ALREADY_EXISTS:
-        self->q->emitFinishedWithError( OtherError, tr("Keyring already exists") );
-        break;
-    case GnomeKeyring::RESULT_NO_MATCH:
-        self->q->emitFinishedWithError(  EntryNotFound, tr("No match") );
-        break;
-    default:
-        self->q->emitFinishedWithError( OtherError, tr("Unknown error") );
-        break;
+    } else {
+        const QPair<Error, QString> errorResult = mapGnomeKeyringError( result );
+        self->q->emitFinishedWithError( errorResult.first, errorResult.second );
     }
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/qtkeychain.git