From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ktnef/ktnef/ktnefdefs.h | 2 +- ktnef/ktnef/ktnefparser.h | 2 +- ktnef/ktnef/ktnefpropertyset.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ktnef/ktnef') diff --git a/ktnef/ktnef/ktnefdefs.h b/ktnef/ktnef/ktnefdefs.h index d2e57aa5..06ec3bdb 100644 --- a/ktnef/ktnef/ktnefdefs.h +++ b/ktnef/ktnef/ktnefdefs.h @@ -85,7 +85,7 @@ #define MAPI_TAG_DATA 0x3701 #define MAPI_TAG_ATTACHENCODING 0x3702 #define MAPI_TAG_EXTENSION 0x3703 -#define MAPI_TAG_ATTACHQT_METHOD 0x3705 +#define MAPI_TAG_ATTACHTQT_METHOD 0x3705 #define MAPI_TAG_RENDERINGPOS 0x370b #define MAPI_TAG_MIMETAG 0x370e #define MAPI_TAG_ATTACHFLAGS 0x3714 diff --git a/ktnef/ktnef/ktnefparser.h b/ktnef/ktnef/ktnefparser.h index ff48ab08..06754df5 100644 --- a/ktnef/ktnef/ktnefparser.h +++ b/ktnef/ktnef/ktnefparser.h @@ -34,7 +34,7 @@ public: ~KTNEFParser(); bool openFile(const TQString& filename); - bool openDevice( TQIODevice *device ); + bool openDevice( TQIODevice *tqdevice ); bool extractFile(const TQString& filename); bool extractFileTo(const TQString& filename, const TQString& dirname); bool extractAll(); diff --git a/ktnef/ktnef/ktnefpropertyset.h b/ktnef/ktnef/ktnefpropertyset.h index 841cf950..6a5ec75a 100644 --- a/ktnef/ktnef/ktnefpropertyset.h +++ b/ktnef/ktnef/ktnefpropertyset.h @@ -32,8 +32,8 @@ public: /* MAPI properties interface */ void addProperty( int key, int type, const TQVariant& value, const TQVariant& name = TQVariant(), bool overwrite = false ); - TQString findProp( int key, const TQString& fallback=TQString::null, bool convertToUpper=false); - TQString findNamedProp(const TQString& name, const TQString& fallback=TQString::null, bool convertToUpper=false); + TQString findProp( int key, const TQString& fallback=TQString(), bool convertToUpper=false); + TQString findNamedProp(const TQString& name, const TQString& fallback=TQString(), bool convertToUpper=false); TQMap& properties(); const TQMap& properties() const; TQVariant property( int key ) const; -- cgit v1.2.3