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 --- kmail/kmailicalifaceimpl.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'kmail/kmailicalifaceimpl.h') diff --git a/kmail/kmailicalifaceimpl.h b/kmail/kmailicalifaceimpl.h index ae2d1d6e..3cec23c6 100644 --- a/kmail/kmailicalifaceimpl.h +++ b/kmail/kmailicalifaceimpl.h @@ -21,17 +21,17 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -/** @file This file tqcontains the class KMailICalIfaceImpl which actually +/** @file This file contains the class KMailICalIfaceImpl which actually * implements the ICal (DCOP) interface for KMail. */ @@ -83,6 +83,7 @@ public: /** The implementation of the interface. */ class KMailICalIfaceImpl : public TQObject, virtual public KMailICalIface { Q_OBJECT + TQ_OBJECT public: KMailICalIfaceImpl(); @@ -135,7 +136,7 @@ public: bool removeSubresource( const TQString& ); bool addSubresource( const TQString& resource, - const TQString& parent, + const TQString& tqparent, const TQString& contentsType ); // tell KOrganizer about messages to be deleted @@ -178,7 +179,7 @@ public: /** * Returns the name of the standard icon for a folder of given type or - * TQString::null if the type is no groupware type. + * TQString() if the type is no groupware type. */ TQString folderPixmap( KFolderTreeItem::Type type ) const; @@ -315,7 +316,7 @@ private: // The reason for storing it here is that it can be shared between // kmfoldercachedimap and kmfolderimap, and that it's groupware data anyway. struct FolderInfo { - FolderInfo() {} // for QMap + FolderInfo() {} // for TQMap FolderInfo( StorageFormat f, FolderChanges c ) : mStorageFormat( f ), mChanges( c ) {} StorageFormat mStorageFormat; -- cgit v1.2.3