headers show public API first. cleanup.

7 files changed, 63 insertions, 24 deletions

diff --git a/src/async/pop/MCPOPAsyncSession.h b/src/async/pop/MCPOPAsyncSession.h
index 606a277d..4732eefd 100644
--- a/src/async/pop/MCPOPAsyncSession.h
+++ b/src/async/pop/MCPOPAsyncSession.h
@@ -11,6 +11,8 @@
 
 #include <mailcore/MCBaseTypes.h>
 
+#ifdef __cplusplus
+
 namespace mailcore {
     
     class POPOperation;
@@ -21,10 +23,6 @@ namespace mailcore {
     class POPFetchMessagesOperation;
 	
 	class POPAsyncSession : public Object {
-	private:
-        POPSession * mSession;
-        OperationQueue * mQueue;
-		
 	public:
 		POPAsyncSession();
 		virtual ~POPAsyncSession();
@@ -62,10 +60,17 @@ namespace mailcore {
         // Will disconnect.
         virtual POPOperation * deleteMessages(Array * indexes);
         
-        // private
+	private:
+        POPSession * mSession;
+        OperationQueue * mQueue;
+		
+    public: // private
         virtual void runOperation(POPOperation * operation);
         virtual POPSession * session();
+        
     };
 }
 
+#endif
+
 #endif /* defined(__mailcore2__MCPopAsyncSession__) */
diff --git a/src/async/pop/MCPOPDeleteMessagesOperation.h b/src/async/pop/MCPOPDeleteMessagesOperation.h
index 1eca422a..e5166e21 100644
--- a/src/async/pop/MCPOPDeleteMessagesOperation.h
+++ b/src/async/pop/MCPOPDeleteMessagesOperation.h
@@ -11,12 +11,11 @@
 
 #include <mailcore/MCPOPOperation.h>
 
+#ifdef __cplusplus
+
 namespace mailcore {
     
     class POPDeleteMessagesOperation : public POPOperation {
-    private:
-        Array * mMessageIndexes;
-        
     public:
         POPDeleteMessagesOperation();
         virtual ~POPDeleteMessagesOperation();
@@ -24,10 +23,16 @@ namespace mailcore {
         virtual void setMessageIndexes(Array * indexes);
         virtual Array * messageIndexes();
         
+    public: // subclass behavior
         virtual void main();
+        
+    private:
+        Array * mMessageIndexes;
+        
     };
     
 }
 
+#endif
 
 #endif /* defined(__mailcore2__MCPOPDeleteMessagesOperation__) */
diff --git a/src/async/pop/MCPOPFetchHeaderOperation.h b/src/async/pop/MCPOPFetchHeaderOperation.h
index 2b48062d..1ad4a40b 100644
--- a/src/async/pop/MCPOPFetchHeaderOperation.h
+++ b/src/async/pop/MCPOPFetchHeaderOperation.h
@@ -11,15 +11,13 @@
 
 #include <mailcore/MCPOPOperation.h>
 
+#ifdef __cplusplus
+
 namespace mailcore {
     
     class MessageHeader;
     
     class POPFetchHeaderOperation : public POPOperation {
-    private:
-        unsigned int mMessageIndex;
-        MessageHeader * mHeader;
-        
     public:
         POPFetchHeaderOperation();
         virtual ~POPFetchHeaderOperation();
@@ -29,8 +27,16 @@ namespace mailcore {
         
         virtual MessageHeader * header();
         
+    public: // subclass behavior
         virtual void main();
+        
+    private:
+        unsigned int mMessageIndex;
+        MessageHeader * mHeader;
+        
     };
 }
 
+#endif
+
 #endif /* defined(__mailcore2__MCPOPFetchHeaderOperation__) */
diff --git a/src/async/pop/MCPOPFetchMessageOperation.h b/src/async/pop/MCPOPFetchMessageOperation.h
index d60841d7..7b61db8a 100644
--- a/src/async/pop/MCPOPFetchMessageOperation.h
+++ b/src/async/pop/MCPOPFetchMessageOperation.h
@@ -11,12 +11,10 @@
 
 #include <mailcore/MCPOPOperation.h>
 
+#ifdef __cplusplus
+
 namespace mailcore {
     class POPFetchMessageOperation : public POPOperation {
-    private:
-        unsigned int mMessageIndex;
-        Data * mData;
-        
     public:
         POPFetchMessageOperation();
         virtual ~POPFetchMessageOperation();
@@ -26,8 +24,16 @@ namespace mailcore {
         
         virtual Data * data();
         
+    public: // subclass behavior
         virtual void main();
+        
+    private:
+        unsigned int mMessageIndex;
+        Data * mData;
+        
     };
 }
 
+#endif
+
 #endif /* defined(__mailcore2__MCPOPFetchMessageOperation__) */
diff --git a/src/async/pop/MCPOPFetchMessagesOperation.h b/src/async/pop/MCPOPFetchMessagesOperation.h
index b8c3d703..f21afa94 100644
--- a/src/async/pop/MCPOPFetchMessagesOperation.h
+++ b/src/async/pop/MCPOPFetchMessagesOperation.h
@@ -11,17 +11,24 @@
 
 #include <mailcore/MCPOPOperation.h>
 
+#ifdef __cplusplus
+
 namespace mailcore {
     class POPFetchMessagesOperation : public POPOperation {
-        Array * mMessages;
     public:
         POPFetchMessagesOperation();
         virtual ~POPFetchMessagesOperation();
         
         virtual Array * messages();
         
+    public: // subclass behavior
         virtual void main();
+        
+    private:
+        Array * mMessages;
     };
 }
 
+#endif
+
 #endif /* defined(__mailcore2__MCPOPFetchMessagesOperation__) */
diff --git a/src/async/pop/MCPOPOperation.h b/src/async/pop/MCPOPOperation.h
index 9fcc6af6..e621caa0 100644
--- a/src/async/pop/MCPOPOperation.h
+++ b/src/async/pop/MCPOPOperation.h
@@ -12,19 +12,14 @@
 #include <mailcore/MCBaseTypes.h>
 #include <mailcore/MCPOPProgressCallback.h>
 
+#ifdef __cplusplus
+
 namespace mailcore {
     
     class POPAsyncSession;
     class POPOperationCallback;
     
     class POPOperation : public Operation, public POPProgressCallback {
-        POPAsyncSession * mSession;
-        POPOperationCallback * mPopCallback;
-        ErrorCode mError;
-    private:
-		virtual void bodyProgress(POPSession * session, unsigned int current, unsigned int maximum);
-        virtual void bodyProgressOnMainThread(void * context);
-        
     public:
         POPOperation();
         virtual ~POPOperation();
@@ -39,8 +34,19 @@ namespace mailcore {
         virtual ErrorCode error();
         
         virtual void start();
+        
+    private:
+        POPAsyncSession * mSession;
+        POPOperationCallback * mPopCallback;
+        ErrorCode mError;
+    private:
+		virtual void bodyProgress(POPSession * session, unsigned int current, unsigned int maximum);
+        virtual void bodyProgressOnMainThread(void * context);
+        
     };
     
 }
 
+#endif
+
 #endif /* defined(__mailcore2__MCPOPOperation__) */
diff --git a/src/async/pop/MCPOPOperationCallback.h b/src/async/pop/MCPOPOperationCallback.h
index a71bd008..48491215 100644
--- a/src/async/pop/MCPOPOperationCallback.h
+++ b/src/async/pop/MCPOPOperationCallback.h
@@ -9,6 +9,8 @@
 #ifndef mailcore2_MCPOPOperationCallback_h
 #define mailcore2_MCPOPOperationCallback_h
 
+#ifdef __cplusplus
+
 namespace mailcore {
     
     class POPOperation;
@@ -21,3 +23,5 @@ namespace mailcore {
 }
 
 #endif
+
+#endif