diff options
Diffstat (limited to 'kmail/kmkernel.h')
| -rw-r--r-- | kmail/kmkernel.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h index 610ab476..ea3610bb 100644 --- a/kmail/kmkernel.h +++ b/kmail/kmkernel.h @@ -1,5 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- - #ifndef _KMCONTROL #define _KMCONTROL @@ -9,11 +7,11 @@ #include <weaver.h> #include <weaverlogger.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tdeconfig.h> #include <tdeversion.h> #include <tdeimproxy.h> -#include <tdepimmacros.h> +#include <tdemacros.h> #ifdef __TDE_HAVE_TDEHWLIB # include <tdenetworkconnections.h> @@ -90,9 +88,9 @@ 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 { - Q_OBJECT + TQ_OBJECT public: @@ -287,7 +285,7 @@ public: const KURL &messageFile, const KURL::List &attach, const QCStringList &customHeaders); void byteArrayToRemoteFile(const TQByteArray&, const KURL&, - bool overwrite = FALSE); + bool overwrite = false); bool folderIsDraftOrOutbox( const KMFolder * ); bool folderIsDrafts( const KMFolder * ); bool folderIsTemplates( const KMFolder * ); @@ -488,7 +486,7 @@ private: TQString the_previousVersion; /** is this the first start? read from config */ bool the_firstStart; - /** are we starting up? set in main.cpp directly before kapp->exec() */ + /** are we starting up? set in main.cpp directly before tdeApp->exec() */ bool the_startingUp; /** are we going down? set from here */ bool the_shuttingDown; |