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

List:       kde-commits
Subject:    kdepim/certmanager/lib/backends/qgpgme
From:       Marc Mutz <Marc.Mutz () uni-bielefeld ! de>
Date:       2004-06-08 16:59:50
Message-ID: 20040608165950.45BD7126ED () office ! kde ! org
[Download RAW message or body]

CVS commit by mutz: 

Enable final, as this is really easy enough and doesn't lead to ugly code.


  M +1 -1      Makefile.am   1.11
  M +1 -5      qgpgmerefreshkeysjob.cpp   1.5
  M +1 -5      qgpgmesecretkeyexportjob.cpp   1.8


--- kdepim/certmanager/lib/backends/qgpgme/Makefile.am  #1.10:1.11
@@ -1,3 +1,3 @@
-KDE_OPTIONS = nofinal
+#KDE_OPTIONS = nofinal
 
 INCLUDES = -I$(top_srcdir)/libkdenetwork \

--- kdepim/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp  #1.4:1.5
@@ -52,8 +52,4 @@
 #include <assert.h>
 
-static inline int make_error( int src, int code ) {
-  return gpg_err_make( (gpg_err_source_t)src, (gpg_err_code_t)code );
-}
-
 Kleo::QGpgMERefreshKeysJob::QGpgMERefreshKeysJob()
   : RefreshKeysJob( QGpgME::EventLoopInteractor::instance(), "Kleo::QGpgMERefreshKeysJob" ),
@@ -158,5 +154,5 @@ void Kleo::QGpgMERefreshKeysJob::slotSta
       return;
     }
-    mError = make_error( source, code );
+    mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code );
 
 

--- kdepim/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp  #1.7:1.8
@@ -54,8 +54,4 @@
 #include <assert.h>
 
-static inline int make_error( int src, int code ) {
-  return gpg_err_make( (gpg_err_source_t)src, (gpg_err_code_t)code );
-}
-
 Kleo::QGpgMESecretKeyExportJob::QGpgMESecretKeyExportJob( bool armour )
   : ExportJob( QGpgME::EventLoopInteractor::instance(), "Kleo::QGpgMESecretKeyExportJob" ),
@@ -136,5 +132,5 @@ void Kleo::QGpgMESecretKeyExportJob::slo
       return;
     }
-    mError = make_error( source, code );
+    mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code );
 
 


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