Changeset 96 for Mulberry/branches/v4.1d1/Sources_Common/Mail/Protocols/CAdbkProtocol.cp

Timestamp:

07/09/07 21:40:14 (1 year ago)

Author:

daboo

Message:

Whitespace fixes.

Files:

• Mulberry/branches/v4.1d1/Sources_Common/Mail/Protocols/CAdbkProtocol.cp (modified) (17 diffs)

Mulberry/branches/v4.1d1/Sources_Common/Mail/Protocols/CAdbkProtocol.cp

@@ -447 +447 @@
                 return;
 
-                try
-                {
+        try
+        {
                 // Logoff if required
                 if (IsLoggedOn())
@@ -463 +463 @@
                 // Clean any free connections in cache
                 CleanConnections();
-                }
-                catch (...)
-                {
-                        CLOG_LOGCATCH(...);
+        }
+        catch (...)
+        {
+                CLOG_LOGCATCH(...);
 
                 // Clean up and throw up
@@ -475 +475 @@
                 CleanConnections();
 
-                        CLOG_LOGRETHROW;
-                        throw;
-                }
-        }
+                CLOG_LOGRETHROW;
+                throw;
+        }
+}
 
 // Logon to server
@@ -505 +505 @@
                         if (!auth->GetPswd().empty())
                                 SetCachedPswd(auth->GetUID(), auth->GetPswd());
-}
+                }
 
                 // Make copy of current authenticator
@@ -703 +703 @@
         {
                 DumpAddressBooks();
-}
+        }
 
         SyncSubList(adbk);
@@ -723 +723 @@
         if (adbk->IsAdbk())
         {
-                        // Get adbk URL
-                        cdstring adbk_url = adbk->GetURL();
-
-                        // Match in open at start list
-                        cdstrvect::const_iterator found = ::find(CPreferences::sPrefs->mAdbkOpenAtStartup.GetValue().begin(),
-                                                                                                         CPreferences::sPrefs->mAdbkOpenAtStartup.GetValue().end(),
-                                                                                                         adbk_url);
-
-                        if (found != CPreferences::sPrefs->mAdbkOpenAtStartup.GetValue().end())
-                        {
-                                adbk->SetFlags(CAddressBook::eOpenOnStart, true);
-
-                                // Open it if its not already open
-                                if (!adbk->IsOpen())
-                                        CActionManager::OpenAddressBook(adbk, true);
-                        }
-
-                        // Match in nick name list
-                        found = ::find(CPreferences::sPrefs->mAdbkNickName.GetValue().begin(),
-                                                        CPreferences::sPrefs->mAdbkNickName.GetValue().end(), adbk_url);
-
-                        if (found != CPreferences::sPrefs->mAdbkNickName.GetValue().end())
-                                adbk->SetFlags(CAddressBook::eLookup, true);
-
-                        // Match in search list
-                        found = ::find(CPreferences::sPrefs->mAdbkSearch.GetValue().begin(),
-                                                        CPreferences::sPrefs->mAdbkSearch.GetValue().end(),  adbk_url);
-
-                        if (found != CPreferences::sPrefs->mAdbkSearch.GetValue().end())
-                                adbk->SetFlags(CAddressBook::eSearch, true);
-
-                        // Match in auto sync list
-                        found = ::find(CPreferences::sPrefs->mAdbkAutoSync.GetValue().begin(),
-                                                        CPreferences::sPrefs->mAdbkAutoSync.GetValue().end(),  adbk_url);
-
-                        if (found != CPreferences::sPrefs->mAdbkAutoSync.GetValue().end())
-                                adbk->SetFlags(CAddressBook::eAutoSync, true);
-
-                        // Force update of manager
-                        CAddressBookManager::sAddressBookManager->SyncAddressBook(adbk, true);
+                // Get adbk URL
+                cdstring adbk_url = adbk->GetURL();
+
+                // Match in open at start list
+                cdstrvect::const_iterator found = ::find(CPreferences::sPrefs->mAdbkOpenAtStartup.GetValue().begin(),
+                                                                                                 CPreferences::sPrefs->mAdbkOpenAtStartup.GetValue().end(),
+                                                                                                 adbk_url);
+
+                if (found != CPreferences::sPrefs->mAdbkOpenAtStartup.GetValue().end())
+                {
+                        adbk->SetFlags(CAddressBook::eOpenOnStart, true);
+
+                        // Open it if its not already open
+                        if (!adbk->IsOpen())
+                                CActionManager::OpenAddressBook(adbk, true);
+                }
+
+                // Match in nick name list
+                found = ::find(CPreferences::sPrefs->mAdbkNickName.GetValue().begin(),
+                                                CPreferences::sPrefs->mAdbkNickName.GetValue().end(), adbk_url);
+
+                if (found != CPreferences::sPrefs->mAdbkNickName.GetValue().end())
+                        adbk->SetFlags(CAddressBook::eLookup, true);
+
+                // Match in search list
+                found = ::find(CPreferences::sPrefs->mAdbkSearch.GetValue().begin(),
+                                                CPreferences::sPrefs->mAdbkSearch.GetValue().end(),  adbk_url);
+
+                if (found != CPreferences::sPrefs->mAdbkSearch.GetValue().end())
+                        adbk->SetFlags(CAddressBook::eSearch, true);
+
+                // Match in auto sync list
+                found = ::find(CPreferences::sPrefs->mAdbkAutoSync.GetValue().begin(),
+                                                CPreferences::sPrefs->mAdbkAutoSync.GetValue().end(),  adbk_url);
+
+                if (found != CPreferences::sPrefs->mAdbkAutoSync.GetValue().end())
+                        adbk->SetFlags(CAddressBook::eAutoSync, true);
+
+                // Force update of manager
+                CAddressBookManager::sAddressBookManager->SyncAddressBook(adbk, true);
         }
 
