summaryrefslogtreecommitdiffstats
path: root/certmanager/lib/kleo
diff options
context:
space:
mode:
Diffstat (limited to 'certmanager/lib/kleo')
-rw-r--r--certmanager/lib/kleo/cryptobackendfactory.h4
-rw-r--r--certmanager/lib/kleo/dn.cpp4
-rw-r--r--certmanager/lib/kleo/dn.h8
-rw-r--r--certmanager/lib/kleo/enum.h24
-rw-r--r--certmanager/lib/kleo/hierarchicalkeylistjob.cpp4
-rw-r--r--certmanager/lib/kleo/hierarchicalkeylistjob.h4
-rw-r--r--certmanager/lib/kleo/job.cpp2
-rw-r--r--certmanager/lib/kleo/keyfiltermanager.cpp2
-rw-r--r--certmanager/lib/kleo/keyfiltermanager.h4
-rw-r--r--certmanager/lib/kleo/multideletejob.cpp2
-rw-r--r--certmanager/lib/kleo/multideletejob.h4
11 files changed, 31 insertions, 31 deletions
diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h
index 03dea6b2..d8b1dd6c 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.h
+++ b/certmanager/lib/kleo/cryptobackendfactory.h
@@ -36,7 +36,7 @@
#include <tqobject.h>
#include "cryptobackend.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <vector>
#include <map>
@@ -56,7 +56,7 @@ namespace Kleo {
}
};
- class KDE_EXPORT CryptoBackendFactory : public TQObject {
+ class TDE_EXPORT CryptoBackendFactory : public TQObject {
TQ_OBJECT
protected:
diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp
index d4ed1301..d6db7d18 100644
--- a/certmanager/lib/kleo/dn.cpp
+++ b/certmanager/lib/kleo/dn.cpp
@@ -484,7 +484,7 @@ Kleo::DNAttributeMapper::Private::Private()
Kleo::DNAttributeMapper::DNAttributeMapper() {
d = new Private();
- const TDEConfigGroup config( kapp->config(), "DN" );
+ const TDEConfigGroup config( tdeApp->config(), "DN" );
d->attributeOrder = config.readListEntry( "AttributeOrder" );
if ( d->attributeOrder.empty() )
std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder,
@@ -529,7 +529,7 @@ void Kleo::DNAttributeMapper::setAttributeOrder( const TQStringList & order ) {
if ( order.empty() )
std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder,
std::back_inserter( d->attributeOrder ) );
- TDEConfigGroup config( kapp->config(), "DN" );
+ TDEConfigGroup config( tdeApp->config(), "DN" );
config.writeEntry( "AttributeOrder", order );
}
diff --git a/certmanager/lib/kleo/dn.h b/certmanager/lib/kleo/dn.h
index c194d58e..493a61a0 100644
--- a/certmanager/lib/kleo/dn.h
+++ b/certmanager/lib/kleo/dn.h
@@ -35,7 +35,7 @@
#include <tqstring.h>
#include <tqvaluevector.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
class TQStringList;
class TQWidget;
@@ -49,7 +49,7 @@ namespace Kleo {
/**
@short DN Attribute mapper
*/
- class KDE_EXPORT DNAttributeMapper {
+ class TDE_EXPORT DNAttributeMapper {
DNAttributeMapper();
~DNAttributeMapper();
public:
@@ -73,7 +73,7 @@ namespace Kleo {
/**
@short DN parser and reorderer
*/
- class KDE_EXPORT DN {
+ class TDE_EXPORT DN {
public:
class Attribute;
typedef TQValueVector<Attribute> AttributeList;
@@ -110,7 +110,7 @@ namespace Kleo {
Private * d;
};
- class KDE_EXPORT DN::Attribute {
+ class TDE_EXPORT DN::Attribute {
public:
typedef DN::AttributeList List;
diff --git a/certmanager/lib/kleo/enum.h b/certmanager/lib/kleo/enum.h
index 723f65ae..a10bc592 100644
--- a/certmanager/lib/kleo/enum.h
+++ b/certmanager/lib/kleo/enum.h
@@ -33,7 +33,7 @@
#ifndef __KLEO_ENUM_H__
#define __KLEO_ENUM_H__
-#include <kdemacros.h>
+#include <tdemacros.h>
class TQString;
class TQStringList;
@@ -50,12 +50,12 @@ namespace Kleo {
AutoFormat = AnyOpenPGP|AnySMIME
};
- KDE_EXPORT TQString cryptoMessageFormatToLabel( CryptoMessageFormat f );
+ TDE_EXPORT TQString cryptoMessageFormatToLabel( CryptoMessageFormat f );
- KDE_EXPORT const char * cryptoMessageFormatToString( CryptoMessageFormat f );
- KDE_EXPORT TQStringList cryptoMessageFormatsToStringList( unsigned int f );
- KDE_EXPORT CryptoMessageFormat stringToCryptoMessageFormat( const TQString & s );
- KDE_EXPORT unsigned int stringListToCryptoMessageFormats( const TQStringList & sl );
+ TDE_EXPORT const char * cryptoMessageFormatToString( CryptoMessageFormat f );
+ TDE_EXPORT TQStringList cryptoMessageFormatsToStringList( unsigned int f );
+ TDE_EXPORT CryptoMessageFormat stringToCryptoMessageFormat( const TQString & s );
+ TDE_EXPORT unsigned int stringListToCryptoMessageFormats( const TQStringList & sl );
enum Action {
Conflict, DoIt, DontDoIt, Ask, AskOpportunistic, Impossible
@@ -71,9 +71,9 @@ namespace Kleo {
MaxEncryptionPreference = AskWheneverPossible
};
- KDE_EXPORT TQString encryptionPreferenceToLabel( EncryptionPreference pref );
- KDE_EXPORT const char* encryptionPreferenceToString( EncryptionPreference pref );
- KDE_EXPORT EncryptionPreference stringToEncryptionPreference( const TQString& str );
+ TDE_EXPORT TQString encryptionPreferenceToLabel( EncryptionPreference pref );
+ TDE_EXPORT const char* encryptionPreferenceToString( EncryptionPreference pref );
+ TDE_EXPORT EncryptionPreference stringToEncryptionPreference( const TQString& str );
enum SigningPreference {
UnknownSigningPreference = 0,
@@ -85,9 +85,9 @@ namespace Kleo {
MaxSigningPreference = AskSigningWheneverPossible
};
- KDE_EXPORT TQString signingPreferenceToLabel( SigningPreference pref ) KDE_EXPORT;
- KDE_EXPORT const char* signingPreferenceToString( SigningPreference pref ) KDE_EXPORT;
- KDE_EXPORT SigningPreference stringToSigningPreference( const TQString& str );
+ TDE_EXPORT TQString signingPreferenceToLabel( SigningPreference pref );
+ TDE_EXPORT const char* signingPreferenceToString( SigningPreference pref );
+ TDE_EXPORT SigningPreference stringToSigningPreference( const TQString& str );
}
#endif // __KLEO_CRYPTOBACKEND_H__
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
index 65b59725..03bb267f 100644
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
@@ -142,8 +142,8 @@ GpgME::Error Kleo::HierarchicalKeyListJob::startAJob() {
assert( mJob ); // FIXME: we need a way to generate errors ourselves,
// but I don't like the dependency on gpg-error :/
- connect( mJob, TQT_SIGNAL(nextKey(const GpgME::Key&)), TQT_SLOT(slotNextKey(const GpgME::Key&)) );
- connect( mJob, TQT_SIGNAL(result(const GpgME::KeyListResult&)), TQT_SLOT(slotResult(const GpgME::KeyListResult&)) );
+ connect( mJob, TQ_SIGNAL(nextKey(const GpgME::Key&)), TQ_SLOT(slotNextKey(const GpgME::Key&)) );
+ connect( mJob, TQ_SIGNAL(result(const GpgME::KeyListResult&)), TQ_SLOT(slotResult(const GpgME::KeyListResult&)) );
TQStringList patterns;
for ( std::set<TQString>::const_iterator it = mNextSet.begin() ; it != mNextSet.end() ; ++it )
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.h b/certmanager/lib/kleo/hierarchicalkeylistjob.h
index cb971bd0..6920bec9 100644
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.h
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.h
@@ -35,7 +35,7 @@
#include <kleo/keylistjob.h>
#include <kleo/cryptobackend.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <gpgmepp/keylistresult.h>
@@ -68,7 +68,7 @@ namespace Kleo {
After result() is emitted, the HierarchicalKeyListJob will
schedule its own destruction by calling TQObject::deleteLater().
*/
- class KDE_EXPORT HierarchicalKeyListJob : public KeyListJob {
+ class TDE_EXPORT HierarchicalKeyListJob : public KeyListJob {
TQ_OBJECT
public:
diff --git a/certmanager/lib/kleo/job.cpp b/certmanager/lib/kleo/job.cpp
index 907a7448..eb638592 100644
--- a/certmanager/lib/kleo/job.cpp
+++ b/certmanager/lib/kleo/job.cpp
@@ -63,7 +63,7 @@ Kleo::Job::Job( TQObject * parent, const char * name )
: TQObject( parent, name )
{
if ( tqApp )
- connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(slotCancel()) );
+ connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(slotCancel()) );
}
Kleo::Job::~Job() {
diff --git a/certmanager/lib/kleo/keyfiltermanager.cpp b/certmanager/lib/kleo/keyfiltermanager.cpp
index 1aa2b170..2c5b5a35 100644
--- a/certmanager/lib/kleo/keyfiltermanager.cpp
+++ b/certmanager/lib/kleo/keyfiltermanager.cpp
@@ -73,7 +73,7 @@ Kleo::KeyFilterManager::KeyFilterManager( TQObject * parent, const char * name )
d = new Private();
// ### DF: doesn't a KStaticDeleter work more reliably?
if ( tqApp )
- connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) );
+ connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(deleteLater()) );
reload();
}
diff --git a/certmanager/lib/kleo/keyfiltermanager.h b/certmanager/lib/kleo/keyfiltermanager.h
index d0022fc0..40f3687d 100644
--- a/certmanager/lib/kleo/keyfiltermanager.h
+++ b/certmanager/lib/kleo/keyfiltermanager.h
@@ -34,7 +34,7 @@
#define __KLEO_KEYFILTERMANAGER_H__
#include <tqobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
namespace GpgME {
class Key;
}
@@ -45,7 +45,7 @@ namespace Kleo {
namespace Kleo {
- class KDE_EXPORT KeyFilterManager : public TQObject {
+ class TDE_EXPORT KeyFilterManager : public TQObject {
TQ_OBJECT
protected:
diff --git a/certmanager/lib/kleo/multideletejob.cpp b/certmanager/lib/kleo/multideletejob.cpp
index 7c83c24b..9aafdd79 100644
--- a/certmanager/lib/kleo/multideletejob.cpp
+++ b/certmanager/lib/kleo/multideletejob.cpp
@@ -102,7 +102,7 @@ GpgME::Error Kleo::MultiDeleteJob::startAJob() {
assert( mJob ); // FIXME: we need a way to generate errors ourselves,
// but I don't like the dependency on gpg-error :/
- connect( mJob, TQT_SIGNAL(result(const GpgME::Error&)), TQT_SLOT(slotResult(const GpgME::Error&)) );
+ connect( mJob, TQ_SIGNAL(result(const GpgME::Error&)), TQ_SLOT(slotResult(const GpgME::Error&)) );
return mJob->start( *mIt, mAllowSecretKeyDeletion );
}
diff --git a/certmanager/lib/kleo/multideletejob.h b/certmanager/lib/kleo/multideletejob.h
index 67ec7492..0bc8d329 100644
--- a/certmanager/lib/kleo/multideletejob.h
+++ b/certmanager/lib/kleo/multideletejob.h
@@ -36,7 +36,7 @@
#include <kleo/job.h>
#include <kleo/cryptobackend.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <tqguardedptr.h>
#include <vector>
@@ -64,7 +64,7 @@ namespace Kleo {
After result() is emitted, the MultiDeleteJob will schedule it's own
destruction by calling TQObject::deleteLater().
*/
- class KDE_EXPORT MultiDeleteJob : public Job {
+ class TDE_EXPORT MultiDeleteJob : public Job {
TQ_OBJECT
public: