Unify Project Style

4 files changed, 77 insertions, 75 deletions

diff --git a/src/core/provider/MCMailProvider.h b/src/core/provider/MCMailProvider.h
index 81b816e9..c4eeec43 100644
--- a/src/core/provider/MCMailProvider.h
+++ b/src/core/provider/MCMailProvider.h
@@ -14,56 +14,57 @@
 #ifdef __cplusplus
 
 namespace mailcore {
+    
     class NetService;
-	
+    
     class MailProvider : public Object {
-        
     public:
         static MailProvider * providerWithInfo(HashMap * info);
         
-		MailProvider();
-		virtual ~MailProvider();
-		
-		virtual String * identifier();
-		
-		virtual Array * /* NetService */ imapServices();
-		virtual Array * /* NetService */ smtpServices();
-		virtual Array * /* NetService */ popServices();
-		
-		virtual bool matchEmail(String * email);
-		virtual bool matchMX(String * hostname);
-		
-		virtual String * sentMailFolderPath();
-		virtual String * starredFolderPath();
-		virtual String * allMailFolderPath();
-		virtual String * trashFolderPath();
-		virtual String * draftsFolderPath();
-		virtual String * spamFolderPath();
-		virtual String * importantFolderPath();
-		
+        MailProvider();
+        virtual ~MailProvider();
+        
+        virtual String * identifier();
+        
+        virtual Array * /* NetService */ imapServices();
+        virtual Array * /* NetService */ smtpServices();
+        virtual Array * /* NetService */ popServices();
+        
+        virtual bool matchEmail(String * email);
+        virtual bool matchMX(String * hostname);
+        
+        virtual String * sentMailFolderPath();
+        virtual String * starredFolderPath();
+        virtual String * allMailFolderPath();
+        virtual String * trashFolderPath();
+        virtual String * draftsFolderPath();
+        virtual String * spamFolderPath();
+        virtual String * importantFolderPath();
+        
         // Returns true if one of the folders above matches the given one.
-		virtual bool isMainFolder(String * folderPath, String * prefix);
-		
+        virtual bool isMainFolder(String * folderPath, String * prefix);
+        
     public: // subclass behavior
-		MailProvider(MailProvider * other);
-		virtual String * description();
-		virtual Object * copy();
-
+        MailProvider(MailProvider * other);
+        virtual String * description();
+        virtual Object * copy();
+        
     public: // private
-		virtual void setIdentifier(String * identifier);
-		virtual void fillWithInfo(HashMap * info);
+        virtual void setIdentifier(String * identifier);
+        virtual void fillWithInfo(HashMap * info);
+        
+    private:
+        String * mIdentifier;
+        Array * /* String */ mDomainMatch;
+        Array * /* NetService */ mImapServices;
+        Array * /* NetService */ mSmtpServices;
+        Array * /* NetService */ mPopServices;
+        HashMap * mMailboxPaths;
+        Set * mMxSet;
         
-	private:
-		String * mIdentifier;
-		Array * /* String */ mDomainMatch;
-		Array * /* NetService */ mImapServices;
-		Array * /* NetService */ mSmtpServices;
-		Array * /* NetService */ mPopServices;
-		HashMap * mMailboxPaths;
-		Set * mMxSet;
-		
-		void init();
+        void init();
     };
+    
 };
 
 #endif
diff --git a/src/core/provider/MCMailProvidersManager.cc b/src/core/provider/MCMailProvidersManager.cc
index 5214b284..0d7938e4 100644
--- a/src/core/provider/MCMailProvidersManager.cc
+++ b/src/core/provider/MCMailProvidersManager.cc
@@ -14,11 +14,11 @@ using namespace mailcore;
 
 void MailProvidersManager::init()
 {
-	mProviders = new HashMap();
+    mProviders = new HashMap();
 }
 
 MailProvidersManager::MailProvidersManager() {
-	init();
+    init();
 }
 
 MailProvidersManager * MailProvidersManager::sharedManager()
