Changeset 96 for Mulberry/branches

Timestamp:

07/09/07 21:40:14 (2 years ago)

Author:

daboo

Message:

Whitespace fixes.

Location:

Mulberry/branches/v4.1d1/Sources_Common

Files:

• Application/Address_Book/CAddressBookViewCommon.cp (modified) (2 diffs)
• Application/Address_Book_Manager/CAdbkManagerTableCommon.cp (modified) (13 diffs)
• Application/Preferences/CIdentity.cp (modified) (1 diff)
• Calendar_Store/Clients/CCalDAVCalendarClient.cpp (modified) (1 diff)
• Calendar_Store/Clients/CWebDAVCalendarClient.cpp (modified) (1 diff)
• HTTP/HTTPClient/CHTTPAuthorizationDigest.cpp (modified) (1 diff)
• HTTP/WebDAVClient/CWebDAVACL.cpp (modified) (1 diff)
• Mail/Address/CAdbkAddress.cp (modified) (1 diff)
• Mail/Address/CAddressList.h (modified) (1 diff)
• Mail/AddressBook/CAddressBook.cp (modified) (3 diffs)
• Mail/AddressBook/CAddressBookManager.cp (modified) (11 diffs)
• Mail/Extensions/CAdbkACL.cp (modified) (1 diff)
• Mail/INET_Clients/IMSP/CIMSPClient.cp (modified) (1 diff)
• Mail/Protocols/CAdbkProtocol.cp (modified) (17 diffs)
• Mail/Protocols/CAdbkProtocol.h (modified) (2 diffs)
• Resources/Alerts.xml (modified) (1 diff)
• Resources/ErrorDialog.xml (modified) (2 diffs)

Mulberry/branches/v4.1d1/Sources_Common/Application/Address_Book/CAddressBookViewCommon.cp

@@ -131 +131 @@
 bool CAddressBookView::TestClose()
 {
-                // Can always close remote
-                return true;
+        // Can always close remote
+        return true;
 }
 
@@ -301 +301 @@
         {
                 GetAddressBook()->Open();
-                
-        // Start listening to new address book's protocol
+                        
+                // Start listening to new address book's protocol
                 GetAddressBook()->GetProtocol()->Add_Listener(this);
         }

Mulberry/branches/v4.1d1/Sources_Common/Application/Address_Book_Manager/CAdbkManagerTableCommon.cp

@@ -215 +215 @@
                 (fullview.GetSingleClickModifiers() == mods))
                 DoFullView();
-        }
-        
+}
+
 // Handle double click
 void CAdbkManagerTable::DoDoubleClick(unsigned long row, const CKeyModifiers& mods)
@@ -236 +236 @@
 {
         PreviewAddressBook();
-        }
-        
+}
+
 void CAdbkManagerTable::DoPreview(CAddressBook* adbk)
 {
@@ -510 +510 @@
         create.use_search = true;
 
-                CAdbkProtocol* proto = NULL;
+        CAdbkProtocol* proto = NULL;
         CAddressBook* node = NULL;
         CAddressBook* result = NULL;
@@ -516 +516 @@
 
         // Determine initial creation type
-                if (IsSelectionValid())
-                {
+        if (IsSelectionValid())
+        {
                 TableIndexT row = GetFirstSelectedRow();
                 TableIndexT woRow = mCollapsableTree->GetWideOpenIndex(row);
@@ -550 +550 @@
                         create.use_wd = false;
                 }
-                        }
+        }
 
         try
@@ -578 +578 @@
                         CAddressBook* adbk = NULL;
 
-                                // Create address book
+                        // Create address book
                         adbk = mManager->NewAddressBook(proto, new_name, create.directory);
 
@@ -596 +596 @@
                         
                         result = adbk;
