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/kmfolderdir.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'kmail/kmfolderdir.h') diff --git a/kmail/kmfolderdir.h b/kmail/kmfolderdir.h index c93317e5..3df289bc 100644 --- a/kmail/kmfolderdir.h +++ b/kmail/kmfolderdir.h @@ -15,10 +15,11 @@ class KMFolderMgr; class KMFolderDir: public KMFolderNode, public KMFolderNodeList { Q_OBJECT + TQ_OBJECT public: - KMFolderDir( KMFolder * owner, KMFolderDir * parent = 0, - const TQString& path = TQString::null, + KMFolderDir( KMFolder * owner, KMFolderDir * tqparent = 0, + const TQString& path = TQString(), KMFolderDirType = KMStandardDir ); virtual ~KMFolderDir(); @@ -27,7 +28,7 @@ public: /** * Adds the given subdirectory of this directory to the associated folder. */ - void addDirToParent( const TQString &dirName, KMFolder *parentFolder ); + void addDirToParent( const TQString &dirName, KMFolder *tqparentFolder ); /** Read contents of directory. */ virtual bool reload(); @@ -54,7 +55,7 @@ public: /** Returns the folder manager that manages this folder */ virtual KMFolderMgr* manager() const; - /** Returns the folder whose children we are holding */ + /** Returns the folder whose tqchildren we are holding */ KMFolder* owner() const { return mOwner; } virtual KMFolderDirType type() const { return mDirType; } @@ -70,10 +71,11 @@ protected: class KMFolderRootDir: public KMFolderDir { Q_OBJECT + TQ_OBJECT public: KMFolderRootDir( KMFolderMgr* manager, - const TQString& path=TQString::null, + const TQString& path=TQString(), KMFolderDirType dirType = KMStandardDir ); virtual ~KMFolderRootDir(); virtual TQString path() const; -- cgit v1.2.3