@@ -30,42 +30,41 @@ MailProvidersManager * MailProvidersManager::sharedManager()
 
 MailProvider * MailProvidersManager::providerForEmail(String * email)
 {
-	mc_foreachhashmapValue(MailProvider, provider, mProviders) {
+    mc_foreachhashmapValue(MailProvider, provider, mProviders) {
         if (provider->matchEmail(email))
             return provider;
-	}
-	
-	return NULL;
+    }
+    
+    return NULL;
 }
 
 MailProvider * MailProvidersManager::providerForMX(String * hostname)
 {
-	mc_foreachhashmapValue(MailProvider, provider, mProviders) {
+    mc_foreachhashmapValue(MailProvider, provider, mProviders) {
         if (provider->matchMX(hostname))
             return provider;
-	}
-	
-	return NULL;
+    }
+    
+    return NULL;
 }
 
 MailProvider * MailProvidersManager::providerForIdentifier(String * identifier)
 {
-	return (MailProvider *) mProviders->objectForKey(identifier);
+    return (MailProvider *) mProviders->objectForKey(identifier);
 }
 
 void MailProvidersManager::registerProviders(HashMap * providers)
 {
-	mc_foreachhashmapKeyAndValue(String, identifier, HashMap, providerInfo, providers) {
+    mc_foreachhashmapKeyAndValue(String, identifier, HashMap, providerInfo, providers) {
         MailProvider * provider = MailProvider::providerWithInfo(providerInfo);
         provider->setIdentifier(identifier);
-        //MCLog("register %s", MCUTF8DESC(identifier));
         mProviders->setObjectForKey(identifier, provider);
-	}
+    }
 }
 
 void MailProvidersManager::registerProvidersWithFilename(String * filename)
 {
-	HashMap * providersInfos;
+    HashMap * providersInfos;
     
     providersInfos = (HashMap *) JSON::objectFromJSONData(Data::dataWithContentsOfFile(filename));
     registerProviders(providersInfos);
diff --git a/src/core/provider/MCMailProvidersManager.h b/src/core/provider/MCMailProvidersManager.h
index 23127148..98f00cdd 100644
--- a/src/core/provider/MCMailProvidersManager.h
+++ b/src/core/provider/MCMailProvidersManager.h
@@ -14,27 +14,27 @@
 #ifdef __cplusplus
 
 namespace mailcore {
-	class MailProvider;
-	
-	class MailProvidersManager : public Object {
+    
+    class MailProvider;
+    
+    class MailProvidersManager : public Object {
+    public:
+        static MailProvidersManager * sharedManager();
         
-	public:
-		static MailProvidersManager * sharedManager();
-		
-		virtual MailProvider * providerForEmail(String * email);
-		virtual MailProvider * providerForMX(String * hostname);
-		virtual MailProvider * providerForIdentifier(String * identifier);
-		
-		virtual void registerProvidersWithFilename(String * filename);
-		
-	private:
-		MailProvidersManager();
-		void registerProviders(HashMap * providers);
-		
-		HashMap * mProviders;
-		
-		void init();
-	};
+        virtual MailProvider * providerForEmail(String * email);
+        virtual MailProvider * providerForMX(String * hostname);
+        virtual MailProvider * providerForIdentifier(String * identifier);
+        
+        virtual void registerProvidersWithFilename(String * filename);
+        
+    private:
+        MailProvidersManager();
+        void registerProviders(HashMap * providers);
+        
+        HashMap * mProviders;
+        
+        void init();
+    };
 }
 
 #endif
diff --git a/src/core/provider/MCNetService.h b/src/core/provider/MCNetService.h
index d3aa5dd7..7fb4e5a7 100644
--- a/src/core/provider/MCNetService.h
+++ b/src/core/provider/MCNetService.h
@@ -15,6 +15,7 @@
 #ifdef __cplusplus
 
 namespace mailcore {
+    
     class NetService : public Object {
     
     public:
@@ -49,6 +50,7 @@ namespace mailcore {
         void init();
         void fillWithInfo(HashMap * info);
     };
+    
 }
 
 #endif