summaryrefslogtreecommitdiffstats
path: root/certmanager/lib/kleo
diff options
context:
space:
mode:
Diffstat (limited to 'certmanager/lib/kleo')
-rw-r--r--certmanager/lib/kleo/cryptobackend.cpp6
-rw-r--r--certmanager/lib/kleo/cryptobackend.h8
-rw-r--r--certmanager/lib/kleo/cryptobackendfactory.cpp20
-rw-r--r--certmanager/lib/kleo/cryptobackendfactory.h9
-rw-r--r--certmanager/lib/kleo/cryptoconfig.h6
-rw-r--r--certmanager/lib/kleo/decryptjob.h9
-rw-r--r--certmanager/lib/kleo/decryptverifyjob.h9
-rw-r--r--certmanager/lib/kleo/deletejob.h9
-rw-r--r--certmanager/lib/kleo/dn.cpp26
-rw-r--r--certmanager/lib/kleo/dn.h10
-rw-r--r--certmanager/lib/kleo/downloadjob.h9
-rw-r--r--certmanager/lib/kleo/encryptjob.h9
-rw-r--r--certmanager/lib/kleo/enum.cpp8
-rw-r--r--certmanager/lib/kleo/enum.h6
-rw-r--r--certmanager/lib/kleo/exportjob.h11
-rw-r--r--certmanager/lib/kleo/hierarchicalkeylistjob.cpp8
-rw-r--r--certmanager/lib/kleo/hierarchicalkeylistjob.h7
-rw-r--r--certmanager/lib/kleo/importjob.h11
-rw-r--r--certmanager/lib/kleo/job.cpp12
-rw-r--r--certmanager/lib/kleo/job.h11
-rw-r--r--certmanager/lib/kleo/kconfigbasedkeyfilter.cpp6
-rw-r--r--certmanager/lib/kleo/kconfigbasedkeyfilter.h6
-rw-r--r--certmanager/lib/kleo/keyfilter.h6
-rw-r--r--certmanager/lib/kleo/keyfiltermanager.cpp10
-rw-r--r--certmanager/lib/kleo/keyfiltermanager.h9
-rw-r--r--certmanager/lib/kleo/keygenerationjob.h9
-rw-r--r--certmanager/lib/kleo/keylistjob.h11
-rw-r--r--certmanager/lib/kleo/multideletejob.cpp6
-rw-r--r--certmanager/lib/kleo/multideletejob.h7
-rw-r--r--certmanager/lib/kleo/oidmap.h6
-rw-r--r--certmanager/lib/kleo/refreshkeysjob.h11
-rw-r--r--certmanager/lib/kleo/signencryptjob.h9
-rw-r--r--certmanager/lib/kleo/signjob.h9
-rw-r--r--certmanager/lib/kleo/specialjob.h11
-rw-r--r--certmanager/lib/kleo/verifydetachedjob.h13
-rw-r--r--certmanager/lib/kleo/verifyopaquejob.h13
36 files changed, 183 insertions, 163 deletions
diff --git a/certmanager/lib/kleo/cryptobackend.cpp b/certmanager/lib/kleo/cryptobackend.cpp
index 7a779c8e..a10aa516 100644
--- a/certmanager/lib/kleo/cryptobackend.cpp
+++ b/certmanager/lib/kleo/cryptobackend.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/certmanager/lib/kleo/cryptobackend.h b/certmanager/lib/kleo/cryptobackend.h
index 0c2c7926..6cb690d0 100644
--- a/certmanager/lib/kleo/cryptobackend.h
+++ b/certmanager/lib/kleo/cryptobackend.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -107,7 +107,7 @@ namespace Kleo {
virtual ImportJob * importJob() const = 0;
virtual ExportJob * publicKeyExportJob( bool armor=false ) const = 0;
// @param charset the encoding of the passphrase in the exported file
- virtual ExportJob * secretKeyExportJob( bool armor=false, const TQString& charset = TQString::null ) const = 0;
+ virtual ExportJob * secretKeyExportJob( bool armor=false, const TQString& charset = TQString() ) const = 0;
virtual DownloadJob * downloadJob( bool armor=false ) const = 0;
virtual DeleteJob * deleteJob() const = 0;
virtual SignEncryptJob * signEncryptJob( bool armor=false, bool textMode=false ) const = 0;
diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp
index 9b56e89b..c6ce40fd 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.cpp
+++ b/certmanager/lib/kleo/cryptobackendfactory.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -111,7 +111,7 @@ Kleo::CryptoBackendFactory * Kleo::CryptoBackendFactory::instance() {
// }
const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::smime() const {
- const BackendMap::const_iterator it = mBackends.find( "SMIME" );
+ const BackendMap::const_iterator it = mBackends.tqfind( "SMIME" );
if ( it == mBackends.end() )
return 0;
if ( !it->second )
@@ -120,7 +120,7 @@ const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::smime() const
}
const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::openpgp() const {
- const BackendMap::const_iterator it = mBackends.find( "OpenPGP" );
+ const BackendMap::const_iterator it = mBackends.tqfind( "OpenPGP" );
if ( it == mBackends.end() )
return 0;
if ( !it->second )
@@ -129,7 +129,7 @@ const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::openpgp() cons
}
const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::protocol( const char * name ) const {
- const BackendMap::const_iterator it = mBackends.find( name );
+ const BackendMap::const_iterator it = mBackends.tqfind( name );
if ( it == mBackends.end() )
return 0;
if ( !it->second )
@@ -174,8 +174,8 @@ const Kleo::CryptoBackend * Kleo::CryptoBackendFactory::backendByName( const TQS
return 0;
}
-Kleo::BackendConfigWidget * Kleo::CryptoBackendFactory::configWidget( TQWidget * parent, const char * name ) const {
- return new Kleo::BackendConfigWidget( mSelf, parent, name );
+Kleo::BackendConfigWidget * Kleo::CryptoBackendFactory::configWidget( TQWidget * tqparent, const char * name ) const {
+ return new Kleo::BackendConfigWidget( mSelf, tqparent, name );
}
KConfig* Kleo::CryptoBackendFactory::configObject() const {
@@ -194,7 +194,7 @@ void Kleo::CryptoBackendFactory::setOpenPGPBackend( const CryptoBackend* backend
}
void Kleo::CryptoBackendFactory::setProtocolBackend( const char * protocol, const CryptoBackend * backend ) {
- const TQString name = backend ? backend->name() : TQString::null ;
+ const TQString name = backend ? backend->name() : TQString() ;
KConfigGroup group( configObject(), "Backends" );
group.writeEntry( protocol, name );
configObject()->sync();
@@ -267,7 +267,7 @@ namespace {
}
bool Kleo::CryptoBackendFactory::knowsAboutProtocol( const char * name ) const {
- return std::find( mAvailableProtocols.begin(), mAvailableProtocols.end(),
+ return std::tqfind( mAvailableProtocols.begin(), mAvailableProtocols.end(),
CaseInsensitiveString( name ) ) != mAvailableProtocols.end();
}
diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h
index 3ced2c50..8f299026 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.h
+++ b/certmanager/lib/kleo/cryptobackendfactory.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -58,6 +58,7 @@ namespace Kleo {
class KDE_EXPORT CryptoBackendFactory : public TQObject {
Q_OBJECT
+ TQ_OBJECT
protected:
CryptoBackendFactory();
~CryptoBackendFactory();
@@ -73,7 +74,7 @@ namespace Kleo {
bool hasBackends() const;
- Kleo::BackendConfigWidget * configWidget( TQWidget * parent=0, const char * name=0 ) const;
+ Kleo::BackendConfigWidget * configWidget( TQWidget * tqparent=0, const char * name=0 ) const;
KConfig* configObject() const;
diff --git a/certmanager/lib/kleo/cryptoconfig.h b/certmanager/lib/kleo/cryptoconfig.h
index ec0a0ed5..90272a67 100644
--- a/certmanager/lib/kleo/cryptoconfig.h
+++ b/certmanager/lib/kleo/cryptoconfig.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/certmanager/lib/kleo/decryptjob.h b/certmanager/lib/kleo/decryptjob.h
index 8351a1ff..ee5802f8 100644
--- a/certmanager/lib/kleo/decryptjob.h
+++ b/certmanager/lib/kleo/decryptjob.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -61,8 +61,9 @@ namespace Kleo {
*/
class DecryptJob : public Job {
Q_OBJECT
+ TQ_OBJECT
protected:
- DecryptJob( TQObject * parent, const char * name );
+ DecryptJob( TQObject * tqparent, const char * name );
public:
~DecryptJob();
diff --git a/certmanager/lib/kleo/decryptverifyjob.h b/certmanager/lib/kleo/decryptverifyjob.h
index e220670c..0431279a 100644
--- a/certmanager/lib/kleo/decryptverifyjob.h
+++ b/certmanager/lib/kleo/decryptverifyjob.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -64,8 +64,9 @@ namespace Kleo {
*/
class DecryptVerifyJob : public Job {
Q_OBJECT
+ TQ_OBJECT
protected:
- DecryptVerifyJob( TQObject * parent, const char * name );
+ DecryptVerifyJob( TQObject * tqparent, const char * name );
public:
~DecryptVerifyJob();
diff --git a/certmanager/lib/kleo/deletejob.h b/certmanager/lib/kleo/deletejob.h
index f5d5f111..e6a3e223 100644
--- a/certmanager/lib/kleo/deletejob.h
+++ b/certmanager/lib/kleo/deletejob.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -57,8 +57,9 @@ namespace Kleo {
*/
class DeleteJob : public Job {
Q_OBJECT
+ TQ_OBJECT
protected:
- DeleteJob( TQObject * parent, const char * name );
+ DeleteJob( TQObject * tqparent, const char * name );
public:
~DeleteJob();
diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp
index a9333ebb..e82b02de 100644
--- a/certmanager/lib/kleo/dn.cpp
+++ b/certmanager/lib/kleo/dn.cpp
@@ -24,11 +24,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -289,7 +289,7 @@ static TQString dn_escape( const TQString & s ) {
return result;
}
-static QString
+static TQString
serialise( const TQValueVector<Kleo::DN::Attribute> & dn ) {
TQStringList result;
for ( TQValueVector<Kleo::DN::Attribute>::const_iterator it = dn.begin() ; it != dn.end() ; ++it )
@@ -309,7 +309,7 @@ reorder_dn( const Kleo::DN::Attribute::List & dn ) {
// find all unknown entries in their order of appearance
for ( Kleo::DN::const_iterator it = dn.begin(); it != dn.end(); ++it )
- if ( attrOrder.find( (*it).name() ) == attrOrder.end() )
+ if ( attrOrder.tqfind( (*it).name() ) == attrOrder.end() )
unknownEntries.push_back( *it );
// process the known attrs in the desired order
@@ -378,14 +378,14 @@ const Kleo::DN & Kleo::DN::operator=( const DN & that ) {
TQString Kleo::DN::prettyDN() const {
if ( !d )
- return TQString::null;
+ return TQString();
if ( d->reorderedAttributes.empty() )
d->reorderedAttributes = reorder_dn( d->attributes );
return serialise( d->reorderedAttributes );
}
TQString Kleo::DN::dn() const {
- return d ? serialise( d->attributes ) : TQString::null ;
+ return d ? serialise( d->attributes ) : TQString() ;
}
// static
@@ -413,13 +413,13 @@ void Kleo::DN::append( const Attribute & attr ) {
TQString Kleo::DN::operator[]( const TQString & attr ) const {
if ( !d )
- return TQString::null;
+ return TQString();
const TQString attrUpper = attr.upper();
for ( TQValueVector<Attribute>::const_iterator it = d->attributes.begin() ;
it != d->attributes.end() ; ++it )
if ( (*it).name() == attrUpper )
return (*it).value();
- return TQString::null;
+ return TQString();
}
static TQValueVector<Kleo::DN::Attribute> empty;
@@ -507,9 +507,9 @@ const Kleo::DNAttributeMapper * Kleo::DNAttributeMapper::instance() {
TQString Kleo::DNAttributeMapper::name2label( const TQString & s ) const {
const std::map<const char*,const char*,ltstr>::const_iterator it
- = d->map.find( s.stripWhiteSpace().upper().latin1() );
+ = d->map.tqfind( s.stripWhiteSpace().upper().latin1() );
if ( it == d->map.end() )
- return TQString::null;
+ return TQString();
return i18n( it->second );
}
@@ -533,6 +533,6 @@ void Kleo::DNAttributeMapper::setAttributeOrder( const TQStringList & order ) {
config.writeEntry( "AttributeOrder", order );
}
-Kleo::DNAttributeOrderConfigWidget * Kleo::DNAttributeMapper::configWidget( TQWidget * parent, const char * name ) const {
- return new DNAttributeOrderConfigWidget( mSelf, parent, name );
+Kleo::DNAttributeOrderConfigWidget * Kleo::DNAttributeMapper::configWidget( TQWidget * tqparent, const char * name ) const {
+ return new DNAttributeOrderConfigWidget( mSelf, tqparent, name );
}
diff --git a/certmanager/lib/kleo/dn.h b/certmanager/lib/kleo/dn.h
index 13a3c02e..0baf83ad 100644
--- a/certmanager/lib/kleo/dn.h
+++ b/certmanager/lib/kleo/dn.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -62,7 +62,7 @@ namespace Kleo {
void setAttributeOrder( const TQStringList & order );
- DNAttributeOrderConfigWidget * configWidget( TQWidget * parent=0, const char * name=0 ) const;
+ DNAttributeOrderConfigWidget * configWidget( TQWidget * tqparent=0, const char * name=0 ) const;
private:
class Private;
@@ -114,7 +114,7 @@ namespace Kleo {
public:
typedef DN::AttributeList List;
- Attribute( const TQString & name=TQString::null, const TQString & value=TQString::null )
+ Attribute( const TQString & name=TQString(), const TQString & value=TQString() )
: mName( name.upper() ), mValue( value ) {}
Attribute( const Attribute & other )
: mName( other.name() ), mValue( other.value() ) {}
diff --git a/certmanager/lib/kleo/downloadjob.h b/certmanager/lib/kleo/downloadjob.h
index 45a4bf9c..d7f83f24 100644
--- a/certmanager/lib/kleo/downloadjob.h
+++ b/certmanager/lib/kleo/downloadjob.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -60,8 +60,9 @@ namespace Kleo {
*/
class DownloadJob : public Job {
Q_OBJECT
+ TQ_OBJECT
protected:
- DownloadJob( TQObject * parent, const char * name );
+ DownloadJob( TQObject * tqparent, const char * name );
public:
~DownloadJob();
diff --git a/certmanager/lib/kleo/encryptjob.h b/certmanager/lib/kleo/encryptjob.h
index 9c3b77df..64041934 100644
--- a/certmanager/lib/kleo/encryptjob.h
+++ b/certmanager/lib/kleo/encryptjob.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -63,8 +63,9 @@ namespace Kleo {
*/
class EncryptJob : public Job {
Q_OBJECT
+ TQ_OBJECT
protected:
- EncryptJob( TQObject * parent, const char * name );
+ EncryptJob( TQObject * tqparent, const char * name );
public:
~EncryptJob();
diff --git a/certmanager/lib/kleo/enum.cpp b/certmanager/lib/kleo/enum.cpp
index ca842807..1d48c6b6 100644
--- a/certmanager/lib/kleo/enum.cpp
+++ b/certmanager/lib/kleo/enum.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -81,7 +81,7 @@ TQString Kleo::cryptoMessageFormatToLabel( Kleo::CryptoMessageFormat f ) {
for ( unsigned int i = 0 ; i < numCryptoMessageFormats ; ++i )
if ( f == cryptoMessageFormats[i].format )
return i18n( cryptoMessageFormats[i].displayName );
- return TQString::null;
+ return TQString();
}
Kleo::CryptoMessageFormat Kleo::stringToCryptoMessageFormat( const TQString & s ) {
diff --git a/certmanager/lib/kleo/enum.h b/certmanager/lib/kleo/enum.h
index ff9ac1c6..1f186456 100644
--- a/certmanager/lib/kleo/enum.h
+++ b/certmanager/lib/kleo/enum.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/certmanager/lib/kleo/exportjob.h b/certmanager/lib/kleo/exportjob.h
index 193ea863..19472593 100644
--- a/certmanager/lib/kleo/exportjob.h
+++ b/certmanager/lib/kleo/exportjob.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -60,15 +60,16 @@ namespace Kleo {
*/
class ExportJob : public Job {
Q_OBJECT
+ TQ_OBJECT
protected:
- ExportJob( TQObject * parent, const char * name );
+ ExportJob( TQObject * tqparent, const char * name );
public:
~ExportJob();
/**
Starts the export operation. \a patterns is a list of patterns
used to restrict the list of keys exported. Empty patterns are
- ignored. If \a patterns is empty or tqcontains only empty
+ ignored. If \a patterns is empty or contains only empty
strings, all available keys are exported.
*/
virtual GpgME::Error start( const TQStringList & patterns ) = 0;
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
index 4d33761f..e94f9700 100644
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -93,7 +93,7 @@ void Kleo::HierarchicalKeyListJob::slotNextKey( const GpgME::Key & key ) {
if ( const char * chain_id = key.chainID() )
mNextSet.insert( chain_id );
if ( const char * fpr = key.primaryFingerprint() )
- if ( mSentSet.find( fpr ) == mSentSet.end() ) {
+ if ( mSentSet.tqfind( fpr ) == mSentSet.end() ) {
mSentSet.insert( fpr );
emit nextKey( key );
}
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.h b/certmanager/lib/kleo/hierarchicalkeylistjob.h
index c4f7fe04..42d037ef 100644
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.h
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -70,6 +70,7 @@ namespace Kleo {
*/
class KDE_EXPORT HierarchicalKeyListJob : public KeyListJob {
Q_OBJECT
+ TQ_OBJECT
public:
HierarchicalKeyListJob( const CryptoBackend::Protocol * protocol,
bool remote=false, bool includeSigs=false, bool validating=false );
diff --git a/certmanager/lib/kleo/importjob.h b/certmanager/lib/kleo/importjob.h
index 275c9b6c..4bd25b34 100644
--- a/certmanager/lib/kleo/importjob.h
+++ b/certmanager/lib/kleo/importjob.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -61,13 +61,14 @@ namespace Kleo {
*/
class ImportJob : public Job {
Q_OBJECT
+ TQ_OBJECT
protected:
- ImportJob( TQObject * parent, const char * name );
+ ImportJob( TQObject * tqparent, const char * name );
public:
~ImportJob();
/**
- Starts the importing operation. \a keyData tqcontains the data to
+ Starts the importing operation. \a keyData contains the data to
import from.
*/
virtual GpgME::Error start( const TQByteArray & keyData ) = 0;
diff --git a/certmanager/lib/kleo/job.cpp b/certmanager/lib/kleo/job.cpp
index ac5dbac2..709b68de 100644
--- a/certmanager/lib/kleo/job.cpp
+++ b/certmanager/lib/kleo/job.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -59,8 +59,8 @@
#include <gpg-error.h>
-Kleo::Job::Job( TQObject * parent, const char * name )
- : TQObject( parent, name )
+Kleo::Job::Job( TQObject * tqparent, const char * name )
+ : TQObject( tqparent, name )
{
if ( tqApp )
connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(slotCancel()) );
@@ -90,7 +90,7 @@ bool Kleo::Job::isAuditLogSupported() const {
}
#define make_job_subclass(x) \
- Kleo::x::x( TQObject * parent, const char * name ) : Job( parent, name ) {} \
+ Kleo::x::x( TQObject * tqparent, const char * name ) : Job( tqparent, name ) {} \
Kleo::x::~x() {}
make_job_subclass(KeyListJob)
diff --git a/certmanager/lib/kleo/job.h b/certmanager/lib/kleo/job.h
index 78ff58ce..9dfaf822 100644
--- a/certmanager/lib/kleo/job.h
+++ b/certmanager/lib/kleo/job.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -63,12 +63,13 @@ namespace Kleo {
*/
class Job : public TQObject {
Q_OBJECT
+ TQ_OBJECT
protected:
- Job( TQObject * parent, const char * name );
+ Job( TQObject * tqparent, const char * name );
public:
~Job();
- virtual void showErrorDialog( TQWidget * parent=0, const TQString & caption=TQString::null ) const;
+ virtual void showErrorDialog( TQWidget * tqparent=0, const TQString & caption=TQString() ) const;
virtual TQString auditLogAsHtml() const;
virtual GpgME::Error auditLogError() const;
diff --git a/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp b/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
index 7cf0bd55..47e1548e 100644
--- a/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
+++ b/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/certmanager/lib/kleo/kconfigbasedkeyfilter.h b/certmanager/lib/kleo/kconfigbasedkeyfilter.h
index 8d77b391..98050cc6 100644
--- a/certmanager/lib/kleo/kconfigbasedkeyfilter.h
+++ b/certmanager/lib/kleo/kconfigbasedkeyfilter.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/certmanager/lib/kleo/keyfilter.h b/certmanager/lib/kleo/keyfilter.h
index 49d8cce3..aa3599ab 100644
--- a/certmanager/lib/kleo/keyfilter.h
+++ b/certmanager/lib/kleo/keyfilter.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/certmanager/lib/kleo/keyfiltermanager.cpp b/certmanager/lib/kleo/keyfiltermanager.cpp
index 51caf5d2..049e3e6f 100644
--- a/certmanager/lib/kleo/keyfiltermanager.cpp
+++ b/certmanager/lib/kleo/keyfiltermanager.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -66,8 +66,8 @@ struct Kleo::KeyFilterManager::Private {
Kleo::KeyFilterManager * Kleo::KeyFilterManager::mSelf = 0;
-Kleo::KeyFilterManager::KeyFilterManager( TQObject * parent, const char * name )
- : TQObject( parent, name ), d( 0 )
+Kleo::KeyFilterManager::KeyFilterManager( TQObject * tqparent, const char * name )
+ : TQObject( tqparent, name ), d( 0 )
{
mSelf = this;
d = new Private();
diff --git a/certmanager/lib/kleo/keyfiltermanager.h b/certmanager/lib/kleo/keyfiltermanager.h
index 662dfdb8..b37a6e37 100644
--- a/certmanager/lib/kleo/keyfiltermanager.h
+++ b/certmanager/lib/kleo/keyfiltermanager.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -47,8 +47,9 @@ namespace Kleo {
class KDE_EXPORT KeyFilterManager : public TQObject {
Q_OBJECT
+ TQ_OBJECT
protected:
- KeyFilterManager( TQObject * parent=0, const char * name=0 );
+ KeyFilterManager( TQObject * tqparent=0, const char * name=0 );
~KeyFilterManager();
public:
diff --git a/certmanager/lib/kleo/keygenerationjob.h b/certmanager/lib/kleo/keygenerationjob.h
index 384d4306..d6478d09 100644
--- a/certmanager/lib/kleo/keygenerationjob.h
+++ b/certmanager/lib/kleo/keygenerationjob.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -60,8 +60,9 @@ namespace Kleo {
*/
class KeyGenerationJob : public Job {
Q_OBJECT
+ TQ_OBJECT
protected:
- KeyGenerationJob( TQObject * parent, const char * name );
+ KeyGenerationJob( TQObject * tqparent, const char * name );
public:
~KeyGenerationJob();
diff --git a/certmanager/lib/kleo/keylistjob.h b/certmanager/lib/kleo/keylistjob.h
index 667ddadc..2200dee3 100644
--- a/certmanager/lib/kleo/keylistjob.h
+++ b/certmanager/lib/kleo/keylistjob.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -64,8 +64,9 @@ namespace Kleo {
*/
class KeyListJob : public Job {
Q_OBJECT
+ TQ_OBJECT
protected:
- KeyListJob( TQObject * parent, const char * name );
+ KeyListJob( TQObject * tqparent, const char * name );
public:
~KeyListJob();
@@ -73,7 +74,7 @@ namespace Kleo {
/**
Starts the keylist operation. \a pattern is a list of patterns
used to restrict the list of keys returned. Empty patterns are
- ignored. If \a pattern is empty or tqcontains only empty strings,
+ ignored. If \a pattern is empty or contains only empty strings,
all keys are returned (however, the backend is free to truncate
the result and should do so; when this happens, it will be
reported by the reult object).
diff --git a/certmanager/lib/kleo/multideletejob.cpp b/certmanager/lib/kleo/multideletejob.cpp
index bd476647..7d1a2730 100644
--- a/certmanager/lib/kleo/multideletejob.cpp
+++ b/certmanager/lib/kleo/multideletejob.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/certmanager/lib/kleo/multideletejob.h b/certmanager/lib/kleo/multideletejob.h
index 9bc5d05a..d6749477 100644
--- a/certmanager/lib/kleo/multideletejob.h
+++ b/certmanager/lib/kleo/multideletejob.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -66,6 +66,7 @@ namespace Kleo {
*/
class KDE_EXPORT MultiDeleteJob : public Job {
Q_OBJECT
+ TQ_OBJECT
public:
MultiDeleteJob( const CryptoBackend::Protocol * protocol );
~MultiDeleteJob();
diff --git a/certmanager/lib/kleo/oidmap.h b/certmanager/lib/kleo/oidmap.h
index 59629633..a31d7642 100644
--- a/certmanager/lib/kleo/oidmap.h
+++ b/certmanager/lib/kleo/oidmap.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/certmanager/lib/kleo/refreshkeysjob.h b/certmanager/lib/kleo/refreshkeysjob.h
index 6249116d..8d790fb7 100644
--- a/certmanager/lib/kleo/refreshkeysjob.h
+++ b/certmanager/lib/kleo/refreshkeysjob.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -61,8 +61,9 @@ namespace Kleo {
*/
class RefreshKeysJob : public Job {
Q_OBJECT
+ TQ_OBJECT
protected:
- RefreshKeysJob( TQObject * parent, const char * name );
+ RefreshKeysJob( TQObject * tqparent, const char * name );
public:
~RefreshKeysJob();
@@ -70,7 +71,7 @@ namespace Kleo {
/**
Starts the keylist operation. \a pattern is a list of patterns
used to restrict the list of keys returned. Empty patterns are
- ignored. If \a pattern is empty or tqcontains only empty strings,
+ ignored. If \a pattern is empty or contains only empty strings,
all keys are returned (however, the backend is free to truncate
the result and should do so; when this happens, it will be
reported by the reult object).
diff --git a/certmanager/lib/kleo/signencryptjob.h b/certmanager/lib/kleo/signencryptjob.h
index 5e12723e..117ac622 100644
--- a/certmanager/lib/kleo/signencryptjob.h
+++ b/certmanager/lib/kleo/signencryptjob.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -66,8 +66,9 @@ namespace Kleo {
*/
class SignEncryptJob : public Job {
Q_OBJECT
+ TQ_OBJECT
protected:
- SignEncryptJob( TQObject * parent, const char * name );
+ SignEncryptJob( TQObject * tqparent, const char * name );
public:
~SignEncryptJob();
diff --git a/certmanager/lib/kleo/signjob.h b/certmanager/lib/kleo/signjob.h
index 677aedcf..7d90dc85 100644
--- a/certmanager/lib/kleo/signjob.h
+++ b/certmanager/lib/kleo/signjob.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -64,8 +64,9 @@ namespace Kleo {
*/
class SignJob : public Job {
Q_OBJECT
+ TQ_OBJECT
protected:
- SignJob( TQObject * parent, const char * name );
+ SignJob( TQObject * tqparent, const char * name );
public:
~SignJob();
diff --git a/certmanager/lib/kleo/specialjob.h b/certmanager/lib/kleo/specialjob.h
index 04867c32..79769391 100644
--- a/certmanager/lib/kleo/specialjob.h
+++ b/certmanager/lib/kleo/specialjob.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -54,7 +54,7 @@ namespace Kleo {
After result() is emitted, the SpecialJob will schedule its own
destruction by calling TQObject::deleteLater().
- Parameters are set using the Qt property system. More general, or
+ Parameters are set using the TQt property system. More general, or
constructor parameters are given in the call to
Kleo::CryptoBackend::Protocol::specialJob().
@@ -64,8 +64,9 @@ namespace Kleo {
*/
class SpecialJob : public Job {
Q_OBJECT
+ TQ_OBJECT
protected:
- SpecialJob( TQObject * parent, const char * name );
+ SpecialJob( TQObject * tqparent, const char * name );
public:
~SpecialJob();
diff --git a/certmanager/lib/kleo/verifydetachedjob.h b/certmanager/lib/kleo/verifydetachedjob.h
index c88c3461..5c0a3c47 100644
--- a/certmanager/lib/kleo/verifydetachedjob.h
+++ b/certmanager/lib/kleo/verifydetachedjob.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -61,14 +61,15 @@ namespace Kleo {
*/
class VerifyDetachedJob : public Job {
Q_OBJECT
+ TQ_OBJECT
protected:
- VerifyDetachedJob( TQObject * parent, const char * name );
+ VerifyDetachedJob( TQObject * tqparent, const char * name );
public:
~VerifyDetachedJob();
/**
- Starts the verification operation. \a signature tqcontains the
- signature data, while \a signedData tqcontains the data over
+ Starts the verification operation. \a signature contains the
+ signature data, while \a signedData contains the data over
which the signature was made.
*/
virtual GpgME::Error start( const TQByteArray & signature,
diff --git a/certmanager/lib/kleo/verifyopaquejob.h b/certmanager/lib/kleo/verifyopaquejob.h
index ba7f40d8..942afac1 100644
--- a/certmanager/lib/kleo/verifyopaquejob.h
+++ b/certmanager/lib/kleo/verifyopaquejob.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -61,14 +61,15 @@ namespace Kleo {
*/
class VerifyOpaqueJob : public Job {
Q_OBJECT
+ TQ_OBJECT
protected:
- VerifyOpaqueJob( TQObject * parent, const char * name );
+ VerifyOpaqueJob( TQObject * tqparent, const char * name );
public:
~VerifyOpaqueJob();
/**
- Starts the verification operation. \a signature tqcontains the
- signature data, while \a signedData tqcontains the data over
+ Starts the verification operation. \a signature contains the
+ signature data, while \a signedData contains the data over
which the signature was made.
*/
virtual GpgME::Error start( const TQByteArray & signedData ) = 0;