[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepimlibs/gpgme++
From:       Marc Mutz <mutz () kde ! org>
Date:       2010-12-06 13:43:40
Message-ID: 20101206134340.91B8CAC8A6 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1204240 by mutz:

gpgme++: collect make_error() copies in util.h

 M  +1 -3      callbacks.cpp  
 M  +0 -4      configuration.cpp  
 M  +0 -4      context.cpp  
 M  +4 -0      util.h  


--- trunk/KDE/kdepimlibs/gpgme++/callbacks.cpp #1204239:1204240
@@ -23,6 +23,7 @@
 #include <gpgme++/config-gpgme++.h>
 
 #include "callbacks.h"
+#include "util.h"
 
 #include <gpgme++/interfaces/progressprovider.h>
 #include <gpgme++/interfaces/passphraseprovider.h>
@@ -45,9 +46,6 @@
   return gpg_error_from_syserror();
 #endif
 }
-static inline gpgme_error_t make_error( gpgme_err_code_t code ) {
-  return gpgme_error( code );
-}
 
 using GpgME::ProgressProvider;
 using GpgME::PassphraseProvider;
--- trunk/KDE/kdepimlibs/gpgme++/configuration.cpp #1204239:1204240
@@ -51,10 +51,6 @@
     struct nodelete { template <typename T> void operator()( T * ) {} };
 }
 
-static inline gpgme_error_t make_error( gpgme_err_code_t code ) {
-    return gpgme_err_make( (gpgme_err_source_t)22, code );
-}
-
 // static
 std::vector<Component> Component::load( Error & returnedError ) {
 
--- trunk/KDE/kdepimlibs/gpgme++/context.cpp #1204239:1204240
@@ -60,10 +60,6 @@
 
 namespace GpgME {
 
-  static inline gpgme_error_t make_error( gpgme_err_code_t code ) {
-    return gpgme_err_make( (gpgme_err_source_t)22, code );
-  }
-
   static inline unsigned int xtoi_1( const char * str ) {
       const unsigned int ch = *str;
       const unsigned int result =
--- trunk/KDE/kdepimlibs/gpgme++/util.h #1204239:1204240
@@ -37,6 +37,10 @@
     return s ? s : "<null>" ;
 }
 
+static inline gpgme_error_t make_error( gpgme_err_code_t code ) {
+    return gpgme_err_make( (gpgme_err_source_t)22, code );
+}
+
 static inline gpgme_keylist_mode_t add_to_gpgme_keylist_mode_t( unsigned int \
oldmode, unsigned int newmodes ) {  if ( newmodes & GpgME::Local ) oldmode |= \
GPGME_KEYLIST_MODE_LOCAL;  if ( newmodes & GpgME::Extern ) oldmode |= \
GPGME_KEYLIST_MODE_EXTERN;


[prev in list] [next in list] [prev in thread] [next in thread]