summaryrefslogtreecommitdiffstats
path: root/libkpgp
diff options
context:
space:
mode:
Diffstat (limited to 'libkpgp')
-rw-r--r--libkpgp/kpgp.cpp28
-rw-r--r--libkpgp/kpgp.h4
-rw-r--r--libkpgp/kpgpbase.cpp32
-rw-r--r--libkpgp/kpgpbase2.cpp62
-rw-r--r--libkpgp/kpgpbase5.cpp60
-rw-r--r--libkpgp/kpgpbase6.cpp36
-rw-r--r--libkpgp/kpgpbaseG.cpp60
-rw-r--r--libkpgp/kpgpblock.cpp8
-rw-r--r--libkpgp/kpgpblock.h22
-rw-r--r--libkpgp/kpgpui.cpp62
10 files changed, 187 insertions, 187 deletions
diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp
index 6035112c8..08557a727 100644
--- a/libkpgp/kpgp.cpp
+++ b/libkpgp/kpgp.cpp
@@ -313,7 +313,7 @@ Module::clearsign( Block& block,
Kpgp::Result
Module::encrypt( Block& block,
- const TQStringList& tqreceivers, const KeyID& keyId,
+ const TQStringList& receivers, const KeyID& keyId,
bool sign, const TQCString& charset )
{
KeyIDList encryptionKeyIds; // list of keys which are used for encryption
@@ -324,8 +324,8 @@ Module::encrypt( Block& block,
setUser( keyId );
- if( !tqreceivers.empty() ) {
- Kpgp::Result result = getEncryptionKeys( encryptionKeyIds, tqreceivers,
+ if( !receivers.empty() ) {
+ Kpgp::Result result = getEncryptionKeys( encryptionKeyIds, receivers,
keyId );
if( Kpgp::Ok != result ) {
return result;
@@ -371,7 +371,7 @@ Module::encrypt( Block& block,
TQString str = i18n("%1 = 'signing failed' error message",
"%1\nDo you want to send the message unsigned, "
"or cancel sending the message?")
- .tqarg( pgp->lastErrorMessage() );
+ .arg( pgp->lastErrorMessage() );
TQApplication::setOverrideCursor( TQCursor(TQCursor::ArrowCursor) );
int ret = KMessageBox::warningContinueCancel( 0, str,
i18n("PGP Warning"),
@@ -389,7 +389,7 @@ Module::encrypt( Block& block,
TQString str = i18n("%1 = 'bad keys' error message",
"%1\nDo you want to encrypt anyway, leave the "
"message as-is, or cancel sending the message?")
- .tqarg( pgp->lastErrorMessage() );
+ .arg( pgp->lastErrorMessage() );
TQApplication::setOverrideCursor( TQCursor(TQCursor::ArrowCursor) );
int ret = KMessageBox::warningYesNoCancel( 0, str,
@@ -416,7 +416,7 @@ Module::encrypt( Block& block,
TQString str = i18n("%1 = 'missing keys' error message",
"%1\nDo you want to leave the message as-is, "
"or cancel sending the message?")
- .tqarg( pgp->lastErrorMessage() );
+ .arg( pgp->lastErrorMessage() );
TQApplication::setOverrideCursor( TQCursor(TQCursor::ArrowCursor) );
int ret = KMessageBox::warningContinueCancel( 0, str,
i18n("PGP Warning"),
@@ -432,10 +432,10 @@ Module::encrypt( Block& block,
if( status & ERROR ) {
// show error dialog
errMsg = i18n( "The following error occurred:\n%1" )
- .tqarg( pgp->lastErrorMessage() );
+ .arg( pgp->lastErrorMessage() );
TQString details = i18n( "This is the error message of %1:\n%2" )
- .tqarg( ( pgpType == tGPG ) ? "GnuPG" : "PGP" )
- .tqarg( block.error().data() );
+ .arg( ( pgpType == tGPG ) ? "GnuPG" : "PGP" )
+ .arg( block.error().data() );
TQApplication::setOverrideCursor( TQCursor(TQCursor::ArrowCursor) );
KMessageBox::detailedSorry( 0, errMsg, details );
TQApplication::restoreOverrideCursor();
@@ -1216,7 +1216,7 @@ Module::getEncryptionKeys( const TQString& person )
"encryption key(s) for \"%1\".\n\n"
"Please re-select the key(s) which should "
"be used for this recipient."
- ).tqarg(person),
+ ).arg(person),
keyIds,
allowedKeys );
if( !keyIds.isEmpty() ) {
@@ -1280,7 +1280,7 @@ Module::getEncryptionKeys( const TQString& person )
"found for \"%1\".\n\n"
"Select the key(s) which should "
"be used for this recipient."
- ).tqarg(person),
+ ).arg(person),
KeyIDList(),
allowedKeys );
if( !keyIds.isEmpty() ) {
@@ -1305,7 +1305,7 @@ Module::getEncryptionKeys( const TQString& person )
"More than one key matches \"%1\".\n\n"
"Select the key(s) which should "
"be used for this recipient."
- ).tqarg(person),
+ ).arg(person),
KeyIDList(),
allowedKeys );
if( !keyIds.isEmpty() ) {
@@ -1744,7 +1744,7 @@ Module::readAddressData()
addressDataDict.clear();
for( int i=1; i<=num; i++ ) {
- KConfigGroup addrGroup( config, TQString("Address #%1").tqarg(i).local8Bit() );
+ KConfigGroup addrGroup( config, TQString("Address #%1").arg(i).local8Bit() );
address = addrGroup.readEntry( "Address" );
data.keyIds = KeyIDList::fromStringList( addrGroup.readListEntry( "Key IDs" ) );
data.encrPref = (EncryptPref) addrGroup.readNumEntry( "EncryptionPreference",
@@ -1769,7 +1769,7 @@ Module::writeAddressData()
for ( i=1, it = addressDataDict.begin();
it != addressDataDict.end();
++it, i++ ) {
- KConfigGroup addrGroup( config, TQString("Address #%1").tqarg(i).local8Bit() );
+ KConfigGroup addrGroup( config, TQString("Address #%1").arg(i).local8Bit() );
addrGroup.writeEntry( "Address", it.key() );
addrGroup.writeEntry( "Key IDs", it.data().keyIds.toStringList() );
addrGroup.writeEntry( "EncryptionPreference", it.data().encrPref );
diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h
index f9f492360..25dc44c0c 100644
--- a/libkpgp/kpgp.h
+++ b/libkpgp/kpgp.h
@@ -25,7 +25,7 @@
#include <tqdialog.h>
#include <tqwidget.h>
#include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqlistview.h>
#include <tqbuttongroup.h>
@@ -123,7 +123,7 @@ public:
Ok if everything is o.k.
*/
Kpgp::Result encrypt( Block& block,
- const TQStringList& tqreceivers, const KeyID& keyId,
+ const TQStringList& receivers, const KeyID& keyId,
bool sign, const TQCString& charset = 0 );
/** Determines the keys which should be used for encrypting the message
diff --git a/libkpgp/kpgpbase.cpp b/libkpgp/kpgpbase.cpp
index d30f0fd15..591a99439 100644
--- a/libkpgp/kpgpbase.cpp
+++ b/libkpgp/kpgpbase.cpp
@@ -70,7 +70,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
int len, len2;
FILE *pass;
pid_t child_pid;
- int childExitqStatus;
+ int childExiStatus;
struct pollfd pollin, pollout, pollerr;
int pollstatus;
@@ -251,8 +251,8 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
do {
//kdDebug(5100) << "Checking if PGP is still running..." << endl;
- childExitqStatus = 0;
- waitpidRetVal = waitpid(child_pid, &childExitqStatus, WNOHANG);
+ childExiStatus = 0;
+ waitpidRetVal = waitpid(child_pid, &childExiStatus, WNOHANG);
//kdDebug(5100) << "waitpid returned " << waitpidRetVal << endl;
if (pout[0] >= 0) {
do {
@@ -351,14 +351,14 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
close(ppass[0]);
// Did the child exit normally?
- if (WIFEXITED(childExitqStatus) != 0) {
+ if (WIFEXITED(childExiStatus) != 0) {
// Get the return code of the child
- childExitqStatus = WEXITSTATUS(childExitqStatus);
- kdDebug(5100) << "PGP exited with exit status " << childExitqStatus
+ childExiStatus = WEXITSTATUS(childExiStatus);
+ kdDebug(5100) << "PGP exited with exit status " << childExiStatus
<< endl;
}
else {
- childExitqStatus = -1;
+ childExiStatus = -1;
kdDebug(5100) << "PGP exited abnormally!" << endl;
}
@@ -371,7 +371,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
*/
kdDebug(5100) << error << endl;
- return childExitqStatus;
+ return childExiStatus;
}
@@ -387,7 +387,7 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG )
int len, len2;
FILE *pass;
pid_t child_pid;
- int childExitqStatus;
+ int childExiStatus;
char gpgcmd[1024] = "\0";
struct pollfd poller[3];
int num_pollers = 0;
@@ -529,8 +529,8 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG )
do {
//kdDebug(5100) << "Checking if GnuPG is still running..." << endl;
- childExitqStatus = 0;
- waitpidRetVal = waitpid(child_pid, &childExitqStatus, WNOHANG);
+ childExiStatus = 0;
+ waitpidRetVal = waitpid(child_pid, &childExiStatus, WNOHANG);
//kdDebug(5100) << "waitpid returned " << waitpidRetVal << endl;
do {
// poll the pipes
@@ -645,14 +645,14 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG )
close(ppass[0]);
// Did the child exit normally?
- if (WIFEXITED(childExitqStatus) != 0) {
+ if (WIFEXITED(childExiStatus) != 0) {
// Get the return code of the child
- childExitqStatus = WEXITSTATUS(childExitqStatus);
- kdDebug(5100) << "GnuPG exited with exit status " << childExitqStatus
+ childExiStatus = WEXITSTATUS(childExiStatus);
+ kdDebug(5100) << "GnuPG exited with exit status " << childExiStatus
<< endl;
}
else {
- childExitqStatus = -1;
+ childExiStatus = -1;
kdDebug(5100) << "GnuPG exited abnormally!" << endl;
}
@@ -663,7 +663,7 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG )
// get to know what's going on during the gpg calls.
kdDebug(5100) << "gpg stderr:\n" << error << endl;
- return childExitqStatus;
+ return childExiStatus;
}
diff --git a/libkpgp/kpgpbase2.cpp b/libkpgp/kpgpbase2.cpp
index 97db773a7..23458e022 100644
--- a/libkpgp/kpgpbase2.cpp
+++ b/libkpgp/kpgpbase2.cpp
@@ -66,7 +66,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
const char *passphrase )
{
TQCString cmd;
- int exitqStatus = 0;
+ int exiStatus = 0;
if(!recipients.isEmpty() && passphrase != 0)
cmd = PGP2 " +batchmode +language=en +verbose=1 -seat";
@@ -100,12 +100,12 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
clear();
input = block.text();
- exitqStatus = run(cmd.data(), passphrase);
+ exiStatus = run(cmd.data(), passphrase);
if( !output.isEmpty() )
block.setProcessedText( output );
block.setError( error );
- if(exitqStatus != 0)
+ if(exiStatus != 0)
status = ERROR;
#if 0
@@ -139,12 +139,12 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
errMsg = i18n("Could not find public keys matching the userid(s)\n"
"%1;\n"
"the message is not encrypted.")
- .tqarg( badkeys.data() );
+ .arg( badkeys.data() );
else
errMsg = i18n("Could not find public keys matching the userid(s)\n"
"%1;\n"
"these persons will not be able to read the message.")
- .tqarg( badkeys.data() );
+ .arg( badkeys.data() );
status |= MISSINGKEY;
status |= ERROR;
}
@@ -171,13 +171,13 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
"for userid(s)\n"
"%1.\n"
"The message is not encrypted.")
- .tqarg( badkeys.data() );
+ .arg( badkeys.data() );
else
errMsg = i18n("Public keys not certified with trusted signature "
"for userid(s)\n"
"%1;\n"
"these persons will not be able to read the message.")
- .tqarg( badkeys.data() );
+ .arg( badkeys.data() );
status |= BADKEYS;
status |= ERROR;
return status;
@@ -218,7 +218,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
}
//kdDebug(5100) << "status = " << status << endl;
- block.setqStatus( status );
+ block.seStatus( status );
return status;
}
@@ -227,11 +227,11 @@ int
Base2::decrypt( Block& block, const char *passphrase )
{
int index, index2;
- int exitqStatus = 0;
+ int exiStatus = 0;
clear();
input = block.text();
- exitqStatus = run(PGP2 " +batchmode +language=en -f", passphrase);
+ exiStatus = run(PGP2 " +batchmode +language=en -f", passphrase);
if( !output.isEmpty() )
block.setProcessedText( output );
block.setError( error );
@@ -249,16 +249,16 @@ Base2::decrypt( Block& block, const char *passphrase )
index1 = input.find('\n', index1);
index2 = input.find("\n\n", index1);
input.remove(index1, index2 - index1);
- exitqStatus = run(PGP2 " +batchmode +language=en -f", passphrase);
+ exiStatus = run(PGP2 " +batchmode +language=en -f", passphrase);
if( !output.isEmpty() )
block.setProcessedText( output );
block.setError( error );
}
- if(exitqStatus == -1) {
+ if(exiStatus == -1) {
errMsg = i18n("error running PGP");
status = RUN_ERR;
- block.setqStatus( status );
+ block.seStatus( status );
return status;
}
@@ -448,7 +448,7 @@ Base2::decrypt( Block& block, const char *passphrase )
index = error.find('\'', index) + 1;
index2 = error.find('\'', index);
block.setSignatureUserId( i18n("The keyring file %1 does not exist.\n"
- "Please check your PGP setup.").tqarg(TQString(error.mid(index, index2-index))) );
+ "Please check your PGP setup.").arg(TQString(error.mid(index, index2-index))) );
}
else
{
@@ -457,7 +457,7 @@ Base2::decrypt( Block& block, const char *passphrase )
}
}
//kdDebug(5100) << "status = " << status << endl;
- block.setqStatus( status );
+ block.seStatus( status );
return status;
}
@@ -467,13 +467,13 @@ Base2::readPublicKey( const KeyID& keyID,
const bool readTrust /* = false */,
Key* key /* = 0 */ )
{
- int exitqStatus = 0;
+ int exiStatus = 0;
status = 0;
- exitqStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kvc -f 0x" +
+ exiStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kvc -f 0x" +
keyID, 0, true );
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return 0;
}
@@ -487,10 +487,10 @@ Base2::readPublicKey( const KeyID& keyID,
if( readTrust )
{
- exitqStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kc -f",
+ exiStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kc -f",
0, true );
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return 0;
}
@@ -512,14 +512,14 @@ Base2::publicKeys( const TQStringList & patterns )
KeyList
Base2::doGetPublicKeys( const TQCString & cmd, const TQStringList & patterns )
{
- int exitqStatus = 0;
+ int exiStatus = 0;
KeyList publicKeys;
status = 0;
if ( patterns.isEmpty() ) {
- exitqStatus = run( cmd, 0, true );
+ exiStatus = run( cmd, 0, true );
- if ( exitqStatus != 0 ) {
+ if ( exiStatus != 0 ) {
status = ERROR;
return KeyList();
}
@@ -533,10 +533,10 @@ Base2::doGetPublicKeys( const TQCString & cmd, const TQStringList & patterns )
for ( TQStringList::ConstIterator it = patterns.begin();
it != patterns.end(); ++it ) {
- exitqStatus = run( cmd + " " + KProcess::quote( *it ).local8Bit(),
+ exiStatus = run( cmd + " " + KProcess::quote( *it ).local8Bit(),
0, true );
- if ( exitqStatus != 0 ) {
+ if ( exiStatus != 0 ) {
status = ERROR;
return KeyList();
}
@@ -576,16 +576,16 @@ int
Base2::signKey(const KeyID& keyID, const char *passphrase)
{
TQCString cmd;
- int exitqStatus = 0;
+ int exiStatus = 0;
cmd = PGP2 " +batchmode +language=en -ks -f ";
cmd += addUserId();
cmd += " 0x" + keyID;
status = 0;
- exitqStatus = run(cmd.data(),passphrase);
+ exiStatus = run(cmd.data(),passphrase);
- if (exitqStatus != 0)
+ if (exiStatus != 0)
status = ERROR;
return status;
@@ -594,16 +594,16 @@ Base2::signKey(const KeyID& keyID, const char *passphrase)
TQCString Base2::getAsciiPublicKey(const KeyID& keyID)
{
- int exitqStatus = 0;
+ int exiStatus = 0;
if (keyID.isEmpty())
return TQCString();
status = 0;
- exitqStatus = run( PGP2 " +batchmode +force +language=en -kxaf 0x" + keyID,
+ exiStatus = run( PGP2 " +batchmode +force +language=en -kxaf 0x" + keyID,
0, true );
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return TQCString();
}
diff --git a/libkpgp/kpgpbase5.cpp b/libkpgp/kpgpbase5.cpp
index 288957399..1f7d67326 100644
--- a/libkpgp/kpgpbase5.cpp
+++ b/libkpgp/kpgpbase5.cpp
@@ -66,7 +66,7 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
const char *passphrase )
{
TQCString cmd;
- int exitqStatus = 0;
+ int exiStatus = 0;
int index;
// used to work around a bug in pgp5. pgp5 treats files
// with non ascii chars (umlauts, etc...) as binary files, but
@@ -116,10 +116,10 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
}
//We have to do this otherwise it's all in vain
- exitqStatus = run(cmd.data(), passphrase);
+ exiStatus = run(cmd.data(), passphrase);
block.setError( error );
- if(exitqStatus != 0)
+ if(exiStatus != 0)
status = ERROR;
// now parse the returned info
@@ -156,7 +156,7 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
else
errMsg = i18n("The following key(s) are not trusted:\n%1\n"
"Their owner(s) will not be able to decrypt the message.")
- .tqarg(TQString(aStr));
+ .arg(TQString(aStr));
status |= ERROR;
status |= BADKEYS;
}
@@ -167,9 +167,9 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
int index2 = error.find('\n',index);
errMsg = i18n("Missing encryption key(s) for:\n%1")
- .tqarg(TQString(error.mid(index,index2-index)));
+ .arg(TQString(error.mid(index,index2-index)));
// errMsg = TQString("Missing encryption key(s) for: %1")
-// .tqarg(error.mid(index,index2-index));
+// .arg(error.mid(index,index2-index));
status |= ERROR;
status |= MISSINGKEY;
}
@@ -185,7 +185,7 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
}
block.setProcessedText( output );
- block.setqStatus( status );
+ block.seStatus( status );
return status;
}
@@ -193,19 +193,19 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
int
Base5::decrypt( Block& block, const char *passphrase )
{
- int exitqStatus = 0;
+ int exiStatus = 0;
clear();
input = block.text();
- exitqStatus = run("pgpv -f +batchmode=1", passphrase);
+ exiStatus = run("pgpv -f +batchmode=1", passphrase);
if( !output.isEmpty() )
block.setProcessedText( output );
block.setError( error );
- if(exitqStatus == -1) {
+ if(exiStatus == -1) {
errMsg = i18n("Error running PGP");
status = RUN_ERR;
- block.setqStatus( status );
+ block.seStatus( status );
return status;
}
@@ -313,7 +313,7 @@ Base5::decrypt( Block& block, const char *passphrase )
}
//kdDebug(5100) << "status = " << status << endl;
- block.setqStatus( status );
+ block.seStatus( status );
return status;
}
@@ -321,12 +321,12 @@ Base5::decrypt( Block& block, const char *passphrase )
Key*
Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key )
{
- int exitqStatus = 0;
+ int exiStatus = 0;
status = 0;
- exitqStatus = run( "pgpk -ll 0x" + keyId, 0, true );
+ exiStatus = run( "pgpk -ll 0x" + keyId, 0, true );
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return 0;
}
@@ -340,9 +340,9 @@ Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key )
if( readTrust )
{
- exitqStatus = run( "pgpk -c 0x" + keyId, 0, true );
+ exiStatus = run( "pgpk -c 0x" + keyId, 0, true );
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return 0;
}
@@ -357,7 +357,7 @@ Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key )
KeyList
Base5::publicKeys( const TQStringList & patterns )
{
- int exitqStatus = 0;
+ int exiStatus = 0;
TQCString cmd = "pgpk -ll";
for ( TQStringList::ConstIterator it = patterns.begin();
@@ -366,9 +366,9 @@ Base5::publicKeys( const TQStringList & patterns )
cmd += KProcess::quote( *it ).local8Bit();
}
status = 0;
- exitqStatus = run( cmd, 0, true );
+ exiStatus = run( cmd, 0, true );
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return KeyList();
}
@@ -386,7 +386,7 @@ Base5::publicKeys( const TQStringList & patterns )
KeyList
Base5::secretKeys( const TQStringList & patterns )
{
- int exitqStatus = 0;
+ int exiStatus = 0;
status = 0;
TQCString cmd = "pgpk -ll";
@@ -396,9 +396,9 @@ Base5::secretKeys( const TQStringList & patterns )
cmd += KProcess::quote( *it ).local8Bit();
}
status = 0;
- exitqStatus = run( cmd, 0, true );
+ exiStatus = run( cmd, 0, true );
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return KeyList();
}
@@ -415,15 +415,15 @@ Base5::secretKeys( const TQStringList & patterns )
TQCString Base5::getAsciiPublicKey(const KeyID& keyID)
{
- int exitqStatus = 0;
+ int exiStatus = 0;
if (keyID.isEmpty())
return TQCString();
status = 0;
- exitqStatus = run( "pgpk -xa 0x" + keyID, 0, true );
+ exiStatus = run( "pgpk -xa 0x" + keyID, 0, true );
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return TQCString();
}
@@ -436,7 +436,7 @@ int
Base5::signKey(const KeyID& keyID, const char *passphrase)
{
TQCString cmd;
- int exitqStatus = 0;
+ int exiStatus = 0;
if(passphrase == 0) return false;
@@ -445,9 +445,9 @@ Base5::signKey(const KeyID& keyID, const char *passphrase)
cmd += addUserId();
status = 0;
- exitqStatus = run(cmd.data(), passphrase);
+ exiStatus = run(cmd.data(), passphrase);
- if (exitqStatus != 0)
+ if (exiStatus != 0)
status = ERROR;
return status;
@@ -579,7 +579,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
TQDateTime dt( TQDate( year, month, day ), TQTime( 00, 00 ) );
subkey->setCreationDate( epoch.secsTo( dt ) );
// has the key already expired?
- if( TQDateTime::tqcurrentDateTime() >= dt )
+ if( TQDateTime::currentDateTime() >= dt )
{
subkey->setExpired( true );
key->setExpired( true );
diff --git a/libkpgp/kpgpbase6.cpp b/libkpgp/kpgpbase6.cpp
index 0972a46e1..0b5073931 100644
--- a/libkpgp/kpgpbase6.cpp
+++ b/libkpgp/kpgpbase6.cpp
@@ -49,19 +49,19 @@ int
Base6::decrypt( Block& block, const char *passphrase )
{
int index, index2;
- int exitqStatus = 0;
+ int exiStatus = 0;
clear();
input = block.text();
- exitqStatus = run( PGP6 " +batchmode +language=C -f", passphrase);
+ exiStatus = run( PGP6 " +batchmode +language=C -f", passphrase);
if( !output.isEmpty() )
block.setProcessedText( output );
block.setError( error );
- if(exitqStatus == -1) {
+ if(exiStatus == -1) {
errMsg = i18n("error running PGP");
status = RUN_ERR;
- block.setqStatus( status );
+ block.seStatus( status );
return status;
}
@@ -180,7 +180,7 @@ Base6::decrypt( Block& block, const char *passphrase )
}
}
//kdDebug(5100) << "status = " << status << endl;
- block.setqStatus( status );
+ block.seStatus( status );
return status;
}
@@ -190,13 +190,13 @@ Base6::readPublicKey( const KeyID& keyID,
const bool readTrust /* = false */,
Key* key /* = 0 */ )
{
- int exitqStatus = 0;
+ int exiStatus = 0;
status = 0;
- exitqStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kvvc "
+ exiStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kvvc "
"0x" + keyID, 0, true );
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return 0;
}
@@ -210,10 +210,10 @@ Base6::readPublicKey( const KeyID& keyID,
if( readTrust )
{
- exitqStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kc "
+ exiStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kc "
"0x" + keyID, 0, true );
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return 0;
}
@@ -238,13 +238,13 @@ TQStrList
Base6::pubKeys()
{
int index, index2;
- int exitqStatus = 0;
+ int exiStatus = 0;
int compatibleMode = 1;
status = 0;
- exitqStatus = run("pgp +batchmode +language=C -kv -f");
+ exiStatus = run("pgp +batchmode +language=C -kv -f");
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return 0;
}
@@ -319,9 +319,9 @@ Base6::pubKeys()
}
// Also look for pgp key groups
- exitqStatus = run("pgp +batchmode +language=C -gv -f");
+ exiStatus = run("pgp +batchmode +language=C -gv -f");
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return 0;
}
@@ -352,11 +352,11 @@ Base6::secretKeys( const TQStringList & patterns )
int
Base6::isVersion6()
{
- int exitqStatus = 0;
+ int exiStatus = 0;
- exitqStatus = run( PGP6, 0, true );
+ exiStatus = run( PGP6, 0, true );
- if(exitqStatus == -1) {
+ if(exiStatus == -1) {
errMsg = i18n("error running PGP");
status = RUN_ERR;
return 0;
diff --git a/libkpgp/kpgpbaseG.cpp b/libkpgp/kpgpbaseG.cpp
index ecb5af195..7ce5c2358 100644
--- a/libkpgp/kpgpbaseG.cpp
+++ b/libkpgp/kpgpbaseG.cpp
@@ -27,7 +27,7 @@
#include <kprocess.h>
#include <kdebug.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <string.h> /* strncmp */
@@ -73,7 +73,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
const char *passphrase )
{
TQCString cmd;
- int exitqStatus = 0;
+ int exiStatus = 0;
if(!recipients.isEmpty() && passphrase != 0)
cmd = "--batch --armor --sign --encrypt --textmode";
@@ -109,12 +109,12 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
clear();
input = block.text();
- exitqStatus = runGpg(cmd.data(), passphrase);
+ exiStatus = runGpg(cmd.data(), passphrase);
if( !output.isEmpty() )
block.setProcessedText( output );
block.setError( error );
- if( exitqStatus != 0 )
+ if( exiStatus != 0 )
{
// this error message is later hopefully overwritten
errMsg = i18n( "Unknown error." );
@@ -153,12 +153,12 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
errMsg = i18n("Could not find public keys matching the userid(s)\n"
"%1;\n"
"the message is not encrypted.")
- .tqarg( badkeys.data() );
+ .arg( badkeys.data() );
else
errMsg = i18n("Could not find public keys matching the userid(s)\n"
"%1;\n"
"these persons will not be able to read the message.")
- .tqarg( badkeys.data() );
+ .arg( badkeys.data() );
status |= MISSINGKEY;
status |= ERROR;
}
@@ -199,7 +199,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
}
//kdDebug(5100) << "status = " << status << endl;
- block.setqStatus( status );
+ block.seStatus( status );
return status;
}
@@ -208,19 +208,19 @@ int
BaseG::decrypt( Block& block, const char *passphrase )
{
int index, index2;
- int exitqStatus = 0;
+ int exiStatus = 0;
clear();
input = block.text();
- exitqStatus = runGpg("--batch --decrypt", passphrase);
+ exiStatus = runGpg("--batch --decrypt", passphrase);
if( !output.isEmpty() && ( error.find( "gpg: quoted printable" ) == -1 ) )
block.setProcessedText( output );
block.setError( error );
- if(exitqStatus == -1) {
+ if(exiStatus == -1) {
errMsg = i18n("Error running gpg");
status = RUN_ERR;
- block.setqStatus( status );
+ block.seStatus( status );
return status;
}
@@ -361,7 +361,7 @@ BaseG::decrypt( Block& block, const char *passphrase )
}
}
//kdDebug(5100) << "status = " << status << endl;
- block.setqStatus( status );
+ block.seStatus( status );
return status;
}
@@ -371,15 +371,15 @@ BaseG::readPublicKey( const KeyID& keyID,
const bool readTrust /* = false */,
Key* key /* = 0 */ )
{
- int exitqStatus = 0;
+ int exiStatus = 0;
status = 0;
if( readTrust )
- exitqStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode 0x" + keyID, 0, true );
+ exiStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode 0x" + keyID, 0, true );
else
- exitqStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode --no-expensive-trust-checks 0x" + keyID, 0, true );
+ exiStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode --no-expensive-trust-checks 0x" + keyID, 0, true );
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return 0;
}
@@ -405,7 +405,7 @@ BaseG::readPublicKey( const KeyID& keyID,
KeyList
BaseG::publicKeys( const TQStringList & patterns )
{
- int exitqStatus = 0;
+ int exiStatus = 0;
// the option --with-colons should be used for interprocess communication
// with gpg (according to Werner Koch)
@@ -417,9 +417,9 @@ BaseG::publicKeys( const TQStringList & patterns )
cmd += KProcess::quote( *it ).local8Bit();
}
status = 0;
- exitqStatus = runGpg( cmd, 0, true );
+ exiStatus = runGpg( cmd, 0, true );
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return KeyList();
}
@@ -437,7 +437,7 @@ BaseG::publicKeys( const TQStringList & patterns )
KeyList
BaseG::secretKeys( const TQStringList & patterns )
{
- int exitqStatus = 0;
+ int exiStatus = 0;
// the option --with-colons should be used for interprocess communication
// with gpg (according to Werner Koch)
@@ -449,9 +449,9 @@ BaseG::secretKeys( const TQStringList & patterns )
cmd += KProcess::quote( *it ).local8Bit();
}
status = 0;
- exitqStatus = runGpg( cmd, 0, true );
+ exiStatus = runGpg( cmd, 0, true );
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return KeyList();
}
@@ -470,7 +470,7 @@ int
BaseG::signKey(const KeyID& keyID, const char *passphrase)
{
TQCString cmd;
- int exitqStatus = 0;
+ int exiStatus = 0;
cmd = "--batch";
cmd += addUserId();
@@ -478,9 +478,9 @@ BaseG::signKey(const KeyID& keyID, const char *passphrase)
cmd += keyID;
status = 0;
- exitqStatus = runGpg(cmd.data(), passphrase);
+ exiStatus = runGpg(cmd.data(), passphrase);
- if (exitqStatus != 0)
+ if (exiStatus != 0)
status = ERROR;
return status;
@@ -490,15 +490,15 @@ BaseG::signKey(const KeyID& keyID, const char *passphrase)
TQCString
BaseG::getAsciiPublicKey(const KeyID& keyID)
{
- int exitqStatus = 0;
+ int exiStatus = 0;
if (keyID.isEmpty())
return TQCString();
status = 0;
- exitqStatus = runGpg("--batch --armor --export 0x" + keyID, 0, true);
+ exiStatus = runGpg("--batch --armor --export 0x" + keyID, 0, true);
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return TQCString();
}
@@ -722,7 +722,7 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
// check whether uid was utf-8 encoded
bool isUtf8 = true;
for ( unsigned int i = 0; i + 1 < uidString.length(); ++i ) {
- if ( uidString[i].tqunicode() == 0xdbff &&
+ if ( uidString[i].unicode() == 0xdbff &&
uidString[i+1].row() == 0xde ) {
// we found a non-Unicode character (see TQString::fromUtf8())
isUtf8 = false;
@@ -778,7 +778,7 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
else {
// assume latin1 encoding
kdDebug(5100) << "Assume latin1 encoding." << endl;
- uidString = TQString::tqfromLatin1( uid.data() );
+ uidString = TQString::fromLatin1( uid.data() );
}
}
userID->setText( uidString );
diff --git a/libkpgp/kpgpblock.cpp b/libkpgp/kpgpblock.cpp
index 4e5f92393..f1c6a5aef 100644
--- a/libkpgp/kpgpblock.cpp
+++ b/libkpgp/kpgpblock.cpp
@@ -27,7 +27,7 @@ Block::Block( const TQCString& str )
: mText(str), mProcessedText(), mError(),
mSignatureUserId(), mSignatureKeyId(), mSignatureDate(),
mRequiredKey(), mEncryptedFor(),
- mtqStatus(0), mHasBeenProcessed(false), mType(NoPgpBlock)
+ mStatus(0), mHasBeenProcessed(false), mType(NoPgpBlock)
{
mEncryptedFor.setAutoDelete( true );
}
@@ -46,7 +46,7 @@ Block::reset()
mSignatureDate = TQCString();
mRequiredKey = TQCString();
mEncryptedFor.clear();
- mtqStatus = 0;
+ mStatus = 0;
mHasBeenProcessed = false;
}
@@ -122,7 +122,7 @@ Block::clearsign( const TQCString& keyId, const TQCString& charset )
}
Kpgp::Result
-Block::encrypt( const TQStringList& tqreceivers, const TQCString& keyId,
+Block::encrypt( const TQStringList& receivers, const TQCString& keyId,
const bool sign, const TQCString& charset )
{
Kpgp::Module *pgp = Kpgp::Module::getKpgp();
@@ -130,7 +130,7 @@ Block::encrypt( const TQStringList& tqreceivers, const TQCString& keyId,
if( pgp == 0 )
return Kpgp::Failure;
- return pgp->encrypt( *this, tqreceivers, keyId, sign, charset );
+ return pgp->encrypt( *this, receivers, keyId, sign, charset );
}
} // namespace Kpgp
diff --git a/libkpgp/kpgpblock.h b/libkpgp/kpgpblock.h
index e3308eab9..ac0214aaa 100644
--- a/libkpgp/kpgpblock.h
+++ b/libkpgp/kpgpblock.h
@@ -58,7 +58,7 @@ typedef enum {
NO_SEC_KEY = 0x0100,
MISSINGKEY = 0x0200,
CANCEL = 0x8000
-} MessagetqStatus;
+} MessageStatus;
class Base;
class Module;
@@ -103,7 +103,7 @@ class KDE_EXPORT Block
void setProcessedText( const TQCString& str );
int status() const;
- void setqStatus( const int status );
+ void seStatus( const int status );
BlockType type();
@@ -169,7 +169,7 @@ class KDE_EXPORT Block
false if there was an unresolvable error or if encryption was canceled
true if everything is o.k.
*/
- Kpgp::Result encrypt( const TQStringList& tqreceivers, const TQCString& keyId,
+ Kpgp::Result encrypt( const TQStringList& receivers, const TQCString& keyId,
const bool sign, const TQCString& charset = TQCString() );
private:
@@ -186,7 +186,7 @@ class KDE_EXPORT Block
TQCString mRequiredKey;
TQString mRequiredUserId;
TQStrList mEncryptedFor;
- int mtqStatus;
+ int mStatus;
bool mHasBeenProcessed;
BlockType mType;
};
@@ -231,13 +231,13 @@ Block::setError( const TQCString& str )
inline int
Block::status() const
{
- return mtqStatus;
+ return mStatus;
}
inline void
-Block::setqStatus( const int status )
+Block::seStatus( const int status )
{
- mtqStatus = status;
+ mStatus = status;
}
inline BlockType
@@ -317,7 +317,7 @@ Block::encryptedFor() const
inline bool
Block::isEncrypted() const
{
- if( mtqStatus & ENCRYPTED )
+ if( mStatus & ENCRYPTED )
return true;
return false;
}
@@ -325,7 +325,7 @@ Block::isEncrypted() const
inline bool
Block::isSigned() const
{
- if( mtqStatus & SIGNED )
+ if( mStatus & SIGNED )
return true;
return false;
}
@@ -333,7 +333,7 @@ Block::isSigned() const
inline bool
Block::goodSignature() const
{
- if( mtqStatus & GOODSIG )
+ if( mStatus & GOODSIG )
return true;
return false;
}
@@ -342,7 +342,7 @@ Block::goodSignature() const
inline bool
Block::unknownSigner() const
{
- if( mtqStatus & UNKNOWN_SIG )
+ if( mStatus & UNKNOWN_SIG )
return true;
return false;
}
diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp
index c9288b01b..ea1262515 100644
--- a/libkpgp/kpgpui.cpp
+++ b/libkpgp/kpgpui.cpp
@@ -24,10 +24,10 @@
#include <tqwhatsthis.h>
#include <tqtooltip.h>
#include <tqapplication.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <tqdatetime.h>
#include <tqpixmap.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtimer.h>
#include <tqpopupmenu.h>
#include <tqregexp.h>
@@ -76,7 +76,7 @@ PassphraseDialog::PassphraseDialog( TQWidget *parent,
if (keyID.isNull())
label = new TQLabel(i18n("Please enter your OpenPGP passphrase:"),rightArea);
else
- label = new TQLabel(i18n("Please enter the OpenPGP passphrase for\n\"%1\":").tqarg(keyID),
+ label = new TQLabel(i18n("Please enter the OpenPGP passphrase for\n\"%1\":").arg(keyID),
rightArea);
lineedit = new KPasswordEdit( rightArea );
lineedit->setEchoMode(TQLineEdit::Password);
@@ -115,7 +115,7 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt )
TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
group = new TQVGroupBox( i18n("Warning"), this );
- group->tqlayout()->setSpacing( KDialog::spacingHint() );
+ group->layout()->setSpacing( KDialog::spacingHint() );
// (mmutz) work around TQt label bug in 3.0.0 (and possibly later):
// 1. Don't use rich text: No <qt><b>...</b></qt>
label = new TQLabel( i18n("Please check if encryption really "
@@ -126,13 +126,13 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt )
labelFont.setBold( true );
label->setFont( labelFont );
// 3. and activate wordwarp:
- label->tqsetAlignment( AlignLeft|WordBreak );
+ label->setAlignment( AlignLeft|WordBreak );
// end; to remove the workaround, add <qt><b>..</b></qt> around the
- // text and remove lines TQFont... -> label->tqsetAlignment(...).
+ // text and remove lines TQFont... -> label->setAlignment(...).
topLayout->addWidget( group );
group = new TQVGroupBox( i18n("Encryption Tool"), this );
- group->tqlayout()->setSpacing( KDialog::spacingHint() );
+ group->layout()->setSpacing( KDialog::spacingHint() );
TQHBox * hbox = new TQHBox( group );
label = new TQLabel( i18n("Select encryption tool to &use:"), hbox );
@@ -153,7 +153,7 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt )
topLayout->addWidget( group );
mpOptionsGroupBox = new TQVGroupBox( i18n("Options"), this );
- mpOptionsGroupBox->tqlayout()->setSpacing( KDialog::spacingHint() );
+ mpOptionsGroupBox->layout()->setSpacing( KDialog::spacingHint() );
storePass = new TQCheckBox( i18n("&Keep passphrase in memory"),
mpOptionsGroupBox );
connect( storePass, TQT_SIGNAL( toggled( bool ) ),
@@ -461,7 +461,7 @@ void KeySelectionDialog::initKeylist( const KeyList& keyList,
childItem = new TQListViewItem( primaryUserID, "",
i18n( "Fingerprint: %1" )
- .tqarg( beautifyFingerprint( (*it)->primaryFingerprint() ) ) );
+ .arg( beautifyFingerprint( (*it)->primaryFingerprint() ) ) );
if( primaryUserID->isSelected() && mListView->isMultiSelection() ) {
mListView->setSelected( childItem, true );
}
@@ -543,15 +543,15 @@ TQString KeySelectionDialog::keyInfo( const Kpgp::Key *key ) const
if( remark.isEmpty() ) {
return " " + i18n("creation date and status of an OpenPGP key",
"Creation date: %1, Status: %2")
- .tqarg( KGlobal::locale()->formatDate( dt.date(), true ) )
- .tqarg( status );
+ .arg( KGlobal::locale()->formatDate( dt.date(), true ) )
+ .arg( status );
}
else {
return " " + i18n("creation date, status and remark of an OpenPGP key",
"Creation date: %1, Status: %2 (%3)")
- .tqarg( KGlobal::locale()->formatDate( dt.date(), true ) )
- .tqarg( status )
- .tqarg( remark );
+ .arg( KGlobal::locale()->formatDate( dt.date(), true ) )
+ .arg( status )
+ .arg( remark );
}
}
@@ -1014,7 +1014,7 @@ bool KeySelectionDialog::checkKeys( const TQValueList<TQListViewItem*>& keys ) c
++it ) {
kdDebug(5100) << "Checking key 0x" << getKeyId( *it ) << "...\n";
pProgressDlg->setLabel( i18n("Checking key 0x%1...")
- .tqarg( TQString( getKeyId( *it ) ) ) );
+ .arg( TQString( getKeyId( *it ) ) ) );
kapp->processEvents();
keysAllowed = keysAllowed && ( -1 != keyAdmissibility( *it, AllowExpensiveTrustCheck ) );
pProgressDlg->progressBar()->advance( 1 );
@@ -1176,7 +1176,7 @@ KeyRequester::KeyRequester( TQWidget * parent, bool multipleKeys,
// the button to unset any key:
mEraseButton = new TQPushButton( this );
mEraseButton->setAutoDefault( false );
- mEraseButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
+ mEraseButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
TQSizePolicy::Minimum ) );
mEraseButton->setPixmap( SmallIcon( "clear_left" ) );
TQToolTip::add( mEraseButton, i18n("Clear") );
@@ -1192,7 +1192,7 @@ KeyRequester::KeyRequester( TQWidget * parent, bool multipleKeys,
connect( mEraseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) );
connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) );
- tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+ setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
TQSizePolicy::Fixed ) );
}
@@ -1480,21 +1480,21 @@ KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses,
// calculate the optimal width for the dialog
int dialogWidth = marginHint()
+ sv->frameWidth()
- + bigvbox->tqsizeHint().width()
- + sv->verticalScrollBar()->tqsizeHint().width()
+ + bigvbox->sizeHint().width()
+ + sv->verticalScrollBar()->sizeHint().width()
+ sv->frameWidth()
+ marginHint()
+ 2;
// calculate the optimal height for the dialog
int dialogHeight = marginHint()
- + label->tqsizeHint().height()
+ + label->sizeHint().height()
+ topLayout->spacing()
+ sv->frameWidth()
- + bigvbox->tqsizeHint().height()
- + sv->horizontalScrollBar()->tqsizeHint().height()
+ + bigvbox->sizeHint().height()
+ + sv->horizontalScrollBar()->sizeHint().height()
+ sv->frameWidth()
+ topLayout->spacing()
- + actionButton( KDialogBase::Cancel )->tqsizeHint().height()
+ + actionButton( KDialogBase::Cancel )->sizeHint().height()
+ marginHint()
+ 2;
// don't make the dialog too large
@@ -1543,7 +1543,7 @@ KeyApprovalDialog::slotChangeEncryptionKey( int nr )
"Select the key(s) which should "
"be used to encrypt the message "
"for\n%1")
- .tqarg( mAddressLabels[nr-1]->text() ),
+ .arg( mAddressLabels[nr-1]->text() ),
keyIds,
mAddressLabels[nr-1]->text(),
mAllowedKeys );
@@ -1630,26 +1630,26 @@ CipherTextDialog::CipherTextDialog( const TQCString & text,
mEditBox->setReadOnly(true);
topLayout->addWidget( mEditBox, 10 );
- TQString tqunicodeText;
+ TQString unicodeText;
if (charset.isEmpty())
- tqunicodeText = TQString::fromLocal8Bit(text.data());
+ unicodeText = TQString::fromLocal8Bit(text.data());
else {
bool ok=true;
TQTextCodec *codec = KGlobal::charsets()->codecForName(charset, ok);
if(!ok)
- tqunicodeText = TQString::fromLocal8Bit(text.data());
+ unicodeText = TQString::fromLocal8Bit(text.data());
else
- tqunicodeText = codec->toUnicode(text.data(), text.length());
+ unicodeText = codec->toUnicode(text.data(), text.length());
}
- mEditBox->setText(tqunicodeText);
+ mEditBox->setText(unicodeText);
setMinimumSize();
}
void CipherTextDialog::setMinimumSize()
{
- // this seems to force a tqlayout of the entire document, so we get a
+ // this seems to force a layout of the entire document, so we get a
// a proper contentsWidth(). Is there a better way?
for ( int i = 0; i < mEditBox->paragraphs(); i++ )
(void) mEditBox->paragraphRect( i );
@@ -1670,7 +1670,7 @@ void CipherTextDialog::setMinimumSize()
gc.readBoolEntry("XineramaPlacementEnabled", true)) {
maxWidth = TQApplication::desktop()->screenGeometry(TQApplication::desktop()->screenNumber(parentWidget())).width()-100;
} else {
- maxWidth = TQApplication::desktop()->tqgeometry().width()-100;
+ maxWidth = TQApplication::desktop()->geometry().width()-100;
}
#endif
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-30 00:18:02 +0000