diff options
316 files changed, 659 insertions, 659 deletions
diff --git a/akregator/src/aboutdata.h b/akregator/src/aboutdata.h index 9b57d201e..3ec567eee 100644 --- a/akregator/src/aboutdata.h +++ b/akregator/src/aboutdata.h @@ -34,7 +34,7 @@ namespace Akregator { /** @author Teemu Rytilahti */ -class KDE_EXPORT AboutData : public TDEAboutData +class TDE_EXPORT AboutData : public TDEAboutData { public: AboutData(); diff --git a/akregator/src/akregator_export.h b/akregator/src/akregator_export.h index d389c0d99..a5a85b1fc 100644 --- a/akregator/src/akregator_export.h +++ b/akregator/src/akregator_export.h @@ -23,6 +23,6 @@ #include <kdemacros.h> -#define AKREGATOR_EXPORT KDE_EXPORT +#define AKREGATOR_EXPORT TDE_EXPORT #endif diff --git a/akregator/src/akregatorconfig.kcfgc b/akregator/src/akregatorconfig.kcfgc index 661834712..fef64628f 100644 --- a/akregator/src/akregatorconfig.kcfgc +++ b/akregator/src/akregatorconfig.kcfgc @@ -4,5 +4,5 @@ ClassName=Settings NameSpace=Akregator Singleton=true Mutators=true -Visibility=KDE_EXPORT +Visibility=TDE_EXPORT MemberVariables=private diff --git a/akregator/src/librss/article.h b/akregator/src/librss/article.h index c27fdfe75..574f48403 100644 --- a/akregator/src/librss/article.h +++ b/akregator/src/librss/article.h @@ -34,7 +34,7 @@ namespace RSS * is via Document::articles(). * @see Document::articles() */ - class KDE_EXPORT Article + class TDE_EXPORT Article { public: /** diff --git a/akregator/src/librss/category.h b/akregator/src/librss/category.h index 0c40e418f..c38a1c4eb 100644 --- a/akregator/src/librss/category.h +++ b/akregator/src/librss/category.h @@ -33,7 +33,7 @@ class TQString; namespace RSS { - class KDE_EXPORT Category + class TDE_EXPORT Category { public: diff --git a/akregator/src/librss/document.h b/akregator/src/librss/document.h index 8d098e7db..b876caf2f 100644 --- a/akregator/src/librss/document.h +++ b/akregator/src/librss/document.h @@ -28,7 +28,7 @@ namespace RSS * but rather use Loader::loadFrom() to produce a Document object. * @see Loader::loadForm() */ - class KDE_EXPORT Document + class TDE_EXPORT Document { public: /** diff --git a/akregator/src/librss/enclosure.h b/akregator/src/librss/enclosure.h index 154f8bc06..54ee2059c 100644 --- a/akregator/src/librss/enclosure.h +++ b/akregator/src/librss/enclosure.h @@ -33,7 +33,7 @@ class TQString; namespace RSS { - class KDE_EXPORT Enclosure + class TDE_EXPORT Enclosure { public: diff --git a/akregator/src/librss/image.h b/akregator/src/librss/image.h index 4c99c7f35..d98a59fca 100644 --- a/akregator/src/librss/image.h +++ b/akregator/src/librss/image.h @@ -31,7 +31,7 @@ namespace RSS * is via Document::image(). * @see Document::image() */ - class KDE_EXPORT Image : public TQObject + class TDE_EXPORT Image : public TQObject { TQ_OBJECT diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h index ea81a0a6b..ce93fc257 100644 --- a/akregator/src/librss/loader.h +++ b/akregator/src/librss/loader.h @@ -32,7 +32,7 @@ namespace RSS * a new retrieval algorithm which can then be plugged into the RSS loader. * @see Loader, FileRetriever, OutputRetriever */ - class KDE_EXPORT DataRetriever : public TQObject + class TDE_EXPORT DataRetriever : public TQObject { TQ_OBJECT @@ -87,7 +87,7 @@ namespace RSS * Implements a file retriever, to be used with Loader::loadFrom(). * @see DataRetriever, Loader::loadFrom() */ - class KDE_EXPORT FileRetriever : public DataRetriever + class TDE_EXPORT FileRetriever : public DataRetriever { TQ_OBJECT @@ -254,7 +254,7 @@ namespace RSS * loadingComplete signal goes out of scope. This is e.g. the case if you * intend to call getPixmap() on Document::image()! */ - class KDE_EXPORT Loader : public TQObject + class TDE_EXPORT Loader : public TQObject { TQ_OBJECT diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index ddcdb8a45..8120628a4 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -100,7 +100,7 @@ #include <kinputdialog.h> namespace { - class KDE_EXPORT DisplayStrategy : public Kleo::KeyListView::DisplayStrategy{ + class TDE_EXPORT DisplayStrategy : public Kleo::KeyListView::DisplayStrategy{ public: ~DisplayStrategy() {} @@ -122,7 +122,7 @@ namespace { } }; - class KDE_EXPORT ColumnStrategy : public Kleo::KeyListView::ColumnStrategy { + class TDE_EXPORT ColumnStrategy : public Kleo::KeyListView::ColumnStrategy { public: ~ColumnStrategy() {} diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h index 8a893b364..0d37a4238 100644 --- a/certmanager/certmanager.h +++ b/certmanager/certmanager.h @@ -76,7 +76,7 @@ namespace GpgME { class Key; } -class KDE_EXPORT CertManager : public TDEMainWindow { +class TDE_EXPORT CertManager : public TDEMainWindow { TQ_OBJECT public: diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp index 49723f4d6..3c9e344be 100644 --- a/certmanager/conf/appearanceconfigpage.cpp +++ b/certmanager/conf/appearanceconfigpage.cpp @@ -70,7 +70,7 @@ void AppearanceConfigurationPage::defaults() extern "C" { - KDE_EXPORT TDECModule *create_kleopatra_config_appear( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kleopatra_config_appear( TQWidget *parent, const char * ) { AppearanceConfigurationPage *page = new AppearanceConfigurationPage( parent, "kleopatra_config_appear" ); diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp index ad2e60993..96e30f374 100644 --- a/certmanager/conf/dirservconfigpage.cpp +++ b/certmanager/conf/dirservconfigpage.cpp @@ -259,7 +259,7 @@ void DirectoryServicesConfigurationPage::defaults() extern "C" { - KDE_EXPORT TDECModule *create_kleopatra_config_dirserv( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kleopatra_config_dirserv( TQWidget *parent, const char * ) { DirectoryServicesConfigurationPage *page = new DirectoryServicesConfigurationPage( parent, "kleopatra_config_dirserv" ); diff --git a/certmanager/conf/dirservconfigpage.h b/certmanager/conf/dirservconfigpage.h index b717b4eb4..dec0543e6 100644 --- a/certmanager/conf/dirservconfigpage.h +++ b/certmanager/conf/dirservconfigpage.h @@ -50,7 +50,7 @@ namespace Kleo { * The user can configure LDAP servers in this page, to be used for listing/fetching * remote certificates in kleopatra. */ -class KDE_EXPORT DirectoryServicesConfigurationPage : public TDECModule { +class TDE_EXPORT DirectoryServicesConfigurationPage : public TDECModule { TQ_OBJECT public: diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp index 5c2d6c203..e7ac6b696 100644 --- a/certmanager/conf/dnorderconfigpage.cpp +++ b/certmanager/conf/dnorderconfigpage.cpp @@ -70,7 +70,7 @@ void DNOrderConfigPage::slotChanged() { emit changed(true); } -extern "C" KDE_EXPORT TDECModule * create_kleopatra_config_dnorder( TQWidget * parent, const char * ) { +extern "C" TDE_EXPORT TDECModule * create_kleopatra_config_dnorder( TQWidget * parent, const char * ) { return new DNOrderConfigPage( parent, "kleopatra_config_dnorder" ); } diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h index 67cdf357f..17521b9d1 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h @@ -47,7 +47,7 @@ namespace GpgME { namespace Kleo { - class KDE_EXPORT QGpgMEDecryptVerifyJob : public DecryptVerifyJob, private QGpgMEJob { + class TDE_EXPORT QGpgMEDecryptVerifyJob : public DecryptVerifyJob, private QGpgMEJob { TQ_OBJECT TQGPGME_JOB public: diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.h b/certmanager/lib/backends/qgpgme/qgpgmejob.h index 64ce36bc5..be12978a7 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.h @@ -75,7 +75,7 @@ namespace Kleo { signal there. Pass "this" as the first argument this QGpgMEJOb's ctor. The rest is dealt with automatically. */ - class KDE_EXPORT QGpgMEJob : public GpgME::ProgressProvider, public GpgME::PassphraseProvider { + class TDE_EXPORT QGpgMEJob : public GpgME::ProgressProvider, public GpgME::PassphraseProvider { public: QGpgMEJob( Kleo::Job * _this, GpgME::Context * context ); ~QGpgMEJob(); diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h index 6b3e6716c..cf69bdcb5 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h @@ -51,7 +51,7 @@ namespace QGpgME { namespace Kleo { - class KDE_EXPORT QGpgMEKeyGenerationJob : public KeyGenerationJob, private QGpgMEJob { + class TDE_EXPORT QGpgMEKeyGenerationJob : public KeyGenerationJob, private QGpgMEJob { TQ_OBJECT TQGPGME_JOB public: diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h index f259d7547..6788420e4 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h @@ -53,7 +53,7 @@ namespace GpgME { namespace Kleo { - class KDE_EXPORT QGpgMESignEncryptJob : public SignEncryptJob, private QGpgMEJob { + class TDE_EXPORT QGpgMESignEncryptJob : public SignEncryptJob, private QGpgMEJob { TQ_OBJECT TQGPGME_JOB public: diff --git a/certmanager/lib/cryptplug.h b/certmanager/lib/cryptplug.h index fce71937a..8b99e03ac 100644 --- a/certmanager/lib/cryptplug.h +++ b/certmanager/lib/cryptplug.h @@ -295,7 +295,7 @@ typedef unsigned long SigStatusFlags; class CryptPlugWrapper; -class KDE_EXPORT CryptPlug { +class TDE_EXPORT CryptPlug { friend class CryptPlugWrapper; protected: CryptPlug(); diff --git a/certmanager/lib/cryptplugfactory.h b/certmanager/lib/cryptplugfactory.h index 4a0a7a3d9..2091b982c 100644 --- a/certmanager/lib/cryptplugfactory.h +++ b/certmanager/lib/cryptplugfactory.h @@ -47,7 +47,7 @@ class CryptPlugWrapperList; namespace KMail { - class KDE_EXPORT CryptPlugFactory : public Kleo::CryptoBackendFactory { + class TDE_EXPORT CryptPlugFactory : public Kleo::CryptoBackendFactory { TQ_OBJECT protected: diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h index 2be5cd567..12068306a 100644 --- a/certmanager/lib/cryptplugwrapper.h +++ b/certmanager/lib/cryptplugwrapper.h @@ -450,7 +450,7 @@ private: /*! \brief This class provides C++ access to the CRYPTPLUG API. */ -class KDE_EXPORT CryptPlugWrapper : public Kleo::CryptoBackend::Protocol { +class TDE_EXPORT CryptPlugWrapper : public Kleo::CryptoBackend::Protocol { public: static TQString errorIdToText( int errId, bool & isPassphraseError ); diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h index 03dea6b2d..72292e5b9 100644 --- a/certmanager/lib/kleo/cryptobackendfactory.h +++ b/certmanager/lib/kleo/cryptobackendfactory.h @@ -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.h b/certmanager/lib/kleo/dn.h index c194d58e8..4b6333780 100644 --- a/certmanager/lib/kleo/dn.h +++ b/certmanager/lib/kleo/dn.h @@ -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 723f65aeb..36b735d66 100644 --- a/certmanager/lib/kleo/enum.h +++ b/certmanager/lib/kleo/enum.h @@ -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.h b/certmanager/lib/kleo/hierarchicalkeylistjob.h index cb971bd02..661c3a4f9 100644 --- a/certmanager/lib/kleo/hierarchicalkeylistjob.h +++ b/certmanager/lib/kleo/hierarchicalkeylistjob.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/keyfiltermanager.h b/certmanager/lib/kleo/keyfiltermanager.h index d0022fc04..d3d902799 100644 --- a/certmanager/lib/kleo/keyfiltermanager.h +++ b/certmanager/lib/kleo/keyfiltermanager.h @@ -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.h b/certmanager/lib/kleo/multideletejob.h index 67ec7492c..f6de39ac6 100644 --- a/certmanager/lib/kleo/multideletejob.h +++ b/certmanager/lib/kleo/multideletejob.h @@ -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: diff --git a/certmanager/lib/ui/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h index 041177a20..e96464de7 100644 --- a/certmanager/lib/ui/backendconfigwidget.h +++ b/certmanager/lib/ui/backendconfigwidget.h @@ -45,7 +45,7 @@ class TQListViewItem; namespace Kleo { - class KDE_EXPORT BackendConfigWidget : public TQWidget { + class TDE_EXPORT BackendConfigWidget : public TQWidget { TQ_OBJECT public: diff --git a/certmanager/lib/ui/cryptoconfigdialog.h b/certmanager/lib/ui/cryptoconfigdialog.h index 9ed30c9e3..36d8e8c06 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.h +++ b/certmanager/lib/ui/cryptoconfigdialog.h @@ -43,7 +43,7 @@ namespace Kleo { /** * Simple KDialogBase wrapper around CryptoConfigModule */ - class KDE_EXPORT CryptoConfigDialog : public KDialogBase + class TDE_EXPORT CryptoConfigDialog : public KDialogBase { TQ_OBJECT diff --git a/certmanager/lib/ui/directoryserviceswidget.h b/certmanager/lib/ui/directoryserviceswidget.h index 5514e8771..4ae64e05b 100644 --- a/certmanager/lib/ui/directoryserviceswidget.h +++ b/certmanager/lib/ui/directoryserviceswidget.h @@ -41,7 +41,7 @@ namespace Kleo { class CryptoConfigEntry; -class KDE_EXPORT DirectoryServicesWidget : public DirectoryServicesWidgetBase +class TDE_EXPORT DirectoryServicesWidget : public DirectoryServicesWidgetBase { TQ_OBJECT diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h index 70c093d45..ba9fa71e4 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.h +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h @@ -43,7 +43,7 @@ class TQListViewItem; namespace Kleo { - class KDE_EXPORT DNAttributeOrderConfigWidget : public TQWidget { + class TDE_EXPORT DNAttributeOrderConfigWidget : public TQWidget { TQ_OBJECT public: diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h index d6a59b096..297237913 100644 --- a/certmanager/lib/ui/keyapprovaldialog.h +++ b/certmanager/lib/ui/keyapprovaldialog.h @@ -55,7 +55,7 @@ class TQStringList; namespace Kleo { - class KDE_EXPORT KeyApprovalDialog : public KDialogBase { + class TDE_EXPORT KeyApprovalDialog : public KDialogBase { TQ_OBJECT public: diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h index 414e4dea7..49fd8b631 100644 --- a/certmanager/lib/ui/keylistview.h +++ b/certmanager/lib/ui/keylistview.h @@ -62,7 +62,7 @@ namespace Kleo { class KeyListView; - class KDE_EXPORT KeyListViewItem : public TQListViewItem { + class TDE_EXPORT KeyListViewItem : public TQListViewItem { public: KeyListViewItem( KeyListView * parent, const GpgME::Key & key ); KeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Key & key ); @@ -101,7 +101,7 @@ namespace Kleo { GpgME::Key mKey; }; - class KDE_EXPORT SubkeyKeyListViewItem : public KeyListViewItem { + class TDE_EXPORT SubkeyKeyListViewItem : public KeyListViewItem { public: SubkeyKeyListViewItem( KeyListView * parent, const GpgME::Subkey & subkey ); SubkeyKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Subkey & subkey ); @@ -133,7 +133,7 @@ namespace Kleo { GpgME::Subkey mSubkey; }; - class KDE_EXPORT UserIDKeyListViewItem : public KeyListViewItem { + class TDE_EXPORT UserIDKeyListViewItem : public KeyListViewItem { public: UserIDKeyListViewItem( KeyListView * parent, const GpgME::UserID & userid ); UserIDKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID & userid ); @@ -165,7 +165,7 @@ namespace Kleo { GpgME::UserID mUserID; }; - class KDE_EXPORT SignatureKeyListViewItem : public KeyListViewItem { + class TDE_EXPORT SignatureKeyListViewItem : public KeyListViewItem { public: SignatureKeyListViewItem( KeyListView * parent, const GpgME::UserID::Signature & sig ); SignatureKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID::Signature & sig ); @@ -198,13 +198,13 @@ namespace Kleo { }; - class KDE_EXPORT KeyListView : public TDEListView { + class TDE_EXPORT KeyListView : public TDEListView { TQ_OBJECT friend class KeyListViewItem; public: - class KDE_EXPORT ColumnStrategy { + class TDE_EXPORT ColumnStrategy { public: virtual ~ColumnStrategy(); virtual TQString title( int column ) const = 0; @@ -232,7 +232,7 @@ namespace Kleo { virtual int signatureCompare( const GpgME::UserID::Signature & sig1, const GpgME::UserID::Signature & sig2, const int column ) const; }; - class KDE_EXPORT DisplayStrategy { + class TDE_EXPORT DisplayStrategy { public: virtual ~DisplayStrategy(); //font diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h index 2f7b3b267..bcb466b43 100644 --- a/certmanager/lib/ui/keyrequester.h +++ b/certmanager/lib/ui/keyrequester.h @@ -73,7 +73,7 @@ class TQLabel; namespace Kleo { /// Base class for SigningKeyRequester and EncryptionKeyRequester - class KDE_EXPORT KeyRequester : public TQWidget { + class TDE_EXPORT KeyRequester : public TQWidget { TQ_OBJECT public: @@ -159,7 +159,7 @@ namespace Kleo { }; - class KDE_EXPORT EncryptionKeyRequester : public KeyRequester { + class TDE_EXPORT EncryptionKeyRequester : public KeyRequester { TQ_OBJECT public: @@ -187,7 +187,7 @@ namespace Kleo { }; - class KDE_EXPORT SigningKeyRequester : public KeyRequester { + class TDE_EXPORT SigningKeyRequester : public KeyRequester { TQ_OBJECT public: diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h index c8c833dd7..a76356f15 100644 --- a/certmanager/lib/ui/keyselectiondialog.h +++ b/certmanager/lib/ui/keyselectiondialog.h @@ -63,7 +63,7 @@ namespace GpgME { namespace Kleo { - class KDE_EXPORT KeySelectionDialog : public KDialogBase { + class TDE_EXPORT KeySelectionDialog : public KDialogBase { TQ_OBJECT public: diff --git a/certmanager/lib/ui/progressbar.h b/certmanager/lib/ui/progressbar.h index ead5b12c0..3e07aa00e 100644 --- a/certmanager/lib/ui/progressbar.h +++ b/certmanager/lib/ui/progressbar.h @@ -42,7 +42,7 @@ namespace Kleo { /** @short A TQProgressBar with self-powered busy indicator */ - class KDE_EXPORT ProgressBar : public TQProgressBar { + class TDE_EXPORT ProgressBar : public TQProgressBar { TQ_OBJECT public: diff --git a/certmanager/lib/ui/progressdialog.h b/certmanager/lib/ui/progressdialog.h index 35b1886dc..65ac78f91 100644 --- a/certmanager/lib/ui/progressdialog.h +++ b/certmanager/lib/ui/progressdialog.h @@ -43,7 +43,7 @@ namespace Kleo { /** @short A progress dialog for Kleo::Jobs */ - class KDE_EXPORT ProgressDialog : public TQProgressDialog { + class TDE_EXPORT ProgressDialog : public TQProgressDialog { TQ_OBJECT public: diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h index 49350be4b..a13847d04 100644 --- a/kaddressbook/common/kabprefs.h +++ b/kaddressbook/common/kabprefs.h @@ -30,7 +30,7 @@ class TDEConfig; -class KDE_EXPORT KABPrefs : public KABPrefsBase +class TDE_EXPORT KABPrefs : public KABPrefsBase { public: virtual ~KABPrefs(); diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h index 5660fed92..c636b10b0 100644 --- a/kaddressbook/interfaces/configurewidget.h +++ b/kaddressbook/interfaces/configurewidget.h @@ -35,7 +35,7 @@ class AddressBook; namespace KAB { -class KDE_EXPORT ConfigureWidget : public TQWidget +class TDE_EXPORT ConfigureWidget : public TQWidget { public: ConfigureWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h index 5c44e3ecc..c3282b5c6 100644 --- a/kaddressbook/interfaces/contacteditorwidget.h +++ b/kaddressbook/interfaces/contacteditorwidget.h @@ -34,7 +34,7 @@ namespace KAB { -class KDE_EXPORT ContactEditorWidget : public TQWidget +class TDE_EXPORT ContactEditorWidget : public TQWidget { TQ_OBJECT diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h index 1c578e23b..e689ee8fb 100644 --- a/kaddressbook/interfaces/core.h +++ b/kaddressbook/interfaces/core.h @@ -52,7 +52,7 @@ namespace KAB { class SearchManager; -class KDE_EXPORT Core : public TQObject +class TDE_EXPORT Core : public TQObject { TQ_OBJECT diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h index 8422a3c27..a7396c2ae 100644 --- a/kaddressbook/interfaces/extensionwidget.h +++ b/kaddressbook/interfaces/extensionwidget.h @@ -36,7 +36,7 @@ namespace KAB { class Core; class ConfigureWidget; -class KDE_EXPORT ExtensionWidget : public TQWidget +class TDE_EXPORT ExtensionWidget : public TQWidget { TQ_OBJECT diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index bed5b0577..13321eeea 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -44,7 +44,7 @@ class TDEApplication; @see: K_EXPORT_COMPONENT_FACTORY() */ #define K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG( libname, XXPortClass, catalog ) \ - class KDE_NO_EXPORT localXXPortFactory : public KAB::XXPortFactory { \ + class TDE_NO_EXPORT localXXPortFactory : public KAB::XXPortFactory { \ KAB::XXPort *xxportObject( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) \ { const char *cat = catalog; \ if (cat) TDEGlobal::locale()->insertCatalogue(cat); \ @@ -65,7 +65,7 @@ class TDEApplication; namespace KAB { -class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient +class TDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient { TQ_OBJECT diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index 43ce8bb3a..ddac716bf 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -80,7 +80,7 @@ typedef struct { int counter; } ResourceMapEntry; -class KDE_EXPORT KABCore : public KAB::Core +class TDE_EXPORT KABCore : public KAB::Core { TQ_OBJECT diff --git a/kaddressbook/kaddressbookiface.h b/kaddressbook/kaddressbookiface.h index c02922d38..df04edb75 100644 --- a/kaddressbook/kaddressbookiface.h +++ b/kaddressbook/kaddressbookiface.h @@ -29,7 +29,7 @@ #include <tqstringlist.h> #include <kdemacros.h> -class KDE_EXPORT KAddressBookIface : virtual public DCOPObject +class TDE_EXPORT KAddressBookIface : virtual public DCOPObject { K_DCOP diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h index 668c5a1d9..cf11b13ce 100644 --- a/kaddressbook/kaddressbookview.h +++ b/kaddressbook/kaddressbookview.h @@ -53,7 +53,7 @@ namespace TDEABC { class AddressBook; } @author Mike Pilone <[email protected]> */ -class KDE_EXPORT KAddressBookView : public TQWidget +class TDE_EXPORT KAddressBookView : public TQWidget { TQ_OBJECT @@ -273,7 +273,7 @@ class KDE_EXPORT KAddressBookView : public TQWidget TQWidget *mViewWidget; }; -class KDE_EXPORT ViewFactory : public KLibFactory +class TDE_EXPORT ViewFactory : public KLibFactory { public: virtual KAddressBookView *view( KAB::Core *core, TQWidget *parent, diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp index 7bc6abd60..ca6b5da4f 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp @@ -35,7 +35,7 @@ extern "C" { - KDE_EXPORT TDECModule *create_kabconfig( TQWidget *parent, const char * ) { + TDE_EXPORT TDECModule *create_kabconfig( TQWidget *parent, const char * ) { return new KCMKabConfig( parent, "kcmkabconfig" ); } } diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp index 8905b8995..c1a6db974 100644 --- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp +++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp @@ -33,7 +33,7 @@ extern "C" { - KDE_EXPORT TDECModule *create_kabcustomfields( TQWidget *parent, const char * ) { + TDE_EXPORT TDECModule *create_kabcustomfields( TQWidget *parent, const char * ) { return new KCMKabCustomFields( parent, "kcmkabcustomfields" ); } } diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp index da6bf49b3..60e47b276 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp @@ -36,7 +36,7 @@ extern "C" { - KDE_EXPORT TDECModule *create_kabldapconfig( TQWidget *parent, const char * ) { + TDE_EXPORT TDECModule *create_kabldapconfig( TQWidget *parent, const char * ) { return new KCMKabLdapConfig( parent, "kcmkabldapconfig" ); } } diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h index ad6c8e338..7fb8df39e 100644 --- a/kaddressbook/viewconfigurewidget.h +++ b/kaddressbook/viewconfigurewidget.h @@ -45,7 +45,7 @@ class ViewConfigureFilterPage; is to show a page with the select fields widget. For simple views this may be sufficient. */ -class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget +class TDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget { TQ_OBJECT diff --git a/kaddressbook/xxportmanager.h b/kaddressbook/xxportmanager.h index 02057213b..3c0344d39 100644 --- a/kaddressbook/xxportmanager.h +++ b/kaddressbook/xxportmanager.h @@ -37,7 +37,7 @@ namespace KAB { class Core; } -class KDE_EXPORT XXPortManager : public TQObject +class TDE_EXPORT XXPortManager : public TQObject { TQ_OBJECT diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index 255319673..48d3fae96 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -414,7 +414,7 @@ TDEInstance* karmPartFactory::instance() extern "C" { - KDE_EXPORT void* init_libkarmpart() + TDE_EXPORT void* init_libkarmpart() { TDEGlobal::locale()->insertCatalogue("karm"); return new karmPartFactory; diff --git a/kgantt/kgantt/KGantt.h b/kgantt/kgantt/KGantt.h index e49e9045a..79c7f7d35 100644 --- a/kgantt/kgantt/KGantt.h +++ b/kgantt/kgantt/KGantt.h @@ -87,7 +87,7 @@ * bar view. */ //////////////////////////////// -class KDE_EXPORT KGantt : public TQWidget +class TDE_EXPORT KGantt : public TQWidget //////////////////////////////// { diff --git a/kgantt/kgantt/KGanttItem.h b/kgantt/kgantt/KGanttItem.h index 3472b889b..298efbcc1 100644 --- a/kgantt/kgantt/KGanttItem.h +++ b/kgantt/kgantt/KGanttItem.h @@ -51,7 +51,7 @@ * in a gantt diagramm. */ ////////////////////////////////// -class KDE_EXPORT KGanttItem : public TQObject +class TDE_EXPORT KGanttItem : public TQObject ////////////////////////////////// { diff --git a/kgantt/kgantt/xQGanttBarViewPort.h b/kgantt/kgantt/xQGanttBarViewPort.h index 090545523..06676d731 100644 --- a/kgantt/kgantt/xQGanttBarViewPort.h +++ b/kgantt/kgantt/xQGanttBarViewPort.h @@ -85,7 +85,7 @@ public : */ ///////////////////////////////////////// -class KDE_EXPORT xQGanttBarViewPort : public TQFrame +class TDE_EXPORT xQGanttBarViewPort : public TQFrame //////////////////////////////////////// { diff --git a/kmail/aboutdata.h b/kmail/aboutdata.h index 2ae6283a9..5a65505ec 100644 --- a/kmail/aboutdata.h +++ b/kmail/aboutdata.h @@ -37,7 +37,7 @@ namespace KMail { - class KDE_EXPORT AboutData : public TDEAboutData { + class TDE_EXPORT AboutData : public TDEAboutData { public: AboutData(); ~AboutData(); diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h index ddc82e47c..f11601492 100644 --- a/kmail/accountmanager.h +++ b/kmail/accountmanager.h @@ -32,7 +32,7 @@ namespace KMail { * The account manager is responsible for creating accounts of various types * via the factory method create() and for keeping track of them. */ -class KDE_EXPORT AccountManager: public TQObject +class TDE_EXPORT AccountManager: public TQObject { TQ_OBJECT diff --git a/kmail/app_octetstream.cpp b/kmail/app_octetstream.cpp index b45140ac5..66a4e266f 100644 --- a/kmail/app_octetstream.cpp +++ b/kmail/app_octetstream.cpp @@ -59,7 +59,7 @@ namespace { } extern "C" -KDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * +TDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * libkmail_bodypartformatter_application_octetstream_create_bodypart_formatter_plugin() { return new Plugin(); } diff --git a/kmail/callback.h b/kmail/callback.h index 2722d0ffb..bd2b56593 100644 --- a/kmail/callback.h +++ b/kmail/callback.h @@ -52,7 +52,7 @@ namespace KMail { Feel free to put whatever you want in here. It's not supposed to be a nicely formatted class, but simply include everything necessary for the plugins. */ -class KDE_EXPORT Callback { +class TDE_EXPORT Callback { public: Callback( KMMessage* msg, KMReaderWin* readerWin ); diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h index f8eecdeb5..e4083b851 100644 --- a/kmail/configuredialog_p.h +++ b/kmail/configuredialog_p.h @@ -266,7 +266,7 @@ private: // // -class KDE_EXPORT IdentityPage : public ConfigModule { +class TDE_EXPORT IdentityPage : public ConfigModule { TQ_OBJECT public: @@ -400,7 +400,7 @@ private: TQValueList< ModifiedAccountsType* > mModifiedAccounts; }; -class KDE_EXPORT AccountsPage : public ConfigModuleWithTabs { +class TDE_EXPORT AccountsPage : public ConfigModuleWithTabs { TQ_OBJECT public: @@ -579,7 +579,7 @@ private: // data TQButtonGroup *mSystemTrayGroup; }; -class KDE_EXPORT AppearancePage : public ConfigModuleWithTabs { +class TDE_EXPORT AppearancePage : public ConfigModuleWithTabs { TQ_OBJECT public: @@ -808,7 +808,7 @@ private: SimpleStringListEditor *mAttachWordsListEditor; }; -class KDE_EXPORT ComposerPage : public ConfigModuleWithTabs { +class TDE_EXPORT ComposerPage : public ConfigModuleWithTabs { TQ_OBJECT public: @@ -959,7 +959,7 @@ private: Kleo::BackendConfigWidget * mBackendConfig; }; -class KDE_EXPORT SecurityPage : public ConfigModuleWithTabs { +class TDE_EXPORT SecurityPage : public ConfigModuleWithTabs { TQ_OBJECT public: @@ -1064,7 +1064,7 @@ private: TQCheckBox* mAutomaticSending; }; -class KDE_EXPORT MiscPage : public ConfigModuleWithTabs { +class TDE_EXPORT MiscPage : public ConfigModuleWithTabs { TQ_OBJECT public: diff --git a/kmail/kcm_kmail.cpp b/kmail/kcm_kmail.cpp index 07dc1d729..19262ae5c 100644 --- a/kmail/kcm_kmail.cpp +++ b/kmail/kcm_kmail.cpp @@ -31,7 +31,7 @@ //---------------------------- extern "C" { - KDE_EXPORT TDECModule *create_kmail_config_misc( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kmail_config_misc( TQWidget *parent, const char * ) { MiscPage *page = new MiscPage( parent, "kcmkmail_config_misc" ); return page; @@ -40,7 +40,7 @@ extern "C" extern "C" { - KDE_EXPORT TDECModule *create_kmail_config_appearance( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kmail_config_appearance( TQWidget *parent, const char * ) { AppearancePage *page = new AppearancePage( parent, "kcmkmail_config_appearance" ); @@ -50,7 +50,7 @@ extern "C" extern "C" { - KDE_EXPORT TDECModule *create_kmail_config_composer( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kmail_config_composer( TQWidget *parent, const char * ) { ComposerPage *page = new ComposerPage( parent, "kcmkmail_config_composer" ); return page; @@ -59,7 +59,7 @@ extern "C" extern "C" { - KDE_EXPORT TDECModule *create_kmail_config_identity( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kmail_config_identity( TQWidget *parent, const char * ) { IdentityPage *page = new IdentityPage( parent, "kcmkmail_config_identity" ); return page; @@ -68,7 +68,7 @@ extern "C" extern "C" { - KDE_EXPORT TDECModule *create_kmail_config_accounts( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kmail_config_accounts( TQWidget *parent, const char * ) { AccountsPage *page = new AccountsPage( parent, "kcmkmail_config_accounts" ); return page; @@ -77,7 +77,7 @@ extern "C" extern "C" { - KDE_EXPORT TDECModule *create_kmail_config_security( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kmail_config_security( TQWidget *parent, const char * ) { SecurityPage *page = new SecurityPage( parent, "kcmkmail_config_security" ); return page; diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h index 079cb6179..7563e34f1 100644 --- a/kmail/kmail_part.h +++ b/kmail/kmail_part.h @@ -49,7 +49,7 @@ class KMFolderTreeItem; class ActionManager; -class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPartIface +class TDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPartIface { TQ_OBJECT diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h index bf74c909f..08cee0b8f 100644 --- a/kmail/kmcommands.h +++ b/kmail/kmcommands.h @@ -46,7 +46,7 @@ namespace Kleo { class SpecialJob; } typedef TQMap<int,KMFolder*> KMMenuToFolder; typedef TQMap<partNode*, KMMessage*> PartNodeMessageMap; -class KDE_EXPORT KMCommand : public TQObject +class TDE_EXPORT KMCommand : public TQObject { TQ_OBJECT @@ -160,7 +160,7 @@ private: TQValueList<TQGuardedPtr<KMFolder> > mFolders; }; -class KDE_EXPORT KMMailtoComposeCommand : public KMCommand +class TDE_EXPORT KMMailtoComposeCommand : public KMCommand { TQ_OBJECT @@ -175,7 +175,7 @@ private: KMMessage *mMessage; }; -class KDE_EXPORT KMMailtoReplyCommand : public KMCommand +class TDE_EXPORT KMMailtoReplyCommand : public KMCommand { TQ_OBJECT @@ -191,7 +191,7 @@ private: TQString mSelection; }; -class KDE_EXPORT KMMailtoForwardCommand : public KMCommand +class TDE_EXPORT KMMailtoForwardCommand : public KMCommand { TQ_OBJECT @@ -206,7 +206,7 @@ private: KURL mUrl; }; -class KDE_EXPORT KMMailtoAddAddrBookCommand : public KMCommand +class TDE_EXPORT KMMailtoAddAddrBookCommand : public KMCommand { TQ_OBJECT @@ -220,7 +220,7 @@ private: KURL mUrl; }; -class KDE_EXPORT KMAddBookmarksCommand : public KMCommand +class TDE_EXPORT KMAddBookmarksCommand : public KMCommand { TQ_OBJECT @@ -235,7 +235,7 @@ private: }; -class KDE_EXPORT KMMailtoOpenAddrBookCommand : public KMCommand +class TDE_EXPORT KMMailtoOpenAddrBookCommand : public KMCommand { TQ_OBJECT @@ -249,7 +249,7 @@ private: KURL mUrl; }; -class KDE_EXPORT KMUrlCopyCommand : public KMCommand +class TDE_EXPORT KMUrlCopyCommand : public KMCommand { TQ_OBJECT @@ -264,7 +264,7 @@ private: KMMainWidget *mMainWidget; }; -class KDE_EXPORT KMUrlOpenCommand : public KMCommand +class TDE_EXPORT KMUrlOpenCommand : public KMCommand { TQ_OBJECT @@ -279,7 +279,7 @@ private: KMReaderWin *mReaderWin; }; -class KDE_EXPORT KMUrlSaveCommand : public KMCommand +class TDE_EXPORT KMUrlSaveCommand : public KMCommand { TQ_OBJECT @@ -296,7 +296,7 @@ private: KURL mUrl; }; -class KDE_EXPORT KMEditMsgCommand : public KMCommand +class TDE_EXPORT KMEditMsgCommand : public KMCommand { TQ_OBJECT @@ -308,7 +308,7 @@ private: virtual Result execute(); }; -class KDE_EXPORT KMUseTemplateCommand : public KMCommand +class TDE_EXPORT KMUseTemplateCommand : public KMCommand { TQ_OBJECT @@ -320,7 +320,7 @@ private: virtual Result execute(); }; -class KDE_EXPORT KMShowMsgSrcCommand : public KMCommand +class TDE_EXPORT KMShowMsgSrcCommand : public KMCommand { TQ_OBJECT @@ -335,7 +335,7 @@ private: bool mMsgWasComplete; }; -class KDE_EXPORT KMSaveMsgCommand : public KMCommand +class TDE_EXPORT KMSaveMsgCommand : public KMCommand { TQ_OBJECT @@ -367,7 +367,7 @@ private: TDEIO::TransferJob *mJob; }; -class KDE_EXPORT KMOpenMsgCommand : public KMCommand +class TDE_EXPORT KMOpenMsgCommand : public KMCommand { TQ_OBJECT @@ -391,7 +391,7 @@ private: const TQString mEncoding; }; -class KDE_EXPORT KMSaveAttachmentsCommand : public KMCommand +class TDE_EXPORT KMSaveAttachmentsCommand : public KMCommand { TQ_OBJECT @@ -430,7 +430,7 @@ private: bool mEncoded; }; -class KDE_EXPORT KMReplyToCommand : public KMCommand +class TDE_EXPORT KMReplyToCommand : public KMCommand { TQ_OBJECT @@ -446,7 +446,7 @@ private: TQString mSelection; }; -class KDE_EXPORT KMNoQuoteReplyToCommand : public KMCommand +class TDE_EXPORT KMNoQuoteReplyToCommand : public KMCommand { TQ_OBJECT @@ -474,7 +474,7 @@ private: TQString mSelection; }; -class KDE_EXPORT KMReplyToAllCommand : public KMCommand +class TDE_EXPORT KMReplyToAllCommand : public KMCommand { TQ_OBJECT @@ -490,7 +490,7 @@ private: TQString mSelection; }; -class KDE_EXPORT KMReplyAuthorCommand : public KMCommand +class TDE_EXPORT KMReplyAuthorCommand : public KMCommand { TQ_OBJECT @@ -506,7 +506,7 @@ private: TQString mSelection; }; -class KDE_EXPORT KMForwardInlineCommand : public KMCommand +class TDE_EXPORT KMForwardInlineCommand : public KMCommand { TQ_OBJECT @@ -524,7 +524,7 @@ private: uint mIdentity; }; -class KDE_EXPORT KMForwardAttachedCommand : public KMCommand +class TDE_EXPORT KMForwardAttachedCommand : public KMCommand { TQ_OBJECT @@ -542,7 +542,7 @@ private: TQGuardedPtr<KMail::Composer> mWin; }; -class KDE_EXPORT KMForwardDigestCommand : public KMCommand +class TDE_EXPORT KMForwardDigestCommand : public KMCommand { TQ_OBJECT @@ -560,7 +560,7 @@ private: TQGuardedPtr<KMail::Composer> mWin; }; -class KDE_EXPORT KMRedirectCommand : public KMCommand +class TDE_EXPORT KMRedirectCommand : public KMCommand { TQ_OBJECT @@ -572,7 +572,7 @@ private: virtual Result execute(); }; -class KDE_EXPORT KMCustomReplyToCommand : public KMCommand +class TDE_EXPORT KMCustomReplyToCommand : public KMCommand { TQ_OBJECT @@ -590,7 +590,7 @@ private: TQString mTemplate; }; -class KDE_EXPORT KMCustomReplyAllToCommand : public KMCommand +class TDE_EXPORT KMCustomReplyAllToCommand : public KMCommand { TQ_OBJECT @@ -608,7 +608,7 @@ private: TQString mTemplate; }; -class KDE_EXPORT KMCustomForwardCommand : public KMCommand +class TDE_EXPORT KMCustomForwardCommand : public KMCommand { TQ_OBJECT @@ -626,7 +626,7 @@ private: TQString mTemplate; }; -class KDE_EXPORT KMPrintCommand : public KMCommand +class TDE_EXPORT KMPrintCommand : public KMCommand { TQ_OBJECT @@ -654,7 +654,7 @@ private: TQString mEncoding; }; -class KDE_EXPORT KMSeStatusCommand : public KMCommand +class TDE_EXPORT KMSeStatusCommand : public KMCommand { TQ_OBJECT @@ -673,7 +673,7 @@ private: bool mToggle; }; -class KDE_EXPORT KMFilterCommand : public KMCommand +class TDE_EXPORT KMFilterCommand : public KMCommand { TQ_OBJECT @@ -689,7 +689,7 @@ private: }; -class KDE_EXPORT KMFilterActionCommand : public KMCommand +class TDE_EXPORT KMFilterActionCommand : public KMCommand { TQ_OBJECT @@ -706,7 +706,7 @@ private: }; -class KDE_EXPORT KMMetaFilterActionCommand : public TQObject +class TDE_EXPORT KMMetaFilterActionCommand : public TQObject { TQ_OBJECT @@ -724,7 +724,7 @@ private: KMMainWidget *mMainWidget; }; -class KDE_EXPORT FolderShortcutCommand : public TQObject +class TDE_EXPORT FolderShortcutCommand : public TQObject { TQ_OBJECT @@ -747,7 +747,7 @@ private: }; -class KDE_EXPORT KMMailingListFilterCommand : public KMCommand +class TDE_EXPORT KMMailingListFilterCommand : public KMCommand { TQ_OBJECT @@ -767,7 +767,7 @@ private: copied. Am empty KMMenuToFolder must be passed in. */ -class KDE_EXPORT KMMenuCommand : public KMCommand +class TDE_EXPORT KMMenuCommand : public KMCommand { TQ_OBJECT @@ -780,7 +780,7 @@ public: TQObject *receiver, KMMenuToFolder *aMenuToFolder, TQPopupMenu *menu ); }; -class KDE_EXPORT KMCopyCommand : public KMMenuCommand +class TDE_EXPORT KMCopyCommand : public KMMenuCommand { TQ_OBJECT @@ -806,7 +806,7 @@ private: namespace KPIM { class ProgressItem; } -class KDE_EXPORT KMMoveCommand : public KMMenuCommand +class TDE_EXPORT KMMoveCommand : public KMMenuCommand { TQ_OBJECT @@ -842,7 +842,7 @@ private: bool mCompleteWithAddedMsg; }; -class KDE_EXPORT KMDeleteMsgCommand : public KMMoveCommand +class TDE_EXPORT KMDeleteMsgCommand : public KMMoveCommand { TQ_OBJECT @@ -857,7 +857,7 @@ private: }; -class KDE_EXPORT KMUrlClickedCommand : public KMCommand +class TDE_EXPORT KMUrlClickedCommand : public KMCommand { TQ_OBJECT @@ -876,7 +876,7 @@ private: KMMainWidget *mMainWidget; }; -class KDE_EXPORT KMLoadPartsCommand : public KMCommand +class TDE_EXPORT KMLoadPartsCommand : public KMCommand { TQ_OBJECT @@ -902,7 +902,7 @@ private: PartNodeMessageMap mPartMap; }; -class KDE_EXPORT KMResendMessageCommand : public KMCommand +class TDE_EXPORT KMResendMessageCommand : public KMCommand { TQ_OBJECT @@ -914,7 +914,7 @@ private: virtual Result execute(); }; -class KDE_EXPORT KMMailingListCommand : public KMCommand +class TDE_EXPORT KMMailingListCommand : public KMCommand { TQ_OBJECT @@ -930,7 +930,7 @@ protected: KMFolder *mFolder; }; -class KDE_EXPORT KMMailingListPostCommand : public KMMailingListCommand +class TDE_EXPORT KMMailingListPostCommand : public KMMailingListCommand { TQ_OBJECT @@ -940,7 +940,7 @@ protected: virtual KURL::List urls() const; }; -class KDE_EXPORT KMMailingListSubscribeCommand : public KMMailingListCommand +class TDE_EXPORT KMMailingListSubscribeCommand : public KMMailingListCommand { TQ_OBJECT @@ -950,7 +950,7 @@ protected: virtual KURL::List urls() const; }; -class KDE_EXPORT KMMailingListUnsubscribeCommand : public KMMailingListCommand +class TDE_EXPORT KMMailingListUnsubscribeCommand : public KMMailingListCommand { TQ_OBJECT @@ -960,7 +960,7 @@ protected: virtual KURL::List urls() const; }; -class KDE_EXPORT KMMailingListArchivesCommand : public KMMailingListCommand +class TDE_EXPORT KMMailingListArchivesCommand : public KMMailingListCommand { TQ_OBJECT @@ -970,7 +970,7 @@ protected: virtual KURL::List urls() const; }; -class KDE_EXPORT KMMailingListHelpCommand : public KMMailingListCommand +class TDE_EXPORT KMMailingListHelpCommand : public KMMailingListCommand { TQ_OBJECT @@ -980,7 +980,7 @@ protected: virtual KURL::List urls() const; }; -class KDE_EXPORT KMIMChatCommand : public KMCommand +class TDE_EXPORT KMIMChatCommand : public KMCommand { TQ_OBJECT @@ -1001,7 +1001,7 @@ private: KMMessage *mMessage; }; -class KDE_EXPORT KMHandleAttachmentCommand : public KMCommand +class TDE_EXPORT KMHandleAttachmentCommand : public KMCommand { TQ_OBJECT @@ -1088,7 +1088,7 @@ private: /** Base class for commands modifying attachements of existing messages. */ -class KDE_EXPORT AttachmentModifyCommand : public KMCommand +class TDE_EXPORT AttachmentModifyCommand : public KMCommand { TQ_OBJECT @@ -1116,7 +1116,7 @@ class KDE_EXPORT AttachmentModifyCommand : public KMCommand TQGuardedPtr<KMFolder> mFolder; }; -class KDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand +class TDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand { TQ_OBJECT @@ -1130,7 +1130,7 @@ class KDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand }; -class KDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand +class TDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand { TQ_OBJECT @@ -1149,7 +1149,7 @@ class KDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand KTempFile mTempFile; }; -class KDE_EXPORT CreateTodoCommand : public KMCommand +class TDE_EXPORT CreateTodoCommand : public KMCommand { TQ_OBJECT diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h index 8184c061b..3d62d6de4 100644 --- a/kmail/kmfoldertree.h +++ b/kmail/kmfoldertree.h @@ -42,7 +42,7 @@ class KMAccount; typedef TQMap<int,KMFolder*> KMMenuToFolder; template <typename T> class TQGuardedPtr; -class KDE_EXPORT KMFolderTreeItem : public TQObject, public KFolderTreeItem +class TDE_EXPORT KMFolderTreeItem : public TQObject, public KFolderTreeItem { TQ_OBJECT diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h index 20d3633b6..d1c2ce0fb 100644 --- a/kmail/kmkernel.h +++ b/kmail/kmkernel.h @@ -88,7 +88,7 @@ class ConfigureDialog; * (singleton) objects such as the UndoStack, the folder managers and filter * manager, etc. */ -class KDE_EXPORT KMKernel : public TQObject, virtual public KMailIface +class TDE_EXPORT KMKernel : public TQObject, virtual public KMailIface { TQ_OBJECT diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h index 06020b7be..dc620fc1b 100644 --- a/kmail/kmmainwidget.h +++ b/kmail/kmmainwidget.h @@ -79,7 +79,7 @@ namespace KMail { typedef TQMap<int,KMFolder*> KMMenuToFolder; -class KDE_EXPORT KMMainWidget : public TQWidget +class TDE_EXPORT KMMainWidget : public TQWidget { TQ_OBJECT diff --git a/kmail/kmstartup.h b/kmail/kmstartup.h index 11c840e67..790e161da 100644 --- a/kmail/kmstartup.h +++ b/kmail/kmstartup.h @@ -22,18 +22,18 @@ extern "C" { -KDE_EXPORT void kmsetSignalHandler(void (*handler)(int)); -KDE_EXPORT void kmsignalHandler(int sigId); -KDE_EXPORT void kmcrashHandler(int sigId); +TDE_EXPORT void kmsetSignalHandler(void (*handler)(int)); +TDE_EXPORT void kmsignalHandler(int sigId); +TDE_EXPORT void kmcrashHandler(int sigId); } namespace KMail { - KDE_EXPORT void checkConfigUpdates(); - KDE_EXPORT void lockOrDie(); - KDE_EXPORT void insertLibraryCataloguesAndIcons(); - KDE_EXPORT void cleanup(); + TDE_EXPORT void checkConfigUpdates(); + TDE_EXPORT void lockOrDie(); + TDE_EXPORT void insertLibraryCataloguesAndIcons(); + TDE_EXPORT void cleanup(); } #endif diff --git a/kmobile/kmobileclient.h b/kmobile/kmobileclient.h index bdb5b19a2..a064e15a1 100644 --- a/kmobile/kmobileclient.h +++ b/kmobile/kmobileclient.h @@ -8,7 +8,7 @@ #include <dcopclient.h> #include <kdemacros.h> -class KDE_EXPORT KMobileClient : public DCOPClient +class TDE_EXPORT KMobileClient : public DCOPClient { TQ_OBJECT diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h index 6647ab73c..100c668fb 100644 --- a/kmobile/kmobiledevice.h +++ b/kmobile/kmobiledevice.h @@ -62,7 +62,7 @@ class TDEConfig; * @author Helge Deller <[email protected]> */ -class KDE_EXPORT KMobileDevice : public KLibFactory +class TDE_EXPORT KMobileDevice : public KLibFactory { TQ_OBJECT diff --git a/kmobile/kmobileview.h b/kmobile/kmobileview.h index d8862b853..e58b286d4 100644 --- a/kmobile/kmobileview.h +++ b/kmobile/kmobileview.h @@ -20,7 +20,7 @@ class KMobileItem; * @author Helge Deller <[email protected]> * @version 0.1 */ -class KDE_EXPORT KMobileView : public TQIconView, public kmobileIface +class TDE_EXPORT KMobileView : public TQIconView, public kmobileIface { TQ_OBJECT diff --git a/kmobile/tdeioslave/tdeio_mobile.cpp b/kmobile/tdeioslave/tdeio_mobile.cpp index 7b2544100..9a00ba38e 100644 --- a/kmobile/tdeioslave/tdeio_mobile.cpp +++ b/kmobile/tdeioslave/tdeio_mobile.cpp @@ -40,7 +40,7 @@ using namespace TDEIO; #define TDEIO_MOBILE_DEBUG_AREA 7126 #define PRINT_DEBUG kdDebug(TDEIO_MOBILE_DEBUG_AREA) << "tdeio_mobile: " -extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); } +extern "C" { TDE_EXPORT int kdemain(int argc, char **argv); } /** * The main program. diff --git a/knode/aboutdata.h b/knode/aboutdata.h index 50faa6dc7..1db0a264a 100644 --- a/knode/aboutdata.h +++ b/knode/aboutdata.h @@ -22,7 +22,7 @@ namespace KNode { - class KDE_EXPORT AboutData : public TDEAboutData + class TDE_EXPORT AboutData : public TDEAboutData { public: AboutData(); diff --git a/knode/knconfig.h b/knode/knconfig.h index f3dff7cd4..d340112ed 100644 --- a/knode/knconfig.h +++ b/knode/knconfig.h @@ -63,7 +63,7 @@ class Base { }; -class KDE_EXPORT Identity : public TQObject, public Base { +class TDE_EXPORT Identity : public TQObject, public Base { TQ_OBJECT @@ -134,7 +134,7 @@ TQ_OBJECT }; -class KDE_EXPORT Appearance : public Base { +class TDE_EXPORT Appearance : public Base { #define COL_CNT 16 #define FNT_CNT 5 @@ -208,7 +208,7 @@ class KDE_EXPORT Appearance : public Base { }; -class KDE_EXPORT ReadNewsGeneral : public Base { +class TDE_EXPORT ReadNewsGeneral : public Base { friend class ReadNewsGeneralWidget; @@ -266,7 +266,7 @@ class KDE_EXPORT ReadNewsGeneral : public Base { }; -class KDE_EXPORT ReadNewsNavigation : public Base { +class TDE_EXPORT ReadNewsNavigation : public Base { friend class ReadNewsNavigationWidget; @@ -294,7 +294,7 @@ class KDE_EXPORT ReadNewsNavigation : public Base { }; -class KDE_EXPORT ReadNewsViewer : public Base { +class TDE_EXPORT ReadNewsViewer : public Base { friend class ReadNewsViewerWidget; @@ -337,7 +337,7 @@ class KDE_EXPORT ReadNewsViewer : public Base { }; -class KDE_EXPORT DisplayedHeaders : public Base +class TDE_EXPORT DisplayedHeaders : public Base { public: DisplayedHeaders(); @@ -359,7 +359,7 @@ class KDE_EXPORT DisplayedHeaders : public Base }; -class KDE_EXPORT Scoring : public Base { +class TDE_EXPORT Scoring : public Base { friend class ScoringWidget; @@ -379,7 +379,7 @@ class KDE_EXPORT Scoring : public Base { }; -class KDE_EXPORT XHeader { +class TDE_EXPORT XHeader { public: XHeader() {} @@ -401,7 +401,7 @@ class KDE_EXPORT XHeader { typedef TQValueList<XHeader> XHeaders; -class KDE_EXPORT PostNewsTechnical : public Base { +class TDE_EXPORT PostNewsTechnical : public Base { friend class PostNewsTechnicalWidget; friend class SmtpAccountWidget; @@ -481,7 +481,7 @@ class PostNewsComposer : public Base { //BEGIN: Cleanup configuration ----------------------------------------------- -class KDE_EXPORT Cleanup : public Base { +class TDE_EXPORT Cleanup : public Base { friend class CleanupWidget; friend class GroupCleanupWidget; diff --git a/knode/knconfigpages.cpp b/knode/knconfigpages.cpp index 91d7666c2..f8b9b70b0 100644 --- a/knode/knconfigpages.cpp +++ b/knode/knconfigpages.cpp @@ -72,7 +72,7 @@ void KNConfig::BasePageWithTabs::defaults() { // extern "C" { - KDE_EXPORT TDECModule *create_knode_config_identity( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_knode_config_identity( TQWidget *parent, const char * ) { KNConfig::IdentityWidget *page = new KNConfig::IdentityWidget( knGlobals.configManager()->identity(), diff --git a/knode/knconfigpages.h b/knode/knconfigpages.h index 80d3a6cfd..ade88885b 100644 --- a/knode/knconfigpages.h +++ b/knode/knconfigpages.h @@ -29,7 +29,7 @@ namespace KNConfig { * It simply forwards load and save operations to all tabs. * Code mostly taken from kmail. */ -class KDE_EXPORT BasePageWithTabs : public TDECModule { +class TDE_EXPORT BasePageWithTabs : public TDECModule { TQ_OBJECT public: @@ -60,7 +60,7 @@ class AccountsPage : public BasePageWithTabs { // read news page -class KDE_EXPORT ReadNewsPage : public BasePageWithTabs { +class TDE_EXPORT ReadNewsPage : public BasePageWithTabs { TQ_OBJECT @@ -69,7 +69,7 @@ class KDE_EXPORT ReadNewsPage : public BasePageWithTabs { }; // post news page -class KDE_EXPORT PostNewsPage : public BasePageWithTabs { +class TDE_EXPORT PostNewsPage : public BasePageWithTabs { TQ_OBJECT diff --git a/knode/knconfigwidgets.h b/knode/knconfigwidgets.h index 85c2ecd77..66978acae 100644 --- a/knode/knconfigwidgets.h +++ b/knode/knconfigwidgets.h @@ -63,7 +63,7 @@ namespace KNConfig { namespace KNConfig { -class KDE_EXPORT IdentityWidget : public TDECModule { +class TDE_EXPORT IdentityWidget : public TDECModule { TQ_OBJECT @@ -105,7 +105,7 @@ class KDE_EXPORT IdentityWidget : public TDECModule { }; -class KDE_EXPORT NntpAccountListWidget : public TDECModule { +class TDE_EXPORT NntpAccountListWidget : public TDECModule { TQ_OBJECT @@ -153,7 +153,7 @@ class KDE_EXPORT NntpAccountListWidget : public TDECModule { }; -class KDE_EXPORT NntpAccountConfDialog : public KDialogBase { +class TDE_EXPORT NntpAccountConfDialog : public KDialogBase { TQ_OBJECT @@ -195,7 +195,7 @@ class KDE_EXPORT NntpAccountConfDialog : public KDialogBase { }; -class KDE_EXPORT SmtpAccountWidget : public SmtpAccountWidgetBase { +class TDE_EXPORT SmtpAccountWidget : public SmtpAccountWidgetBase { TQ_OBJECT @@ -217,7 +217,7 @@ TQ_OBJECT }; -class KDE_EXPORT AppearanceWidget : public TDECModule { +class TDE_EXPORT AppearanceWidget : public TDECModule { TQ_OBJECT @@ -233,7 +233,7 @@ class KDE_EXPORT AppearanceWidget : public TDECModule { //=================================================================================== // code taken from KMail, Copyright (C) 2000 Espen Sand, [email protected] - class KDE_EXPORT ColorListItem : public TQListBoxText { + class TDE_EXPORT ColorListItem : public TQListBoxText { public: ColorListItem( const TQString &text, const TQColor &color=TQt::black ); @@ -252,7 +252,7 @@ class KDE_EXPORT AppearanceWidget : public TDECModule { //=================================================================================== - class KDE_EXPORT FontListItem : public TQListBoxText { + class TDE_EXPORT FontListItem : public TQListBoxText { public: FontListItem( const TQString &name, const TQFont & ); @@ -296,7 +296,7 @@ class KDE_EXPORT AppearanceWidget : public TDECModule { }; -class KDE_EXPORT ReadNewsGeneralWidget : public TDECModule { +class TDE_EXPORT ReadNewsGeneralWidget : public TDECModule { public: ReadNewsGeneralWidget(ReadNewsGeneral *d, TQWidget *p=0, const char *n=0); @@ -325,7 +325,7 @@ class KDE_EXPORT ReadNewsGeneralWidget : public TDECModule { }; -class KDE_EXPORT ReadNewsNavigationWidget : public TDECModule { +class TDE_EXPORT ReadNewsNavigationWidget : public TDECModule { public: ReadNewsNavigationWidget(ReadNewsNavigation *d, TQWidget *p=0, const char *n=0); @@ -346,7 +346,7 @@ class KDE_EXPORT ReadNewsNavigationWidget : public TDECModule { }; -class KDE_EXPORT ReadNewsViewerWidget : public TDECModule { +class TDE_EXPORT ReadNewsViewerWidget : public TDECModule { TQ_OBJECT @@ -373,7 +373,7 @@ class KDE_EXPORT ReadNewsViewerWidget : public TDECModule { }; -class KDE_EXPORT DisplayedHeadersWidget : public TDECModule { +class TDE_EXPORT DisplayedHeadersWidget : public TDECModule { TQ_OBJECT @@ -420,7 +420,7 @@ class KDE_EXPORT DisplayedHeadersWidget : public TDECModule { }; -class KDE_EXPORT DisplayedHeaderConfDialog : public KDialogBase { +class TDE_EXPORT DisplayedHeaderConfDialog : public KDialogBase { TQ_OBJECT @@ -445,7 +445,7 @@ class KDE_EXPORT DisplayedHeaderConfDialog : public KDialogBase { }; -class KDE_EXPORT ScoringWidget : public TDECModule { +class TDE_EXPORT ScoringWidget : public TDECModule { TQ_OBJECT @@ -466,7 +466,7 @@ class KDE_EXPORT ScoringWidget : public TDECModule { }; -class KDE_EXPORT FilterListWidget : public TDECModule { +class TDE_EXPORT FilterListWidget : public TDECModule { TQ_OBJECT @@ -532,7 +532,7 @@ class KDE_EXPORT FilterListWidget : public TDECModule { }; -class KDE_EXPORT PostNewsTechnicalWidget : public TDECModule { +class TDE_EXPORT PostNewsTechnicalWidget : public TDECModule { TQ_OBJECT @@ -570,7 +570,7 @@ class KDE_EXPORT PostNewsTechnicalWidget : public TDECModule { }; -class KDE_EXPORT XHeaderConfDialog : public KDialogBase { +class TDE_EXPORT XHeaderConfDialog : public KDialogBase { public: XHeaderConfDialog(const TQString &h=TQString(), TQWidget *p=0, const char *n=0); @@ -586,7 +586,7 @@ class KDE_EXPORT XHeaderConfDialog : public KDialogBase { }; -class KDE_EXPORT PostNewsComposerWidget : public TDECModule { +class TDE_EXPORT PostNewsComposerWidget : public TDECModule { TQ_OBJECT @@ -617,7 +617,7 @@ class KDE_EXPORT PostNewsComposerWidget : public TDECModule { }; -class KDE_EXPORT PostNewsSpellingWidget : public TDECModule { +class TDE_EXPORT PostNewsSpellingWidget : public TDECModule { public: PostNewsSpellingWidget(TQWidget *p=0, const char *n=0); @@ -632,7 +632,7 @@ class KDE_EXPORT PostNewsSpellingWidget : public TDECModule { -class KDE_EXPORT PrivacyWidget : public TDECModule { +class TDE_EXPORT PrivacyWidget : public TDECModule { TQ_OBJECT @@ -652,7 +652,7 @@ class KDE_EXPORT PrivacyWidget : public TDECModule { //BEGIN: Cleanup configuration ----------------------------------------------- /** Configuration widget for group expireration */ -class KDE_EXPORT GroupCleanupWidget : public TQWidget { +class TDE_EXPORT GroupCleanupWidget : public TQWidget { TQ_OBJECT @@ -681,7 +681,7 @@ class KDE_EXPORT GroupCleanupWidget : public TQWidget { /** Global cleanup configuration widget */ -class KDE_EXPORT CleanupWidget : public TDECModule { +class TDE_EXPORT CleanupWidget : public TDECModule { TQ_OBJECT diff --git a/knode/knconvert.h b/knode/knconvert.h index 56d2f13b3..7cfcf7ab4 100644 --- a/knode/knconvert.h +++ b/knode/knconvert.h @@ -32,7 +32,7 @@ class KLineEdit; class TDEProcess; -class KDE_EXPORT KNConvert : public TQDialog { +class TDE_EXPORT KNConvert : public TQDialog { TQ_OBJECT diff --git a/knode/knglobals.h b/knode/knglobals.h index c2eca4b8e..105984197 100644 --- a/knode/knglobals.h +++ b/knode/knglobals.h @@ -49,7 +49,7 @@ namespace KNode { via KNodeApp. Now they can be accessed directly, this removes many header dependencies. (knode.h isn't include everywhere) */ -class KDE_EXPORT KNGlobals { +class TDE_EXPORT KNGlobals { public: KNGlobals(); ~KNGlobals(); @@ -93,6 +93,6 @@ private: }; -extern KNGlobals knGlobals KDE_EXPORT; +extern KNGlobals knGlobals TDE_EXPORT; #endif diff --git a/knode/knmainwidget.h b/knode/knmainwidget.h index 7dabe226f..09469427e 100644 --- a/knode/knmainwidget.h +++ b/knode/knmainwidget.h @@ -60,7 +60,7 @@ class KNLocalArticle; class KNRemoteArticle; class TDEActionCollection; -class KDE_EXPORT KNMainWidget : public KDockArea, virtual public KNodeIface +class TDE_EXPORT KNMainWidget : public KDockArea, virtual public KNodeIface { TQ_OBJECT diff --git a/knotes/resourcenotes.h b/knotes/resourcenotes.h index 9ea668a0d..948dd4520 100644 --- a/knotes/resourcenotes.h +++ b/knotes/resourcenotes.h @@ -52,7 +52,7 @@ namespace KCal { * \warning This code is still under heavy development. Don't expect source or * binary compatibility in future versions. */ -class KDE_EXPORT ResourceNotes : public KRES::Resource +class TDE_EXPORT ResourceNotes : public KRES::Resource { public: ResourceNotes( const TDEConfig * ); diff --git a/kode/automakefile.h b/kode/automakefile.h index 1a5937324..25113bd43 100644 --- a/kode/automakefile.h +++ b/kode/automakefile.h @@ -30,10 +30,10 @@ namespace KODE { -class KDE_EXPORT AutoMakefile +class TDE_EXPORT AutoMakefile { public: - class KDE_EXPORT Target + class TDE_EXPORT Target { public: typedef TQValueList<Target> List; diff --git a/kode/class.h b/kode/class.h index aab15d279..7e8548c77 100644 --- a/kode/class.h +++ b/kode/class.h @@ -34,7 +34,7 @@ namespace KODE { -class KDE_EXPORT Class +class TDE_EXPORT Class { public: typedef TQValueList<Class> List; diff --git a/kode/code.h b/kode/code.h index 2b1da6311..d060b2f50 100644 --- a/kode/code.h +++ b/kode/code.h @@ -29,7 +29,7 @@ #include <kdemacros.h> namespace KODE { -class KDE_EXPORT Code +class TDE_EXPORT Code { public: Code(); diff --git a/kode/enum.h b/kode/enum.h index d4566bba5..f4f90f375 100644 --- a/kode/enum.h +++ b/kode/enum.h @@ -26,7 +26,7 @@ namespace KODE { -class KDE_EXPORT Enum +class TDE_EXPORT Enum { public: typedef TQValueList<Enum> List; diff --git a/kode/file.h b/kode/file.h index 7a8991542..c0d9d39cb 100644 --- a/kode/file.h +++ b/kode/file.h @@ -32,7 +32,7 @@ namespace KODE { -class KDE_EXPORT File +class TDE_EXPORT File { public: File(); diff --git a/kode/function.h b/kode/function.h index 6d928f4fd..f9cab7e2f 100644 --- a/kode/function.h +++ b/kode/function.h @@ -30,7 +30,7 @@ namespace KODE { -class KDE_EXPORT Function +class TDE_EXPORT Function { public: typedef TQValueList<Function> List; diff --git a/kode/license.h b/kode/license.h index e73be1348..d5aa685df 100644 --- a/kode/license.h +++ b/kode/license.h @@ -26,7 +26,7 @@ namespace KODE { -class KDE_EXPORT License +class TDE_EXPORT License { public: enum Type { GPL, LGPL }; diff --git a/kode/membervariable.h b/kode/membervariable.h index f75ab0f12..6adc9ddb9 100644 --- a/kode/membervariable.h +++ b/kode/membervariable.h @@ -29,7 +29,7 @@ namespace KODE { -class KDE_EXPORT MemberVariable : public Variable +class TDE_EXPORT MemberVariable : public Variable { public: typedef TQValueList<MemberVariable> List; diff --git a/kode/printer.h b/kode/printer.h index ceb0f7a99..0f92608e9 100644 --- a/kode/printer.h +++ b/kode/printer.h @@ -33,7 +33,7 @@ namespace KODE { -class KDE_EXPORT Printer +class TDE_EXPORT Printer { public: Printer(); diff --git a/kode/statemachine.h b/kode/statemachine.h index a34905925..c4e5f6a55 100644 --- a/kode/statemachine.h +++ b/kode/statemachine.h @@ -29,7 +29,7 @@ namespace KODE { -class KDE_EXPORT StateMachine +class TDE_EXPORT StateMachine { public: StateMachine(); diff --git a/kode/style.h b/kode/style.h index 42b5fe187..989cf0d15 100644 --- a/kode/style.h +++ b/kode/style.h @@ -31,7 +31,7 @@ namespace KODE { -class KDE_EXPORT Style +class TDE_EXPORT Style { public: Style(); diff --git a/kode/typedef.h b/kode/typedef.h index a985c5fb3..7da8eb469 100644 --- a/kode/typedef.h +++ b/kode/typedef.h @@ -26,7 +26,7 @@ namespace KODE { -class KDE_EXPORT Typedef +class TDE_EXPORT Typedef { public: typedef TQValueList<Typedef> List; diff --git a/kode/variable.h b/kode/variable.h index 252d7b405..87b87eeba 100644 --- a/kode/variable.h +++ b/kode/variable.h @@ -28,7 +28,7 @@ namespace KODE { -class KDE_EXPORT Variable +class TDE_EXPORT Variable { public: typedef TQValueList<Variable> List; diff --git a/konsolekalendar/stdcalendar.h b/konsolekalendar/stdcalendar.h index b1f434729..555beb5be 100644 --- a/konsolekalendar/stdcalendar.h +++ b/konsolekalendar/stdcalendar.h @@ -27,7 +27,7 @@ namespace KCal { -class KDE_EXPORT StdCalendar : public KCal::CalendarResources +class TDE_EXPORT StdCalendar : public KCal::CalendarResources { public: StdCalendar(); diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h index 7317febc1..a075c2431 100644 --- a/kontact/interfaces/core.h +++ b/kontact/interfaces/core.h @@ -38,7 +38,7 @@ class Plugin; /** This class provides the interface to the Kontact core for the plugins. */ -class KDE_EXPORT Core : public KParts::MainWindow +class TDE_EXPORT Core : public KParts::MainWindow { TQ_OBJECT diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h index af7cbfa71..c08957411 100644 --- a/kontact/interfaces/plugin.h +++ b/kontact/interfaces/plugin.h @@ -55,7 +55,7 @@ class Summary; to get a plugin. It can insert an icon into the sidepane, add widgets to the widgetstack and add menu items via XMLGUI. */ -class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient +class TDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient { TQ_OBJECT diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h index 945395c80..303babb3d 100644 --- a/kontact/interfaces/summary.h +++ b/kontact/interfaces/summary.h @@ -33,7 +33,7 @@ namespace Kontact /** Summary widget for display in the Summary View plugin. */ -class KDE_EXPORT Summary : public TQWidget +class TDE_EXPORT Summary : public TQWidget { TQ_OBJECT diff --git a/kontact/interfaces/uniqueapphandler.h b/kontact/interfaces/uniqueapphandler.h index bef34d470..d6a339634 100644 --- a/kontact/interfaces/uniqueapphandler.h +++ b/kontact/interfaces/uniqueapphandler.h @@ -36,7 +36,7 @@ namespace Kontact * By default this means simply bringing the main window to the front, * but newInstance can be reimplemented. */ -class KDE_EXPORT UniqueAppHandler : public DCOPObject +class TDE_EXPORT UniqueAppHandler : public DCOPObject { K_DCOP @@ -91,7 +91,7 @@ template <class T> class UniqueAppHandlerFactory : public UniqueAppHandlerFactor * Kontact takes over from there. * */ -class KDE_EXPORT UniqueAppWatcher : public TQObject +class TDE_EXPORT UniqueAppWatcher : public TQObject { TQ_OBJECT diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index 690cbc500..20ba1a729 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -41,7 +41,7 @@ extern "C" { - KDE_EXPORT TDECModule *create_kmailsummary( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kmailsummary( TQWidget *parent, const char * ) { return new KCMKMailSummary( parent, "kcmkmailsummary" ); } diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp index 4c0945e79..7e2dd0a33 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.cpp +++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp @@ -41,7 +41,7 @@ extern "C" { - KDE_EXPORT TDECModule *create_korgsummary( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_korgsummary( TQWidget *parent, const char * ) { return new KCMKOrgSummary( parent, "kcmkorgsummary" ); } diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index 4a698ff83..929be9aa8 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -49,7 +49,7 @@ extern "C" { - KDE_EXPORT TDECModule *create_kontactknt( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kontactknt( TQWidget *parent, const char * ) { return new KCMKontactKNT( parent, "kcmkontactknt" ); } diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index f35cc2b49..f0b874148 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.cpp +++ b/kontact/plugins/specialdates/kcmsdsummary.cpp @@ -43,7 +43,7 @@ extern "C" { - KDE_EXPORT TDECModule *create_sdsummary( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_sdsummary( TQWidget *parent, const char * ) { return new KCMSDSummary( parent, "kcmsdsummary" ); } diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index 591cb033b..d400df313 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -43,7 +43,7 @@ extern "C" { - KDE_EXPORT TDECModule *create_kontactsummary( TQWidget *parent, const char * ) { + TDE_EXPORT TDECModule *create_kontactsummary( TQWidget *parent, const char * ) { return new KCMKontactSummary( parent, "kcmkontactsummary" ); } } diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp index b1d0b0399..7c4b19286 100644 --- a/kontact/src/kcmkontact.cpp +++ b/kontact/src/kcmkontact.cpp @@ -42,7 +42,7 @@ extern "C" { - KDE_EXPORT TDECModule *create_kontactconfig( TQWidget *parent, const char * ) { + TDE_EXPORT TDECModule *create_kontactconfig( TQWidget *parent, const char * ) { return new KcmKontact( parent, "kcmkontact" ); } } diff --git a/kontact/src/prefs.kcfgc b/kontact/src/prefs.kcfgc index 03eb7af75..3b94b5b70 100644 --- a/kontact/src/prefs.kcfgc +++ b/kontact/src/prefs.kcfgc @@ -6,7 +6,7 @@ Singleton=true Mutators=true #Inherits=KPimPrefs #IncludeFiles=libtdepim/kpimprefs.h -Visibility=KDE_EXPORT +Visibility=TDE_EXPORT MemberVariables=public GlobalEnums=true ItemAccessors=true diff --git a/korganizer/aboutdata.h b/korganizer/aboutdata.h index 9edf278a1..1bbc93ad8 100644 --- a/korganizer/aboutdata.h +++ b/korganizer/aboutdata.h @@ -29,7 +29,7 @@ namespace KOrg { -class KDE_EXPORT AboutData : public TDEAboutData +class TDE_EXPORT AboutData : public TDEAboutData { public: AboutData(); diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h index d7b8c4173..8df8ef6f5 100644 --- a/korganizer/actionmanager.h +++ b/korganizer/actionmanager.h @@ -70,7 +70,7 @@ using namespace KCal; actions are in one location. It also provides DCOP interface[s]. */ -class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface +class TDE_EXPORT ActionManager : public TQObject, public KCalendarIface { TQ_OBJECT diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 3d1d76238..acf786af6 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h @@ -78,7 +78,7 @@ class CalendarViewExtension : public TQWidget @short main calendar view widget @author Cornelius Schumacher */ -class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::Observer +class TDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::Observer { TQ_OBJECT diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h index ce3e2145c..065171429 100644 --- a/korganizer/interfaces/korganizer/baseview.h +++ b/korganizer/interfaces/korganizer/baseview.h @@ -56,7 +56,7 @@ namespace KOrg { @author Preston Brown, Cornelius Schumacher @see KOTodoView, KOEventView, KOListView, KOAgendaView, KOMonthView */ -class KDE_EXPORT BaseView : public TQWidget +class TDE_EXPORT BaseView : public TQWidget { TQ_OBJECT diff --git a/korganizer/kocore.h b/korganizer/kocore.h index f5dd7c97b..f4125c53b 100644 --- a/korganizer/kocore.h +++ b/korganizer/kocore.h @@ -34,7 +34,7 @@ namespace KPIM { class IdentityManager; } -class KDE_EXPORT KOCore +class TDE_EXPORT KOCore { public: ~KOCore(); diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h index 7758cfdc9..739dce7ee 100644 --- a/korganizer/koeventviewer.h +++ b/korganizer/koeventviewer.h @@ -37,7 +37,7 @@ using namespace KCal; /** Viewer widget for events. */ -class KDE_EXPORT KOEventViewer : public TQTextBrowser +class TDE_EXPORT KOEventViewer : public TQTextBrowser { TQ_OBJECT diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h index 48c02c8a3..30eef1883 100644 --- a/korganizer/koeventviewerdialog.h +++ b/korganizer/koeventviewerdialog.h @@ -38,7 +38,7 @@ class KOEventViewer; /** Viewer dialog for events. */ -class KDE_EXPORT KOEventViewerDialog : public KDialogBase +class TDE_EXPORT KOEventViewerDialog : public KDialogBase { TQ_OBJECT diff --git a/korganizer/koglobals.h b/korganizer/koglobals.h index b6f48cf78..6ec6cb892 100644 --- a/korganizer/koglobals.h +++ b/korganizer/koglobals.h @@ -36,7 +36,7 @@ class TDEConfig; class TDEInstance; class KHolidays; -class KDE_EXPORT KOGlobals +class TDE_EXPORT KOGlobals { public: static KOGlobals *self(); diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui index 13626feb7..6858b9005 100644 --- a/korganizer/kogroupwareprefspage.ui +++ b/korganizer/kogroupwareprefspage.ui @@ -626,6 +626,6 @@ For security reasons, it is not recommended to store your password in the config <slots> <slot>slotChanged()</slot> </slots> -<exportmacro>KDE_EXPORT</exportmacro> +<exportmacro>TDE_EXPORT</exportmacro> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/korganizer/kohelper.h b/korganizer/kohelper.h index e73484213..a1ae0151e 100644 --- a/korganizer/kohelper.h +++ b/korganizer/kohelper.h @@ -32,7 +32,7 @@ namespace KCal { class Incidence; } -class KDE_EXPORT KOHelper +class TDE_EXPORT KOHelper { public: /** diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 3e57a77c3..6d3395d17 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h @@ -38,7 +38,7 @@ class TQStringList; TQColor getTextColor(const TQColor &c); -class KDE_EXPORT KOPrefs : public KOPrefsBase +class TDE_EXPORT KOPrefs : public KOPrefsBase { public: virtual ~KOPrefs(); diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 60fd3e45c..137210c8d 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -138,7 +138,7 @@ void KOPrefsDialogMain::toggleEmailSettings( bool on ) extern "C" { - KDE_EXPORT TDECModule *create_korganizerconfigmain( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_korganizerconfigmain( TQWidget *parent, const char * ) { return new KOPrefsDialogMain( parent, "kcmkorganizermain" ); } diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h index e6fec99c3..bd51386da 100644 --- a/korganizer/koprefsdialog.h +++ b/korganizer/koprefsdialog.h @@ -38,7 +38,7 @@ class KPushButton; class TQColor; class TQListView; -class KDE_EXPORT KOPrefsDialogMain : public KPrefsModule +class TDE_EXPORT KOPrefsDialogMain : public KPrefsModule { TQ_OBJECT @@ -51,7 +51,7 @@ class KDE_EXPORT KOPrefsDialogMain : public KPrefsModule TQWidget *mUserEmailSettings; }; -class KDE_EXPORT KOPrefsDialogColors : public KPrefsModule +class TDE_EXPORT KOPrefsDialogColors : public KPrefsModule { TQ_OBJECT @@ -82,7 +82,7 @@ class KDE_EXPORT KOPrefsDialogColors : public KPrefsModule TQStringList mResourceIdentifier; }; -class KDE_EXPORT KOPrefsDialogGroupScheduling : public KPrefsModule +class TDE_EXPORT KOPrefsDialogGroupScheduling : public KPrefsModule { TQ_OBJECT @@ -106,7 +106,7 @@ class KDE_EXPORT KOPrefsDialogGroupScheduling : public KPrefsModule class KOGroupwarePrefsPage; -class KDE_EXPORT KOPrefsDialogGroupwareScheduling : public KPrefsModule +class TDE_EXPORT KOPrefsDialogGroupwareScheduling : public KPrefsModule { TQ_OBJECT @@ -121,7 +121,7 @@ class KDE_EXPORT KOPrefsDialogGroupwareScheduling : public KPrefsModule KOGroupwarePrefsPage* mGroupwarePage; }; -class KDE_EXPORT KOPrefsDialogPlugins : public KPrefsModule +class TDE_EXPORT KOPrefsDialogPlugins : public KPrefsModule { TQ_OBJECT @@ -141,7 +141,7 @@ class KDE_EXPORT KOPrefsDialogPlugins : public KPrefsModule KPushButton *mConfigureButton; }; -class KDE_EXPORT KOPrefsDesignerFields : public KPIM::KCMDesignerFields +class TDE_EXPORT KOPrefsDesignerFields : public KPIM::KCMDesignerFields { public: KOPrefsDesignerFields( TQWidget *parent = 0, const char *name = 0 ); diff --git a/korganizer/korganizerifaceimpl.h b/korganizer/korganizerifaceimpl.h index c91a715e7..508546e8e 100644 --- a/korganizer/korganizerifaceimpl.h +++ b/korganizer/korganizerifaceimpl.h @@ -39,7 +39,7 @@ class ActionManager; -class KDE_EXPORT KOrganizerIfaceImpl : public TQObject, virtual public KOrganizerIface { +class TDE_EXPORT KOrganizerIfaceImpl : public TQObject, virtual public KOrganizerIface { public: KOrganizerIfaceImpl( ActionManager* mActionManager, TQObject* parent=0, const char* name=0 ); diff --git a/korganizer/printing/calprinter.h b/korganizer/printing/calprinter.h index 5d5035f40..c8e462d66 100644 --- a/korganizer/printing/calprinter.h +++ b/korganizer/printing/calprinter.h @@ -50,7 +50,7 @@ class TQLabel; different formats (day, week, month). It also provides a way for setting up the printer and remembering these preferences. */ -class KDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase +class TDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase { TQ_OBJECT diff --git a/korganizer/printing/calprintpluginbase.h b/korganizer/printing/calprintpluginbase.h index 7b9e52e00..cc42b928d 100644 --- a/korganizer/printing/calprintpluginbase.h +++ b/korganizer/printing/calprintpluginbase.h @@ -61,7 +61,7 @@ using namespace KCal; Base class for KOrganizer printing classes. Each sub class represents one calendar print format. */ -class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin +class TDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin { public: enum DisplayFlags { diff --git a/korganizer/printing/cellitem.h b/korganizer/printing/cellitem.h index 4d8206bc5..5b8c977f8 100644 --- a/korganizer/printing/cellitem.h +++ b/korganizer/printing/cellitem.h @@ -31,7 +31,7 @@ namespace KOrg { -class KDE_EXPORT CellItem +class TDE_EXPORT CellItem { public: CellItem() diff --git a/korganizer/stdcalendar.h b/korganizer/stdcalendar.h index 0b91d6112..158cbbe06 100644 --- a/korganizer/stdcalendar.h +++ b/korganizer/stdcalendar.h @@ -25,7 +25,7 @@ namespace KOrg { -class KDE_EXPORT StdCalendar : public KCal::CalendarResources +class TDE_EXPORT StdCalendar : public KCal::CalendarResources { public: static StdCalendar *self(); diff --git a/korganizer/urihandler.h b/korganizer/urihandler.h index ccf8338f1..d3364e411 100644 --- a/korganizer/urihandler.h +++ b/korganizer/urihandler.h @@ -29,7 +29,7 @@ class TQString; class TQWidget; -class KDE_EXPORT UriHandler +class TDE_EXPORT UriHandler { public: /** diff --git a/ktnef/gui/ktnefview.h b/ktnef/gui/ktnefview.h index 60321bf49..71278e626 100644 --- a/ktnef/gui/ktnefview.h +++ b/ktnef/gui/ktnefview.h @@ -24,7 +24,7 @@ class KTNEFAttach; -class KDE_EXPORT KTNEFView : public TDEListView +class TDE_EXPORT KTNEFView : public TDEListView { TQ_OBJECT diff --git a/ktnef/ktnef/ktnefattach.h b/ktnef/ktnef/ktnefattach.h index 24a14c2dc..077d7a3c1 100644 --- a/ktnef/ktnef/ktnefattach.h +++ b/ktnef/ktnef/ktnefattach.h @@ -26,7 +26,7 @@ class KTNEFProperty; -class KDE_EXPORT KTNEFAttach : public KTNEFPropertySet +class TDE_EXPORT KTNEFAttach : public KTNEFPropertySet { public: enum ParseState { Unparsed = 0x0000, TitleParsed = 0x0001, DataParsed = 0x0002, InfoParsed = 0x0004}; diff --git a/ktnef/ktnef/ktnefmessage.h b/ktnef/ktnef/ktnefmessage.h index 48d397c4b..24723c007 100644 --- a/ktnef/ktnef/ktnefmessage.h +++ b/ktnef/ktnef/ktnefmessage.h @@ -24,7 +24,7 @@ class KTNEFAttach; -class KDE_EXPORT KTNEFMessage : public KTNEFPropertySet +class TDE_EXPORT KTNEFMessage : public KTNEFPropertySet { public: KTNEFMessage(); diff --git a/ktnef/ktnef/ktnefparser.h b/ktnef/ktnef/ktnefparser.h index ea098dd69..7d42b9d1c 100644 --- a/ktnef/ktnef/ktnefparser.h +++ b/ktnef/ktnef/ktnefparser.h @@ -27,7 +27,7 @@ class KTNEFAttach; class KTNEFMessage; class KTNEFProperty; -class KDE_EXPORT KTNEFParser +class TDE_EXPORT KTNEFParser { public: KTNEFParser(); diff --git a/ktnef/ktnef/ktnefproperty.h b/ktnef/ktnef/ktnefproperty.h index c0af8d94f..0443e7154 100644 --- a/ktnef/ktnef/ktnefproperty.h +++ b/ktnef/ktnef/ktnefproperty.h @@ -22,7 +22,7 @@ #include <tqstring.h> #include <kdemacros.h> -class KDE_EXPORT KTNEFProperty +class TDE_EXPORT KTNEFProperty { public: enum MAPIType diff --git a/ktnef/ktnef/ktnefpropertyset.h b/ktnef/ktnef/ktnefpropertyset.h index c35aa0e32..789bfe89c 100644 --- a/ktnef/ktnef/ktnefpropertyset.h +++ b/ktnef/ktnef/ktnefpropertyset.h @@ -24,7 +24,7 @@ class KTNEFProperty; -class KDE_EXPORT KTNEFPropertySet +class TDE_EXPORT KTNEFPropertySet { public: KTNEFPropertySet(); diff --git a/libemailfunctions/email.h b/libemailfunctions/email.h index 6f5f44e0c..30f4e9e5c 100644 --- a/libemailfunctions/email.h +++ b/libemailfunctions/email.h @@ -50,7 +50,7 @@ enum EmailParseResult { AddressOk, AddressEmpty, UnexpectedEnd, // Helper functions /** Split a comma separated list of email addresses. */ -KDE_EXPORT TQStringList splitEmailAddrList(const TQString& aStr); +TDE_EXPORT TQStringList splitEmailAddrList(const TQString& aStr); /** Splits the given address into display name, email address and comment. Returns AddressOk if no error was encountered. Otherwise an appropriate @@ -71,7 +71,7 @@ KDE_EXPORT TQStringList splitEmailAddrList(const TQString& aStr); @return AddressOk if no error was encountered. Otherwise an appropriate error code is returned. */ -KDE_EXPORT EmailParseResult splitAddress( const TQCString & address, +TDE_EXPORT EmailParseResult splitAddress( const TQCString & address, TQCString & displayName, TQCString & addrSpec, TQCString & comment ); @@ -98,7 +98,7 @@ KDE_EXPORT EmailParseResult splitAddress( const TQCString & address, @return AddressOk if no error was encountered. Otherwise an appropriate error code is returned. */ -KDE_EXPORT EmailParseResult splitAddress( const TQString & address, +TDE_EXPORT EmailParseResult splitAddress( const TQString & address, TQString & displayName, TQString & addrSpec, TQString & comment ); @@ -112,7 +112,7 @@ KDE_EXPORT EmailParseResult splitAddress( const TQString & address, @return AddressOk if no error was encountered. Otherwise an appropriate error code is returned. */ -KDE_EXPORT EmailParseResult isValidEmailAddress( const TQString& aStr ); +TDE_EXPORT EmailParseResult isValidEmailAddress( const TQString& aStr ); /** Translate the enum errorcodes from emailParseResult into i18n'd strings that can be used for msg boxes. @@ -121,7 +121,7 @@ KDE_EXPORT EmailParseResult isValidEmailAddress( const TQString& aStr ); @return An i18n ready string for use in msgboxes. */ -KDE_EXPORT TQString emailParseResultToString( EmailParseResult errorCode ); +TDE_EXPORT TQString emailParseResultToString( EmailParseResult errorCode ); /** Validates an email address in the form of [email protected]. Returns true if no error was encountered. @@ -133,7 +133,7 @@ KDE_EXPORT TQString emailParseResultToString( EmailParseResult errorCode ); example: [email protected] @return true if no error was encountered. */ -KDE_EXPORT bool isValidSimpleEmailAddress( const TQString& aStr ); +TDE_EXPORT bool isValidSimpleEmailAddress( const TQString& aStr ); /** Returns a i18n string to be used in msgboxes this allows for error messages to be the same @@ -142,7 +142,7 @@ KDE_EXPORT bool isValidSimpleEmailAddress( const TQString& aStr ); @return An i18n ready string for use in msgboxes. */ -KDE_EXPORT TQString simpleEmailAddressErrorMsg(); +TDE_EXPORT TQString simpleEmailAddressErrorMsg(); /** Returns the pure email address (addr-spec in RFC2822) of the given address (mailbox in RFC2822). @@ -151,7 +151,7 @@ KDE_EXPORT TQString simpleEmailAddressErrorMsg(); @return the addr-spec of @a address, i.e. [email protected] in the example */ -KDE_EXPORT TQCString getEmailAddress( const TQCString & address ); +TDE_EXPORT TQCString getEmailAddress( const TQCString & address ); /** This is an overloaded member function, provided for convenience. It behaves essentially like the above function. @@ -163,7 +163,7 @@ KDE_EXPORT TQCString getEmailAddress( const TQCString & address ); @return the addr-spec of @a address, i.e. [email protected] in the example */ -KDE_EXPORT TQString getEmailAddress( const TQString & address ); +TDE_EXPORT TQString getEmailAddress( const TQString & address ); /** Returns the pure email address (addr-spec in RFC2822) of the first email address of a list of addresses. @@ -172,7 +172,7 @@ KDE_EXPORT TQString getEmailAddress( const TQString & address ); @return the addr-spec of @a addresses, i.e. [email protected] in the example */ -KDE_EXPORT TQCString getFirstEmailAddress( const TQCString & addresses ); +TDE_EXPORT TQCString getFirstEmailAddress( const TQCString & addresses ); /** This is an overloaded member function, provided for convenience. It behaves essentially like the above function. @@ -184,7 +184,7 @@ KDE_EXPORT TQCString getFirstEmailAddress( const TQCString & addresses ); @return the addr-spec of @a addresses, i.e. [email protected] in the example */ -KDE_EXPORT TQString getFirstEmailAddress( const TQString & addresses ); +TDE_EXPORT TQString getFirstEmailAddress( const TQString & addresses ); /** Return email address and name from string. Examples: * "Stefan Taferner <[email protected]>" returns "[email protected]" @@ -194,14 +194,14 @@ KDE_EXPORT TQString getFirstEmailAddress( const TQString & addresses ); * mail are not empty: this does NOT tell you if mail contains a * valid email address or just some rubbish. */ -KDE_EXPORT bool getNameAndMail(const TQString& aStr, TQString& name, TQString& mail); +TDE_EXPORT bool getNameAndMail(const TQString& aStr, TQString& name, TQString& mail); /** * Compare two email addresses. If matchName is false, it just checks * the email address, and returns true if this matches. If matchName * is true, both the name and the email must be the same. */ -KDE_EXPORT bool compareEmail( const TQString& email1, const TQString& email2, +TDE_EXPORT bool compareEmail( const TQString& email1, const TQString& email2, bool matchName ); /** Returns a normalized address built from the given parts. The normalized @@ -216,7 +216,7 @@ KDE_EXPORT bool compareEmail( const TQString& email1, const TQString& email2, @param comment a comment @return a normalized address built from the given parts */ -KDE_EXPORT TQString normalizedAddress( const TQString & displayName, +TDE_EXPORT TQString normalizedAddress( const TQString & displayName, const TQString & addrSpec, const TQString & comment ); @@ -225,7 +225,7 @@ KDE_EXPORT TQString normalizedAddress( const TQString & displayName, @param addrSpec a pure 7-bit email address (addr-spec in RFC2822) @return the email address with Unicode domain */ -KDE_EXPORT TQString decodeIDN( const TQString & addrSpec ); +TDE_EXPORT TQString decodeIDN( const TQString & addrSpec ); /** Encodes the domain part of the given addr-spec in punycode if it's an IDN. @@ -233,7 +233,7 @@ KDE_EXPORT TQString decodeIDN( const TQString & addrSpec ); @param addrSpec a pure email address with Unicode domain @return the email address with domain in punycode */ -KDE_EXPORT TQString encodeIDN( const TQString & addrSpec ); +TDE_EXPORT TQString encodeIDN( const TQString & addrSpec ); /** Normalizes all email addresses in the given list and decodes all IDNs. @@ -241,17 +241,17 @@ KDE_EXPORT TQString encodeIDN( const TQString & addrSpec ); @return the email addresses in normalized form with Unicode IDNs */ -KDE_EXPORT TQString normalizeAddressesAndDecodeIDNs( const TQString & addresses ); +TDE_EXPORT TQString normalizeAddressesAndDecodeIDNs( const TQString & addresses ); /** Normalizes all email addresses in the given list and encodes all IDNs in punycode. */ -KDE_EXPORT TQString normalizeAddressesAndEncodeIDNs( const TQString & str ); +TDE_EXPORT TQString normalizeAddressesAndEncodeIDNs( const TQString & str ); /** Add quote characters around the given string if it contains a * character that makes that necessary, in an email name, such as ",". */ -KDE_EXPORT TQString quoteNameIfNecessary( const TQString& str ); +TDE_EXPORT TQString quoteNameIfNecessary( const TQString& str ); } // namespace diff --git a/libemailfunctions/idmapper.h b/libemailfunctions/idmapper.h index fcd974514..04d34e4c7 100644 --- a/libemailfunctions/idmapper.h +++ b/libemailfunctions/idmapper.h @@ -34,7 +34,7 @@ namespace KPIM { clear, but maps have categories. This is probably an adjoint functor, since adjoint functors are everywhere. */ -class KDE_EXPORT IdMapper +class TDE_EXPORT IdMapper { public: /** diff --git a/libkcal/attachment.h b/libkcal/attachment.h index 9d36274c4..8377836ea 100644 --- a/libkcal/attachment.h +++ b/libkcal/attachment.h @@ -31,7 +31,7 @@ namespace KCal { /** This class represents information related to an attachment. */ -class KDE_EXPORT Attachment +class TDE_EXPORT Attachment { public: typedef ListBase<Attachment> List; diff --git a/libkcal/confirmsavedialog.h b/libkcal/confirmsavedialog.h index bc0fcb09d..313dd2731 100644 --- a/libkcal/confirmsavedialog.h +++ b/libkcal/confirmsavedialog.h @@ -29,7 +29,7 @@ class TDEListView; namespace KCal { -class KDE_EXPORT ConfirmSaveDialog : public KDialogBase +class TDE_EXPORT ConfirmSaveDialog : public KDialogBase { public: ConfirmSaveDialog( const TQString &destination, TQWidget *parent, diff --git a/libkcal/htmlexport.h b/libkcal/htmlexport.h index 0fbe8022d..bcf5af96a 100644 --- a/libkcal/htmlexport.h +++ b/libkcal/htmlexport.h @@ -39,7 +39,7 @@ namespace KCal { /** This class provides the functions to export a calendar as an HTML page. */ -class KDE_EXPORT HtmlExport +class TDE_EXPORT HtmlExport { public: /** diff --git a/libkcal/htmlexportsettings.kcfgc b/libkcal/htmlexportsettings.kcfgc index db2360aac..e756d7e21 100644 --- a/libkcal/htmlexportsettings.kcfgc +++ b/libkcal/htmlexportsettings.kcfgc @@ -7,4 +7,4 @@ MemberVariables=public GlobalEnums=true ItemAccessors=true SetUserTexts=true -Visibility=KDE_EXPORT +Visibility=TDE_EXPORT diff --git a/libkcal/imipscheduler.h b/libkcal/imipscheduler.h index 59379403f..698ef0b55 100644 --- a/libkcal/imipscheduler.h +++ b/libkcal/imipscheduler.h @@ -34,7 +34,7 @@ namespace KCal { This class implements the iTIP interface using the email interface specified as iMIP. */ -class KDE_EXPORT IMIPScheduler : public Scheduler +class TDE_EXPORT IMIPScheduler : public Scheduler { public: IMIPScheduler( Calendar * ); diff --git a/libkcal/libkcal_export.h b/libkcal/libkcal_export.h index 7fca2dbee..19502ff16 100644 --- a/libkcal/libkcal_export.h +++ b/libkcal/libkcal_export.h @@ -23,6 +23,6 @@ #include <kdemacros.h> -#define LIBKCAL_EXPORT KDE_EXPORT +#define LIBKCAL_EXPORT TDE_EXPORT #endif diff --git a/libkcal/period.h b/libkcal/period.h index b0ca32a33..64250a436 100644 --- a/libkcal/period.h +++ b/libkcal/period.h @@ -32,7 +32,7 @@ namespace KCal { This class represents a period of time. The period can be defined by either a start time and an end time or by a start time and a duration. */ -class KDE_EXPORT Period +class TDE_EXPORT Period { public: Period(); diff --git a/libkcal/resourcecached.h b/libkcal/resourcecached.h index 6fc30a1ce..6d0458084 100644 --- a/libkcal/resourcecached.h +++ b/libkcal/resourcecached.h @@ -42,7 +42,7 @@ namespace KCal { This class provides a calendar resource using a local CalendarLocal object to cache the calendar data. */ -class KDE_EXPORT ResourceCached : public ResourceCalendar, +class TDE_EXPORT ResourceCached : public ResourceCalendar, public KCal::Calendar::Observer { TQ_OBJECT diff --git a/libkcal/resourcecachedconfig.h b/libkcal/resourcecachedconfig.h index 81e4ee8ee..ff3639c13 100644 --- a/libkcal/resourcecachedconfig.h +++ b/libkcal/resourcecachedconfig.h @@ -36,7 +36,7 @@ class ResourceCached; @see ResourceCached */ -class KDE_EXPORT ResourceCachedReloadConfig : public TQWidget +class TDE_EXPORT ResourceCachedReloadConfig : public TQWidget { TQ_OBJECT @@ -63,7 +63,7 @@ class KDE_EXPORT ResourceCachedReloadConfig : public TQWidget @see ResourceCached */ -class KDE_EXPORT ResourceCachedSaveConfig : public TQWidget +class TDE_EXPORT ResourceCachedSaveConfig : public TQWidget { TQ_OBJECT diff --git a/libkcal/vcaldrag.h b/libkcal/vcaldrag.h index 7cb8c6bbd..7cfbff52f 100644 --- a/libkcal/vcaldrag.h +++ b/libkcal/vcaldrag.h @@ -32,7 +32,7 @@ class Calendar; /** vCalendar drag&drop class. */ -class KDE_EXPORT VCalDrag : public TQStoredDrag +class TDE_EXPORT VCalDrag : public TQStoredDrag { public: /** diff --git a/libkholidays/kholidays.h b/libkholidays/kholidays.h index 198053778..5afc63fc3 100644 --- a/libkholidays/kholidays.h +++ b/libkholidays/kholidays.h @@ -33,7 +33,7 @@ struct KHoliday { int Category; }; -class KDE_EXPORT KHolidays { +class TDE_EXPORT KHolidays { public: /** Return a list of all available locations which have a holiday definition. diff --git a/libkmime/boolflags.h b/libkmime/boolflags.h index 0964c19a5..821c8188a 100644 --- a/libkmime/boolflags.h +++ b/libkmime/boolflags.h @@ -25,7 +25,7 @@ We use it to store the flags of an article @internal */ -class KDE_EXPORT BoolFlags { +class TDE_EXPORT BoolFlags { public: BoolFlags() { clear(); } diff --git a/libkmime/kmime_charfreq.h b/libkmime/kmime_charfreq.h index 64a6e213c..fcd7aeabe 100644 --- a/libkmime/kmime_charfreq.h +++ b/libkmime/kmime_charfreq.h @@ -21,7 +21,7 @@ namespace KMime { -class KDE_EXPORT CharFreq { +class TDE_EXPORT CharFreq { public: CharFreq( const TQByteArray & buf ); CharFreq( const char * buf, size_t len ); diff --git a/libkmime/kmime_codecs.h b/libkmime/kmime_codecs.h index 2a2f4d79e..1bd1bddcb 100644 --- a/libkmime/kmime_codecs.h +++ b/libkmime/kmime_codecs.h @@ -54,7 +54,7 @@ class Decoder; @short Codecs for common mail transfer encodings. @author Marc Mutz <[email protected]> */ -class KDE_EXPORT Codec { +class TDE_EXPORT Codec { protected: static TQAsciiDict<Codec>* all; diff --git a/libkmime/kmime_content.h b/libkmime/kmime_content.h index 1d2aac2d3..784179c6e 100644 --- a/libkmime/kmime_content.h +++ b/libkmime/kmime_content.h @@ -56,7 +56,7 @@ class Base { structure, that represents the structure of the message */ -class KDE_EXPORT Content : public Base { +class TDE_EXPORT Content : public Base { public: typedef TQPtrList<KMime::Content> List; diff --git a/libkmime/kmime_header_parsing.h b/libkmime/kmime_header_parsing.h index c4c69945e..cf398e61c 100644 --- a/libkmime/kmime_header_parsing.h +++ b/libkmime/kmime_header_parsing.h @@ -48,32 +48,32 @@ namespace KMime { namespace Types { // for when we can't make up our mind what to use... - struct KDE_EXPORT TQStringOrTQPair { + struct TDE_EXPORT TQStringOrTQPair { TQStringOrTQPair() : qstring(), qpair(0,0) {} TQString qstring; TQPair<const char*,int> qpair; }; - struct KDE_EXPORT AddrSpec { + struct TDE_EXPORT AddrSpec { TQString asString() const; TQString localPart; TQString domain; }; typedef TQValueList<AddrSpec> AddrSpecList; - struct KDE_EXPORT Mailbox { + struct TDE_EXPORT Mailbox { TQString displayName; AddrSpec addrSpec; }; typedef TQValueList<Mailbox> MailboxList; - struct KDE_EXPORT Address { + struct TDE_EXPORT Address { TQString displayName; MailboxList mailboxList; }; typedef TQValueList<Address> AddressList; - struct KDE_EXPORT DateTime { + struct TDE_EXPORT DateTime { time_t time; // secs since 1.1.1970, 0:00 UTC/GMT long int secsEastOfGMT; // timezone bool timeZoneKnown; // do we know the timezone? (e.g. on -0000) @@ -98,7 +98,7 @@ namespace HeaderParsing { @return the decoded string the encoded word represented. */ bool parseEncodedWord( const char* & scursor, const char * const send, - TQString & result, TQCString & language ) KDE_EXPORT; + TQString & result, TQCString & language ) TDE_EXPORT; // // The parsing squad: // @@ -106,34 +106,34 @@ namespace HeaderParsing { /** You may or may not have already started parsing into the atom. This function will go on where you left off. */ bool parseAtom( const char* & scursor, const char * const send, - TQString & result, bool allow8Bit=false ) KDE_EXPORT; + TQString & result, bool allow8Bit=false ) TDE_EXPORT; bool parseAtom( const char* & scursor, const char * const send, - TQPair<const char*,int> & result, bool allow8Bit=false ) KDE_EXPORT; + TQPair<const char*,int> & result, bool allow8Bit=false ) TDE_EXPORT; /** You may or may not have already started parsing into the token. This function will go on where you left off. */ bool parseToken( const char* & scursor, const char * const send, - TQString & result, bool allow8Bit=false ) KDE_EXPORT; + TQString & result, bool allow8Bit=false ) TDE_EXPORT; bool parseToken( const char* & scursor, const char * const send, - TQPair<const char*,int> & result, bool allow8Bit=false ) KDE_EXPORT; + TQPair<const char*,int> & result, bool allow8Bit=false ) TDE_EXPORT; /** @p scursor must be positioned after the opening openChar. */ bool parseGenericQuotedString( const char* & scursor, const char* const send, TQString & result, bool isCRLF, const char openChar='"', - const char closeChar='"' ) KDE_EXPORT; + const char closeChar='"' ) TDE_EXPORT; /** @p scursor must be positioned right after the opening '(' */ bool parseComment( const char* & scursor, const char * const send, - TQString & result, bool isCRLF=false, bool reallySave=true ) KDE_EXPORT; + TQString & result, bool isCRLF=false, bool reallySave=true ) TDE_EXPORT; /** You may or may not have already started parsing into the phrase, but only if it starts with atext. If you setup this function to parse a phrase starting with an encoded-word or quoted-string, @p scursor has to point to the char introducing the encoded-word or quoted-string, resp. */ bool parsePhrase( const char* & scursor, const char * const send, - TQString & result, bool isCRLF=false ) KDE_EXPORT; + TQString & result, bool isCRLF=false ) TDE_EXPORT; /** You may or may not have already started parsing into the initial atom, but not up to it's end. */ bool parseDotAtom( const char* & scursor, const char * const send, - TQString & result, bool isCRLF=false ) KDE_EXPORT; + TQString & result, bool isCRLF=false ) TDE_EXPORT; /** Eats comment-folding-white-space, skips whitespace, folding and comments (even nested ones) and stops at the next non-CFWS @@ -144,42 +144,42 @@ namespace HeaderParsing { scursor is being positioned on the opening '(' of the outmost comment. */ - void eatCFWS( const char* & scursor, const char * const send, bool isCRLF ) KDE_EXPORT; + void eatCFWS( const char* & scursor, const char * const send, bool isCRLF ) TDE_EXPORT; bool parseDomain( const char* & scursor, const char * const send, - TQString & result, bool isCRLF=false ) KDE_EXPORT; + TQString & result, bool isCRLF=false ) TDE_EXPORT; bool parseObsRoute( const char* & scursor, const char * const send, TQStringList & result, - bool isCRLF=false, bool save=false ) KDE_EXPORT; + bool isCRLF=false, bool save=false ) TDE_EXPORT; bool parseAddrSpec( const char* & scursor, const char * const send, - Types::AddrSpec & result, bool isCRLF=false ) KDE_EXPORT; + Types::AddrSpec & result, bool isCRLF=false ) TDE_EXPORT; bool parseAngleAddr( const char* & scursor, const char * const send, - Types::AddrSpec & result, bool isCRLF=false ) KDE_EXPORT; + Types::AddrSpec & result, bool isCRLF=false ) TDE_EXPORT; bool parseMailbox( const char* & scursor, const char * const send, - Types::Mailbox & result, bool isCRLF=false ) KDE_EXPORT; + Types::Mailbox & result, bool isCRLF=false ) TDE_EXPORT; bool parseGroup( const char* & scursor, const char * const send, - Types::Address & result, bool isCRLF=false ) KDE_EXPORT; + Types::Address & result, bool isCRLF=false ) TDE_EXPORT; bool parseAddress( const char* & scursor, const char * const send, - Types::Address & result, bool isCRLF=false ) KDE_EXPORT; + Types::Address & result, bool isCRLF=false ) TDE_EXPORT; bool parseAddressList( const char* & scursor, const char * const send, - Types::AddressList & result, bool isCRLF=false ) KDE_EXPORT; + Types::AddressList & result, bool isCRLF=false ) TDE_EXPORT; bool parseParameter( const char* & scursor, const char * const send, TQPair<TQString,Types::TQStringOrTQPair> & result, - bool isCRLF=false ) KDE_EXPORT; + bool isCRLF=false ) TDE_EXPORT; bool parseParameterList( const char* & scursor, const char * const send, - TQMap<TQString,TQString> & result, bool isCRLF=false ) KDE_EXPORT; + TQMap<TQString,TQString> & result, bool isCRLF=false ) TDE_EXPORT; bool parseRawParameterList( const char* & scursor, const char * const send, TQMap<TQString,Types::TQStringOrTQPair> & result, - bool isCRLF=false ) KDE_EXPORT; + bool isCRLF=false ) TDE_EXPORT; bool parseTime( const char* & scursor, const char * const send, int & hour, int & min, int & sec, long int & secsEastOfGMT, - bool & timeZoneKnown, bool isCRLF=false ) KDE_EXPORT; + bool & timeZoneKnown, bool isCRLF=false ) TDE_EXPORT; bool parseDateTime( const char* & scursor, const char * const send, - Types::DateTime & result, bool isCRLF=false ) KDE_EXPORT; + Types::DateTime & result, bool isCRLF=false ) TDE_EXPORT; #if 0 bool tryToMakeAnySenseOfDateString( const char* & scursor, diff --git a/libkmime/kmime_headers.h b/libkmime/kmime_headers.h index 02d0ad6a1..0b17cbb16 100644 --- a/libkmime/kmime_headers.h +++ b/libkmime/kmime_headers.h @@ -108,7 +108,7 @@ mk_parsing_subclass_with_name( subclass, subclass, baseclass ) /** Baseclass of all header-classes. It represents a header-field as described in RFC-822. */ -class KDE_EXPORT Base { +class TDE_EXPORT Base { public: typedef TQPtrList<Base> List; @@ -213,7 +213,7 @@ namespace Generics { // known issues: // - uses old decodeRFC2047String function, instead of our own... -class KDE_EXPORT GUnstructured : public Base { +class TDE_EXPORT GUnstructured : public Base { public: GUnstructured() : Base() {} @@ -266,7 +266,7 @@ private: @author Marc Mutz <[email protected]> */ -class KDE_EXPORT GStructured : public Base { +class TDE_EXPORT GStructured : public Base { public: GStructured() : Base() {} GStructured( Content * p ) : Base( p ) {} @@ -300,7 +300,7 @@ protected: }; -class KDE_EXPORT GAddress : public GStructured { +class TDE_EXPORT GAddress : public GStructured { public: GAddress() : GStructured() {} GAddress( Content * p ) : GStructured( p ) {} @@ -316,7 +316,7 @@ protected: /** Base class for headers that deal with (possibly multiple) addresses, but don't allow groups: */ -class KDE_EXPORT MailboxList : public GAddress { +class TDE_EXPORT MailboxList : public GAddress { public: MailboxList() : GAddress() {} MailboxList( Content * p ) : GAddress( p ) {} @@ -340,7 +340,7 @@ mk_parsing_subclass(SingleMailbox,MailboxList); /** Base class for headers that deal with (possibly multiple) addresses, allowing groups. */ -class KDE_EXPORT AddressList : public GAddress { +class TDE_EXPORT AddressList : public GAddress { public: AddressList() : GAddress() {} AddressList( Content * p ) : GAddress( p ) {} @@ -358,7 +358,7 @@ protected: }; /** Base class for headers which deal with a list of msg-id's */ -class KDE_EXPORT GIdent : public GAddress { +class TDE_EXPORT GIdent : public GAddress { public: GIdent() : GAddress() {} GIdent( Content * p ) : GAddress( p ) {} @@ -379,7 +379,7 @@ protected: mk_parsing_subclass(GSingleIdent,GIdent); /** Base class for headers which deal with a single atom. */ -class KDE_EXPORT GToken : public GStructured { +class TDE_EXPORT GToken : public GStructured { public: GToken() : GStructured() {} GToken( Content * p ) : GStructured( p ) {} @@ -396,7 +396,7 @@ protected: }; -class KDE_EXPORT GPhraseList : public GStructured { +class TDE_EXPORT GPhraseList : public GStructured { public: GPhraseList() : GStructured() {} GPhraseList( Content * p ) : GStructured( p ) {} @@ -412,7 +412,7 @@ protected: TQStringList mPhraseList; }; -class KDE_EXPORT GDotAtom : public GStructured { +class TDE_EXPORT GDotAtom : public GStructured { public: GDotAtom() : GStructured() {} GDotAtom( Content * p ) : GStructured( p ) {} @@ -428,7 +428,7 @@ protected: TQString mDotAtom; }; -class KDE_EXPORT GParametrized : public GStructured { +class TDE_EXPORT GParametrized : public GStructured { public: GParametrized() : GStructured() {} GParametrized( Content * p ) : GStructured( p ) {} @@ -444,7 +444,7 @@ protected: private: }; -class KDE_EXPORT GContentType : public GParametrized { +class TDE_EXPORT GContentType : public GParametrized { public: GContentType() : GParametrized() {} GContentType( Content * p ) : GParametrized( p ) {} @@ -462,7 +462,7 @@ protected: }; -class KDE_EXPORT GCISTokenWithParameterList : public GParametrized { +class TDE_EXPORT GCISTokenWithParameterList : public GParametrized { public: GCISTokenWithParameterList() : GParametrized() {} GCISTokenWithParameterList( Content * p ) : GParametrized( p ) {} @@ -489,7 +489,7 @@ protected: /** Represents the Return-Path header field. */ -class KDE_EXPORT ReturnPath : public Generics::GAddress { +class TDE_EXPORT ReturnPath : public Generics::GAddress { public: ReturnPath() : Generics::GAddress() {} ReturnPath( Content * p ) : Generics::GAddress( p ) {} @@ -565,7 +565,7 @@ mk_trivial_subclass_with_name(ContentDisposition,Content-Disposition, Adds a type over GUnstructured. @see GUnstructured */ -class KDE_EXPORT Generic : public Generics::GUnstructured { +class TDE_EXPORT Generic : public Generics::GUnstructured { public: Generic() : Generics::GUnstructured(), t_ype(0) {} @@ -591,7 +591,7 @@ class KDE_EXPORT Generic : public Generics::GUnstructured { /** Represents a "Subject" header */ -class KDE_EXPORT Subject : public Generics::GUnstructured { +class TDE_EXPORT Subject : public Generics::GUnstructured { public: Subject() : Generics::GUnstructured() {} @@ -610,7 +610,7 @@ class KDE_EXPORT Subject : public Generics::GUnstructured { }; /** Represents a "Organization" header */ -class KDE_EXPORT Organization : public Generics::GUnstructured { +class TDE_EXPORT Organization : public Generics::GUnstructured { public: Organization() : Generics::GUnstructured() {} @@ -634,7 +634,7 @@ class KDE_EXPORT Organization : public Generics::GUnstructured { /** Represents a "Control" header */ -class KDE_EXPORT Control : public Base { +class TDE_EXPORT Control : public Base { public: Control() : Base() {} @@ -659,7 +659,7 @@ class KDE_EXPORT Control : public Base { }; /** Represents a "Date" header */ -class KDE_EXPORT Date : public Base { +class TDE_EXPORT Date : public Base { public: Date() : Base(), t_ime(0) {} @@ -690,7 +690,7 @@ class KDE_EXPORT Date : public Base { /** Represents a "Newsgroups" header */ -class KDE_EXPORT Newsgroups : public Base { +class TDE_EXPORT Newsgroups : public Base { public: Newsgroups() : Base() {} @@ -718,7 +718,7 @@ class KDE_EXPORT Newsgroups : public Base { /** Represents a "Followup-To" header */ -class KDE_EXPORT FollowUpTo : public Newsgroups { +class TDE_EXPORT FollowUpTo : public Newsgroups { public: FollowUpTo() : Newsgroups() {} @@ -733,7 +733,7 @@ class KDE_EXPORT FollowUpTo : public Newsgroups { /** Represents a "Lines" header */ -class KDE_EXPORT Lines : public Base { +class TDE_EXPORT Lines : public Base { public: Lines() : Base(),l_ines(-1) {} @@ -762,7 +762,7 @@ class KDE_EXPORT Lines : public Base { /** Represents a "User-Agent" header */ -class KDE_EXPORT UserAgent : public Base { +class TDE_EXPORT UserAgent : public Base { public: UserAgent() : Base() {} diff --git a/libkmime/kmime_headers_obs.h b/libkmime/kmime_headers_obs.h index 8905d1c59..2278af902 100644 --- a/libkmime/kmime_headers_obs.h +++ b/libkmime/kmime_headers_obs.h @@ -23,7 +23,7 @@ #include <kdemacros.h> /** Represents a "Message-Id" header */ -class KDE_EXPORT MessageID : public Base { +class TDE_EXPORT MessageID : public Base { public: MessageID() : Base() {} @@ -48,7 +48,7 @@ class KDE_EXPORT MessageID : public Base { }; /** Represents a "Supersedes" header */ -class KDE_EXPORT Supersedes : public MessageID { +class TDE_EXPORT Supersedes : public MessageID { public: Supersedes() : MessageID() {} @@ -63,7 +63,7 @@ class KDE_EXPORT Supersedes : public MessageID { /** This class encapsulates an address-field, containing an email-address and a real name */ -class KDE_EXPORT AddressField : public Base { +class TDE_EXPORT AddressField : public Base { public: AddressField() : Base() {} @@ -98,7 +98,7 @@ class KDE_EXPORT AddressField : public Base { typedef TQPtrList<AddressField> ObsAddressList; /** Represent a "From" header */ -class KDE_EXPORT From : public AddressField { +class TDE_EXPORT From : public AddressField { public: From() : AddressField() {} @@ -112,7 +112,7 @@ class KDE_EXPORT From : public AddressField { /** Represents a "Reply-To" header */ -class KDE_EXPORT ReplyTo : public AddressField { +class TDE_EXPORT ReplyTo : public AddressField { public: ReplyTo() : AddressField() {} @@ -128,7 +128,7 @@ class KDE_EXPORT ReplyTo : public AddressField { /** Represents a "Mail-Copies-To" header http://www.newsreaders.com/misc/mail-copies-to.html */ -class KDE_EXPORT MailCopiesTo : public AddressField { +class TDE_EXPORT MailCopiesTo : public AddressField { public: MailCopiesTo() : AddressField() {} @@ -146,7 +146,7 @@ class KDE_EXPORT MailCopiesTo : public AddressField { }; /** Represents a "To" header */ -class KDE_EXPORT To : public Base { +class TDE_EXPORT To : public Base { public: To() : Base(),a_ddrList(0) {} @@ -176,7 +176,7 @@ class KDE_EXPORT To : public Base { /** Represents a "CC" header */ -class KDE_EXPORT CC : public To { +class TDE_EXPORT CC : public To { public: CC() : To() {} @@ -191,7 +191,7 @@ class KDE_EXPORT CC : public To { /** Represents a "BCC" header */ -class KDE_EXPORT BCC : public To { +class TDE_EXPORT BCC : public To { public: BCC() : To() {} @@ -205,7 +205,7 @@ class KDE_EXPORT BCC : public To { }; /** Represents a "References" header */ -class KDE_EXPORT References : public Base { +class TDE_EXPORT References : public Base { public: References() : Base(),p_os(-1) {} @@ -235,7 +235,7 @@ class KDE_EXPORT References : public Base { }; /** Represents a "Content-Type" header */ -class KDE_EXPORT ContentType : public Base { +class TDE_EXPORT ContentType : public Base { public: ContentType() : Base(),m_imeType("invalid/invalid"),c_ategory(CCsingle) {} @@ -294,7 +294,7 @@ class KDE_EXPORT ContentType : public Base { /** Represents a "Content-Transfer-Encoding" header */ -class KDE_EXPORT CTEncoding : public Base { +class TDE_EXPORT CTEncoding : public Base { public: CTEncoding() : Base(),c_te(CE7Bit),d_ecoded(true) {} @@ -324,7 +324,7 @@ class KDE_EXPORT CTEncoding : public Base { /** Represents a "Content-Disposition" header */ -class KDE_EXPORT CDisposition : public Base { +class TDE_EXPORT CDisposition : public Base { public: CDisposition() : Base(),d_isp(CDinline) {} @@ -355,7 +355,7 @@ class KDE_EXPORT CDisposition : public Base { /** Represents a "Content-Description" header */ -class KDE_EXPORT CDescription : public Generics::GUnstructured { +class TDE_EXPORT CDescription : public Generics::GUnstructured { public: CDescription() : Generics::GUnstructured() {} diff --git a/libkmime/kmime_mdn.h b/libkmime/kmime_mdn.h index c261b5fdc..53959550e 100644 --- a/libkmime/kmime_mdn.h +++ b/libkmime/kmime_mdn.h @@ -178,7 +178,7 @@ namespace KMime { /** Main function. Generates the content of the message/disposition-notification body part. */ - KDE_EXPORT extern TQCString dispositionNotificationBodyContent( const TQString & finalRecipient, + TDE_EXPORT extern TQCString dispositionNotificationBodyContent( const TQString & finalRecipient, const TQCString & originalRecipient, const TQCString & originalMsgID, DispositionType disposition, @@ -188,7 +188,7 @@ namespace KMime { =TQValueList<DispositionModifier>(), const TQString & special=TQString() ); - KDE_EXPORT extern TQString descriptionFor( DispositionType d, + TDE_EXPORT extern TQString descriptionFor( DispositionType d, const TQValueList<DispositionModifier> & m =TQValueList<DispositionModifier>() ); diff --git a/libkmime/kmime_message.h b/libkmime/kmime_message.h index 8f6a0a398..0cfa20152 100644 --- a/libkmime/kmime_message.h +++ b/libkmime/kmime_message.h @@ -22,7 +22,7 @@ namespace KMime { -class KDE_EXPORT Message : public Content { +class TDE_EXPORT Message : public Content { public: typedef TQPtrList<Message> List; diff --git a/libkmime/kmime_newsarticle.h b/libkmime/kmime_newsarticle.h index accb8f5c8..a7b9d35da 100644 --- a/libkmime/kmime_newsarticle.h +++ b/libkmime/kmime_newsarticle.h @@ -22,7 +22,7 @@ namespace KMime { -class KDE_EXPORT NewsArticle : public Message { +class TDE_EXPORT NewsArticle : public Message { public: diff --git a/libkmime/kmime_util.h b/libkmime/kmime_util.h index 7acc861ce..ff332c31e 100644 --- a/libkmime/kmime_util.h +++ b/libkmime/kmime_util.h @@ -29,14 +29,14 @@ namespace KMime { /** Consult the charset cache. Only used for reducing mem usage by keeping strings in a common repository.*/ - extern const char* cachedCharset(const TQCString &name) KDE_EXPORT; + extern const char* cachedCharset(const TQCString &name) TDE_EXPORT; /** Consult the language cache. Only used for reducing mem usage by keeping strings in a common repository.*/ - extern const char* cachedLanguage(const TQCString &name) KDE_EXPORT; + extern const char* cachedLanguage(const TQCString &name) TDE_EXPORT; /** checks whether @p s contains any non-us-ascii characters */ - extern bool isUsAscii(const TQString &s) KDE_EXPORT; + extern bool isUsAscii(const TQString &s) TDE_EXPORT; inline bool isOfSet(const uchar map[16], unsigned char ch) { Q_ASSERT( ch < 128 ); @@ -75,14 +75,14 @@ namespace KMime { @return the decoded string. */ extern TQString decodeRFC2047String(const TQCString &src, const char **usedCS, - const TQCString &defaultCS, bool forceCS) KDE_EXPORT; + const TQCString &defaultCS, bool forceCS) TDE_EXPORT; /** Decode string @p src according to RFC2047 (ie. the =?charset?[qb]?encoded?= construct). @param src source string. @return the decoded string. */ - extern TQString decodeRFC2047String(const TQCString &src) KDE_EXPORT; + extern TQString decodeRFC2047String(const TQCString &src) TDE_EXPORT; /** Encode string @p src according to RFC2047 using charset @p charset. @@ -95,7 +95,7 @@ namespace KMime { @return the encoded string. */ extern TQCString encodeRFC2047String(const TQString &src, const char *charset, - bool addressHeader=false, bool allow8bitHeaders=false) KDE_EXPORT; + bool addressHeader=false, bool allow8bitHeaders=false) TDE_EXPORT; /** Uses current time, pid and random numbers to construct a string that aims to be unique on a per-host basis (ie. for the local @@ -103,7 +103,7 @@ namespace KMime { @return the unique string. @see multiPartBoundary */ - extern TQCString uniqueString() KDE_EXPORT; + extern TQCString uniqueString() TDE_EXPORT; /** Constructs a random string (sans leading/trailing "--") that can be used as a multipart delimiter (ie. as @p boundary parameter @@ -111,7 +111,7 @@ namespace KMime { @return the randomized string. @see uniqueString */ - extern TQCString multiPartBoundary() KDE_EXPORT; + extern TQCString multiPartBoundary() TDE_EXPORT; /** Tries to extract the header with name @p name from the string @p src, unfolding it if necessary. @@ -120,7 +120,7 @@ namespace KMime { @return the first instance of the header @p name in @p src or a null TQCString if no such header was found. */ - extern TQCString extractHeader(const TQCString &src, const char *name) KDE_EXPORT; + extern TQCString extractHeader(const TQCString &src, const char *name) TDE_EXPORT; /** Converts all occurrences of "\r\n" (CRLF) in @p s to "\n" (LF). This function is expensive and should be used only if the mail @@ -130,7 +130,7 @@ namespace KMime { @return the string with CRLF's substitued for LF's @see CRLFtoLF(const char*) LFtoCRLF */ - extern TQCString CRLFtoLF(const TQCString &s) KDE_EXPORT; + extern TQCString CRLFtoLF(const TQCString &s) TDE_EXPORT; /** Converts all occurrences of "\r\n" (CRLF) in @p s to "\n" (LF). This function is expensive and should be used only if the mail @@ -140,7 +140,7 @@ namespace KMime { @return the string with CRLF's substitued for LF's @see CRLFtoLF(const TQCString&) LFtoCRLF */ - extern TQCString CRLFtoLF(const char *s) KDE_EXPORT; + extern TQCString CRLFtoLF(const char *s) TDE_EXPORT; /** Converts all occurrences of "\n" (LF) in @p s to "\r\n" (CRLF). This function is expensive and should be used only if the mail @@ -152,27 +152,27 @@ namespace KMime { @return the string with CRLF's substitued for LF's @see CRLFtoLF(const TQCString&) LFtoCRLF */ - extern TQCString LFtoCRLF(const TQCString &s) KDE_EXPORT; + extern TQCString LFtoCRLF(const TQCString &s) TDE_EXPORT; /** Removes quote (DQUOTE) characters and decodes "quoted-pairs" (ie. backslash-escaped characters) @param str the string to work on. @see addQuotes */ - KDE_EXPORT extern void removeQuots(TQCString &str); + TDE_EXPORT extern void removeQuots(TQCString &str); /** Removes quote (DQUOTE) characters and decodes "quoted-pairs" (ie. backslash-escaped characters) @param str the string to work on. @see addQuotes */ - KDE_EXPORT extern void removeQuots(TQString &str); + TDE_EXPORT extern void removeQuots(TQString &str); /** Converts the given string into a quoted-string if the string contains any special characters (ie. one of ()<>@,.;:[]=\"). @param str us-ascii string to work on. @param forceQuotes if @p true, always add quote characters. */ - KDE_EXPORT extern void addQuotes(TQCString &str, bool forceQuotes); + TDE_EXPORT extern void addQuotes(TQCString &str, bool forceQuotes); /** @@ -191,7 +191,7 @@ namespace KMime { * * */ - class KDE_EXPORT DateFormatter { + class TDE_EXPORT DateFormatter { public: enum FormatType { CTime, //< ctime "Sun Mar 31 02:08:35 2002" diff --git a/libkmime/kqcstringsplitter.h b/libkmime/kqcstringsplitter.h index cc992a487..964fd09d1 100644 --- a/libkmime/kqcstringsplitter.h +++ b/libkmime/kqcstringsplitter.h @@ -21,7 +21,7 @@ #include <kdemacros.h> -class KDE_EXPORT KTQCStringSplitter { +class TDE_EXPORT KTQCStringSplitter { public: KTQCStringSplitter(); diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h index 5ae06b798..bd7fda9ce 100644 --- a/libkpgp/kpgp.h +++ b/libkpgp/kpgp.h @@ -78,7 +78,7 @@ enum Result class Base; class Block; -class KDE_EXPORT Module +class TDE_EXPORT Module { friend class Block; diff --git a/libkpgp/kpgpblock.h b/libkpgp/kpgpblock.h index a1df95bf3..736ea20ab 100644 --- a/libkpgp/kpgpblock.h +++ b/libkpgp/kpgpblock.h @@ -90,7 +90,7 @@ class Module; * BEGIN PGP SIGNED MESSAGE * Used for cleartext signed messages. */ -class KDE_EXPORT Block +class TDE_EXPORT Block { public: diff --git a/libkpgp/kpgpui.h b/libkpgp/kpgpui.h index dacfe41b2..dc2e8db6f 100644 --- a/libkpgp/kpgpui.h +++ b/libkpgp/kpgpui.h @@ -52,7 +52,7 @@ class Key; // needed by KeySelectionDialog class KeyIDList; // needed by KeySelectionDialog /** the passphrase dialog */ -class KDE_EXPORT PassphraseDialog : public KDialogBase +class TDE_EXPORT PassphraseDialog : public KDialogBase { TQ_OBJECT @@ -73,7 +73,7 @@ class KDE_EXPORT PassphraseDialog : public KDialogBase /** a widget for configuring the pgp interface. Can be included into a tabdialog. This widget by itself does not provide an apply/cancel button mechanism. */ -class KDE_EXPORT Config : public TQWidget +class TDE_EXPORT Config : public TQWidget { TQ_OBJECT @@ -101,7 +101,7 @@ class KDE_EXPORT Config : public TQWidget // ------------------------------------------------------------------------- #define KeySelectionDialogSuper KDialogBase -class KDE_EXPORT KeySelectionDialog: public KeySelectionDialogSuper +class TDE_EXPORT KeySelectionDialog: public KeySelectionDialogSuper { TQ_OBJECT @@ -201,7 +201,7 @@ class KDE_EXPORT KeySelectionDialog: public KeySelectionDialogSuper static const int sCheckSelectionDelay; }; -class KDE_EXPORT KeyRequester: public TQWidget +class TDE_EXPORT KeyRequester: public TQWidget { TQ_OBJECT @@ -254,7 +254,7 @@ protected: }; -class KDE_EXPORT PublicKeyRequester : public KeyRequester { +class TDE_EXPORT PublicKeyRequester : public KeyRequester { TQ_OBJECT public: @@ -274,7 +274,7 @@ protected: }; -class KDE_EXPORT SecretKeyRequester : public KeyRequester { +class TDE_EXPORT SecretKeyRequester : public KeyRequester { TQ_OBJECT public: @@ -295,7 +295,7 @@ protected: // ------------------------------------------------------------------------- -class KDE_EXPORT KeyApprovalDialog: public KDialogBase +class TDE_EXPORT KeyApprovalDialog: public KDialogBase { TQ_OBJECT @@ -331,7 +331,7 @@ class KDE_EXPORT KeyApprovalDialog: public KDialogBase // ------------------------------------------------------------------------- -class KDE_EXPORT CipherTextDialog: public KDialogBase +class TDE_EXPORT CipherTextDialog: public KDialogBase { TQ_OBJECT diff --git a/libkpimexchange/core/exchangeaccount.h b/libkpimexchange/core/exchangeaccount.h index 032594be4..4c1a7df86 100644 --- a/libkpimexchange/core/exchangeaccount.h +++ b/libkpimexchange/core/exchangeaccount.h @@ -32,7 +32,7 @@ namespace KPIM { -class KDE_EXPORT ExchangeAccount : public TQObject +class TDE_EXPORT ExchangeAccount : public TQObject { TQ_OBJECT diff --git a/libkpimexchange/core/exchangeclient.h b/libkpimexchange/core/exchangeclient.h index b1a2cbc77..9ad36f5ca 100644 --- a/libkpimexchange/core/exchangeclient.h +++ b/libkpimexchange/core/exchangeclient.h @@ -45,7 +45,7 @@ class ExchangeUpload; class ExchangeDelete; //class ExchangeMonitor; -class KDE_EXPORT ExchangeClient : public TQObject { +class TDE_EXPORT ExchangeClient : public TQObject { TQ_OBJECT public: diff --git a/libkpimexchange/core/exchangedelete.h b/libkpimexchange/core/exchangedelete.h index eb8328923..32f2c0cc4 100644 --- a/libkpimexchange/core/exchangedelete.h +++ b/libkpimexchange/core/exchangedelete.h @@ -33,7 +33,7 @@ namespace KPIM { class ExchangeAccount; -class KDE_EXPORT ExchangeDelete : public TQObject { +class TDE_EXPORT ExchangeDelete : public TQObject { TQ_OBJECT public: diff --git a/libkpimexchange/core/exchangeupload.h b/libkpimexchange/core/exchangeupload.h index 255d9c03c..56635a7c5 100644 --- a/libkpimexchange/core/exchangeupload.h +++ b/libkpimexchange/core/exchangeupload.h @@ -33,7 +33,7 @@ namespace KPIM { class ExchangeAccount; -class KDE_EXPORT ExchangeUpload : public TQObject { +class TDE_EXPORT ExchangeUpload : public TQObject { TQ_OBJECT public: diff --git a/libkpimidentities/identity.h b/libkpimidentities/identity.h index 6a6c972f4..cfc44260e 100644 --- a/libkpimidentities/identity.h +++ b/libkpimidentities/identity.h @@ -26,17 +26,17 @@ class TQDataStream; namespace KPIM { -KDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Signature & sig ); -KDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Signature & sig ); +TDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Signature & sig ); +TDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Signature & sig ); -KDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Identity & ident ); -KDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Identity & ident ); +TDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Identity & ident ); +TDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Identity & ident ); /** * @short abstraction of a signature (aka "footer"). * @author Marc Mutz <[email protected]> */ -class KDE_EXPORT Signature { +class TDE_EXPORT Signature { friend class Identity; friend TQDataStream & KPIM::operator<<( TQDataStream & stream, const Signature & sig ); @@ -92,7 +92,7 @@ private: }; /** User identity information */ -class KDE_EXPORT Identity +class TDE_EXPORT Identity { // only the identity manager should be able to construct and // destruct us, but then we get into problems with using diff --git a/libkpimidentities/identitycombo.h b/libkpimidentities/identitycombo.h index 119983edb..f95944224 100644 --- a/libkpimidentities/identitycombo.h +++ b/libkpimidentities/identitycombo.h @@ -48,7 +48,7 @@ class Identity; * @author Marc Mutz <[email protected]> **/ -class KDE_EXPORT IdentityCombo : public TQComboBox { +class TDE_EXPORT IdentityCombo : public TQComboBox { TQ_OBJECT public: diff --git a/libkpimidentities/identitymanager.h b/libkpimidentities/identitymanager.h index 76b2a290d..92d591575 100644 --- a/libkpimidentities/identitymanager.h +++ b/libkpimidentities/identitymanager.h @@ -50,7 +50,7 @@ class Identity; * @short Manages the list of identities. * @author Marc Mutz <[email protected]> **/ -#define IdentityManager KDE_EXPORT IdentityManager +#define IdentityManager TDE_EXPORT IdentityManager class IdentityManager : public ConfigManager, public DCOPObject #undef IdentityManager { diff --git a/libksieve/ksieve/error.h b/libksieve/ksieve/error.h index 762c49e75..8b9c3d160 100644 --- a/libksieve/ksieve/error.h +++ b/libksieve/ksieve/error.h @@ -43,7 +43,7 @@ namespace KSieve { - class KDE_EXPORT Error { + class TDE_EXPORT Error { public: enum Type { None = 0, diff --git a/libksieve/ksieve/parser.h b/libksieve/ksieve/parser.h index 22e6ebf38..0a848d0cd 100644 --- a/libksieve/ksieve/parser.h +++ b/libksieve/ksieve/parser.h @@ -45,7 +45,7 @@ namespace KSieve { /** @short Parser for the Sieve grammar. @author Marc Mutz <[email protected]> **/ - class KDE_EXPORT Parser { + class TDE_EXPORT Parser { public: Parser( const char * scursor, const char * const send, int options=0 ); diff --git a/libtdenetwork/gpgmepp/context.h b/libtdenetwork/gpgmepp/context.h index 2eaee6601..ec01f20d7 100644 --- a/libtdenetwork/gpgmepp/context.h +++ b/libtdenetwork/gpgmepp/context.h @@ -46,7 +46,7 @@ namespace GpgME { class EngineInfo; - class KDE_EXPORT Error { + class TDE_EXPORT Error { public: Error( int e=0 ) : mErr( e ) {} @@ -64,9 +64,9 @@ namespace GpgME { int mErr; }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, Error err ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, Error err ); - class KDE_EXPORT Context { + class TDE_EXPORT Context { Context( gpgme_ctx_t ); public: enum Protocol { OpenPGP, CMS, Unknown }; @@ -283,12 +283,12 @@ namespace GpgME { const Context & operator=( const Context & ); }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::Protocol proto ); - KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::CertificateInclusion incl ); - KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::KeyListMode mode ); - KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::SignatureMode mode ); - KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::EncryptionFlags flags ); - KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::AuditLogFlags flags ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::Protocol proto ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::CertificateInclusion incl ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::KeyListMode mode ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::SignatureMode mode ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::EncryptionFlags flags ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::AuditLogFlags flags ); // // @@ -296,19 +296,19 @@ namespace GpgME { // // - KDE_EXPORT void initializeLibrary(); + TDE_EXPORT void initializeLibrary(); - KDE_EXPORT GpgME::Error setDefaultLocale( int category, const char * value ); + TDE_EXPORT GpgME::Error setDefaultLocale( int category, const char * value ); - KDE_EXPORT Context * wait( GpgME::Error & e, bool hang=true ); + TDE_EXPORT Context * wait( GpgME::Error & e, bool hang=true ); typedef void (*IdleFunction)(void); - KDE_EXPORT IdleFunction registerIdleFunction( IdleFunction idleFunction ); + TDE_EXPORT IdleFunction registerIdleFunction( IdleFunction idleFunction ); typedef void (*IOCallback)( void * data, int fd ); - KDE_EXPORT EngineInfo engineInfo( Context::Protocol proto ); + TDE_EXPORT EngineInfo engineInfo( Context::Protocol proto ); - KDE_EXPORT GpgME::Error checkEngine( Context::Protocol proto ); + TDE_EXPORT GpgME::Error checkEngine( Context::Protocol proto ); enum Feature { ValidatingKeylistModeFeature = 0x00000001, @@ -319,7 +319,7 @@ namespace GpgME { FeatureMaxValue = 0x80000000 }; - KDE_EXPORT bool hasFeature( unsigned long feature ); + TDE_EXPORT bool hasFeature( unsigned long feature ); } // namespace GpgME diff --git a/libtdenetwork/gpgmepp/data.h b/libtdenetwork/gpgmepp/data.h index b1c76029e..4d6dfb1f6 100644 --- a/libtdenetwork/gpgmepp/data.h +++ b/libtdenetwork/gpgmepp/data.h @@ -32,7 +32,7 @@ namespace GpgME { class DataProvider; class Error; - class KDE_EXPORT Data { + class TDE_EXPORT Data { public: Data(); Data( gpgme_data_t data ); diff --git a/libtdenetwork/gpgmepp/decryptionresult.h b/libtdenetwork/gpgmepp/decryptionresult.h index 1721a19e8..86e6af58a 100644 --- a/libtdenetwork/gpgmepp/decryptionresult.h +++ b/libtdenetwork/gpgmepp/decryptionresult.h @@ -32,7 +32,7 @@ namespace GpgME { class Error; - class KDE_EXPORT DecryptionResult : public Result { + class TDE_EXPORT DecryptionResult : public Result { public: DecryptionResult( gpgme_ctx_t ctx=0, int error=0 ); explicit DecryptionResult( const Error & err ); @@ -52,7 +52,7 @@ namespace GpgME { Private * d; }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, const DecryptionResult & result ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, const DecryptionResult & result ); } diff --git a/libtdenetwork/gpgmepp/encryptionresult.h b/libtdenetwork/gpgmepp/encryptionresult.h index 44ea09a6b..745ce09b0 100644 --- a/libtdenetwork/gpgmepp/encryptionresult.h +++ b/libtdenetwork/gpgmepp/encryptionresult.h @@ -34,7 +34,7 @@ namespace GpgME { class Error; class InvalidRecipient; - class KDE_EXPORT EncryptionResult : public Result { + class TDE_EXPORT EncryptionResult : public Result { public: EncryptionResult( gpgme_ctx_t ctx=0, int error=0 ); explicit EncryptionResult( const Error & err ); @@ -55,9 +55,9 @@ namespace GpgME { Private * d; }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, const EncryptionResult & result ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, const EncryptionResult & result ); - class KDE_EXPORT InvalidRecipient { + class TDE_EXPORT InvalidRecipient { friend class EncryptionResult; InvalidRecipient( EncryptionResult::Private * parent, unsigned int index ); public: @@ -77,7 +77,7 @@ namespace GpgME { unsigned int idx; }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, const InvalidRecipient & recipient ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, const InvalidRecipient & recipient ); } diff --git a/libtdenetwork/gpgmepp/engineinfo.h b/libtdenetwork/gpgmepp/engineinfo.h index 5dcd2f83e..6f1511858 100644 --- a/libtdenetwork/gpgmepp/engineinfo.h +++ b/libtdenetwork/gpgmepp/engineinfo.h @@ -28,7 +28,7 @@ namespace GpgME { - class KDE_EXPORT EngineInfo { + class TDE_EXPORT EngineInfo { public: EngineInfo(); EngineInfo( gpgme_engine_info_t engine ); diff --git a/libtdenetwork/gpgmepp/eventloopinteractor.h b/libtdenetwork/gpgmepp/eventloopinteractor.h index 37acc0f89..e8da527cf 100644 --- a/libtdenetwork/gpgmepp/eventloopinteractor.h +++ b/libtdenetwork/gpgmepp/eventloopinteractor.h @@ -102,7 +102,7 @@ namespace GpgME { */ - class KDE_EXPORT EventLoopInteractor { + class TDE_EXPORT EventLoopInteractor { protected: EventLoopInteractor(); public: diff --git a/libtdenetwork/gpgmepp/importresult.h b/libtdenetwork/gpgmepp/importresult.h index 87f9aaf93..110e9834c 100644 --- a/libtdenetwork/gpgmepp/importresult.h +++ b/libtdenetwork/gpgmepp/importresult.h @@ -32,7 +32,7 @@ namespace GpgME { class Error; class Import; - class KDE_EXPORT ImportResult : public Result { + class TDE_EXPORT ImportResult : public Result { public: ImportResult( gpgme_ctx_t ctx=0, int error=0 ); explicit ImportResult( const Error & error ); @@ -68,7 +68,7 @@ namespace GpgME { Private * d; }; - class KDE_EXPORT Import { + class TDE_EXPORT Import { friend class ImportResult; Import( ImportResult::Private * parent, unsigned int idx ); public: diff --git a/libtdenetwork/gpgmepp/interfaces/dataprovider.h b/libtdenetwork/gpgmepp/interfaces/dataprovider.h index be926446b..aa21a11f7 100644 --- a/libtdenetwork/gpgmepp/interfaces/dataprovider.h +++ b/libtdenetwork/gpgmepp/interfaces/dataprovider.h @@ -27,7 +27,7 @@ namespace GpgME { - class KDE_EXPORT DataProvider { + class TDE_EXPORT DataProvider { public: virtual ~DataProvider() {} diff --git a/libtdenetwork/gpgmepp/key.h b/libtdenetwork/gpgmepp/key.h index 4bbd24be2..c35223606 100644 --- a/libtdenetwork/gpgmepp/key.h +++ b/libtdenetwork/gpgmepp/key.h @@ -36,7 +36,7 @@ namespace GpgME { // class Key // - class KDE_EXPORT Key { + class TDE_EXPORT Key { friend class Context; public: Key(); @@ -110,7 +110,7 @@ namespace GpgME { // class Subkey // - class KDE_EXPORT Subkey { + class TDE_EXPORT Subkey { public: Subkey( gpgme_key_t key=0, gpgme_sub_key_t subkey=0 ); Subkey( gpgme_key_t key, unsigned int idx ); @@ -156,7 +156,7 @@ namespace GpgME { // class UserID // - class KDE_EXPORT UserID { + class TDE_EXPORT UserID { public: class Signature; @@ -198,7 +198,7 @@ namespace GpgME { // class UserID::Signature // - class KDE_EXPORT UserID::Signature { + class TDE_EXPORT UserID::Signature { public: class Notation; @@ -255,7 +255,7 @@ namespace GpgME { // // - class KDE_EXPORT UserID::Signature::Notation { + class TDE_EXPORT UserID::Signature::Notation { public: Notation( gpgme_key_t key=0, gpgme_user_id_t uid=0, gpgme_key_sig_t sig=0, gpgme_sig_notation_t nota=0 ); diff --git a/libtdenetwork/gpgmepp/keygenerationresult.h b/libtdenetwork/gpgmepp/keygenerationresult.h index 2cf8c8a77..7fef89f38 100644 --- a/libtdenetwork/gpgmepp/keygenerationresult.h +++ b/libtdenetwork/gpgmepp/keygenerationresult.h @@ -28,7 +28,7 @@ namespace GpgME { class Error; - class KDE_EXPORT KeyGenerationResult : public Result { + class TDE_EXPORT KeyGenerationResult : public Result { public: KeyGenerationResult( gpgme_ctx_t ctx=0, int error=0 ); explicit KeyGenerationResult( const Error & err ); diff --git a/libtdenetwork/gpgmepp/keylistresult.h b/libtdenetwork/gpgmepp/keylistresult.h index 064539cf2..8a77a0b53 100644 --- a/libtdenetwork/gpgmepp/keylistresult.h +++ b/libtdenetwork/gpgmepp/keylistresult.h @@ -30,7 +30,7 @@ namespace GpgME { class Context; class Error; - class KDE_EXPORT KeyListResult : public Result { + class TDE_EXPORT KeyListResult : public Result { public: KeyListResult( gpgme_ctx_t ctx=0, int error=0 ); explicit KeyListResult( const Error & err ); diff --git a/libtdenetwork/gpgmepp/signingresult.h b/libtdenetwork/gpgmepp/signingresult.h index a31b29289..3a35c3d55 100644 --- a/libtdenetwork/gpgmepp/signingresult.h +++ b/libtdenetwork/gpgmepp/signingresult.h @@ -38,7 +38,7 @@ namespace GpgME { class CreatedSignature; class InvalidSigningKey; - class KDE_EXPORT SigningResult : public Result { + class TDE_EXPORT SigningResult : public Result { public: SigningResult( gpgme_ctx_t ctx=0, int error=0 ); explicit SigningResult( const Error & err ); @@ -60,9 +60,9 @@ namespace GpgME { Private * d; }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, const SigningResult & result ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, const SigningResult & result ); - class KDE_EXPORT InvalidSigningKey { + class TDE_EXPORT InvalidSigningKey { friend class SigningResult; InvalidSigningKey( SigningResult::Private * parent, unsigned int index ); public: @@ -82,9 +82,9 @@ namespace GpgME { unsigned int idx; }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, const InvalidSigningKey & key ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, const InvalidSigningKey & key ); - class KDE_EXPORT CreatedSignature { + class TDE_EXPORT CreatedSignature { friend class SigningResult; CreatedSignature( SigningResult::Private * parent, unsigned int index ); public: @@ -117,7 +117,7 @@ namespace GpgME { unsigned int idx; }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, const CreatedSignature & sig ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, const CreatedSignature & sig ); } diff --git a/libtdenetwork/gpgmepp/verificationresult.h b/libtdenetwork/gpgmepp/verificationresult.h index 70269df38..1bc61a690 100644 --- a/libtdenetwork/gpgmepp/verificationresult.h +++ b/libtdenetwork/gpgmepp/verificationresult.h @@ -36,7 +36,7 @@ namespace GpgME { class Error; class Signature; - class KDE_EXPORT VerificationResult : public Result { + class TDE_EXPORT VerificationResult : public Result { public: VerificationResult( gpgme_ctx_t ctx=0, int error=0 ); explicit VerificationResult( const Error & err ); @@ -55,9 +55,9 @@ namespace GpgME { Private * d; }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, const VerificationResult & result ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, const VerificationResult & result ); - class KDE_EXPORT Signature { + class TDE_EXPORT Signature { friend class VerificationResult; Signature( VerificationResult::Private * parent, unsigned int index ); public: @@ -113,10 +113,10 @@ namespace GpgME { unsigned int idx; }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, const Signature & sig ); - KDE_EXPORT std::ostream & operator<<( std::ostream & os, Signature::Summary summary ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, const Signature & sig ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, Signature::Summary summary ); - class KDE_EXPORT Signature::Notation { + class TDE_EXPORT Signature::Notation { friend class Signature; Notation( VerificationResult::Private * parent, unsigned int sindex, unsigned int nindex ); public: @@ -137,7 +137,7 @@ namespace GpgME { unsigned int nidx; }; - KDE_EXPORT std::ostream & operator<<( std::ostream & os, const Signature::Notation & nota ); + TDE_EXPORT std::ostream & operator<<( std::ostream & os, const Signature::Notation & nota ); } diff --git a/libtdenetwork/qgpgme/dataprovider.h b/libtdenetwork/qgpgme/dataprovider.h index e3613a250..9daf4021a 100644 --- a/libtdenetwork/qgpgme/dataprovider.h +++ b/libtdenetwork/qgpgme/dataprovider.h @@ -26,7 +26,7 @@ namespace QGpgME { - class KDE_EXPORT TQByteArrayDataProvider : public GpgME::DataProvider { + class TDE_EXPORT TQByteArrayDataProvider : public GpgME::DataProvider { public: TQByteArrayDataProvider(); TQByteArrayDataProvider( const TQByteArray & initialData ); diff --git a/libtdenetwork/qgpgme/eventloopinteractor.h b/libtdenetwork/qgpgme/eventloopinteractor.h index 10f240319..ea7ccd037 100644 --- a/libtdenetwork/qgpgme/eventloopinteractor.h +++ b/libtdenetwork/qgpgme/eventloopinteractor.h @@ -33,7 +33,7 @@ namespace GpgME { namespace QGpgME { - class KDE_EXPORT EventLoopInteractor : public TQObject, public GpgME::EventLoopInteractor { + class TDE_EXPORT EventLoopInteractor : public TQObject, public GpgME::EventLoopInteractor { TQ_OBJECT protected: diff --git a/libtdepim/addresseediffalgo.h b/libtdepim/addresseediffalgo.h index 7b133823d..2cda4ef56 100644 --- a/libtdepim/addresseediffalgo.h +++ b/libtdepim/addresseediffalgo.h @@ -27,7 +27,7 @@ namespace KPIM { -class KDE_EXPORT AddresseeDiffAlgo : public DiffAlgo +class TDE_EXPORT AddresseeDiffAlgo : public DiffAlgo { public: AddresseeDiffAlgo( const TDEABC::Addressee &leftAddressee, const TDEABC::Addressee &rightAddressee ); diff --git a/libtdepim/addresseeemailselection.h b/libtdepim/addresseeemailselection.h index f4394a93f..d3464b183 100644 --- a/libtdepim/addresseeemailselection.h +++ b/libtdepim/addresseeemailselection.h @@ -26,7 +26,7 @@ namespace KPIM { -class KDE_EXPORT AddresseeEmailSelection : public Selection +class TDE_EXPORT AddresseeEmailSelection : public Selection { public: AddresseeEmailSelection(); diff --git a/libtdepim/addresseelineedit.h b/libtdepim/addresseelineedit.h index 95457fd16..17ad5f058 100644 --- a/libtdepim/addresseelineedit.h +++ b/libtdepim/addresseelineedit.h @@ -50,7 +50,7 @@ typedef TQMap< TQString, TQPair<int,int> > CompletionItemsMap; namespace KPIM { -class KDE_EXPORT AddresseeLineEdit : public ClickLineEdit, public DCOPObject +class TDE_EXPORT AddresseeLineEdit : public ClickLineEdit, public DCOPObject { K_DCOP TQ_OBJECT diff --git a/libtdepim/addresseeselector.h b/libtdepim/addresseeselector.h index fa4a3c76b..bfe3e4aef 100644 --- a/libtdepim/addresseeselector.h +++ b/libtdepim/addresseeselector.h @@ -41,7 +41,7 @@ namespace KPIM { class AddresseeSelector; -class KDE_EXPORT Selection +class TDE_EXPORT Selection { friend class AddresseeSelector; @@ -163,7 +163,7 @@ class SelectionItem TQBitArray mField; }; -class KDE_EXPORT AddresseeSelector : public TQWidget +class TDE_EXPORT AddresseeSelector : public TQWidget { TQ_OBJECT @@ -213,7 +213,7 @@ class KDE_EXPORT AddresseeSelector : public TQWidget AddressBookManager *mAddressBookManager; }; -class KDE_EXPORT AddresseeSelectorDialog : public KDialogBase +class TDE_EXPORT AddresseeSelectorDialog : public KDialogBase { TQ_OBJECT diff --git a/libtdepim/addresseeview.h b/libtdepim/addresseeview.h index 59a02124f..43e442f36 100644 --- a/libtdepim/addresseeview.h +++ b/libtdepim/addresseeview.h @@ -40,7 +40,7 @@ class TQPopupMenu; namespace KPIM { -class KDE_EXPORT AddresseeView : public KTextBrowser +class TDE_EXPORT AddresseeView : public KTextBrowser { TQ_OBJECT diff --git a/libtdepim/addressesdialog.h b/libtdepim/addressesdialog.h index da56b31f1..dcfee2005 100644 --- a/libtdepim/addressesdialog.h +++ b/libtdepim/addressesdialog.h @@ -76,7 +76,7 @@ namespace KPIM { AddresseeViewItemPrivate *d; }; - class KDE_EXPORT AddressesDialog : public KDialogBase + class TDE_EXPORT AddressesDialog : public KDialogBase { TQ_OBJECT diff --git a/libtdepim/broadcaststatus.h b/libtdepim/broadcaststatus.h index 37da6f952..8cfc2e2ed 100644 --- a/libtdepim/broadcaststatus.h +++ b/libtdepim/broadcaststatus.h @@ -29,7 +29,7 @@ class ProgressItem; */ -class KDE_EXPORT BroadcastStatus : public TQObject +class TDE_EXPORT BroadcastStatus : public TQObject { TQ_OBJECT diff --git a/libtdepim/calendardiffalgo.h b/libtdepim/calendardiffalgo.h index 9ccd6c8c0..c83f3aab2 100644 --- a/libtdepim/calendardiffalgo.h +++ b/libtdepim/calendardiffalgo.h @@ -29,7 +29,7 @@ namespace KPIM { -class KDE_EXPORT CalendarDiffAlgo : public DiffAlgo +class TDE_EXPORT CalendarDiffAlgo : public DiffAlgo { public: CalendarDiffAlgo( KCal::Incidence *leftIncidence, KCal::Incidence *rightIncidence ); diff --git a/libtdepim/categoryeditdialog.h b/libtdepim/categoryeditdialog.h index 32d2c26cc..3f45ca8ff 100644 --- a/libtdepim/categoryeditdialog.h +++ b/libtdepim/categoryeditdialog.h @@ -29,7 +29,7 @@ class KPimPrefs; namespace KPIM { -class KDE_EXPORT CategoryEditDialog : public KDialogBase +class TDE_EXPORT CategoryEditDialog : public KDialogBase { TQ_OBJECT diff --git a/libtdepim/categoryselectdialog.h b/libtdepim/categoryselectdialog.h index 9c4f4149e..ec0af3dce 100644 --- a/libtdepim/categoryselectdialog.h +++ b/libtdepim/categoryselectdialog.h @@ -30,7 +30,7 @@ class CategorySelectDialog_base; namespace KPIM { -class KDE_EXPORT CategorySelectDialog : public KDialogBase +class TDE_EXPORT CategorySelectDialog : public KDialogBase { TQ_OBJECT diff --git a/libtdepim/clicklineedit.h b/libtdepim/clicklineedit.h index 1d6ad5c28..a570e44e0 100644 --- a/libtdepim/clicklineedit.h +++ b/libtdepim/clicklineedit.h @@ -33,7 +33,7 @@ namespace KPIM { @short LineEdit with customizable "Click here" text @author Daniel Molkentin */ -class KDE_EXPORT ClickLineEdit : public KLineEdit +class TDE_EXPORT ClickLineEdit : public KLineEdit { TQ_OBJECT diff --git a/libtdepim/collectingprocess.h b/libtdepim/collectingprocess.h index f0128a0c0..5de4960cf 100644 --- a/libtdepim/collectingprocess.h +++ b/libtdepim/collectingprocess.h @@ -46,7 +46,7 @@ namespace KPIM { * * @author Ingo Kloecker <[email protected]> */ -class KDE_EXPORT CollectingProcess : public TDEProcess { +class TDE_EXPORT CollectingProcess : public TDEProcess { TQ_OBJECT public: diff --git a/libtdepim/configmanager.h b/libtdepim/configmanager.h index 213524c48..c3d93b16f 100644 --- a/libtdepim/configmanager.h +++ b/libtdepim/configmanager.h @@ -29,7 +29,7 @@ namespace KPIM { * @short Class for managing a set of config options. * @author Marc Mutz <[email protected]> **/ -class KDE_EXPORT ConfigManager : public TQObject { +class TDE_EXPORT ConfigManager : public TQObject { TQ_OBJECT public: diff --git a/libtdepim/designerfields.h b/libtdepim/designerfields.h index b243e48ce..ee50c8db3 100644 --- a/libtdepim/designerfields.h +++ b/libtdepim/designerfields.h @@ -32,7 +32,7 @@ namespace KPIM { -class KDE_EXPORT DesignerFields : public TQWidget +class TDE_EXPORT DesignerFields : public TQWidget { TQ_OBJECT diff --git a/libtdepim/diffalgo.h b/libtdepim/diffalgo.h index a437d9d5b..2bb6a2b9f 100644 --- a/libtdepim/diffalgo.h +++ b/libtdepim/diffalgo.h @@ -76,7 +76,7 @@ class DiffAlgoDisplay }; -class KDE_EXPORT DiffAlgo +class TDE_EXPORT DiffAlgo { public: /** diff --git a/libtdepim/embeddedurlpage.h b/libtdepim/embeddedurlpage.h index d644ce6f5..d8e0e0030 100644 --- a/libtdepim/embeddedurlpage.h +++ b/libtdepim/embeddedurlpage.h @@ -29,7 +29,7 @@ namespace KParts { class ReadOnlyPart; } namespace KPIM { -class KDE_EXPORT EmbeddedURLPage : public TQWidget +class TDE_EXPORT EmbeddedURLPage : public TQWidget { TQ_OBJECT diff --git a/libtdepim/htmldiffalgodisplay.h b/libtdepim/htmldiffalgodisplay.h index e38b7a604..5eccc00c8 100644 --- a/libtdepim/htmldiffalgodisplay.h +++ b/libtdepim/htmldiffalgodisplay.h @@ -29,7 +29,7 @@ namespace KPIM { -class KDE_EXPORT HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser +class TDE_EXPORT HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser { public: HTMLDiffAlgoDisplay( TQWidget *parent ); diff --git a/libtdepim/infoextension.h b/libtdepim/infoextension.h index 737cbf8e2..16da91437 100644 --- a/libtdepim/infoextension.h +++ b/libtdepim/infoextension.h @@ -35,7 +35,7 @@ namespace KParts /** * Provides a way to get information out of a PIM-Part **/ - class KDE_EXPORT InfoExtension : public TQObject + class TDE_EXPORT InfoExtension : public TQObject { TQ_OBJECT diff --git a/libtdepim/interfaces/AddressBookServiceIface.h b/libtdepim/interfaces/AddressBookServiceIface.h index e39b8fc7c..d14a7e688 100644 --- a/libtdepim/interfaces/AddressBookServiceIface.h +++ b/libtdepim/interfaces/AddressBookServiceIface.h @@ -31,7 +31,7 @@ namespace KPIM { -#define AddressBookServiceIface KDE_EXPORT AddressBookServiceIface +#define AddressBookServiceIface TDE_EXPORT AddressBookServiceIface class AddressBookServiceIface : virtual public DCOPObject #undef AddressBookServiceIface { diff --git a/libtdepim/interfaces/MailTransportServiceIface.h b/libtdepim/interfaces/MailTransportServiceIface.h index 3a69f83b6..3dfbf3002 100644 --- a/libtdepim/interfaces/MailTransportServiceIface.h +++ b/libtdepim/interfaces/MailTransportServiceIface.h @@ -32,7 +32,7 @@ namespace KPim { -#define MailTransportServiceIface KDE_EXPORT MailTransportServiceIface +#define MailTransportServiceIface TDE_EXPORT MailTransportServiceIface class MailTransportServiceIface : virtual public DCOPObject #undef MailTransportServiceIface { diff --git a/libtdepim/kaccount.h b/libtdepim/kaccount.h index e5ec2d79f..8fd645222 100644 --- a/libtdepim/kaccount.h +++ b/libtdepim/kaccount.h @@ -37,7 +37,7 @@ class TDEConfig; -class KDE_EXPORT KAccount +class TDE_EXPORT KAccount { public: /** Type information */ diff --git a/libtdepim/kaddrbook.h b/libtdepim/kaddrbook.h index bd44e25ae..c68266b20 100644 --- a/libtdepim/kaddrbook.h +++ b/libtdepim/kaddrbook.h @@ -17,7 +17,7 @@ namespace TDEABC { class TQWidget; -class KDE_EXPORT KAddrBookExternal { +class TDE_EXPORT KAddrBookExternal { public: static void addEmail( const TQString &addr, TQWidget *parent ); static void addNewAddressee( TQWidget* ); diff --git a/libtdepim/kcmdesignerfields.h b/libtdepim/kcmdesignerfields.h index c90eff484..dc1f344eb 100644 --- a/libtdepim/kcmdesignerfields.h +++ b/libtdepim/kcmdesignerfields.h @@ -33,7 +33,7 @@ class TQPushButton; namespace KPIM { -class KDE_EXPORT KCMDesignerFields : public TDECModule +class TDE_EXPORT KCMDesignerFields : public TDECModule { TQ_OBJECT diff --git a/libtdepim/kdateedit.h b/libtdepim/kdateedit.h index 9475f7529..e031751b2 100644 --- a/libtdepim/kdateedit.h +++ b/libtdepim/kdateedit.h @@ -51,7 +51,7 @@ class TQEvent; @author David Jarvie <[email protected]> @author Tobias Koenig <[email protected]> */ -class KDE_EXPORT KDateEdit : public TQComboBox +class TDE_EXPORT KDateEdit : public TQComboBox { TQ_OBJECT diff --git a/libtdepim/kdatepickerpopup.h b/libtdepim/kdatepickerpopup.h index 9156fddc5..6b3de6352 100644 --- a/libtdepim/kdatepickerpopup.h +++ b/libtdepim/kdatepickerpopup.h @@ -42,7 +42,7 @@ @author Bram Schoenmakers <[email protected]> */ -class KDE_EXPORT KDatePickerPopup: public TQPopupMenu +class TDE_EXPORT KDatePickerPopup: public TQPopupMenu { TQ_OBJECT diff --git a/libtdepim/kfoldertree.h b/libtdepim/kfoldertree.h index d881976de..536118f95 100644 --- a/libtdepim/kfoldertree.h +++ b/libtdepim/kfoldertree.h @@ -139,7 +139,7 @@ struct KPaintInfo { //========================================================================== -class KDE_EXPORT KFolderTreeItem : public TDEListViewItem +class TDE_EXPORT KFolderTreeItem : public TDEListViewItem { public: /** Protocol information */ @@ -238,7 +238,7 @@ class KDE_EXPORT KFolderTreeItem : public TDEListViewItem //========================================================================== -class KDE_EXPORT KFolderTree : public TDEListView +class TDE_EXPORT KFolderTree : public TDEListView { TQ_OBJECT diff --git a/libtdepim/kincidencechooser.h b/libtdepim/kincidencechooser.h index 4a2a507e4..ceffc0b04 100644 --- a/libtdepim/kincidencechooser.h +++ b/libtdepim/kincidencechooser.h @@ -39,7 +39,7 @@ class TQButtonGroup; /** Dialog to change the korganizer configuration. */ -class KDE_EXPORT KIncidenceChooser : public KDialog +class TDE_EXPORT KIncidenceChooser : public KDialog { TQ_OBJECT diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp index f8260c10a..ce21e222b 100644 --- a/libtdepim/komposer/core/prefsmodule.cpp +++ b/libtdepim/komposer/core/prefsmodule.cpp @@ -35,7 +35,7 @@ extern "C" { - KDE_EXPORT TDECModule *create_komposerconfig( TQWidget *parent, const char * ) { + TDE_EXPORT TDECModule *create_komposerconfig( TQWidget *parent, const char * ) { return new Komposer::PrefsModule( parent, "komposerprefs" ); } } diff --git a/libtdepim/kpimprefs.h b/libtdepim/kpimprefs.h index b67d24916..fad92a086 100644 --- a/libtdepim/kpimprefs.h +++ b/libtdepim/kpimprefs.h @@ -28,7 +28,7 @@ class TQString; -class KDE_EXPORT KPimPrefs : public TDEConfigSkeleton +class TDE_EXPORT KPimPrefs : public TDEConfigSkeleton { public: KPimPrefs( const TQString &name = TQString() ); diff --git a/libtdepim/kpimurlrequesterdlg.h b/libtdepim/kpimurlrequesterdlg.h index 8679923d8..a0954ab1a 100644 --- a/libtdepim/kpimurlrequesterdlg.h +++ b/libtdepim/kpimurlrequesterdlg.h @@ -26,7 +26,7 @@ class TQWidget; -class KDE_EXPORT KPimURLRequesterDlg +class TDE_EXPORT KPimURLRequesterDlg { public: /** diff --git a/libtdepim/kpixmapregionselectordialog.h b/libtdepim/kpixmapregionselectordialog.h index 2f77ab890..c02d6b02a 100644 --- a/libtdepim/kpixmapregionselectordialog.h +++ b/libtdepim/kpixmapregionselectordialog.h @@ -43,7 +43,7 @@ namespace KPIM { * @author Antonio Larrosa <[email protected]> * @since 3.4 */ -class KDE_EXPORT KPixmapRegionSelectorDialog : public KDialogBase +class TDE_EXPORT KPixmapRegionSelectorDialog : public KDialogBase { public: /** diff --git a/libtdepim/kprefsdialog.h b/libtdepim/kprefsdialog.h index 080d592ee..851253827 100644 --- a/libtdepim/kprefsdialog.h +++ b/libtdepim/kprefsdialog.h @@ -55,7 +55,7 @@ class KURLRequester; KPrefsDialog. The control element consists of a set of widgets for handling a certain type of configuration information. */ -class KDE_EXPORT KPrefsWid : public TQObject +class TDE_EXPORT KPrefsWid : public TQObject { TQ_OBJECT @@ -89,7 +89,7 @@ class KDE_EXPORT KPrefsWid : public TQObject This class provides a control element for configuring bool values. It is meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidBool : public KPrefsWid +class TDE_EXPORT KPrefsWidBool : public KPrefsWid { public: /** @@ -123,7 +123,7 @@ class KDE_EXPORT KPrefsWidBool : public KPrefsWid meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidInt : public KPrefsWid +class TDE_EXPORT KPrefsWidInt : public KPrefsWid { public: /** @@ -164,7 +164,7 @@ class KDE_EXPORT KPrefsWidInt : public KPrefsWid meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidTime : public KPrefsWid +class TDE_EXPORT KPrefsWidTime : public KPrefsWid { public: /** @@ -201,7 +201,7 @@ class KDE_EXPORT KPrefsWidTime : public KPrefsWid meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidDuration : public KPrefsWid +class TDE_EXPORT KPrefsWidDuration : public KPrefsWid { public: /** @@ -239,7 +239,7 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidDate : public KPrefsWid +class TDE_EXPORT KPrefsWidDate : public KPrefsWid { public: /** @@ -276,7 +276,7 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidColor : public KPrefsWid +class TDE_EXPORT KPrefsWidColor : public KPrefsWid { TQ_OBJECT @@ -319,7 +319,7 @@ class KDE_EXPORT KPrefsWidColor : public KPrefsWid This class provides a control element for configuring font values. It is meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidFont : public KPrefsWid +class TDE_EXPORT KPrefsWidFont : public KPrefsWid { TQ_OBJECT @@ -377,7 +377,7 @@ class KDE_EXPORT KPrefsWidFont : public KPrefsWid the radio button. The position of the button is defined by the sequence of @ref addRadio() calls, starting with 0. */ -class KDE_EXPORT KPrefsWidRadios : public KPrefsWid +class TDE_EXPORT KPrefsWidRadios : public KPrefsWid { public: /** @@ -425,7 +425,7 @@ class KDE_EXPORT KPrefsWidRadios : public KPrefsWid The setting is interpreted as an int value, corresponding to the index in the combo box. */ -class KDE_EXPORT KPrefsWidCombo : public KPrefsWid +class TDE_EXPORT KPrefsWidCombo : public KPrefsWid { public: /** @@ -458,7 +458,7 @@ class KDE_EXPORT KPrefsWidCombo : public KPrefsWid meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidString : public KPrefsWid +class TDE_EXPORT KPrefsWidString : public KPrefsWid { public: /** @@ -505,7 +505,7 @@ class KDE_EXPORT KPrefsWidString : public KPrefsWid meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidPath : public KPrefsWid +class TDE_EXPORT KPrefsWidPath : public KPrefsWid { public: /** @@ -554,7 +554,7 @@ class KDE_EXPORT KPrefsWidPath : public KPrefsWid transparent way. The user has to add the widgets by the corresponding addWid functions and KPrefsWidManager handles the rest automatically. */ -class KDE_EXPORT KPrefsWidManager +class TDE_EXPORT KPrefsWidManager { public: /** @@ -718,7 +718,7 @@ class KDE_EXPORT KPrefsWidManager default values is handled automatically. Custom widgets have to be handled in the functions @ref usrReadConfig() and @ref usrWriteConfig(). */ -class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager +class TDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager { TQ_OBJECT @@ -772,7 +772,7 @@ class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager }; -class KDE_EXPORT KPrefsModule : public TDECModule, public KPrefsWidManager +class TDE_EXPORT KPrefsModule : public TDECModule, public KPrefsWidManager { TQ_OBJECT diff --git a/libtdepim/kregexp3.h b/libtdepim/kregexp3.h index 909e6bfa9..da30ddfa4 100644 --- a/libtdepim/kregexp3.h +++ b/libtdepim/kregexp3.h @@ -76,7 +76,7 @@ @see TQRegExp */ -class KDE_EXPORT KRegExp3 : public TQRegExp +class TDE_EXPORT KRegExp3 : public TQRegExp { public: KRegExp3() diff --git a/libtdepim/kresourceprefs.h b/libtdepim/kresourceprefs.h index 398490a13..102d5c5a1 100644 --- a/libtdepim/kresourceprefs.h +++ b/libtdepim/kresourceprefs.h @@ -35,7 +35,7 @@ class TQString; The prefix should be an unique identifier to avoid name clashes and the method has to be called before readConfig(), otherwise the wrong entries are read. */ -class KDE_EXPORT KResourcePrefs : public TDEConfigSkeleton +class TDE_EXPORT KResourcePrefs : public TDEConfigSkeleton { public: KResourcePrefs( const TQString &name = TQString() ); diff --git a/libtdepim/krsqueezedtextlabel.h b/libtdepim/krsqueezedtextlabel.h index 518493c10..7262b2cd8 100644 --- a/libtdepim/krsqueezedtextlabel.h +++ b/libtdepim/krsqueezedtextlabel.h @@ -38,7 +38,7 @@ /* * TQLabel */ -class KDE_EXPORT KRSqueezedTextLabel : public TQLabel { +class TDE_EXPORT KRSqueezedTextLabel : public TQLabel { TQ_OBJECT diff --git a/libtdepim/kscoring.h b/libtdepim/kscoring.h index 07ddb1786..93c76e3ca 100644 --- a/libtdepim/kscoring.h +++ b/libtdepim/kscoring.h @@ -55,13 +55,13 @@ class TQLabel; */ //---------------------------------------------------------------------------- -class KDE_EXPORT ScorableGroup +class TDE_EXPORT ScorableGroup { public: virtual ~ScorableGroup(); }; -class KDE_EXPORT ScorableArticle +class TDE_EXPORT ScorableArticle { public: virtual ~ScorableArticle(); @@ -81,7 +81,7 @@ public: /** Base class for other Action classes. */ -class KDE_EXPORT ActionBase { +class TDE_EXPORT ActionBase { public: ActionBase(); virtual ~ActionBase(); @@ -100,7 +100,7 @@ class KDE_EXPORT ActionBase { enum ActionTypes { SETSCORE, NOTIFY, COLOR, MARKASREAD }; }; -class KDE_EXPORT ActionColor : public ActionBase { +class TDE_EXPORT ActionColor : public ActionBase { public: ActionColor(const TQColor&); ActionColor(const TQString&); @@ -118,7 +118,7 @@ private: TQColor color; }; -class KDE_EXPORT ActionSetScore : public ActionBase { +class TDE_EXPORT ActionSetScore : public ActionBase { public: ActionSetScore(short); ActionSetScore(const ActionSetScore&); @@ -136,7 +136,7 @@ class KDE_EXPORT ActionSetScore : public ActionBase { short val; }; -class KDE_EXPORT ActionNotify : public ActionBase { +class TDE_EXPORT ActionNotify : public ActionBase { public: ActionNotify(const TQString&); ActionNotify(const ActionNotify&); @@ -151,7 +151,7 @@ class KDE_EXPORT ActionNotify : public ActionBase { TQString note; }; -class KDE_EXPORT ActionMarkAsRead : public ActionBase { +class TDE_EXPORT ActionMarkAsRead : public ActionBase { public: ActionMarkAsRead(); ActionMarkAsRead( const ActionMarkAsRead& ); @@ -162,7 +162,7 @@ class KDE_EXPORT ActionMarkAsRead : public ActionBase { virtual ActionMarkAsRead* clone() const; }; -class KDE_EXPORT NotifyCollection +class TDE_EXPORT NotifyCollection { public: NotifyCollection(); @@ -182,7 +182,7 @@ private: //---------------------------------------------------------------------------- -class KDE_EXPORT KScoringExpression +class TDE_EXPORT KScoringExpression { friend class KScoringRule; public: @@ -217,7 +217,7 @@ class KDE_EXPORT KScoringExpression }; //---------------------------------------------------------------------------- -class KDE_EXPORT KScoringRule +class TDE_EXPORT KScoringRule { friend class KScoringManager; public: @@ -280,7 +280,7 @@ private: With the help of this class its very easy for the KScoringManager to temporary drop lists of rules and restore them afterwards */ -class KDE_EXPORT RuleStack +class TDE_EXPORT RuleStack { public: RuleStack(); @@ -300,7 +300,7 @@ private: //---------------------------------------------------------------------------- // Manages the score rules. -class KDE_EXPORT KScoringManager : public TQObject +class TDE_EXPORT KScoringManager : public TQObject { TQ_OBJECT @@ -407,7 +407,7 @@ class KDE_EXPORT KScoringManager : public TQObject //---------------------------------------------------------------------------- -class KDE_EXPORT NotifyDialog : public KDialogBase +class TDE_EXPORT NotifyDialog : public KDialogBase { TQ_OBJECT diff --git a/libtdepim/kscoringeditor.h b/libtdepim/kscoringeditor.h index 8df84e177..81e7a21f8 100644 --- a/libtdepim/kscoringeditor.h +++ b/libtdepim/kscoringeditor.h @@ -49,7 +49,7 @@ class KColorCombo; /** this widget implements an editor for one condition. It is used in ExpressionEditWidget */ -class KDE_EXPORT SingleConditionWidget : public TQFrame +class TDE_EXPORT SingleConditionWidget : public TQFrame { TQ_OBJECT @@ -131,7 +131,7 @@ private: /** this widget implements the action editor */ -class KDE_EXPORT ActionEditWidget : public KWidgetLister +class TDE_EXPORT ActionEditWidget : public KWidgetLister { TQ_OBJECT @@ -200,7 +200,7 @@ private: /** This widget shows a list of rules with buttons for copy, delete aso. */ -class KDE_EXPORT RuleListWidget : public TQWidget +class TDE_EXPORT RuleListWidget : public TQWidget { TQ_OBJECT @@ -251,7 +251,7 @@ private: TQPushButton *mRuleDown; }; -class KDE_EXPORT KScoringEditor : public KDialogBase +class TDE_EXPORT KScoringEditor : public KDialogBase { TQ_OBJECT @@ -299,7 +299,7 @@ private: TQString ruleName; }; -class KDE_EXPORT KScoringEditorWidget : public TQWidget +class TDE_EXPORT KScoringEditorWidget : public TQWidget { TQ_OBJECT diff --git a/libtdepim/ksubscription.h b/libtdepim/ksubscription.h index c2d710503..97488fde6 100644 --- a/libtdepim/ksubscription.h +++ b/libtdepim/ksubscription.h @@ -42,7 +42,7 @@ class KAccount; //========================================================================== -class KDE_EXPORT KGroupInfo +class TDE_EXPORT KGroupInfo { public: enum Status { @@ -69,7 +69,7 @@ class KDE_EXPORT KGroupInfo //========================================================================== /** A class representing a single group item (what's that?) */ -class KDE_EXPORT GroupItem : public TQCheckListItem +class TDE_EXPORT GroupItem : public TQCheckListItem { public: GroupItem( TQListView *v, const KGroupInfo &gi, KSubscription* browser, @@ -185,7 +185,7 @@ class KDE_EXPORT GroupItem : public TQCheckListItem * */ -class KDE_EXPORT KSubscription : public KDialogBase +class TDE_EXPORT KSubscription : public KDialogBase { TQ_OBJECT diff --git a/libtdepim/ktimeedit.h b/libtdepim/ktimeedit.h index a4dbc7545..7669295bb 100644 --- a/libtdepim/ktimeedit.h +++ b/libtdepim/ktimeedit.h @@ -41,7 +41,7 @@ @short Provides a way to edit times in a user-friendly manner. @author Preston Brown, Ian Dawes */ -class KDE_EXPORT KTimeEdit : public TQComboBox +class TDE_EXPORT KTimeEdit : public TQComboBox { TQ_OBJECT diff --git a/libtdepim/kvcarddrag.h b/libtdepim/kvcarddrag.h index 9a9cfda31..d6e21cde2 100644 --- a/libtdepim/kvcarddrag.h +++ b/libtdepim/kvcarddrag.h @@ -37,7 +37,7 @@ class KVCardDragPrivate; * * See the TQt drag'n'drop documentation. */ -class KDE_EXPORT KVCardDrag : public TQStoredDrag +class TDE_EXPORT KVCardDrag : public TQStoredDrag { TQ_OBJECT diff --git a/libtdepim/kwidgetlister.h b/libtdepim/kwidgetlister.h index 4924f6841..1af5b0103 100644 --- a/libtdepim/kwidgetlister.h +++ b/libtdepim/kwidgetlister.h @@ -62,7 +62,7 @@ class TQHBox; */ -class KDE_EXPORT KWidgetLister : public TQWidget +class TDE_EXPORT KWidgetLister : public TQWidget { TQ_OBJECT diff --git a/libtdepim/kxface.h b/libtdepim/kxface.h index ce7e98b38..f0a036be2 100644 --- a/libtdepim/kxface.h +++ b/libtdepim/kxface.h @@ -519,7 +519,7 @@ class TQString; namespace KPIM { - class KDE_EXPORT KXFace : public TQObject + class TDE_EXPORT KXFace : public TQObject { TQ_OBJECT diff --git a/libtdepim/ldapclient.h b/libtdepim/ldapclient.h index a6249f7ab..8f1e3c2aa 100644 --- a/libtdepim/ldapclient.h +++ b/libtdepim/ldapclient.h @@ -139,7 +139,7 @@ class LdapObject * We mean it! * */ -class KDE_EXPORT LdapClient : public TQObject +class TDE_EXPORT LdapClient : public TQObject { TQ_OBJECT @@ -243,7 +243,7 @@ typedef TQValueList<LdapResult> LdapResultList; * We mean it! * */ -class KDE_EXPORT LdapSearch : public TQObject +class TDE_EXPORT LdapSearch : public TQObject { TQ_OBJECT diff --git a/libtdepim/linklocator.h b/libtdepim/linklocator.h index 3fb3330b5..ce5bba1c2 100644 --- a/libtdepim/linklocator.h +++ b/libtdepim/linklocator.h @@ -38,7 +38,7 @@ * @short Identifies URLs and email addresses embedded in plaintext. * @author Dave Corrie <[email protected]> */ -class KDE_EXPORT LinkLocator +class TDE_EXPORT LinkLocator { public: /** diff --git a/libtdepim/maillistdrag.h b/libtdepim/maillistdrag.h index c0a95c8a5..d83aaebf1 100644 --- a/libtdepim/maillistdrag.h +++ b/libtdepim/maillistdrag.h @@ -44,7 +44,7 @@ namespace KPIM { -class KDE_EXPORT MailSummary +class TDE_EXPORT MailSummary { public: MailSummary( TQ_UINT32 serialNumber, TQString messageId, TQString subject, @@ -83,7 +83,7 @@ private: typedef TQValueList<MailSummary> MailList; // Object for the drag object to call-back for message fulltext -class KDE_EXPORT MailTextSource { +class TDE_EXPORT MailTextSource { public: MailTextSource() {} virtual ~MailTextSource() {} @@ -92,7 +92,7 @@ public: }; // Drag and drop object for mails -class KDE_EXPORT MailListDrag : public TQStoredDrag +class TDE_EXPORT MailListDrag : public TQStoredDrag { public: // Takes ownership of "src" and deletes it when done diff --git a/libtdepim/pluginloader.h b/libtdepim/pluginloader.h index 1ec8dc6f9..5e69c265e 100644 --- a/libtdepim/pluginloader.h +++ b/libtdepim/pluginloader.h @@ -76,7 +76,7 @@ namespace KPIM { * **/ template< typename T, typename T_config > - class KDE_EXPORT PluginLoader : public PluginLoaderBase { + class TDE_EXPORT PluginLoader : public PluginLoaderBase { protected: PluginLoader() : PluginLoaderBase() {} @@ -122,7 +122,7 @@ namespace KPIM { #define KPIM_DEFINE_PLUGIN_LOADER( pl, t, mf, p ) \ namespace { /* don't pollute namespaces */ \ - struct KDE_EXPORT pl##Config { \ + struct TDE_EXPORT pl##Config { \ static const char * const mainfunc; \ static const char * const path; \ }; \ diff --git a/libtdepim/pluginloaderbase.h b/libtdepim/pluginloaderbase.h index 6edc61bee..d622ea446 100644 --- a/libtdepim/pluginloaderbase.h +++ b/libtdepim/pluginloaderbase.h @@ -32,7 +32,7 @@ class TQStringList; namespace KPIM { - class KDE_EXPORT PluginMetaData { + class TDE_EXPORT PluginMetaData { public: PluginMetaData() {} PluginMetaData( const TQString & lib, const TQString & name, @@ -45,7 +45,7 @@ namespace KPIM { mutable bool loaded; }; - class KDE_EXPORT PluginLoaderBase { + class TDE_EXPORT PluginLoaderBase { protected: PluginLoaderBase(); virtual ~PluginLoaderBase(); diff --git a/libtdepim/progressdialog.h b/libtdepim/progressdialog.h index 85a82bbd5..090bfde21 100644 --- a/libtdepim/progressdialog.h +++ b/libtdepim/progressdialog.h @@ -115,7 +115,7 @@ protected: ProgressItem* mItem; }; -class KDE_EXPORT ProgressDialog : public OverlayWidget +class TDE_EXPORT ProgressDialog : public OverlayWidget { TQ_OBJECT diff --git a/libtdepim/progressmanager.h b/libtdepim/progressmanager.h index 59dc7262b..8610f9c92 100644 --- a/libtdepim/progressmanager.h +++ b/libtdepim/progressmanager.h @@ -36,7 +36,7 @@ class ProgressItem; class ProgressManager; typedef TQMap<ProgressItem*, bool> ProgressItemMap; -class KDE_EXPORT ProgressItem : public TQObject +class TDE_EXPORT ProgressItem : public TQObject { TQ_OBJECT @@ -263,7 +263,7 @@ signals: * items to parents by id. */ -class KDE_EXPORT ProgressManager : public TQObject +class TDE_EXPORT ProgressManager : public TQObject { TQ_OBJECT diff --git a/libtdepim/qutf7codec.h b/libtdepim/qutf7codec.h index 01e97494a..6fe3a4739 100644 --- a/libtdepim/qutf7codec.h +++ b/libtdepim/qutf7codec.h @@ -45,7 +45,7 @@ @author Marc Mutz <[email protected]> */ -class KDE_EXPORT TQUtf7Codec : public TQTextCodec { +class TDE_EXPORT TQUtf7Codec : public TQTextCodec { bool encOpt, encLwsp; public: TQUtf7Codec() : TQTextCodec() {} @@ -81,7 +81,7 @@ public: @short A variant of @ref TQUtf7Codec, which protectes certain characters in MIME transport @author Marc Mutz <[email protected]> */ -class KDE_EXPORT TQStrictUtf7Codec : public TQUtf7Codec { +class TDE_EXPORT TQStrictUtf7Codec : public TQUtf7Codec { public: TQStrictUtf7Codec() : TQUtf7Codec() {} diff --git a/libtdepim/recentaddresses.h b/libtdepim/recentaddresses.h index f9f6a6ceb..c0d2fc2d0 100644 --- a/libtdepim/recentaddresses.h +++ b/libtdepim/recentaddresses.h @@ -41,7 +41,7 @@ class TDEConfig; class KEditListBox; namespace TDERecentAddress { -class KDE_EXPORT RecentAddressDialog : public KDialogBase +class TDE_EXPORT RecentAddressDialog : public KDialogBase { public: RecentAddressDialog( TQWidget *parent, const char *name = 0 ); @@ -58,7 +58,7 @@ class KDE_EXPORT RecentAddressDialog : public KDialogBase * @author Carsten Pfeiffer <[email protected]> */ -class KDE_EXPORT RecentAddresses +class TDE_EXPORT RecentAddresses { public: ~RecentAddresses(); diff --git a/libtdepim/resourceabc.h b/libtdepim/resourceabc.h index 0eee0901f..9b7c942c5 100644 --- a/libtdepim/resourceabc.h +++ b/libtdepim/resourceabc.h @@ -41,7 +41,7 @@ namespace KPIM { * handle subresources. */ -class KDE_EXPORT ResourceABC : public TDEABC::Resource +class TDE_EXPORT ResourceABC : public TDEABC::Resource { TQ_OBJECT diff --git a/libtdepim/sidebarextension.h b/libtdepim/sidebarextension.h index 9abd6ea7d..eead6af6a 100644 --- a/libtdepim/sidebarextension.h +++ b/libtdepim/sidebarextension.h @@ -35,7 +35,7 @@ namespace KParts * Provides a way to export a widget which will be displayed in Kontacts * stackview at the left **/ - class KDE_EXPORT SideBarExtension : public TQObject + class TDE_EXPORT SideBarExtension : public TQObject { TQ_OBJECT diff --git a/libtdepim/spellingfilter.h b/libtdepim/spellingfilter.h index d0a8d8845..23a43ef1e 100644 --- a/libtdepim/spellingfilter.h +++ b/libtdepim/spellingfilter.h @@ -29,7 +29,7 @@ #include <kdemacros.h> -class KDE_EXPORT SpellingFilter +class TDE_EXPORT SpellingFilter { public: enum UrlFiltering { DontFilterUrls, FilterUrls }; diff --git a/libtdepim/statusbarprogresswidget.h b/libtdepim/statusbarprogresswidget.h index def30fee4..caee11724 100644 --- a/libtdepim/statusbarprogresswidget.h +++ b/libtdepim/statusbarprogresswidget.h @@ -51,7 +51,7 @@ class SSLLabel; class ProgressItem; class ProgressDialog; -class KDE_EXPORT StatusbarProgressWidget : public TQFrame { +class TDE_EXPORT StatusbarProgressWidget : public TQFrame { TQ_OBJECT diff --git a/libtdepim/tdeabcresourcecached.h b/libtdepim/tdeabcresourcecached.h index 5d3e27a38..6960b25bd 100644 --- a/libtdepim/tdeabcresourcecached.h +++ b/libtdepim/tdeabcresourcecached.h @@ -31,7 +31,7 @@ namespace TDEABC { -class KDE_EXPORT ResourceCached : public Resource +class TDE_EXPORT ResourceCached : public Resource { TQ_OBJECT diff --git a/libtdepim/tdeconfigpropagator.h b/libtdepim/tdeconfigpropagator.h index 94a0bff8f..7a24384c2 100644 --- a/libtdepim/tdeconfigpropagator.h +++ b/libtdepim/tdeconfigpropagator.h @@ -31,7 +31,7 @@ class TDEConfigSkeleton; class TDEConfigSkeletonItem; -class KDE_EXPORT TDEConfigPropagator +class TDE_EXPORT TDEConfigPropagator { public: @@ -55,7 +55,7 @@ class KDE_EXPORT TDEConfigPropagator */ void commit(); - class KDE_EXPORT Condition + class TDE_EXPORT Condition { public: Condition() : isValid( false ) {} @@ -68,7 +68,7 @@ class KDE_EXPORT TDEConfigPropagator bool isValid; }; - class KDE_EXPORT Rule + class TDE_EXPORT Rule { public: typedef TQValueList<Rule> List; @@ -88,7 +88,7 @@ class KDE_EXPORT TDEConfigPropagator bool hideValue; }; - class KDE_EXPORT Change + class TDE_EXPORT Change { public: typedef TQPtrList<Change> List; @@ -108,7 +108,7 @@ class KDE_EXPORT TDEConfigPropagator TQString mTitle; }; - class KDE_EXPORT ChangeConfig : public Change + class TDE_EXPORT ChangeConfig : public Change { public: ChangeConfig(); diff --git a/libtdepim/tdeconfigwizard.h b/libtdepim/tdeconfigwizard.h index 19da572d7..e9922d614 100644 --- a/libtdepim/tdeconfigwizard.h +++ b/libtdepim/tdeconfigwizard.h @@ -30,7 +30,7 @@ class TQListView; /** @short Configuration wizard base class */ -class KDE_EXPORT TDEConfigWizard : public KDialogBase +class TDE_EXPORT TDEConfigWizard : public KDialogBase { TQ_OBJECT diff --git a/libtdepim/tdefileio.cpp b/libtdepim/tdefileio.cpp index ec798a722..95eb77285 100644 --- a/libtdepim/tdefileio.cpp +++ b/libtdepim/tdefileio.cpp @@ -33,7 +33,7 @@ static void msgDialog(const TQString &msg) //----------------------------------------------------------------------------- -KDE_EXPORT TQCString kFileToString(const TQString &aFileName, bool aEnsureNL, bool aVerbose) +TDE_EXPORT TQCString kFileToString(const TQString &aFileName, bool aEnsureNL, bool aVerbose) { TQCString result; TQFileInfo info(aFileName); @@ -173,7 +173,7 @@ TQByteArray kFileToBytes(const TQString &aFileName, bool aVerbose) #endif //----------------------------------------------------------------------------- -KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, +TDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, const TQString &aFileName, bool aAskIfExists, bool aBackup, bool aVerbose) { @@ -253,14 +253,14 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, return TRUE; } -KDE_EXPORT bool kCStringToFile(const TQCString& aBuffer, const TQString &aFileName, +TDE_EXPORT bool kCStringToFile(const TQCString& aBuffer, const TQString &aFileName, bool aAskIfExists, bool aBackup, bool aVerbose) { return kBytesToFile(aBuffer, aBuffer.length(), aFileName, aAskIfExists, aBackup, aVerbose); } -KDE_EXPORT bool kByteArrayToFile(const TQByteArray& aBuffer, const TQString &aFileName, +TDE_EXPORT bool kByteArrayToFile(const TQByteArray& aBuffer, const TQString &aFileName, bool aAskIfExists, bool aBackup, bool aVerbose) { return kBytesToFile(aBuffer, aBuffer.size(), aFileName, aAskIfExists, diff --git a/libtdepim/tdefileio.h b/libtdepim/tdefileio.h index f0cd8d8d4..2f2e04535 100644 --- a/libtdepim/tdefileio.h +++ b/libtdepim/tdefileio.h @@ -26,7 +26,7 @@ namespace KPIM { * If ensureNewline is TRUE the string will always have a trailing newline. */ TQCString kFileToString(const TQString &fileName, bool ensureNewline=true, - bool withDialogs=true) KDE_EXPORT; + bool withDialogs=true) TDE_EXPORT; // unused //TQByteArray kFileToBytes(const TQString &fileName, bool withDialogs=true); @@ -39,15 +39,15 @@ TQCString kFileToString(const TQString &fileName, bool ensureNewline=true, */ bool kBytesToFile(const char* aBuffer, int len, const TQString &aFileName, - bool aAskIfExists, bool aBackup, bool aVerbose) KDE_EXPORT; + bool aAskIfExists, bool aBackup, bool aVerbose) TDE_EXPORT; bool kCStringToFile(const TQCString& buffer, const TQString &fileName, bool askIfExists=false, bool createBackup=true, - bool withDialogs=true) KDE_EXPORT; + bool withDialogs=true) TDE_EXPORT; /** Does not stop at NUL */ -KDE_EXPORT bool kByteArrayToFile(const TQByteArray& buffer, const TQString &fileName, +bool kByteArrayToFile(const TQByteArray& buffer, const TQString &fileName, bool askIfExists=false, bool createBackup=true, - bool withDialogs=true) KDE_EXPORT; + bool withDialogs=true) TDE_EXPORT; /** diff --git a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp index 18952fe15..58b247b85 100644 --- a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp +++ b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp @@ -106,8 +106,8 @@ bool KPartsWidgetPlugin::isContainer( const TQString & /*key*/ ) const { /// Duplicated from tdelibs/tdecore/kdemacros.h.in for those with tdelibs < 3.4 #ifndef KDE_TQ_EXPORT_PLUGIN #define KDE_TQ_EXPORT_PLUGIN(PLUGIN) \ - TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \ - TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \ + TQ_EXTERN_C TDE_EXPORT const char* qt_ucm_query_verification_data(); \ + TQ_EXTERN_C TDE_EXPORT TQUnknownInterface* ucm_instantiate(); \ TQ_EXPORT_PLUGIN(PLUGIN) #endif diff --git a/libtdepim/weaver.h b/libtdepim/weaver.h index b949a1109..6f38b8701 100644 --- a/libtdepim/weaver.h +++ b/libtdepim/weaver.h @@ -50,22 +50,22 @@ namespace ThreadWeaver { Use setDebugLevel () to integrate adapt debug () to your platform. */ - KDE_EXPORT extern bool Debug; - KDE_EXPORT extern int DebugLevel; + TDE_EXPORT extern bool Debug; + TDE_EXPORT extern int DebugLevel; - KDE_EXPORT inline void setDebugLevel (bool debug, int level) + TDE_EXPORT inline void setDebugLevel (bool debug, int level) { Debug = debug; DebugLevel = level; } - KDE_EXPORT inline void debug(int severity, const char * cformat, ...) + TDE_EXPORT inline void debug(int severity, const char * cformat, ...) #ifdef __GNUC__ __attribute__ ( (format (printf, 2, 3 ) ) ) #endif ; - KDE_EXPORT inline void debug(int severity, const char * cformat, ...) + TDE_EXPORT inline void debug(int severity, const char * cformat, ...) { if ( Debug == true && ( severity<=DebugLevel || severity == 0) ) { @@ -96,7 +96,7 @@ namespace ThreadWeaver { Note: Do not create and use SPR/APR events, use Job::triggerSPR or Job::triggerAPR to create the requests. */ - class KDE_EXPORT Event : public TQCustomEvent + class TDE_EXPORT Event : public TQCustomEvent { public: enum Action { @@ -160,7 +160,7 @@ namespace ThreadWeaver { Note: When using an APR, you better make sure to receive the signal with some object, otherwise the calling thread will block forever! */ - class KDE_EXPORT Job : public TQObject + class TDE_EXPORT Job : public TQObject { TQ_OBJECT @@ -246,7 +246,7 @@ namespace ThreadWeaver { /** The class Thread is used to represent the worker threads in the weaver's inventory. It is not meant to be overloaded. */ - class KDE_EXPORT Thread : public TQThread + class TDE_EXPORT Thread : public TQThread { public: /** Create a thread. @@ -293,7 +293,7 @@ namespace ThreadWeaver { /** A weaver is the manager of worker threads (Thread objects) to which it assigns jobs from it's queue. */ - class KDE_EXPORT Weaver : public TQObject + class TDE_EXPORT Weaver : public TQObject { TQ_OBJECT diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp index da28a1f0c..b0c325093 100644 --- a/plugins/kmail/bodypartformatter/text_calendar.cpp +++ b/plugins/kmail/bodypartformatter/text_calendar.cpp @@ -968,7 +968,7 @@ class Plugin : public KMail::Interface::BodyPartFormatterPlugin } extern "C" -KDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * +TDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * libkmail_bodypartformatter_text_calendar_create_bodypart_formatter_plugin() { TDEGlobal::locale()->insertCatalogue( "kmail_text_calendar_plugin" ); diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp index c5e1297a8..4ef5c92c0 100644 --- a/plugins/kmail/bodypartformatter/text_vcard.cpp +++ b/plugins/kmail/bodypartformatter/text_vcard.cpp @@ -268,7 +268,7 @@ namespace { } extern "C" -KDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * +TDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * libkmail_bodypartformatter_text_vcard_create_bodypart_formatter_plugin() { TDEGlobal::locale()->insertCatalogue( "kmail_text_vcard_plugin" ); return new Plugin(); diff --git a/tdeioslave/imap4/imap4.cpp b/tdeioslave/imap4/imap4.cpp index 449711dec..e541e734d 100644 --- a/tdeioslave/imap4/imap4.cpp +++ b/tdeioslave/imap4/imap4.cpp @@ -104,7 +104,7 @@ using namespace TDEIO; extern "C" { void sigalrm_handler (int); - KDE_EXPORT int kdemain (int argc, char **argv); + TDE_EXPORT int kdemain (int argc, char **argv); } int diff --git a/tdeioslave/mbox/mbox.cpp b/tdeioslave/mbox/mbox.cpp index 8f45dcaff..62eab9b9d 100644 --- a/tdeioslave/mbox/mbox.cpp +++ b/tdeioslave/mbox/mbox.cpp @@ -38,7 +38,7 @@ #include "mbox.h" -extern "C" { KDE_EXPORT int kdemain(int argc, char* argv[]); } +extern "C" { TDE_EXPORT int kdemain(int argc, char* argv[]); } int kdemain( int argc, char * argv[] ) { diff --git a/tdeioslave/opengroupware/opengroupware.cpp b/tdeioslave/opengroupware/opengroupware.cpp index b202373e3..66a0b19a9 100644 --- a/tdeioslave/opengroupware/opengroupware.cpp +++ b/tdeioslave/opengroupware/opengroupware.cpp @@ -64,7 +64,7 @@ class ResourceMemory : public ResourceCached extern "C" { -KDE_EXPORT int kdemain( int argc, char **argv ); +TDE_EXPORT int kdemain( int argc, char **argv ); } int kdemain( int argc, char **argv ) diff --git a/tdeioslave/sieve/sieve.cpp b/tdeioslave/sieve/sieve.cpp index 0925b5153..8ca806d9e 100644 --- a/tdeioslave/sieve/sieve.cpp +++ b/tdeioslave/sieve/sieve.cpp @@ -80,7 +80,7 @@ static const unsigned int SIEVE_DEFAULT_RECIEVE_BUFFER = 512; using namespace TDEIO; extern "C" { - KDE_EXPORT int kdemain(int argc, char **argv) + TDE_EXPORT int kdemain(int argc, char **argv) { TDEInstance instance("tdeio_sieve" ); diff --git a/tderesources/birthdays/resourcetdeabc.h b/tderesources/birthdays/resourcetdeabc.h index 93c15d943..1b25fd075 100644 --- a/tderesources/birthdays/resourcetdeabc.h +++ b/tderesources/birthdays/resourcetdeabc.h @@ -45,7 +45,7 @@ namespace KCal { /** Resource providing birthdays and anniversaries as events. */ -class KDE_EXPORT ResourceTDEABC : public ResourceCalendar +class TDE_EXPORT ResourceTDEABC : public ResourceCalendar { TQ_OBJECT diff --git a/tderesources/blogging/kcal_resourceblogging.h b/tderesources/blogging/kcal_resourceblogging.h index 2e401d8f6..109d9ccf0 100644 --- a/tderesources/blogging/kcal_resourceblogging.h +++ b/tderesources/blogging/kcal_resourceblogging.h @@ -33,7 +33,7 @@ namespace KCal { /** This class provides a resource for accessing blogs on a blogging server as journals */ -class KDE_EXPORT ResourceBlogging : public ResourceGroupwareBase +class TDE_EXPORT ResourceBlogging : public ResourceGroupwareBase { TQ_OBJECT diff --git a/tderesources/blogging/kcal_resourcebloggingconfig.h b/tderesources/blogging/kcal_resourcebloggingconfig.h index 7d69f830e..d78042b34 100644 --- a/tderesources/blogging/kcal_resourcebloggingconfig.h +++ b/tderesources/blogging/kcal_resourcebloggingconfig.h @@ -25,7 +25,7 @@ namespace KCal { -class KDE_EXPORT ResourceBloggingConfig : public ResourceGroupwareBaseConfig +class TDE_EXPORT ResourceBloggingConfig : public ResourceGroupwareBaseConfig { TQ_OBJECT diff --git a/tderesources/caldav/config.h b/tderesources/caldav/config.h index 4dec65f30..ffeaa27fa 100644 --- a/tderesources/caldav/config.h +++ b/tderesources/caldav/config.h @@ -37,7 +37,7 @@ class CalDavSaveConfig; /** * Configuration widget for CalDAV resource. */ -class KDE_EXPORT ResourceCalDavConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceCalDavConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/caldav/configwidgets.h b/tderesources/caldav/configwidgets.h index 5bee6aa96..7ad3597ee 100644 --- a/tderesources/caldav/configwidgets.h +++ b/tderesources/caldav/configwidgets.h @@ -47,7 +47,7 @@ class ResourceCached; @see ResourceCached */ -class KDE_EXPORT CalDavReloadConfig : public TQWidget +class TDE_EXPORT CalDavReloadConfig : public TQWidget { TQ_OBJECT @@ -74,7 +74,7 @@ class KDE_EXPORT CalDavReloadConfig : public TQWidget @see ResourceCached */ -class KDE_EXPORT CalDavSaveConfig : public TQWidget +class TDE_EXPORT CalDavSaveConfig : public TQWidget { TQ_OBJECT diff --git a/tderesources/caldav/resource.h b/tderesources/caldav/resource.h index 7e4bbdc59..95aba7d77 100644 --- a/tderesources/caldav/resource.h +++ b/tderesources/caldav/resource.h @@ -41,7 +41,7 @@ class CalDavWriter; /** * This class provides a resource for accessing calendars via CalDAV protocol. */ -class KDE_EXPORT ResourceCalDav : public ResourceCached +class TDE_EXPORT ResourceCalDav : public ResourceCached { TQ_OBJECT diff --git a/tderesources/carddav/config.h b/tderesources/carddav/config.h index 027dc0696..e752aee49 100644 --- a/tderesources/carddav/config.h +++ b/tderesources/carddav/config.h @@ -36,7 +36,7 @@ class CardDavSaveConfig; /** * Configuration widget for CardDAV resource. */ -class KDE_EXPORT ResourceCardDavConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceCardDavConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/carddav/configwidgets.h b/tderesources/carddav/configwidgets.h index 3fcb10f87..e61b97e0a 100644 --- a/tderesources/carddav/configwidgets.h +++ b/tderesources/carddav/configwidgets.h @@ -46,7 +46,7 @@ class ResourceCached; @see ResourceCached */ -class KDE_EXPORT CardDavReloadConfig : public TQWidget +class TDE_EXPORT CardDavReloadConfig : public TQWidget { TQ_OBJECT @@ -73,7 +73,7 @@ class KDE_EXPORT CardDavReloadConfig : public TQWidget @see ResourceCached */ -class KDE_EXPORT CardDavSaveConfig : public TQWidget +class TDE_EXPORT CardDavSaveConfig : public TQWidget { TQ_OBJECT diff --git a/tderesources/carddav/resource.h b/tderesources/carddav/resource.h index e255714a3..828c6da72 100644 --- a/tderesources/carddav/resource.h +++ b/tderesources/carddav/resource.h @@ -40,7 +40,7 @@ class CardDavWriter; /** * This class provides a resource for accessing calendars via CardDAV protocol. */ -class KDE_EXPORT ResourceCardDav : public ResourceCached +class TDE_EXPORT ResourceCardDav : public ResourceCached { TQ_OBJECT diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.h b/tderesources/egroupware/kcal_resourcexmlrpc.h index b3eef6326..45cc13448 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpc.h +++ b/tderesources/egroupware/kcal_resourcexmlrpc.h @@ -50,7 +50,7 @@ class EGroupwarePrefs; /** This class provides access to php/eGroupware calendar via XML-RPC. */ -class KDE_EXPORT ResourceXMLRPC : public ResourceCached +class TDE_EXPORT ResourceXMLRPC : public ResourceCached { TQ_OBJECT diff --git a/tderesources/egroupware/kcal_resourcexmlrpcconfig.h b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h index 0cd619c09..316b5dfda 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpcconfig.h +++ b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h @@ -30,7 +30,7 @@ class KURLRequester; namespace KCal { -class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.h b/tderesources/egroupware/knotes_resourcexmlrpc.h index e0b19cfc5..83ee4b27b 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpc.h +++ b/tderesources/egroupware/knotes_resourcexmlrpc.h @@ -46,7 +46,7 @@ class EGroupwarePrefs; /** This class provides access to eGroupware notes via XML-RPC. */ -class KDE_EXPORT ResourceXMLRPC : public ResourceNotes +class TDE_EXPORT ResourceXMLRPC : public ResourceNotes { TQ_OBJECT diff --git a/tderesources/egroupware/knotes_resourcexmlrpcconfig.h b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h index 25557d4fc..b451fafbb 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpcconfig.h +++ b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h @@ -30,7 +30,7 @@ class KURLRequester; namespace KNotes { -class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.h b/tderesources/egroupware/tdeabc_resourcexmlrpc.h index d671912a4..e5996b5eb 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpc.h +++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.h @@ -37,7 +37,7 @@ namespace TDEABC { class EGroupwarePrefs; -class KDE_EXPORT ResourceXMLRPC : public ResourceCached +class TDE_EXPORT ResourceXMLRPC : public ResourceCached { TQ_OBJECT diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h index 6208f684a..2b06903ad 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h +++ b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h @@ -29,7 +29,7 @@ class KURLRequester; namespace TDEABC { -class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.h b/tderesources/featureplan/kcal_resourcefeatureplan.h index 7b64e12a8..fa83bef7f 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplan.h +++ b/tderesources/featureplan/kcal_resourcefeatureplan.h @@ -37,7 +37,7 @@ namespace KCal { /** This class represents a featureplan (in KDE XML format) */ -class KDE_EXPORT ResourceFeaturePlan : public ResourceCached +class TDE_EXPORT ResourceFeaturePlan : public ResourceCached { TQ_OBJECT diff --git a/tderesources/featureplan/kcal_resourcefeatureplanconfig.h b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h index 23809cea7..c811b72be 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplanconfig.h +++ b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h @@ -31,7 +31,7 @@ class TQCheckBox; namespace KCal { -class KDE_EXPORT ResourceFeaturePlanConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceFeaturePlanConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/groupdav/kcal_resourcegroupdav.h b/tderesources/groupdav/kcal_resourcegroupdav.h index 68aa44a66..7085f3276 100644 --- a/tderesources/groupdav/kcal_resourcegroupdav.h +++ b/tderesources/groupdav/kcal_resourcegroupdav.h @@ -31,7 +31,7 @@ namespace KCal { /** This class provides a resource for accessing an GroupDav.org server */ -class KDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase +class TDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase { TQ_OBJECT diff --git a/tderesources/groupdav/tdeabc_resourcegroupdav.h b/tderesources/groupdav/tdeabc_resourcegroupdav.h index 9057a8d80..5457e46e8 100644 --- a/tderesources/groupdav/tdeabc_resourcegroupdav.h +++ b/tderesources/groupdav/tdeabc_resourcegroupdav.h @@ -27,7 +27,7 @@ namespace TDEABC { -class KDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase +class TDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase { TQ_OBJECT diff --git a/tderesources/groupwise/kcal_resourcegroupwise.h b/tderesources/groupwise/kcal_resourcegroupwise.h index 1bf1a5dce..64a9c1117 100644 --- a/tderesources/groupwise/kcal_resourcegroupwise.h +++ b/tderesources/groupwise/kcal_resourcegroupwise.h @@ -41,7 +41,7 @@ class GroupwisePrefsBase; /** This class provides a resource for accessing a Groupwise calendar. */ -class KDE_EXPORT ResourceGroupwise : public ResourceCached +class TDE_EXPORT ResourceGroupwise : public ResourceCached { TQ_OBJECT diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h index e982b8192..2c77dab5d 100644 --- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h +++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h @@ -39,7 +39,7 @@ class ResourceCachedSaveConfig; @see KCalResourceGroupwise */ -class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.h b/tderesources/groupwise/tdeabc_resourcegroupwise.h index ccf74403a..17cc9b528 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwise.h +++ b/tderesources/groupwise/tdeabc_resourcegroupwise.h @@ -37,7 +37,7 @@ namespace TDEABC { class GroupwisePrefs; -class KDE_EXPORT ResourceGroupwise : public ResourceCached +class TDE_EXPORT ResourceGroupwise : public ResourceCached { friend class ResourceGroupwiseConfig; diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h index 2e3ccea49..7fd2b45a5 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h +++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h @@ -36,7 +36,7 @@ namespace TDEABC { class ResourceGroupwise; -class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp index 1c68d654e..ed054b8e0 100644 --- a/tderesources/groupwise/tdeioslave/groupwise.cpp +++ b/tderesources/groupwise/tdeioslave/groupwise.cpp @@ -64,7 +64,7 @@ class ResourceMemory : public ResourceCached } extern "C" { -KDE_EXPORT int kdemain( int argc, char **argv ); +TDE_EXPORT int kdemain( int argc, char **argv ); } int kdemain( int argc, char **argv ) diff --git a/tderesources/kolab/kcal/resourcekolab.h b/tderesources/kolab/kcal/resourcekolab.h index a8404cd3c..9700afe93 100644 --- a/tderesources/kolab/kcal/resourcekolab.h +++ b/tderesources/kolab/kcal/resourcekolab.h @@ -47,7 +47,7 @@ namespace KCal { struct TemporarySilencer; -class KDE_EXPORT ResourceKolab : public KCal::ResourceCalendar, +class TDE_EXPORT ResourceKolab : public KCal::ResourceCalendar, public KCal::IncidenceBase::Observer, public Kolab::ResourceKolabBase { diff --git a/tderesources/kolab/knotes/resourcekolab.h b/tderesources/kolab/knotes/resourcekolab.h index 5f1023b43..c28d6e22f 100644 --- a/tderesources/kolab/knotes/resourcekolab.h +++ b/tderesources/kolab/knotes/resourcekolab.h @@ -49,7 +49,7 @@ namespace Kolab { * addresses in an IMAP folder in KMail (or other conforming email * clients). */ -class KDE_EXPORT ResourceKolab : public ResourceNotes, +class TDE_EXPORT ResourceKolab : public ResourceNotes, public KCal::IncidenceBase::Observer, public ResourceKolabBase { diff --git a/tderesources/kolab/tdeabc/resourcekolab.h b/tderesources/kolab/tdeabc/resourcekolab.h index 3347a1774..84bce5e63 100644 --- a/tderesources/kolab/tdeabc/resourcekolab.h +++ b/tderesources/kolab/tdeabc/resourcekolab.h @@ -49,7 +49,7 @@ namespace TDEABC { * addresses in an Kolab folder in KMail (or other conforming email * clients). */ -class KDE_EXPORT ResourceKolab : public KPIM::ResourceABC, +class TDE_EXPORT ResourceKolab : public KPIM::ResourceABC, public Kolab::ResourceKolabBase { TQ_OBJECT diff --git a/tderesources/lib/addressbookadaptor.h b/tderesources/lib/addressbookadaptor.h index 5a754bc69..00852d18b 100644 --- a/tderesources/lib/addressbookadaptor.h +++ b/tderesources/lib/addressbookadaptor.h @@ -43,7 +43,7 @@ class AddressBookUploadItem : public KPIM::GroupwareUploadItem : KPIM::GroupwareUploadItem( type ) {} }; -class KDE_EXPORT AddressBookAdaptor : public KPIM::GroupwareDataAdaptor +class TDE_EXPORT AddressBookAdaptor : public KPIM::GroupwareDataAdaptor { public: AddressBookAdaptor(); diff --git a/tderesources/lib/calendaradaptor.h b/tderesources/lib/calendaradaptor.h index dc2034405..4b913d897 100644 --- a/tderesources/lib/calendaradaptor.h +++ b/tderesources/lib/calendaradaptor.h @@ -49,7 +49,7 @@ class CalendarUploadItem : public KPIM::GroupwareUploadItem }; -class KDE_EXPORT CalendarAdaptor : public KPIM::GroupwareDataAdaptor +class TDE_EXPORT CalendarAdaptor : public KPIM::GroupwareDataAdaptor { TQ_OBJECT diff --git a/tderesources/lib/davaddressbookadaptor.h b/tderesources/lib/davaddressbookadaptor.h index fcb16afa1..6ff319d76 100644 --- a/tderesources/lib/davaddressbookadaptor.h +++ b/tderesources/lib/davaddressbookadaptor.h @@ -28,7 +28,7 @@ namespace TDEABC { -class KDE_EXPORT DavAddressBookAdaptor : public AddressBookAdaptor +class TDE_EXPORT DavAddressBookAdaptor : public AddressBookAdaptor { public: DavAddressBookAdaptor() {} diff --git a/tderesources/lib/davcalendaradaptor.h b/tderesources/lib/davcalendaradaptor.h index ab1c9757f..942caf717 100644 --- a/tderesources/lib/davcalendaradaptor.h +++ b/tderesources/lib/davcalendaradaptor.h @@ -28,7 +28,7 @@ namespace KCal { -class KDE_EXPORT DavCalendarAdaptor : public CalendarAdaptor +class TDE_EXPORT DavCalendarAdaptor : public CalendarAdaptor { public: DavCalendarAdaptor() {} diff --git a/tderesources/lib/folderconfig.h b/tderesources/lib/folderconfig.h index 892128a4c..741c12d5c 100644 --- a/tderesources/lib/folderconfig.h +++ b/tderesources/lib/folderconfig.h @@ -35,7 +35,7 @@ namespace KPIM { class FolderLister; -class KDE_EXPORT FolderConfig : public TQWidget +class TDE_EXPORT FolderConfig : public TQWidget { TQ_OBJECT diff --git a/tderesources/lib/folderlister.h b/tderesources/lib/folderlister.h index 8a5ba5291..90790af74 100644 --- a/tderesources/lib/folderlister.h +++ b/tderesources/lib/folderlister.h @@ -45,7 +45,7 @@ class GroupwareDataAdaptor; class GroupwarePrefsBase; -class KDE_EXPORT FolderLister : public TQObject +class TDE_EXPORT FolderLister : public TQObject { TQ_OBJECT diff --git a/tderesources/lib/groupwaredataadaptor.h b/tderesources/lib/groupwaredataadaptor.h index 27807124e..ba11cf1bb 100644 --- a/tderesources/lib/groupwaredataadaptor.h +++ b/tderesources/lib/groupwaredataadaptor.h @@ -44,7 +44,7 @@ class IdMapper; class GroupwareDataAdaptor; //class GroupwareJob; -class KDE_EXPORT GroupwareUploadItem +class TDE_EXPORT GroupwareUploadItem { public: typedef KCal::ListBase<GroupwareUploadItem> List; @@ -88,7 +88,7 @@ class KDE_EXPORT GroupwareUploadItem }; -class KDE_EXPORT GroupwareDataAdaptor : public TQObject +class TDE_EXPORT GroupwareDataAdaptor : public TQObject { TQ_OBJECT diff --git a/tderesources/lib/kcal_cachesettingsdlg.h b/tderesources/lib/kcal_cachesettingsdlg.h index f9462e5d3..5fe2c7579 100644 --- a/tderesources/lib/kcal_cachesettingsdlg.h +++ b/tderesources/lib/kcal_cachesettingsdlg.h @@ -39,7 +39,7 @@ class ResourceCachedSaveConfig; Configuration widget for groupware tdeioslave resource. @see KCalOpenGroupware */ -class KDE_EXPORT CacheSettingsDialog : public KDialogBase +class TDE_EXPORT CacheSettingsDialog : public KDialogBase { TQ_OBJECT diff --git a/tderesources/lib/kcal_resourcegroupwarebase.h b/tderesources/lib/kcal_resourcegroupwarebase.h index ae4ca5792..d0f6c48fb 100644 --- a/tderesources/lib/kcal_resourcegroupwarebase.h +++ b/tderesources/lib/kcal_resourcegroupwarebase.h @@ -49,7 +49,7 @@ class CalendarAdaptor; This class provides a resource for accessing a Groupware tdeioslave-based calendar. */ -class KDE_EXPORT ResourceGroupwareBase : public ResourceCached +class TDE_EXPORT ResourceGroupwareBase : public ResourceCached { TQ_OBJECT diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h index db3ddd989..22c9f2077 100644 --- a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h +++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h @@ -44,7 +44,7 @@ class CacheSettingsDialog; @see KCalOpenGroupware */ -class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.h b/tderesources/lib/tdeabc_resourcegroupwarebase.h index bea6ca913..77358bd69 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebase.h +++ b/tderesources/lib/tdeabc_resourcegroupwarebase.h @@ -40,7 +40,7 @@ namespace TDEABC { class AddressBookAdaptor; -class KDE_EXPORT ResourceGroupwareBase : public ResourceCached +class TDE_EXPORT ResourceGroupwareBase : public ResourceCached { TQ_OBJECT diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h index c1ccb689b..6b2ad4d34 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h +++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h @@ -36,7 +36,7 @@ namespace TDEABC { class ResourceGroupwareBase; -class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/lib/webdavhandler.h b/tderesources/lib/webdavhandler.h index a2de509d4..65018c7b4 100644 --- a/tderesources/lib/webdavhandler.h +++ b/tderesources/lib/webdavhandler.h @@ -29,7 +29,7 @@ #include <kurl.h> #include <kdemacros.h> -class KDE_EXPORT WebdavHandler +class TDE_EXPORT WebdavHandler { public: WebdavHandler(); diff --git a/tderesources/newexchange/kcal_resourceexchange.h b/tderesources/newexchange/kcal_resourceexchange.h index 886319a4f..f2e313415 100644 --- a/tderesources/newexchange/kcal_resourceexchange.h +++ b/tderesources/newexchange/kcal_resourceexchange.h @@ -29,7 +29,7 @@ namespace KCal { /** This class provides a resource for accessing an Exchange server */ -class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase +class TDE_EXPORT ResourceExchange : public ResourceGroupwareBase { TQ_OBJECT diff --git a/tderesources/newexchange/tdeabc_resourceexchange.h b/tderesources/newexchange/tdeabc_resourceexchange.h index 121cdf11b..9ed102e23 100644 --- a/tderesources/newexchange/tdeabc_resourceexchange.h +++ b/tderesources/newexchange/tdeabc_resourceexchange.h @@ -25,7 +25,7 @@ namespace TDEABC { -class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase +class TDE_EXPORT ResourceExchange : public ResourceGroupwareBase { TQ_OBJECT diff --git a/tderesources/remote/resourceremote.h b/tderesources/remote/resourceremote.h index 6989169fa..cdbb6f1ad 100644 --- a/tderesources/remote/resourceremote.h +++ b/tderesources/remote/resourceremote.h @@ -48,7 +48,7 @@ namespace KCal { /** This class provides a calendar stored as a remote file. */ -class KDE_EXPORT ResourceRemote : public ResourceCached +class TDE_EXPORT ResourceRemote : public ResourceCached { TQ_OBJECT diff --git a/tderesources/remote/resourceremoteconfig.h b/tderesources/remote/resourceremoteconfig.h index 454177952..8c4a2b251 100644 --- a/tderesources/remote/resourceremoteconfig.h +++ b/tderesources/remote/resourceremoteconfig.h @@ -42,7 +42,7 @@ class ResourceCachedSaveConfig; @see ResourceRemote */ -class KDE_EXPORT ResourceRemoteConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceRemoteConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/scalix/kcal/resourcescalix.h b/tderesources/scalix/kcal/resourcescalix.h index 5b283534e..60dba194a 100644 --- a/tderesources/scalix/kcal/resourcescalix.h +++ b/tderesources/scalix/kcal/resourcescalix.h @@ -46,7 +46,7 @@ namespace KCal { struct TemporarySilencer; -class KDE_EXPORT ResourceScalix : public KCal::ResourceCalendar, +class TDE_EXPORT ResourceScalix : public KCal::ResourceCalendar, public KCal::IncidenceBase::Observer, public Scalix::ResourceScalixBase { diff --git a/tderesources/scalix/knotes/resourcescalix.h b/tderesources/scalix/knotes/resourcescalix.h index bcfa8cf56..2266bf1e1 100644 --- a/tderesources/scalix/knotes/resourcescalix.h +++ b/tderesources/scalix/knotes/resourcescalix.h @@ -48,7 +48,7 @@ namespace Scalix { * addresses in an IMAP folder in KMail (or other conforming email * clients). */ -class KDE_EXPORT ResourceScalix : public ResourceNotes, +class TDE_EXPORT ResourceScalix : public ResourceNotes, public KCal::IncidenceBase::Observer, public ResourceScalixBase { diff --git a/tderesources/scalix/tdeabc/resourcescalix.h b/tderesources/scalix/tdeabc/resourcescalix.h index ee3c8af94..99e5f03cb 100644 --- a/tderesources/scalix/tdeabc/resourcescalix.h +++ b/tderesources/scalix/tdeabc/resourcescalix.h @@ -50,7 +50,7 @@ namespace TDEABC { * addresses in an Scalix folder in KMail (or other conforming email * clients). */ -class KDE_EXPORT ResourceScalix : public KPIM::ResourceABC, +class TDE_EXPORT ResourceScalix : public KPIM::ResourceABC, public Scalix::ResourceScalixBase { TQ_OBJECT diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp index 8dbb86516..b56f398a3 100644 --- a/tderesources/scalix/tdeioslave/scalix.cpp +++ b/tderesources/scalix/tdeioslave/scalix.cpp @@ -35,7 +35,7 @@ #include "scalix.h" extern "C" { - KDE_EXPORT int kdemain( int argc, char **argv ); + TDE_EXPORT int kdemain( int argc, char **argv ); } static const TDECmdLineOptions options[] = diff --git a/tderesources/slox/kcalresourceslox.h b/tderesources/slox/kcalresourceslox.h index a4a80b3e0..59db8a9f9 100644 --- a/tderesources/slox/kcalresourceslox.h +++ b/tderesources/slox/kcalresourceslox.h @@ -58,7 +58,7 @@ class SloxAccounts; /** This class provides a calendar stored as a remote file. */ -class KDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase +class TDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase { TQ_OBJECT diff --git a/tderesources/slox/kcalresourcesloxconfig.h b/tderesources/slox/kcalresourcesloxconfig.h index 21670bbba..2ebd0108c 100644 --- a/tderesources/slox/kcalresourcesloxconfig.h +++ b/tderesources/slox/kcalresourcesloxconfig.h @@ -42,7 +42,7 @@ class SloxBase; @see KCalResourceSlox */ -class KDE_EXPORT KCalResourceSloxConfig : public KRES::ConfigWidget +class TDE_EXPORT KCalResourceSloxConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/slox/sloxaccounts.h b/tderesources/slox/sloxaccounts.h index 7b5e92a1c..a9e615da6 100644 --- a/tderesources/slox/sloxaccounts.h +++ b/tderesources/slox/sloxaccounts.h @@ -30,7 +30,7 @@ class Job; class SloxBase; -class KDE_EXPORT SloxAccounts : public TQObject +class TDE_EXPORT SloxAccounts : public TQObject { TQ_OBJECT diff --git a/tderesources/slox/sloxbase.h b/tderesources/slox/sloxbase.h index dc3c9c536..577c83879 100644 --- a/tderesources/slox/sloxbase.h +++ b/tderesources/slox/sloxbase.h @@ -27,7 +27,7 @@ namespace KRES { class Resource; } -class KDE_EXPORT SloxBase { +class TDE_EXPORT SloxBase { public: enum Field { ObjectId = 0, // system fields diff --git a/tderesources/slox/sloxfolder.h b/tderesources/slox/sloxfolder.h index 06f080034..bb39ba85e 100644 --- a/tderesources/slox/sloxfolder.h +++ b/tderesources/slox/sloxfolder.h @@ -32,7 +32,7 @@ enum FolderType { Contacts }; -class KDE_EXPORT SloxFolder +class TDE_EXPORT SloxFolder { public: SloxFolder( const TQString &id, const TQString &parentId, const TQString &type, const TQString &name, bool def = false ); diff --git a/tderesources/slox/sloxfoldermanager.h b/tderesources/slox/sloxfoldermanager.h index f61ab4716..c0be7c1aa 100644 --- a/tderesources/slox/sloxfoldermanager.h +++ b/tderesources/slox/sloxfoldermanager.h @@ -35,7 +35,7 @@ class DavJob; class SloxBase; class SloxFolder; -class KDE_EXPORT SloxFolderManager : public TQObject +class TDE_EXPORT SloxFolderManager : public TQObject { TQ_OBJECT diff --git a/tderesources/slox/tdeabcresourceslox.h b/tderesources/slox/tdeabcresourceslox.h index 225f8a338..126ee75c1 100644 --- a/tderesources/slox/tdeabcresourceslox.h +++ b/tderesources/slox/tdeabcresourceslox.h @@ -45,7 +45,7 @@ namespace TDEABC { class SloxPrefs; -class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase +class TDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase { TQ_OBJECT diff --git a/tderesources/slox/tdeabcresourcesloxconfig.h b/tderesources/slox/tdeabcresourcesloxconfig.h index 46a9a74a4..37b27e1d9 100644 --- a/tderesources/slox/tdeabcresourcesloxconfig.h +++ b/tderesources/slox/tdeabcresourcesloxconfig.h @@ -32,7 +32,7 @@ class SloxBase; namespace TDEABC { -class KDE_EXPORT ResourceSloxConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceSloxConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/tderesources/slox/webdavhandler.h b/tderesources/slox/webdavhandler.h index 6d98fd522..338fe2c35 100644 --- a/tderesources/slox/webdavhandler.h +++ b/tderesources/slox/webdavhandler.h @@ -34,7 +34,7 @@ class Incidence; class SloxBase; -class KDE_EXPORT SloxItem +class TDE_EXPORT SloxItem { public: enum Status { Invalid, Delete, Create, New }; @@ -49,7 +49,7 @@ class KDE_EXPORT SloxItem TQString responseDescription; }; -class KDE_EXPORT WebdavHandler +class TDE_EXPORT WebdavHandler { public: WebdavHandler(); diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.h b/tderesources/tvanytime/kcal_resourcetvanytime.h index cea9004b8..093a175c9 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytime.h +++ b/tderesources/tvanytime/kcal_resourcetvanytime.h @@ -48,7 +48,7 @@ class TVAnytimePrefsBase; /** This class provides a resource for accessing a BBC TV and radio schedule as a calendar. */ -class KDE_EXPORT ResourceTVAnytime : public ResourceCached +class TDE_EXPORT ResourceTVAnytime : public ResourceCached { TQ_OBJECT diff --git a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h index 926bc7f32..3800d3244 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h +++ b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h @@ -38,7 +38,7 @@ class ResourceCachedSaveConfig; Configuration widget for TVAnytime resource. @see KCal::ResourceTVAnytime */ -class KDE_EXPORT ResourceTVAnytimeConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceTVAnytimeConfig : public KRES::ConfigWidget { TQ_OBJECT diff --git a/wizards/egroupwarewizard.h b/wizards/egroupwarewizard.h index bd25dea11..01fe34b77 100644 --- a/wizards/egroupwarewizard.h +++ b/wizards/egroupwarewizard.h @@ -27,7 +27,7 @@ class KLineEdit; class TQCheckBox; -class KDE_EXPORT EGroupwareWizard : public TDEConfigWizard +class TDE_EXPORT EGroupwareWizard : public TDEConfigWizard { public: EGroupwareWizard(); diff --git a/wizards/exchangewizard.h b/wizards/exchangewizard.h index 8f4978ed1..c13cf7855 100644 --- a/wizards/exchangewizard.h +++ b/wizards/exchangewizard.h @@ -27,7 +27,7 @@ class KLineEdit; class TQCheckBox; class TQSpinBox; -class KDE_EXPORT ExchangeWizard : public TDEConfigWizard +class TDE_EXPORT ExchangeWizard : public TDEConfigWizard { public: ExchangeWizard(); diff --git a/wizards/groupwisewizard.h b/wizards/groupwisewizard.h index f27868053..58d9e0372 100644 --- a/wizards/groupwisewizard.h +++ b/wizards/groupwisewizard.h @@ -28,7 +28,7 @@ class TQCheckBox; class TQSpinBox; class TQGroupBox; -class KDE_EXPORT GroupwiseWizard : public TDEConfigWizard +class TDE_EXPORT GroupwiseWizard : public TDEConfigWizard { TQ_OBJECT diff --git a/wizards/kolabwizard.h b/wizards/kolabwizard.h index a0f898a0b..20525dd77 100644 --- a/wizards/kolabwizard.h +++ b/wizards/kolabwizard.h @@ -29,7 +29,7 @@ class KLineEdit; class TQCheckBox; class TQRadioButton; -class KDE_EXPORT KolabWizard : public TDEConfigWizard +class TDE_EXPORT KolabWizard : public TDEConfigWizard { public: KolabWizard(); diff --git a/wizards/scalixwizard.h b/wizards/scalixwizard.h index 3b5b5ec31..90ca8fa8d 100644 --- a/wizards/scalixwizard.h +++ b/wizards/scalixwizard.h @@ -29,7 +29,7 @@ class KComboBox; class KLineEdit; class TQCheckBox; -class KDE_EXPORT ScalixWizard : public TDEConfigWizard +class TDE_EXPORT ScalixWizard : public TDEConfigWizard { public: ScalixWizard(); diff --git a/wizards/sloxwizard.h b/wizards/sloxwizard.h index ad6ec0d25..f2488294a 100644 --- a/wizards/sloxwizard.h +++ b/wizards/sloxwizard.h @@ -26,7 +26,7 @@ class KLineEdit; class TQCheckBox; -class KDE_EXPORT SloxWizard : public TDEConfigWizard +class TDE_EXPORT SloxWizard : public TDEConfigWizard { public: SloxWizard(); |