1 files changed, 17 insertions, 28 deletions

diff --git a/libtdenetwork/gpgmepp/context.h b/libtdenetwork/gpgmepp/context.h
index 054f8bee..580d766c 100644
--- a/libtdenetwork/gpgmepp/context.h
+++ b/libtdenetwork/gpgmepp/context.h
@@ -16,8 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with GPGME++; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
-
-// -*- c++ -*-
 #ifndef __GPGMEPP_CONTEXT_H__
 #define __GPGMEPP_CONTEXT_H__
 
@@ -27,13 +25,12 @@
 #include <utility>
 #include <iosfwd>
 
-#include <tdepimmacros.h>
+#include <tdemacros.h>
 
 namespace GpgME {
 
   class Key;
   class Data;
-  class TrustItem;
   class ProgressProvider;
   class PassphraseProvider;
   class EventLoopInteractor;
@@ -48,7 +45,7 @@ namespace GpgME {
 
   class EngineInfo;
 
-  class KDE_EXPORT Error {
+  class TDE_EXPORT Error {
   public:
     Error( int e=0 ) : mErr( e ) {}
 
@@ -66,9 +63,9 @@ namespace GpgME {
     int mErr;
   };
 
-  KDE_EXPORT std::ostream & operator<<( std::ostream & os, Error err );
+  TDE_EXPORT std::ostream & operator<<( std::ostream & os, Error err );
 
-  class KDE_EXPORT Context {
+  class TDE_EXPORT Context {
     Context( gpgme_ctx_t );
   public:
     enum Protocol { OpenPGP, CMS, Unknown };
@@ -182,14 +179,6 @@ namespace GpgME {
     GpgME::Error startKeyDeletion( const Key & key, bool allowSecretKeyDeletion=false );
 
     //
-    // Trust Item Management
-    //
-
-    GpgME::Error startTrustItemListing( const char * pattern, int maxLevel );
-    TrustItem nextTrustItem( GpgME::Error & e );
-    GpgME::Error endTrustItemListing();
-
-    //
     //
     // Crypto Operations
     //
@@ -285,12 +274,12 @@ namespace GpgME {
     const Context & operator=( const Context & );
   };
 
-  KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::Protocol proto );
-  KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::CertificateInclusion incl );
-  KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::KeyListMode mode );
-  KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::SignatureMode mode );
-  KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::EncryptionFlags flags );
-  KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::AuditLogFlags flags );
+  TDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::Protocol proto );
+  TDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::CertificateInclusion incl );
+  TDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::KeyListMode mode );
+  TDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::SignatureMode mode );
+  TDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::EncryptionFlags flags );
+  TDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::AuditLogFlags flags );
 
   //
   //
@@ -298,19 +287,19 @@ namespace GpgME {
   //
   //
 
-  KDE_EXPORT void initializeLibrary();
+  TDE_EXPORT void initializeLibrary();
 
-  KDE_EXPORT GpgME::Error setDefaultLocale( int category, const char * value );
+  TDE_EXPORT GpgME::Error setDefaultLocale( int category, const char * value );
 
-  KDE_EXPORT Context * wait( GpgME::Error & e, bool hang=true );
+  TDE_EXPORT Context * wait( GpgME::Error & e, bool hang=true );
   typedef void (*IdleFunction)(void);
-  KDE_EXPORT IdleFunction registerIdleFunction( IdleFunction idleFunction );
+  TDE_EXPORT IdleFunction registerIdleFunction( IdleFunction idleFunction );
 
   typedef void (*IOCallback)( void * data, int fd );
 
-  KDE_EXPORT EngineInfo engineInfo( Context::Protocol proto );
+  TDE_EXPORT EngineInfo engineInfo( Context::Protocol proto );
 
-  KDE_EXPORT GpgME::Error checkEngine( Context::Protocol proto );
+  TDE_EXPORT GpgME::Error checkEngine( Context::Protocol proto );
 
   enum Feature {
       ValidatingKeylistModeFeature = 0x00000001,
@@ -321,7 +310,7 @@ namespace GpgME {
 
       FeatureMaxValue              = 0x80000000
   };
-  KDE_EXPORT bool hasFeature( unsigned long feature );
+  TDE_EXPORT bool hasFeature( unsigned long feature );
 
 } // namespace GpgME