-                                }
-                        }
-                        catch (...)
-                        {
-                                CLOG_LOGCATCH(...);
-                }
-        }
+                }
+        }
+        catch (...)
+        {
+                CLOG_LOGCATCH(...);
+        }
+}
 
 // Open address book
 void CAdbkManagerTable::OnOpenAddressBook(void)
 {
-                // Display each selected address book
-                DoToSelection((DoToSelectionPP) &CAdbkManagerTable::OpenAddressBook);
+        // Display each selected address book
+        DoToSelection((DoToSelectionPP) &CAdbkManagerTable::OpenAddressBook);
 }
 
@@ -621 +621 @@
                 return false;
         
-                // Open it
+        // Open it
         return CAddressBookWindow::OpenWindow(adbk);
 }
@@ -698 +698 @@
                                 for(CAddressBookList::reverse_iterator riter = selected.rbegin(); riter != selected.rend(); riter++)
                                         mManager->DeleteAddressBook(*riter);
-        }
-}
+                        }
+                }
         }
         catch (...)
@@ -705 +705 @@
                 CLOG_LOGCATCH(...);
         }
-        }
+}
 
 // Search address books
@@ -1029 +1029 @@
         uint32_t woRow = adbk->GetRow();
         TableIndexT exp_row = GetExposedIndex(woRow);
-                if (exp_row)
+        if (exp_row)
                 RefreshRow(exp_row);
 }
@@ -1139 +1139 @@
                 CPreferences::sPrefs->mExpandedAdbks.Value().insert(adbk->IsProtocol() ? adbk->GetName() : adbk->GetAccountName());
         }
-                                else
+        else
         {
                 CPreferences::sPrefs->mExpandedAdbks.Value().erase(adbk->IsProtocol() ? adbk->GetName() : adbk->GetAccountName());
@@ -1162 +1162 @@
                 if (exp_row)
                         RefreshRow(exp_row);
-                        }
-                }
+        }
+}
 
 void CAdbkManagerTable::ExpandAction(TableIndexT worow, bool deep)

Mulberry/branches/v4.1d1/Sources_Common/Application/Preferences/CIdentity.cp

@@ -911 +911 @@
         
         return NULL;
-        }
-        
+}
+
 CIdentity* CIdentityList::GetIdentity(const CCalendarAddress& caladdr) const
 {

Mulberry/branches/v4.1d1/Sources_Common/Calendar_Store/Clients/CCalDAVCalendarClient.cpp

@@ -359 +359 @@
         if (no_report)
         {
-        for(cdstrvect::const_iterator iter = hrefs.begin(); iter != hrefs.end(); iter++)
-        {
-                // Read in the component
-                ReadCalendarComponent(*iter, cal);
-        }
+                for(cdstrvect::const_iterator iter = hrefs.begin(); iter != hrefs.end(); iter++)
+                {
+                        // Read in the component
+                        ReadCalendarComponent(*iter, cal);
+                }
         }
         else
         {
-        // Don't bother with this if empty (actually spec requires at least one href)
-        if (hrefs.empty())
-                return;
-
-        // Run the calendar-multiget report
-        cdstring rurl = GetRURL(&node);
-
-        // Create WebDAV REPORT
-        bool old_style = false;
+                // Don't bother with this if empty (actually spec requires at least one href)
+                if (hrefs.empty())
+                        return;
+
+                // Run the calendar-multiget report
+                cdstring rurl = GetRURL(&node);
+
+                // Create WebDAV REPORT
+                bool old_style = false;
 #ifdef OLD_STYLE_CALENDAR_DATA
-        old_style = (GetCalendarProtocol()->GetAccount()->GetName().find("oldstyle") != cdstring::npos);
+                old_style = (GetCalendarProtocol()->GetAccount()->GetName().find("oldstyle") != cdstring::npos);
 #endif
-        auto_ptr<http::caldav::CCalDAVMultigetReport> request(new http::caldav::CCalDAVMultigetReport(this, rurl, hrefs, old_style));
-        http::CHTTPOutputDataString dout;
-        request->SetOutput(&dout);
-
-        // Process it
-        RunSession(request.get());
-
-        // Check response status
-        switch(request->GetStatusCode())
-        {
-        case http::webdav::eStatus_MultiStatus:
-                // Do default action
-                break;
-        default:
-                // Handle error and exit here
-                HandleHTTPError(request.get());
-                return;
-        }
-
-        http::caldav::CCalDAVReportParser parser(cal);
-        parser.ParseData(dout.GetData());
+                auto_ptr<http::caldav::CCalDAVMultigetReport> request(new http::caldav::CCalDAVMultigetReport(this, rurl, hrefs, old_style));
+                http::CHTTPOutputDataString dout;
+                request->SetOutput(&dout);
+
+                // Process it
+                RunSession(request.get());
+
+                // Check response status
+                switch(request->GetStatusCode())
+                {
+                case http::webdav::eStatus_MultiStatus:
+                        // Do default action
+                        break;
+                default:
+                        // Handle error and exit here
+                        HandleHTTPError(request.get());
+                        return;
+                }
+
+                http::caldav::CCalDAVReportParser parser(cal);
+                parser.ParseData(dout.GetData());
         }
 }

