diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
commit | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch) | |
tree | 5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /libkdenetwork/gpgmepp/importresult.cpp | |
parent | 2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff) | |
download | tdepim-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/importresult.cpp')
-rw-r--r-- | libkdenetwork/gpgmepp/importresult.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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 ); } |