diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:55:33 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:55:33 -0600 |
| commit | ae6cafee5339716bd01aa6c66aa4f366bdc5d43b (patch) | |
| tree | db682cc1b772442e3ac4986b8f66119531291a4e /src/kgpgme.cpp | |
| parent | 882bcd26b3d60be72ea2b35921969a9850c52db9 (diff) | |
| download | basket-ae6cafee5339716bd01aa6c66aa4f366bdc5d43b.tar.gz basket-ae6cafee5339716bd01aa6c66aa4f366bdc5d43b.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 882bcd26b3d60be72ea2b35921969a9850c52db9.
Diffstat (limited to 'src/kgpgme.cpp')
| -rw-r--r-- | src/kgpgme.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/kgpgme.cpp b/src/kgpgme.cpp index 54db06b..cc5662e 100644 --- a/src/kgpgme.cpp +++ b/src/kgpgme.cpp @@ -29,7 +29,7 @@ #include <klistview.h> #include <kdebug.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <klocale.h> #include <locale.h> @@ -139,7 +139,7 @@ void KGpgMe::init(gpgme_protocol_t proto) err = gpgme_engine_check_version(proto); if(err) { KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), TQString("%1: %2") - .arg(gpgme_strsource(err)).arg(gpgme_strerror(err))); + .tqarg(gpgme_strsource(err)).tqarg(gpgme_strerror(err))); } } @@ -221,7 +221,7 @@ KGpgKeyList KGpgMe::keys(bool privateKeys /* = false */) const if(err) { KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), TQString("%1: %2") - .arg(gpgme_strsource(err)).arg(gpgme_strerror(err))); + .tqarg(gpgme_strsource(err)).tqarg(gpgme_strerror(err))); } else { result = gpgme_op_keylist_result(m_ctx); @@ -263,8 +263,8 @@ bool KGpgMe::encrypt(const TQByteArray& inBuffer, TQ_ULONG length, result = gpgme_op_encrypt_result(m_ctx); if (result->invalid_recipients) { KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), TQString("%1: %2") - .arg(i18n("That public key is not meant for encryption")) - .arg(result->invalid_recipients->fpr)); + .tqarg(i18n("That public key is not meant for encryption")) + .tqarg(result->invalid_recipients->fpr)); } else { err = readToBuffer(out, outBuffer); @@ -276,7 +276,7 @@ bool KGpgMe::encrypt(const TQByteArray& inBuffer, TQ_ULONG length, } if(err != GPG_ERR_NO_ERROR && err != GPG_ERR_CANCELED) { KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), TQString("%1: %2") - .arg(gpgme_strsource(err)).arg(gpgme_strerror(err))); + .tqarg(gpgme_strsource(err)).tqarg(gpgme_strerror(err))); } if(err != GPG_ERR_NO_ERROR) clearCache(); @@ -306,8 +306,8 @@ bool KGpgMe::decrypt(const TQByteArray& inBuffer, TQByteArray* outBuffer) result = gpgme_op_decrypt_result(m_ctx); if(result->unsupported_algorithm) { KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), TQString("%1: %2") - .arg(i18n("Unsupported algorithm")) - .arg(result->unsupported_algorithm)); + .tqarg(i18n("Unsupported algorithm")) + .tqarg(result->unsupported_algorithm)); } else { err = readToBuffer(out, outBuffer); @@ -318,7 +318,7 @@ bool KGpgMe::decrypt(const TQByteArray& inBuffer, TQByteArray* outBuffer) } if(err != GPG_ERR_NO_ERROR && err != GPG_ERR_CANCELED) { KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), TQString("%1: %2") - .arg(gpgme_strsource(err)).arg(gpgme_strerror(err))); + .tqarg(gpgme_strsource(err)).tqarg(gpgme_strerror(err))); } if(err != GPG_ERR_NO_ERROR) clearCache(); @@ -346,7 +346,7 @@ gpgme_error_t KGpgMe::readToBuffer(gpgme_data_t in, TQByteArray* outBuffer) cons if(buf) { while((ret = gpgme_data_read(in, buf, BUF_SIZE)) > 0) { uint size = outBuffer->size(); - if(outBuffer->resize(size + ret)) + if(outBuffer->tqresize(size + ret)) memcpy(outBuffer->data() + size, buf, ret); } if(ret < 0) |