@@ -795 +795 @@
         {
                 DumpAddressBooks();
-                        }
-                }
+        }
+}
 
 CAddressBook* CAdbkProtocol::GetNode(const cdstring& adbk, bool parent) const
@@ -820 +820 @@
         
         return names.empty() ? const_cast<CAddressBook*>(&mStoreRoot) : mStoreRoot.FindNode(names);
-        }
+}
 
 CAddressBook* CAdbkProtocol::GetParentNode(const cdstring& adbk) const
@@ -844 +844 @@
         // Don't do on server if cache is primary
         if (!mCacheIsPrimary)
-        mClient->_CreateAdbk(adbk);
+                mClient->_CreateAdbk(adbk);
 
         // Always keep disconnected cache in sync with server
@@ -863 +863 @@
         // Don't do on server if cache is primary
         if (!mCacheIsPrimary)
-        mClient->_TouchAdbk(adbk);
+                mClient->_TouchAdbk(adbk);
 
         // Always keep disconnected cache in sync with server
@@ -890 +890 @@
         // Don't do on server if cache is primary
         if (!mCacheIsPrimary)
-        mClient->_DeleteAdbk(adbk);
+                mClient->_DeleteAdbk(adbk);
 
         // Always keep disconnected cache in sync with server
@@ -915 +915 @@
         // Don't do on server if cache is primary
         if (!mCacheIsPrimary)
-        mClient->_RenameAdbk(adbk, adbk_new);
+                mClient->_RenameAdbk(adbk, adbk_new);
 
         // Always keep disconnected cache in sync with server
@@ -1135 +1135 @@
                 adbk->GetVCardAdbk()->ClearRecording();
                 adbk->GetVCardAdbk()->SetDirty(false);
-}
-
+        }
+        
         // Always keep disconnected cache in sync with server
         if (adbk->IsOpen() && (mCacheClient != NULL))
@@ -1159 +1159 @@
                 adbk->GetVCardAdbk()->ClearRecording();
                 adbk->GetVCardAdbk()->SetDirty(false);
-}
-
+        }
+        
         // Always keep disconnected cache in sync with server
         if (adbk->IsOpen() && (mCacheClient != NULL))
@@ -1391 +1391 @@
         // Write to stream
         doc->Generate(fout);
-                }
+}
 
 void CAdbkProtocol::ReadAddressBooks()
@@ -1407 +1407 @@
                 xmllib::XMLNode* root = parser.Document()->GetRoot();
                 if (!root->CompareFullName(cXMLElement_adbklist))
-                return;
-
+                        return;
+                
                 // Now have store root read in all children
                 mStoreRoot.ReadXML(root, true);
@@ -1427 +1427 @@
 void CAdbkProtocol::SynchroniseRemote(CAddressBook* adbk, bool fast)
 {
-        }
+}
 
 void CAdbkProtocol::SyncRemote(CAddressBook* remote, CAddressBook* local, bool fast)
 {
-        }
+}
 
 void CAdbkProtocol::ClearDisconnect(CAddressBook* adbk)