1 files changed, 21 insertions, 17 deletions
diff --git a/src/messaging/maildirFolder.hpp b/src/messaging/maildirFolder.hpp
index 37578157..65835219 100644
--- a/src/messaging/maildirFolder.hpp
+++ b/src/messaging/maildirFolder.hpp
@@ -40,7 +40,7 @@ class maildirStore;
 
 class maildirFolder : public folder
 {
-protected:
+private:
 
 	friend class maildirStore;
 	friend class maildirMessage;
@@ -53,14 +53,14 @@ protected:
 
 public:
 
-	const int mode() const;
+	const int getMode() const;
 
-	const int type();
+	const int getType();
 
-	const int flags();
+	const int getFlags();
 
-	const folder::path::component name() const;
-	const folder::path fullPath() const;
+	const folder::path::component getName() const;
+	const folder::path getFullPath() const;
 
 	void open(const int mode, bool failIfModeIsNotAvailable = false);
 	void close(const bool expunge);
@@ -100,8 +100,8 @@ public:
 
 	folder* getParent();
 
-	const class store& store() const;
-	class store& store();
+	const store* getStore() const;
+	store* getStore();
 
 
 	void fetchMessages(std::vector <message*>& msg, const int options, progressionListener* progress = NULL);
@@ -111,6 +111,18 @@ public:
 
 private:
 
+	void scanFolder();
+
+	void listFolders(std::vector <folder*>& list, const bool recursive);
+
+	void registerMessage(maildirMessage* msg);
+	void unregisterMessage(maildirMessage* msg);
+
+	void onStoreDisconnected();
+
+	void onClose();
+
+
 	maildirStore* m_store;
 
 	folder::path m_path;
@@ -125,15 +137,7 @@ private:
 	std::vector <folder::path::component> m_unreadMessageFilenames;
 	std::vector <folder::path::component> m_messageFilenames;
 
-	void scanFolder();
-
-	void listFolders(std::vector <folder*>& list, const bool recursive);
-
-
-
-	void onStoreDisconnected();
-
-	void onClose();
+	std::vector <maildirMessage*> m_messages;
 };