Mulberry/branches/v4.1d1/Sources_Common/Calendar_Store/Clients/CWebDAVCalendarClient.cpp

@@ -1552 +1552 @@
                                         // as we might have a digest re-auth.
                                         if (!first_time)
-                                        DisplayHTTPError(request);
+                                                DisplayHTTPError(request);
                                 }
 

Mulberry/branches/v4.1d1/Sources_Common/HTTP/HTTPClient/CHTTPAuthorizationDigest.cpp

@@ -51 +51 @@
         else
         {
-        os << cHeaderAuthorization << cHeaderDelimiter << "Digest "
+                os << cHeaderAuthorization << cHeaderDelimiter << "Digest "
                 << "username=\"" << mUser << "\"," << net_endl
                 << " realm=\"" << mRealm << "\"," << net_endl

Mulberry/branches/v4.1d1/Sources_Common/HTTP/WebDAVClient/CWebDAVACL.cpp

@@ -112 +112 @@
         {
                 for(CCalendarACLList::const_iterator iter = mCalACLs->begin(); iter != mCalACLs->end(); iter++)
-        {
-                // Cannot do if change not allowed
-                if (!(*iter).CanChange())
-                        continue;
-                
-                // <DAV:ace> element
-                (*iter).GenerateACE(&xmldoc, acl, static_cast<const CWebDAVSession*>(GetSession())->HasDAVVersion(CWebDAVSession::eCyrusoftInheritable));
+                {
+                        // Cannot do if change not allowed
+                        if (!(*iter).CanChange())
+                                continue;
+                        
+                        // <DAV:ace> element
+                        (*iter).GenerateACE(&xmldoc, acl, static_cast<const CWebDAVSession*>(GetSession())->HasDAVVersion(CWebDAVSession::eCyrusoftInheritable));
                 }
         }

Mulberry/branches/v4.1d1/Sources_Common/Mail/Address/CAdbkAddress.cp

@@ -274 +274 @@
                 result += GetMailAddress();
                 result += ">";
-}
-
+        }
+        
         list.push_back(result);
 }

Mulberry/branches/v4.1d1/Sources_Common/Mail/Address/CAddressList.h

@@ -70 +70 @@
                                                                  bool full) const;
         void    AddCalendarAddressToList(cdstrvect& list,                               // Add calendar addresses to list
-                                                                        bool full) const;
+                                                                 bool full) const;
         void    WriteToStream(ostream& stream) const;                                   // Write to stream
 

Mulberry/branches/v4.1d1/Sources_Common/Mail/AddressBook/CAddressBook.cp

@@ -530 +530 @@
 
                 // Mark as open
-        SetFlags(eOpen);
+                SetFlags(eOpen);
         }
         catch (...)
@@ -795 +795 @@
         }
 
-                // Add unique items
+        // Add unique items
         if (unique.size())
                 AddAddress(&unique);
-        }
+}
 
 void CAddressBook::UpdateAddress(CAddress* addr, bool sorted)
