diff options
Diffstat (limited to 'kmail/importjob.h')
| -rw-r--r-- | kmail/importjob.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/kmail/importjob.h b/kmail/importjob.h index 170441415..ddb009113 100644 --- a/kmail/importjob.h +++ b/kmail/importjob.h @@ -52,6 +52,7 @@ namespace KMail class ImportJob : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -71,13 +72,13 @@ class ImportJob : public TQObject struct Folder { - KMFolder *parent; + KMFolder *tqparent; const KArchiveDirectory *archiveDir; }; struct Messages { - KMFolder *parent; + KMFolder *tqparent; TQPtrList<KArchiveFile> files; }; @@ -85,8 +86,8 @@ class ImportJob : public TQObject void abort( const TQString &errorMessage ); void queueFolders(); void importNextDirectory(); - KMFolder* createSubFolder( KMFolder *parent, const TQString &folderName, mode_t permissions ); - KMFolder* getOrCreateSubFolder( KMFolder *parentFolder, const TQString &subFolderName, + KMFolder* createSubFolder( KMFolder *tqparent, const TQString &folderName, mode_t permissions ); + KMFolder* getOrCreateSubFolder( KMFolder *tqparentFolder, const TQString &subFolderName, mode_t subFolderPermissions ); void enqueueMessages( const KArchiveDirectory *dir, KMFolder *folder ); void messageAdded(); @@ -101,11 +102,11 @@ class ImportJob : public TQObject KURL mArchiveFile; int mNumberOfImportedMessages; - // List of archive folders with their corresponding KMail parent folder that are awaiting + // List of archive folders with their corresponding KMail tqparent folder that are awaiting // processing TQValueList<Folder> mQueuedDirectories; - // List of list of messages and their parent folders which are awaiting processing + // List of list of messages and their tqparent folders which are awaiting processing TQValueList<Messages> mQueuedMessages; // The folder to which we are currently importing messages |