summaryrefslogtreecommitdiffstats
path: root/libkdenetwork/gpgmepp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-13 00:46:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-13 00:46:47 +0000
commit67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch)
tree5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /libkdenetwork/gpgmepp
parent2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff)
downloadtdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz
tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip
Initial conversion of kdepim to TQt
This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libkdenetwork/gpgmepp')
-rw-r--r--libkdenetwork/gpgmepp/encryptionresult.cpp4
-rw-r--r--libkdenetwork/gpgmepp/encryptionresult.h2
-rw-r--r--libkdenetwork/gpgmepp/eventloopinteractor.h4
-rw-r--r--libkdenetwork/gpgmepp/importresult.cpp8
-rw-r--r--libkdenetwork/gpgmepp/importresult.h6
-rw-r--r--libkdenetwork/gpgmepp/key.cpp10
-rw-r--r--libkdenetwork/gpgmepp/key.h12
-rw-r--r--libkdenetwork/gpgmepp/signingresult.cpp8
-rw-r--r--libkdenetwork/gpgmepp/signingresult.h4
-rw-r--r--libkdenetwork/gpgmepp/verificationresult.cpp10
-rw-r--r--libkdenetwork/gpgmepp/verificationresult.h4
11 files changed, 36 insertions, 36 deletions
diff --git a/libkdenetwork/gpgmepp/encryptionresult.cpp b/libkdenetwork/gpgmepp/encryptionresult.cpp
index f827ca839..cad520baa 100644
--- a/libkdenetwork/gpgmepp/encryptionresult.cpp
+++ b/libkdenetwork/gpgmepp/encryptionresult.cpp
@@ -94,8 +94,8 @@ std::vector<GpgME::InvalidRecipient> GpgME::EncryptionResult::invalidEncryptionK
-GpgME::InvalidRecipient::InvalidRecipient( EncryptionResult::Private * parent, unsigned int i )
- : d( parent ), idx( i )
+GpgME::InvalidRecipient::InvalidRecipient( EncryptionResult::Private * tqparent, unsigned int i )
+ : d( tqparent ), idx( i )
{
if ( d )
d->ref();
diff --git a/libkdenetwork/gpgmepp/encryptionresult.h b/libkdenetwork/gpgmepp/encryptionresult.h
index 7267afc01..0624779d2 100644
--- a/libkdenetwork/gpgmepp/encryptionresult.h
+++ b/libkdenetwork/gpgmepp/encryptionresult.h
@@ -59,7 +59,7 @@ namespace GpgME {
class KDE_EXPORT InvalidRecipient {
friend class EncryptionResult;
- InvalidRecipient( EncryptionResult::Private * parent, unsigned int index );
+ InvalidRecipient( EncryptionResult::Private * tqparent, unsigned int index );
public:
InvalidRecipient();
InvalidRecipient( const InvalidRecipient & other );
diff --git a/libkdenetwork/gpgmepp/eventloopinteractor.h b/libkdenetwork/gpgmepp/eventloopinteractor.h
index 5a07490da..f924569e6 100644
--- a/libkdenetwork/gpgmepp/eventloopinteractor.h
+++ b/libkdenetwork/gpgmepp/eventloopinteractor.h
@@ -34,7 +34,7 @@ namespace GpgME {
\brief Abstract base class for gpgme's external event loop support
This class does most of the work involved with hooking GpgME++
- up with external event loops, such as the GTK or Qt ones.
+ up with external event loops, such as the GTK or TQt ones.
It actually provides two interfaces: An interface to the gpgme
IO Callback handling and one for gpgme events. The IO Callback
@@ -67,7 +67,7 @@ namespace GpgME {
and return a tag identifying that particular watching process
uniquely. This could be the index into an array of objects you
use for that purpose or the address of such an object. E.g. in
- Qt, you'd essentially just create a new \c TQSocketNotifier:
+ TQt, you'd essentially just create a new \c TQSocketNotifier:
\verbatim
void * registerWatcher( int fd, Direction dir ) {
diff --git a/libkdenetwork/gpgmepp/importresult.cpp b/libkdenetwork/gpgmepp/importresult.cpp
index d23c195e3..7acd35e4c 100644
--- a/libkdenetwork/gpgmepp/importresult.cpp
+++ b/libkdenetwork/gpgmepp/importresult.cpp
@@ -140,8 +140,8 @@ std::vector<GpgME::Import> GpgME::ImportResult::imports() const {
-GpgME::Import::Import( ImportResult::Private * parent, unsigned int i )
- : d( parent ), idx( i )
+GpgME::Import::Import( ImportResult::Private * tqparent, unsigned int i )
+ : d( tqparent ), idx( i )
{
if ( d )
d->ref();
@@ -190,7 +190,7 @@ GpgME::Error GpgME::Import::error() const {
return isNull() ? 0 : d->imports[idx]->result ;
}
-GpgME::Import::Status GpgME::Import::status() const {
+GpgME::Import::tqStatus GpgME::Import::status() const {
if ( isNull() )
return Unknown;
unsigned int s = d->imports[idx]->status;
@@ -200,5 +200,5 @@ GpgME::Import::Status GpgME::Import::status() const {
if ( s & GPGME_IMPORT_SIG ) result |= NewSignatures;
if ( s & GPGME_IMPORT_SUBKEY ) result |= NewSubkeys;
if ( s & GPGME_IMPORT_SECRET ) result |= ContainedSecretKey;
- return static_cast<Status>( result );
+ return static_cast<tqStatus>( result );
}
diff --git a/libkdenetwork/gpgmepp/importresult.h b/libkdenetwork/gpgmepp/importresult.h
index 2bb1b61b3..eae58a5dc 100644
--- a/libkdenetwork/gpgmepp/importresult.h
+++ b/libkdenetwork/gpgmepp/importresult.h
@@ -70,7 +70,7 @@ namespace GpgME {
class KDE_EXPORT Import {
friend class ImportResult;
- Import( ImportResult::Private * parent, unsigned int idx );
+ Import( ImportResult::Private * tqparent, unsigned int idx );
public:
Import();
Import( const Import & other );
@@ -83,7 +83,7 @@ namespace GpgME {
const char * fingerprint() const;
Error error() const;
- enum Status {
+ enum tqStatus {
Unknown = 0x0,
NewKey = 0x1,
NewUserIDs = 0x2,
@@ -91,7 +91,7 @@ namespace GpgME {
NewSubkeys = 0x8,
ContainedSecretKey = 0x10
};
- Status status() const;
+ tqStatus status() const;
private:
ImportResult::Private * d;
diff --git a/libkdenetwork/gpgmepp/key.cpp b/libkdenetwork/gpgmepp/key.cpp
index cf70aaf03..d24a1d644 100644
--- a/libkdenetwork/gpgmepp/key.cpp
+++ b/libkdenetwork/gpgmepp/key.cpp
@@ -348,7 +348,7 @@ namespace GpgME {
return !d || !d->key || !d->subkey;
}
- Key Subkey::parent() const {
+ Key Subkey::tqparent() const {
return Key( d->key, true );
}
@@ -496,7 +496,7 @@ namespace GpgME {
return !d || !d->key || !d->uid;
}
- Key UserID::parent() const {
+ Key UserID::tqparent() const {
return Key( d->key, true );
}
@@ -669,7 +669,7 @@ namespace GpgME {
return !d || !d->key || !d->uid || !d->sig;
}
- UserID UserID::Signature::parent() const {
+ UserID UserID::Signature::tqparent() const {
return UserID( d->key, d->uid );
}
@@ -733,7 +733,7 @@ namespace GpgME {
return d->sig ? d->sig->sig_class : 0 ;
}
- UserID::Signature::Status UserID::Signature::status() const {
+ UserID::Signature::tqStatus UserID::Signature::status() const {
if ( !d->sig )
return GeneralError;
@@ -911,7 +911,7 @@ namespace GpgME {
return !d || !d->key || !d->uid || !d->sig || !d->nota;
}
- UserID::Signature UserID::Signature::Notation::parent() const {
+ UserID::Signature UserID::Signature::Notation::tqparent() const {
return Signature( d->key, d->uid, d->sig );
}
diff --git a/libkdenetwork/gpgmepp/key.h b/libkdenetwork/gpgmepp/key.h
index c25e3a6f3..9760e6429 100644
--- a/libkdenetwork/gpgmepp/key.h
+++ b/libkdenetwork/gpgmepp/key.h
@@ -123,7 +123,7 @@ namespace GpgME {
bool isNull() const;
- Key parent() const;
+ Key tqparent() const;
const char * keyID() const;
const char * fingerprint() const;
@@ -171,7 +171,7 @@ namespace GpgME {
bool isNull() const;
- Key parent() const;
+ Key tqparent() const;
unsigned int numSignatures() const;
Signature signature( unsigned int index ) const;
@@ -213,7 +213,7 @@ namespace GpgME {
bool isNull() const;
- UserID parent() const;
+ UserID tqparent() const;
const char * signerKeyID() const;
@@ -235,9 +235,9 @@ namespace GpgME {
unsigned int certClass() const;
- enum Status { NoError = 0, SigExpired, KeyExpired,
+ enum tqStatus { NoError = 0, SigExpired, KeyExpired,
BadSignature, NoPublicKey, GeneralError };
- Status status() const;
+ tqStatus status() const;
const char * statusAsString() const;
const char * policyURL() const;
@@ -270,7 +270,7 @@ namespace GpgME {
bool isNull() const;
- Signature parent() const;
+ Signature tqparent() const;
const char * name() const;
const char * value() const;
diff --git a/libkdenetwork/gpgmepp/signingresult.cpp b/libkdenetwork/gpgmepp/signingresult.cpp
index 6996eef7a..6dab4d71d 100644
--- a/libkdenetwork/gpgmepp/signingresult.cpp
+++ b/libkdenetwork/gpgmepp/signingresult.cpp
@@ -116,8 +116,8 @@ std::vector<GpgME::InvalidSigningKey> GpgME::SigningResult::invalidSigningKeys()
-GpgME::InvalidSigningKey::InvalidSigningKey( SigningResult::Private * parent, unsigned int i )
- : d( parent ), idx( i )
+GpgME::InvalidSigningKey::InvalidSigningKey( SigningResult::Private * tqparent, unsigned int i )
+ : d( tqparent ), idx( i )
{
if ( d )
d->ref();
@@ -165,8 +165,8 @@ GpgME::Error GpgME::InvalidSigningKey::reason() const {
-GpgME::CreatedSignature::CreatedSignature( SigningResult::Private * parent, unsigned int i )
- : d( parent ), idx( i )
+GpgME::CreatedSignature::CreatedSignature( SigningResult::Private * tqparent, unsigned int i )
+ : d( tqparent ), idx( i )
{
if ( d )
d->ref();
diff --git a/libkdenetwork/gpgmepp/signingresult.h b/libkdenetwork/gpgmepp/signingresult.h
index 202d09b41..facf8979b 100644
--- a/libkdenetwork/gpgmepp/signingresult.h
+++ b/libkdenetwork/gpgmepp/signingresult.h
@@ -64,7 +64,7 @@ namespace GpgME {
class KDE_EXPORT InvalidSigningKey {
friend class SigningResult;
- InvalidSigningKey( SigningResult::Private * parent, unsigned int index );
+ InvalidSigningKey( SigningResult::Private * tqparent, unsigned int index );
public:
InvalidSigningKey();
InvalidSigningKey( const InvalidSigningKey & other );
@@ -86,7 +86,7 @@ namespace GpgME {
class KDE_EXPORT CreatedSignature {
friend class SigningResult;
- CreatedSignature( SigningResult::Private * parent, unsigned int index );
+ CreatedSignature( SigningResult::Private * tqparent, unsigned int index );
public:
class Notation;
diff --git a/libkdenetwork/gpgmepp/verificationresult.cpp b/libkdenetwork/gpgmepp/verificationresult.cpp
index abf30d96c..e4f905d83 100644
--- a/libkdenetwork/gpgmepp/verificationresult.cpp
+++ b/libkdenetwork/gpgmepp/verificationresult.cpp
@@ -121,8 +121,8 @@ std::vector<GpgME::Signature> GpgME::VerificationResult::signatures() const {
-GpgME::Signature::Signature( VerificationResult::Private * parent, unsigned int i )
- : d( parent ), idx( i )
+GpgME::Signature::Signature( VerificationResult::Private * tqparent, unsigned int i )
+ : d( tqparent ), idx( i )
{
if ( d )
d->ref();
@@ -253,8 +253,8 @@ std::vector<GpgME::Signature::Notation> GpgME::Signature::notations() const {
}
-GpgME::Signature::Notation::Notation( VerificationResult::Private * parent, unsigned int sindex, unsigned int nindex )
- : d( parent ), sidx( sindex ), nidx( nindex )
+GpgME::Signature::Notation::Notation( VerificationResult::Private * tqparent, unsigned int sindex, unsigned int nindex )
+ : d( tqparent ), sidx( sindex ), nidx( nindex )
{
if ( d )
d->ref();
@@ -338,7 +338,7 @@ std::ostream & GpgME::operator<<( std::ostream & os, const Signature & sig ) {
if ( !sig.isNull() ) {
os << "\n Summary: " << sig.summary()
<< "\n Fingerprint: " << protect( sig.fingerprint() )
- << "\n Status: " << sig.status()
+ << "\n tqStatus: " << sig.status()
<< "\n creationTime: " << sig.creationTime()
<< "\n expirationTime: " << sig.expirationTime()
<< "\n wrongKeyUsage: " << sig.wrongKeyUsage()
diff --git a/libkdenetwork/gpgmepp/verificationresult.h b/libkdenetwork/gpgmepp/verificationresult.h
index edcd02787..c5c14aab9 100644
--- a/libkdenetwork/gpgmepp/verificationresult.h
+++ b/libkdenetwork/gpgmepp/verificationresult.h
@@ -59,7 +59,7 @@ namespace GpgME {
class KDE_EXPORT Signature {
friend class VerificationResult;
- Signature( VerificationResult::Private * parent, unsigned int index );
+ Signature( VerificationResult::Private * tqparent, unsigned int index );
public:
class Notation;
@@ -118,7 +118,7 @@ namespace GpgME {
class KDE_EXPORT Signature::Notation {
friend class Signature;
- Notation( VerificationResult::Private * parent, unsigned int sindex, unsigned int nindex );
+ Notation( VerificationResult::Private * tqparent, unsigned int sindex, unsigned int nindex );
public:
Notation();
Notation( const Notation & other );