@@ -1476 +1476 @@
         else
         {
-        cdstring matchit(name);
-        CAdbkAddress::ExpandMatch(match, matchit);
-
-        // Iterate over all single addresses
-        for(CAddressList::const_iterator iter = mAddresses.begin(); iter != mAddresses.end(); iter++)
-        {
-                bool result = false;
-
-                CAdbkAddress* addr = dynamic_cast<CAdbkAddress*>(*iter);
-                if (!addr)
-                        continue;
-                        
-                // Do comparison of specific field
-                result = addr->Search(matchit, field);
-
-                // Check for matching item
-                if (result)
-                        // Add copy to list
-                        addr_list.push_back(new CAdbkAddress(*addr));
+                cdstring matchit(name);
+                CAdbkAddress::ExpandMatch(match, matchit);
+
+                // Iterate over all single addresses
+                for(CAddressList::const_iterator iter = mAddresses.begin(); iter != mAddresses.end(); iter++)
+                {
+                        bool result = false;
+
+                        CAdbkAddress* addr = dynamic_cast<CAdbkAddress*>(*iter);
+                        if (!addr)
+                                continue;
+                                
+                        // Do comparison of specific field
+                        result = addr->Search(matchit, field);
+
+                        // Check for matching item
+                        if (result)
+                                // Add copy to list
+                                addr_list.push_back(new CAdbkAddress(*addr));
                 }
         }

Mulberry/branches/v4.1d1/Sources_Common/Mail/AddressBook/CAddressBookManager.cp

@@ -403 +403 @@
                         break;
                 }
-        }
+        }       
 }
 
@@ -558 +558 @@
                 // Add to protos list
                 mProtos.push_back(proto);
-}
+        }
 
         // Adjust indices to remove local/web
@@ -571 +571 @@
         if (new_index < (long) mProtos.size() - 1 - proto_offset)
                 accts.insert(accts.begin() + new_index, acct);
-                else
+        else
                 accts.push_back(acct);
         CPreferences::sPrefs->mAddressAccounts.SetDirty();
@@ -587 +587 @@
                 if (result != NULL)
                         return result;
-}
-
+        }
+        
         return NULL;
-        }
+}
 
 // Managing the store
@@ -596 +596 @@
 {
         if ((proto == NULL) || name.empty())
-        return NULL;
+                return NULL;
 
         // Create account name
@@ -623 +623 @@
                 if (!directory)
                 {
-}
+                }
 
                 // Now insert into parent
@@ -682 +682 @@
                                 // Now read the calendar data
                                 node->GetProtocol()->ReadFullCalendar(*node, *cal);
-}
-
+                        }
+                        
                         // Change the name in the calendar
                         cal->EditName(node->GetShortName());
@@ -704 +704 @@
                         {
                                 node->SetCalendar(NULL);
-                }
-                
+                        }
+                        
                         CLOG_LOGRETHROW;
                         throw;
@@ -711 +711 @@
 #endif
         }
-
+        
         // Now adjust node position
         
@@ -725 +725 @@
                 parent_node->AddChild(node, true);
                 Broadcast_Message(eBroadcast_InsertNode, node);
-}
+        }
 
         // Make sure protocol list is in sync after rename
@@ -778 +778 @@
                         if (found == mAdbkSearch.end())
                                 mAdbkSearch.push_back(adbk);
-                                }
-                        }
+                }
+        }
         else
         {

Mulberry/branches/v4.1d1/Sources_Common/Mail/Extensions/CAdbkACL.cp

@@ -32 +32 @@
         if (this != &copy)
         {
-        CACL::operator=(copy);
+                CACL::operator=(copy);
                 mType = copy.mType;
                 mCanChange = copy.mCanChange;

Mulberry/branches/v4.1d1/Sources_Common/Mail/INET_Clients/IMSP/CIMSPClient.cp

@@ -1425 +1425 @@
         }
 
-                // Add adress book to list
+        // Add adress book to list
         CAddressBook* adbk = new CAddressBook(GetAdbkOwner(), GetAdbkOwner()->GetStoreRoot(), !noselect, !noinferiors, adbk_name);
         GetAdbkOwner()->GetStoreRoot()->AddChildHierarchy(adbk);

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();
-                }