summaryrefslogtreecommitdiffstats
path: root/libtdenetwork
diff options
context:
space:
mode:
Diffstat (limited to 'libtdenetwork')
-rw-r--r--libtdenetwork/gpgmepp/context.h34
-rw-r--r--libtdenetwork/gpgmepp/data.h4
-rw-r--r--libtdenetwork/gpgmepp/decryptionresult.h6
-rw-r--r--libtdenetwork/gpgmepp/encryptionresult.h10
-rw-r--r--libtdenetwork/gpgmepp/engineinfo.h4
-rw-r--r--libtdenetwork/gpgmepp/eventloopinteractor.h4
-rw-r--r--libtdenetwork/gpgmepp/importresult.h6
-rw-r--r--libtdenetwork/gpgmepp/interfaces/dataprovider.h4
-rw-r--r--libtdenetwork/gpgmepp/key.h12
-rw-r--r--libtdenetwork/gpgmepp/keygenerationresult.h4
-rw-r--r--libtdenetwork/gpgmepp/keylistresult.h4
-rw-r--r--libtdenetwork/gpgmepp/signingresult.h14
-rw-r--r--libtdenetwork/gpgmepp/verificationresult.h16
-rw-r--r--libtdenetwork/qgpgme/dataprovider.h4
-rw-r--r--libtdenetwork/qgpgme/eventloopinteractor.cpp8
-rw-r--r--libtdenetwork/qgpgme/eventloopinteractor.h6
16 files changed, 70 insertions, 70 deletions
diff --git a/libtdenetwork/gpgmepp/context.h b/libtdenetwork/gpgmepp/context.h
index e886d832..03c03829 100644
--- a/libtdenetwork/gpgmepp/context.h
+++ b/libtdenetwork/gpgmepp/context.h
@@ -25,7 +25,7 @@
#include <utility>
#include <iosfwd>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
namespace GpgME {
@@ -46,7 +46,7 @@ namespace GpgME {
class EngineInfo;
- class KDE_EXPORT Error {
+ class TDE_EXPORT Error {
public:
Error( int e=0 ) : mErr( e ) {}
@@ -64,9 +64,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 };
@@ -283,12 +283,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 );
//
//
@@ -296,19 +296,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,
@@ -319,7 +319,7 @@ namespace GpgME {
FeatureMaxValue = 0x80000000
};
- KDE_EXPORT bool hasFeature( unsigned long feature );
+ TDE_EXPORT bool hasFeature( unsigned long feature );
} // namespace GpgME
diff --git a/libtdenetwork/gpgmepp/data.h b/libtdenetwork/gpgmepp/data.h
index e1206472..b0bb6b02 100644
--- a/libtdenetwork/gpgmepp/data.h
+++ b/libtdenetwork/gpgmepp/data.h
@@ -25,14 +25,14 @@
#include <sys/types.h> // for size_t, off_t
#include <cstdio> // FILE
-#include <tdepimmacros.h>
+#include <tdemacros.h>
namespace GpgME {
class DataProvider;
class Error;
- class KDE_EXPORT Data {
+ class TDE_EXPORT Data {
public:
Data();
Data( gpgme_data_t data );
diff --git a/libtdenetwork/gpgmepp/decryptionresult.h b/libtdenetwork/gpgmepp/decryptionresult.h
index da4833bb..f23d5fc3 100644
--- a/libtdenetwork/gpgmepp/decryptionresult.h
+++ b/libtdenetwork/gpgmepp/decryptionresult.h
@@ -26,13 +26,13 @@
#include <iosfwd>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
namespace GpgME {
class Error;
- class KDE_EXPORT DecryptionResult : public Result {
+ class TDE_EXPORT DecryptionResult : public Result {
public:
DecryptionResult( gpgme_ctx_t ctx=0, int error=0 );
explicit DecryptionResult( const Error & err );
@@ -52,7 +52,7 @@ namespace GpgME {
Private * d;
};
- KDE_EXPORT std::ostream & operator<<( std::ostream & os, const DecryptionResult & result );
+ TDE_EXPORT std::ostream & operator<<( std::ostream & os, const DecryptionResult & result );
}
diff --git a/libtdenetwork/gpgmepp/encryptionresult.h b/libtdenetwork/gpgmepp/encryptionresult.h
index 4339bef5..62649604 100644
--- a/libtdenetwork/gpgmepp/encryptionresult.h
+++ b/libtdenetwork/gpgmepp/encryptionresult.h
@@ -27,14 +27,14 @@
#include <vector>
#include <iosfwd>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
namespace GpgME {
class Error;
class InvalidRecipient;
- class KDE_EXPORT EncryptionResult : public Result {
+ class TDE_EXPORT EncryptionResult : public Result {
public:
EncryptionResult( gpgme_ctx_t ctx=0, int error=0 );
explicit EncryptionResult( const Error & err );
@@ -55,9 +55,9 @@ namespace GpgME {
Private * d;
};
- KDE_EXPORT std::ostream & operator<<( std::ostream & os, const EncryptionResult & result );
+ TDE_EXPORT std::ostream & operator<<( std::ostream & os, const EncryptionResult & result );
- class KDE_EXPORT InvalidRecipient {
+ class TDE_EXPORT InvalidRecipient {
friend class EncryptionResult;
InvalidRecipient( EncryptionResult::Private * parent, unsigned int index );
public:
@@ -77,7 +77,7 @@ namespace GpgME {
unsigned int idx;
};
- KDE_EXPORT std::ostream & operator<<( std::ostream & os, const InvalidRecipient & recipient );
+ TDE_EXPORT std::ostream & operator<<( std::ostream & os, const InvalidRecipient & recipient );
}
diff --git a/libtdenetwork/gpgmepp/engineinfo.h b/libtdenetwork/gpgmepp/engineinfo.h
index c07d2817..98164c70 100644
--- a/libtdenetwork/gpgmepp/engineinfo.h
+++ b/libtdenetwork/gpgmepp/engineinfo.h
@@ -24,11 +24,11 @@
#include <gpgmepp/gpgmefw.h>
#include <gpgmepp/context.h>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
namespace GpgME {
- class KDE_EXPORT EngineInfo {
+ class TDE_EXPORT EngineInfo {
public:
EngineInfo();
EngineInfo( gpgme_engine_info_t engine );
diff --git a/libtdenetwork/gpgmepp/eventloopinteractor.h b/libtdenetwork/gpgmepp/eventloopinteractor.h
index 0bf3785f..6a696a40 100644
--- a/libtdenetwork/gpgmepp/eventloopinteractor.h
+++ b/libtdenetwork/gpgmepp/eventloopinteractor.h
@@ -19,7 +19,7 @@
#ifndef __GPGMEPP_EVENTLOOPINTERACTOR_H__
#define __GPGMEPP_EVENTLOOPINTERACTOR_H__
-#include <tdepimmacros.h>
+#include <tdemacros.h>
namespace GpgME {
@@ -102,7 +102,7 @@ namespace GpgME {
*/
- class KDE_EXPORT EventLoopInteractor {
+ class TDE_EXPORT EventLoopInteractor {
protected:
EventLoopInteractor();
public:
diff --git a/libtdenetwork/gpgmepp/importresult.h b/libtdenetwork/gpgmepp/importresult.h
index 020ed0c4..e85298e6 100644
--- a/libtdenetwork/gpgmepp/importresult.h
+++ b/libtdenetwork/gpgmepp/importresult.h
@@ -25,14 +25,14 @@
#include <gpgmepp/result.h>
#include <vector>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
namespace GpgME {
class Error;
class Import;
- class KDE_EXPORT ImportResult : public Result {
+ class TDE_EXPORT ImportResult : public Result {
public:
ImportResult( gpgme_ctx_t ctx=0, int error=0 );
explicit ImportResult( const Error & error );
@@ -68,7 +68,7 @@ namespace GpgME {
Private * d;
};
- class KDE_EXPORT Import {
+ class TDE_EXPORT Import {
friend class ImportResult;
Import( ImportResult::Private * parent, unsigned int idx );
public:
diff --git a/libtdenetwork/gpgmepp/interfaces/dataprovider.h b/libtdenetwork/gpgmepp/interfaces/dataprovider.h
index 34dd4a7e..e9886eac 100644
--- a/libtdenetwork/gpgmepp/interfaces/dataprovider.h
+++ b/libtdenetwork/gpgmepp/interfaces/dataprovider.h
@@ -23,11 +23,11 @@
#include <sys/types.h>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
namespace GpgME {
- class KDE_EXPORT DataProvider {
+ class TDE_EXPORT DataProvider {
public:
virtual ~DataProvider() {}
diff --git a/libtdenetwork/gpgmepp/key.h b/libtdenetwork/gpgmepp/key.h
index 753ffec0..b64c564e 100644
--- a/libtdenetwork/gpgmepp/key.h
+++ b/libtdenetwork/gpgmepp/key.h
@@ -25,7 +25,7 @@
#include <sys/time.h>
#include <vector>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
namespace GpgME {
@@ -36,7 +36,7 @@ namespace GpgME {
// class Key
//
- class KDE_EXPORT Key {
+ class TDE_EXPORT Key {
friend class Context;
public:
Key();
@@ -110,7 +110,7 @@ namespace GpgME {
// class Subkey
//
- class KDE_EXPORT Subkey {
+ class TDE_EXPORT Subkey {
public:
Subkey( gpgme_key_t key=0, gpgme_sub_key_t subkey=0 );
Subkey( gpgme_key_t key, unsigned int idx );
@@ -156,7 +156,7 @@ namespace GpgME {
// class UserID
//
- class KDE_EXPORT UserID {
+ class TDE_EXPORT UserID {
public:
class Signature;
@@ -198,7 +198,7 @@ namespace GpgME {
// class UserID::Signature
//
- class KDE_EXPORT UserID::Signature {
+ class TDE_EXPORT UserID::Signature {
public:
class Notation;
@@ -255,7 +255,7 @@ namespace GpgME {
//
//
- class KDE_EXPORT UserID::Signature::Notation {
+ class TDE_EXPORT UserID::Signature::Notation {
public:
Notation( gpgme_key_t key=0, gpgme_user_id_t uid=0,
gpgme_key_sig_t sig=0, gpgme_sig_notation_t nota=0 );
diff --git a/libtdenetwork/gpgmepp/keygenerationresult.h b/libtdenetwork/gpgmepp/keygenerationresult.h
index 7b2d98e8..dcfb56f2 100644
--- a/libtdenetwork/gpgmepp/keygenerationresult.h
+++ b/libtdenetwork/gpgmepp/keygenerationresult.h
@@ -23,12 +23,12 @@
#include <gpgmepp/gpgmefw.h>
#include <gpgmepp/result.h>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
namespace GpgME {
class Error;
- class KDE_EXPORT KeyGenerationResult : public Result {
+ class TDE_EXPORT KeyGenerationResult : public Result {
public:
KeyGenerationResult( gpgme_ctx_t ctx=0, int error=0 );
explicit KeyGenerationResult( const Error & err );
diff --git a/libtdenetwork/gpgmepp/keylistresult.h b/libtdenetwork/gpgmepp/keylistresult.h
index 068210c0..877fd517 100644
--- a/libtdenetwork/gpgmepp/keylistresult.h
+++ b/libtdenetwork/gpgmepp/keylistresult.h
@@ -23,14 +23,14 @@
#include <gpgmepp/gpgmefw.h>
#include <gpgmepp/result.h>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
namespace GpgME {
class Context;
class Error;
- class KDE_EXPORT KeyListResult : public Result {
+ class TDE_EXPORT KeyListResult : public Result {
public:
KeyListResult( gpgme_ctx_t ctx=0, int error=0 );
explicit KeyListResult( const Error & err );
diff --git a/libtdenetwork/gpgmepp/signingresult.h b/libtdenetwork/gpgmepp/signingresult.h
index 1ee7a8de..c43b577e 100644
--- a/libtdenetwork/gpgmepp/signingresult.h
+++ b/libtdenetwork/gpgmepp/signingresult.h
@@ -30,7 +30,7 @@
#include <vector>
#include <iosfwd>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
namespace GpgME {
@@ -38,7 +38,7 @@ namespace GpgME {
class CreatedSignature;
class InvalidSigningKey;
- class KDE_EXPORT SigningResult : public Result {
+ class TDE_EXPORT SigningResult : public Result {
public:
SigningResult( gpgme_ctx_t ctx=0, int error=0 );
explicit SigningResult( const Error & err );
@@ -60,9 +60,9 @@ namespace GpgME {
Private * d;
};
- KDE_EXPORT std::ostream & operator<<( std::ostream & os, const SigningResult & result );
+ TDE_EXPORT std::ostream & operator<<( std::ostream & os, const SigningResult & result );
- class KDE_EXPORT InvalidSigningKey {
+ class TDE_EXPORT InvalidSigningKey {
friend class SigningResult;
InvalidSigningKey( SigningResult::Private * parent, unsigned int index );
public:
@@ -82,9 +82,9 @@ namespace GpgME {
unsigned int idx;
};
- KDE_EXPORT std::ostream & operator<<( std::ostream & os, const InvalidSigningKey & key );
+ TDE_EXPORT std::ostream & operator<<( std::ostream & os, const InvalidSigningKey & key );
- class KDE_EXPORT CreatedSignature {
+ class TDE_EXPORT CreatedSignature {
friend class SigningResult;
CreatedSignature( SigningResult::Private * parent, unsigned int index );
public:
@@ -117,7 +117,7 @@ namespace GpgME {
unsigned int idx;
};
- KDE_EXPORT std::ostream & operator<<( std::ostream & os, const CreatedSignature & sig );
+ TDE_EXPORT std::ostream & operator<<( std::ostream & os, const CreatedSignature & sig );
}
diff --git a/libtdenetwork/gpgmepp/verificationresult.h b/libtdenetwork/gpgmepp/verificationresult.h
index e572ecfe..86d54b8d 100644
--- a/libtdenetwork/gpgmepp/verificationresult.h
+++ b/libtdenetwork/gpgmepp/verificationresult.h
@@ -29,14 +29,14 @@
#include <vector>
#include <iosfwd>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
namespace GpgME {
class Error;
class Signature;
- class KDE_EXPORT VerificationResult : public Result {
+ class TDE_EXPORT VerificationResult : public Result {
public:
VerificationResult( gpgme_ctx_t ctx=0, int error=0 );
explicit VerificationResult( const Error & err );
@@ -55,9 +55,9 @@ namespace GpgME {
Private * d;
};
- KDE_EXPORT std::ostream & operator<<( std::ostream & os, const VerificationResult & result );
+ TDE_EXPORT std::ostream & operator<<( std::ostream & os, const VerificationResult & result );
- class KDE_EXPORT Signature {
+ class TDE_EXPORT Signature {
friend class VerificationResult;
Signature( VerificationResult::Private * parent, unsigned int index );
public:
@@ -113,10 +113,10 @@ namespace GpgME {
unsigned int idx;
};
- KDE_EXPORT std::ostream & operator<<( std::ostream & os, const Signature & sig );
- KDE_EXPORT std::ostream & operator<<( std::ostream & os, Signature::Summary summary );
+ TDE_EXPORT std::ostream & operator<<( std::ostream & os, const Signature & sig );
+ TDE_EXPORT std::ostream & operator<<( std::ostream & os, Signature::Summary summary );
- class KDE_EXPORT Signature::Notation {
+ class TDE_EXPORT Signature::Notation {
friend class Signature;
Notation( VerificationResult::Private * parent, unsigned int sindex, unsigned int nindex );
public:
@@ -137,7 +137,7 @@ namespace GpgME {
unsigned int nidx;
};
- KDE_EXPORT std::ostream & operator<<( std::ostream & os, const Signature::Notation & nota );
+ TDE_EXPORT std::ostream & operator<<( std::ostream & os, const Signature::Notation & nota );
}
diff --git a/libtdenetwork/qgpgme/dataprovider.h b/libtdenetwork/qgpgme/dataprovider.h
index 36e2afc7..235998f7 100644
--- a/libtdenetwork/qgpgme/dataprovider.h
+++ b/libtdenetwork/qgpgme/dataprovider.h
@@ -22,11 +22,11 @@
#include <gpgmepp/interfaces/dataprovider.h>
#include <tqcstring.h>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
namespace QGpgME {
- class KDE_EXPORT TQByteArrayDataProvider : public GpgME::DataProvider {
+ class TDE_EXPORT TQByteArrayDataProvider : public GpgME::DataProvider {
public:
TQByteArrayDataProvider();
TQByteArrayDataProvider( const TQByteArray & initialData );
diff --git a/libtdenetwork/qgpgme/eventloopinteractor.cpp b/libtdenetwork/qgpgme/eventloopinteractor.cpp
index 3e75bf89..34cc51f4 100644
--- a/libtdenetwork/qgpgme/eventloopinteractor.cpp
+++ b/libtdenetwork/qgpgme/eventloopinteractor.cpp
@@ -39,8 +39,8 @@ QGpgME::EventLoopInteractor::EventLoopInteractor( TQObject * parent, const char
{
if ( !parent )
if ( tqApp ) {
- connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) );
- connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SIGNAL(aboutToDestroy()) );
+ connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(deleteLater()) );
+ connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SIGNAL(aboutToDestroy()) );
}
mSelf = this;
}
@@ -67,9 +67,9 @@ void * QGpgME::EventLoopInteractor::registerWatcher( int fd, Direction dir, bool
TQSocketNotifier * sn = new TQSocketNotifier( fd,
dir == Read ? TQSocketNotifier::Read : TQSocketNotifier::Write );
if ( dir == Read )
- connect( sn, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReadActivity(int)) );
+ connect( sn, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReadActivity(int)) );
else
- connect( sn, TQT_SIGNAL(activated(int)), TQT_SLOT(slotWriteActivity(int)) );
+ connect( sn, TQ_SIGNAL(activated(int)), TQ_SLOT(slotWriteActivity(int)) );
ok = true; // Can above operations fails?
return sn;
}
diff --git a/libtdenetwork/qgpgme/eventloopinteractor.h b/libtdenetwork/qgpgme/eventloopinteractor.h
index 64abc576..7fca3bc0 100644
--- a/libtdenetwork/qgpgme/eventloopinteractor.h
+++ b/libtdenetwork/qgpgme/eventloopinteractor.h
@@ -22,7 +22,7 @@
#include <gpgmepp/eventloopinteractor.h>
#include <tqobject.h>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
namespace GpgME {
class Context;
@@ -33,8 +33,8 @@ namespace GpgME {
namespace QGpgME {
- class KDE_EXPORT EventLoopInteractor : public TQObject, public GpgME::EventLoopInteractor {
- Q_OBJECT
+ class TDE_EXPORT EventLoopInteractor : public TQObject, public GpgME::EventLoopInteractor {
+ TQ_OBJECT
protected:
EventLoopInteractor( TQObject * parent, const char * name=0 );