diff options
Diffstat (limited to 'libtdenetwork')
24 files changed, 74 insertions, 100 deletions
diff --git a/libtdenetwork/gpgmepp/context.h b/libtdenetwork/gpgmepp/context.h index 054f8bee..ec01f20d 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,7 +25,7 @@ #include <utility> #include <iosfwd> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { @@ -48,7 +46,7 @@ namespace GpgME { class EngineInfo; - class KDE_EXPORT Error { + class TDE_EXPORT Error { public: Error( int e=0 ) : mErr( e ) {} @@ -66,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 }; @@ -285,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 ); // // @@ -298,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, @@ -321,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/context_p.h b/libtdenetwork/gpgmepp/context_p.h index dfff5863..5d44ba7c 100644 --- a/libtdenetwork/gpgmepp/context_p.h +++ b/libtdenetwork/gpgmepp/context_p.h @@ -16,9 +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_P_H__ #define __GPGMEPP_CONTEXT_P_H__ diff --git a/libtdenetwork/gpgmepp/data.h b/libtdenetwork/gpgmepp/data.h index e1206472..4d6dfb1f 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 <kdemacros.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/data_p.h b/libtdenetwork/gpgmepp/data_p.h index 38981cce..7f2c83fc 100644 --- a/libtdenetwork/gpgmepp/data_p.h +++ b/libtdenetwork/gpgmepp/data_p.h @@ -1,4 +1,4 @@ -/* data_p.h - wraps a gpgme data object, private part -*- c++ -*- +/* Copyright (C) 2003,2004 Klarälvdalens Datakonsult AB This file is part of GPGME++. diff --git a/libtdenetwork/gpgmepp/decryptionresult.h b/libtdenetwork/gpgmepp/decryptionresult.h index da4833bb..86e6af58 100644 --- a/libtdenetwork/gpgmepp/decryptionresult.h +++ b/libtdenetwork/gpgmepp/decryptionresult.h @@ -26,13 +26,13 @@ #include <iosfwd> -#include <tdepimmacros.h> +#include <kdemacros.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..745ce09b 100644 --- a/libtdenetwork/gpgmepp/encryptionresult.h +++ b/libtdenetwork/gpgmepp/encryptionresult.h @@ -27,14 +27,14 @@ #include <vector> #include <iosfwd> -#include <tdepimmacros.h> +#include <kdemacros.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..6f151185 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 <kdemacros.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 c3688833..e8da527c 100644 --- a/libtdenetwork/gpgmepp/eventloopinteractor.h +++ b/libtdenetwork/gpgmepp/eventloopinteractor.h @@ -16,12 +16,10 @@ 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_EVENTLOOPINTERACTOR_H__ #define __GPGMEPP_EVENTLOOPINTERACTOR_H__ -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { @@ -104,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..110e9834 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 <kdemacros.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..aa21a11f 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 <kdemacros.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 f05d372d..c3522360 100644 --- a/libtdenetwork/gpgmepp/key.h +++ b/libtdenetwork/gpgmepp/key.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_KEY_H__ #define __GPGMEPP_KEY_H__ @@ -27,7 +25,7 @@ #include <sys/time.h> #include <vector> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { @@ -38,7 +36,7 @@ namespace GpgME { // class Key // - class KDE_EXPORT Key { + class TDE_EXPORT Key { friend class Context; public: Key(); @@ -112,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 ); @@ -158,7 +156,7 @@ namespace GpgME { // class UserID // - class KDE_EXPORT UserID { + class TDE_EXPORT UserID { public: class Signature; @@ -200,7 +198,7 @@ namespace GpgME { // class UserID::Signature // - class KDE_EXPORT UserID::Signature { + class TDE_EXPORT UserID::Signature { public: class Notation; @@ -257,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..7fef89f3 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 <kdemacros.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..8a77a0b5 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 <kdemacros.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/shared.h b/libtdenetwork/gpgmepp/shared.h index f9c79e0c..e263d8f1 100644 --- a/libtdenetwork/gpgmepp/shared.h +++ b/libtdenetwork/gpgmepp/shared.h @@ -1,4 +1,4 @@ -/* shared.h - internal tool for refcounting -*- c++ -*- +/* Copyright (C) 2003 Klarälvdalens Datakonsult AB This file is part of GPGME++. diff --git a/libtdenetwork/gpgmepp/signingresult.h b/libtdenetwork/gpgmepp/signingresult.h index 1ee7a8de..3a35c3d5 100644 --- a/libtdenetwork/gpgmepp/signingresult.h +++ b/libtdenetwork/gpgmepp/signingresult.h @@ -30,7 +30,7 @@ #include <vector> #include <iosfwd> -#include <tdepimmacros.h> +#include <kdemacros.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/trustitem.h b/libtdenetwork/gpgmepp/trustitem.h index 61c74617..aa1850b5 100644 --- a/libtdenetwork/gpgmepp/trustitem.h +++ b/libtdenetwork/gpgmepp/trustitem.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_TRUSTITEM_H__ #define __GPGMEPP_TRUSTITEM_H__ diff --git a/libtdenetwork/gpgmepp/util.h b/libtdenetwork/gpgmepp/util.h index 8246cfc3..088a81c4 100644 --- a/libtdenetwork/gpgmepp/util.h +++ b/libtdenetwork/gpgmepp/util.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_UTIL_H__ #define __GPGMEPP_UTIL_H__ diff --git a/libtdenetwork/gpgmepp/verificationresult.h b/libtdenetwork/gpgmepp/verificationresult.h index e572ecfe..1bc61a69 100644 --- a/libtdenetwork/gpgmepp/verificationresult.h +++ b/libtdenetwork/gpgmepp/verificationresult.h @@ -29,14 +29,14 @@ #include <vector> #include <iosfwd> -#include <tdepimmacros.h> +#include <kdemacros.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/libgpgme-copy/gpgme/stpcpy.c b/libtdenetwork/libgpgme-copy/gpgme/stpcpy.c index 4e9fc10a..7e6fa69e 100644 --- a/libtdenetwork/libgpgme-copy/gpgme/stpcpy.c +++ b/libtdenetwork/libgpgme-copy/gpgme/stpcpy.c @@ -35,8 +35,8 @@ __stpcpy (dest, src) char *dest; const char *src; { - register char *d = dest; - register const char *s = src; + char *d = dest; + const char *s = src; do *d++ = *s; diff --git a/libtdenetwork/qgpgme/dataprovider.cpp b/libtdenetwork/qgpgme/dataprovider.cpp index 308fbc12..af3bc715 100644 --- a/libtdenetwork/qgpgme/dataprovider.cpp +++ b/libtdenetwork/qgpgme/dataprovider.cpp @@ -16,9 +16,6 @@ You should have received a copy of the GNU General Public License along with TQGPGME; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -// -*- c++ -*- - #include <config.h> #include <qgpgme/dataprovider.h> diff --git a/libtdenetwork/qgpgme/dataprovider.h b/libtdenetwork/qgpgme/dataprovider.h index 58c097d1..9daf4021 100644 --- a/libtdenetwork/qgpgme/dataprovider.h +++ b/libtdenetwork/qgpgme/dataprovider.h @@ -16,19 +16,17 @@ You should have received a copy of the GNU General Public License along with TQGPGME; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -// -*- c++ -*- #ifndef __TQGPGME_DATAPROVIDER_H__ #define __TQGPGME_DATAPROVIDER_H__ #include <gpgmepp/interfaces/dataprovider.h> #include <tqcstring.h> -#include <tdepimmacros.h> +#include <kdemacros.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 b6d9830d..34cc51f4 100644 --- a/libtdenetwork/qgpgme/eventloopinteractor.cpp +++ b/libtdenetwork/qgpgme/eventloopinteractor.cpp @@ -16,9 +16,6 @@ You should have received a copy of the GNU General Public License along with TQGPGME; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -// -*- c++ -*- - #ifdef HAVE_CONFIG_H #include <config.h> #endif @@ -42,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; } @@ -70,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 b89b1841..ea7ccd03 100644 --- a/libtdenetwork/qgpgme/eventloopinteractor.h +++ b/libtdenetwork/qgpgme/eventloopinteractor.h @@ -16,15 +16,13 @@ You should have received a copy of the GNU General Public License along with TQGPGME; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -// -*- c++ -*- #ifndef __TQGPGME_EVENTLOOPINTERACTOR_H__ #define __TQGPGME_EVENTLOOPINTERACTOR_H__ #include <gpgmepp/eventloopinteractor.h> #include <tqobject.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { class Context; @@ -35,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 ); diff --git a/libtdenetwork/qgpgme/tests/dataprovidertest.cpp b/libtdenetwork/qgpgme/tests/dataprovidertest.cpp index 675c85ea..c72ac36c 100644 --- a/libtdenetwork/qgpgme/tests/dataprovidertest.cpp +++ b/libtdenetwork/qgpgme/tests/dataprovidertest.cpp @@ -16,9 +16,6 @@ You should have received a copy of the GNU General Public License along with TQGPGME; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -// -*- c++ -*- - #ifdef NDEBUG #undef NDEBUG #endif |