summaryrefslogtreecommitdiffstats
path: root/kmail
diff options
context:
space:
mode:
Diffstat (limited to 'kmail')
-rw-r--r--kmail/aboutdata.h2
-rw-r--r--kmail/accountmanager.h2
-rw-r--r--kmail/app_octetstream.cpp2
-rw-r--r--kmail/callback.h2
-rw-r--r--kmail/configuredialog_p.h12
-rw-r--r--kmail/kcm_kmail.cpp12
-rw-r--r--kmail/keyresolver.cpp10
-rw-r--r--kmail/kmail_part.h2
-rw-r--r--kmail/kmcommands.h106
-rw-r--r--kmail/kmfoldertree.h2
-rw-r--r--kmail/kmkernel.h2
-rw-r--r--kmail/kmmainwidget.h2
-rw-r--r--kmail/kmmimeparttree.cpp3
-rw-r--r--kmail/kmreaderwin.cpp2
-rw-r--r--kmail/kmstartup.h14
15 files changed, 88 insertions, 87 deletions
diff --git a/kmail/aboutdata.h b/kmail/aboutdata.h
index 2ae6283a..5a65505e 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 ddc82e47..f1160149 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 b45140ac..66a4e266 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 2722d0ff..bd2b5659 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 f8eecdeb..e4083b85 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 07dc1d72..19262ae5 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/keyresolver.cpp b/kmail/keyresolver.cpp
index 68187d2a..c0b0cf69 100644
--- a/kmail/keyresolver.cpp
+++ b/kmail/keyresolver.cpp
@@ -335,7 +335,7 @@ static std::vector<GpgME::Key> trustedOrConfirmed( const std::vector<GpgME::Key>
}
namespace {
- struct IsNotForFormat : public std::unary_function<GpgME::Key,bool> {
+ struct IsNotForFormat : public std::function<bool(GpgME::Key)> {
IsNotForFormat( Kleo::CryptoMessageFormat f ) : format( f ) {}
bool operator()( const GpgME::Key & key ) const {
@@ -347,7 +347,7 @@ namespace {
const Kleo::CryptoMessageFormat format;
};
- struct IsForFormat : std::unary_function<GpgME::Key,bool> {
+ struct IsForFormat : std::function<bool(GpgME::Key)> {
explicit IsForFormat( Kleo::CryptoMessageFormat f )
: protocol( isOpenPGP( f ) ? GpgME::Context::OpenPGP :
isSMIME( f ) ? GpgME::Context::CMS :
@@ -364,7 +364,7 @@ namespace {
-class Kleo::KeyResolver::SigningPreferenceCounter : public std::unary_function<Kleo::KeyResolver::Item,void> {
+class Kleo::KeyResolver::SigningPreferenceCounter : public std::function<void(Kleo::KeyResolver::Item)> {
public:
SigningPreferenceCounter()
: mTotal( 0 ),
@@ -409,7 +409,7 @@ void Kleo::KeyResolver::SigningPreferenceCounter::operator()( const Kleo::KeyRes
-class Kleo::KeyResolver::EncryptionPreferenceCounter : public std::unary_function<Item,void> {
+class Kleo::KeyResolver::EncryptionPreferenceCounter : public std::function<void(Item)> {
const Kleo::KeyResolver * _this;
public:
EncryptionPreferenceCounter( const Kleo::KeyResolver * kr, EncryptionPreference defaultPreference )
@@ -476,7 +476,7 @@ void Kleo::KeyResolver::EncryptionPreferenceCounter::operator()( Item & item ) {
namespace {
- class FormatPreferenceCounterBase : public std::unary_function<Kleo::KeyResolver::Item,void> {
+ class FormatPreferenceCounterBase : public std::function<void(Kleo::KeyResolver::Item)> {
public:
FormatPreferenceCounterBase()
: mTotal( 0 ),
diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h
index 079cb617..7563e34f 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 bf74c909..08cee0b8 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 8184c061..3d62d6de 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 20d3633b..d1c2ce0f 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 06020b7b..dc620fc1 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/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp
index 91d8592f..56910cb2 100644
--- a/kmail/kmmimeparttree.cpp
+++ b/kmail/kmmimeparttree.cpp
@@ -131,7 +131,8 @@ void KMMimePartTree::itemRightClicked( TQListViewItem* item,
else {
TQPopupMenu* popup = new TQPopupMenu;
if ( mCurrentContextMenuItem->node()->nodeId() > 2 &&
- mCurrentContextMenuItem->node()->typeString() != "Multipart" ) {
+ mCurrentContextMenuItem->node()->typeString() != "Multipart" ||
+ mCurrentContextMenuItem->node()->subTypeString() == "HTML" ) {
popup->insertItem( SmallIcon("document-open"), i18n("to open", "Open"), this, TQ_SLOT(slotOpen()) );
popup->insertItem( i18n("Open With..."), this, TQ_SLOT(slotOpenWith()) );
popup->insertItem( i18n("to view something", "View"), this, TQ_SLOT(slotView()) );
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index d0d78b72..8ada99f4 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -2690,7 +2690,7 @@ KURL KMReaderWin::tempFileUrlFromPartNode( const partNode * node )
bool ok;
int res = path.mid(left + 1, right - left - 1).toInt(&ok);
if ( res == node->nodeId() )
- return KURL( path );
+ return KURL::fromPathOrURL( path );
}
return KURL();
}
diff --git a/kmail/kmstartup.h b/kmail/kmstartup.h
index 11c840e6..790e161d 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 03:45:07 +0000