Changeset 62 for Mulberry/trunk

Timestamp:

07/08/07 13:04:25 (2 years ago)

Author:

daboo

Message:

Fixes for OS X build. This may break linux, so we may have to fix
that later.

Location:

Mulberry/trunk/Sources_Common

Files:

• Application/Server/CServerTableCommon.cp (modified) (23 diffs)
• Formatting/CParserHTML.cp (modified) (3 diffs)
• Mail/Address/CGroupList.cp (modified) (3 diffs)
• Mail/Extensions/CQuotas.cp (modified) (2 diffs)
• Mail/Filters/CAFFilter.cp (modified) (1 diff)
• Mail/Filters/CBinHexFilter.cp (modified) (3 diffs)
• Mail/Filters/CFilter.cp (modified) (3 diffs)
• Mail/Filters/CMIMEFilters.cp (modified) (4 diffs)
• Mail/Filters/CUUFilter.cp (modified) (4 diffs)
• Mail/Filters/filterbuf.cp (modified) (10 diffs)
• Mail/Filters/filterbuf.h (modified) (10 diffs)
• Mail/Filters/mimefilters.cp (modified) (8 diffs)
• Mail/Filters/mimefilters.h (modified) (4 diffs)
• Mail/INET_Clients/IMAP/CSequence.cp (modified) (2 diffs)
• Mail/Message/CEnvelope.cp (modified) (1 diff)
• Offline/Mail/CRFC822Parser.cp (modified) (21 diffs)
• Offline/Mail/CRFC822Parser.h (modified) (5 diffs)
• Offline/Recording/CMailRecord.cp (modified) (1 diff)
• Utilities/CStringUtils.cp (modified) (1 diff)
• Utilities/CStringUtils.h (modified) (1 diff)
• Utilities/CTextEngine.cp (modified) (6 diffs)
• Utilities/cdiomanip.h (modified) (1 diff)
• Utilities/cdstring.h (modified) (1 diff)
• Utilities/cdustring.cp (modified) (10 diffs)
• Utilities/pvector.h (modified) (1 diff)
• Utilities/templs.h (modified) (1 diff)

Mulberry/trunk/Sources_Common/Application/Server/CServerTableCommon.cp

@@ -240 +240 @@
                 // Add mailbox selection to list
                 CMboxList selected;
-                DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectionToList, &selected);
+                DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectionToList, &selected);
 
                 // Only do one if preview does not do substitute
@@ -357 +357 @@
                 // Add selection to list
                 CMboxList selected;
-                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddDSelectionToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddDSelectionToList, &selected))
                 {
                         // New draft with identity tied to first selected mailbox
@@ -415 +415 @@
 
         // Add selection to list
-        if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectedNodesToList, &selected))
+        if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectedNodesToList, &selected))
         {
                 // Logon to all protocols
@@ -433 +433 @@
 
         // Add selection to list
-        if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectedNodesToList, &selected))
+        if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectedNodesToList, &selected))
         {
                 // Logoff to all protocols
@@ -635 +635 @@
 
         // Remove selection from list
-        if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectedNodesToList, &selected))
+        if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectedNodesToList, &selected))
         {
                 for(CServerNodeArray::reverse_iterator iter = selected.rbegin(); iter != selected.rend(); iter++)
@@ -665 +665 @@
 
                 // Remove selection from list
-                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectedNodesToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectedNodesToList, &selected))
                 {
                         for(CServerNodeArray::reverse_iterator iter = selected.rbegin(); iter != selected.rend(); iter++)
@@ -687 +687 @@
 
                 // Add selection to list
-                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectedNodesToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectedNodesToList, &selected))
                 {
                         for(CServerNodeArray::reverse_iterator iter = selected.rbegin(); iter != selected.rend(); iter++)
@@ -827 +827 @@
 
         // Add selection to list
-        if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectedNodesToList, &selected))
+        if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectedNodesToList, &selected))
         {
                 // Remove wds from account (do in reverse)
@@ -866 +866 @@
 
                 // Add selection to list
-                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectedNodesToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectedNodesToList, &selected))
                 {
                         // Remove wds from account (do in reverse)
@@ -891 +891 @@
 
                 // Add selection to list
-                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectedNodesToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectedNodesToList, &selected))
                 {
                         // Reset hierarchy for each node (avoid doing more than once per server)
@@ -966 +966 @@
         {
                 // Add selection to list
-                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddDSelectionToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddDSelectionToList, &selected))
                 {
                         // Check all mboxes first
@@ -1108 +1108 @@
         try
         {
-                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectionToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectionToList, &selected))
                 {
                         // Check all mboxes
@@ -1244 +1244 @@
 
         // Add named selection to list
-        DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectionToList, &mboxes);
+        DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectionToList, &mboxes);
 
         // Check that each mailbox to be opened is on a logged in server
@@ -1442 +1442 @@
         {
                 // Get all selected mailboxes
-                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectionToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectionToList, &selected))
                 {
                         // Punt unseen in all mboxes
@@ -1501 +1501 @@
 
                         // Add selection to list
-                        if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectedNodesToList, &selected))
+                        if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectedNodesToList, &selected))
                         {
                                 for(CServerNodeArray::reverse_iterator iter = selected.rbegin(); iter != selected.rend(); iter++)
@@ -1527 +1527 @@
                 // Get all selected mailboxes
                 CMboxList selected;
-                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddDSelectionToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddDSelectionToList, &selected))
                 {
                         // Generate string for list of items being deleted
@@ -1601 +1601 @@
         try
         {
-                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddDSelectionToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddDSelectionToList, &selected))
                 {
                         //StValueChanger<bool> change(mListChanging, true);
@@ -1676 +1676 @@
         {
                 // Get all selected mailboxes
-                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectionToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectionToList, &selected))
                         CSynchroniseDialog::PoseDialog(&selected);
         }
@@ -1697 +1697 @@
                 {
                         // Get all selected mailboxes
-                        if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectionToList, &selected))
+                        if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectionToList, &selected))
                         {
                                 // Clear all mboxes
@@ -1738 +1738 @@
         try
         {
-                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectionToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectionToList, &selected))
                 {
                         //StValueChanger<bool> change(mListChanging, true);
@@ -1782 +1782 @@
         try
         {
-                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectionToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectionToList, &selected))
                 {
                         bool unsubscribed = false;
@@ -1823 +1823 @@
 
         // Add selection to list
-        if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectedNodesToList, &selected))
+        if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectedNodesToList, &selected))
         {
                 // Logon to all protocols
@@ -1902 +1902 @@
         CMboxList selected;
 
-        if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectionToList, &selected))
+        if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectionToList, &selected))
         {
                 // Do it again

Mulberry/trunk/Sources_Common/Formatting/CParserHTML.cp

@@ -39 +39 @@
 const int cRulerWidth = 50;
 
-CParserHTML::CParserHTML(const unichar_t* st, CFormatList* format, CClickList* click, CAnchorElementMap* anchor, bool use_styles) :
-  mFontNames(JPtrArrayT::kDeleteAll)
+CParserHTML::CParserHTML(const unichar_t* st, CFormatList* format, CClickList* click, CAnchorElementMap* anchor, bool use_styles)
+#if __dest_os == __linux_os
+        : mFontNames(JPtrArrayT::kDeleteAll)
+#endif
 {
         InitParserHTML();
@@ -56 +58 @@
 }
 
-CParserHTML::CParserHTML(CFormatList* format, CClickList* click, CAnchorElementMap* anchor) :
-  mFontNames(JPtrArrayT::kDeleteAll)
+CParserHTML::CParserHTML(CFormatList* format, CClickList* click, CAnchorElementMap* anchor)
+#if __dest_os == __linux_os
+        : mFontNames(JPtrArrayT::kDeleteAll)
+#endif
 {
         InitParserHTML();
@@ -67 +71 @@
 
 
-CParserHTML::CParserHTML() :
-  mFontNames(JPtrArrayT::kDeleteAll)
+CParserHTML::CParserHTML()
+#if __dest_os == __linux_os
+        : mFontNames(JPtrArrayT::kDeleteAll)
+#endif
 {
         InitParserHTML();

Mulberry/trunk/Sources_Common/Mail/Address/CGroupList.cp

@@ -102 +102 @@
 {
         if (mComparator)
-                ::stable_sort(begin(), end(), mComparator->GetComparator());
+                std::stable_sort(begin(), end(), mComparator->GetComparator());
 }
 
@@ -138 +138 @@
 
         if (mComparator)
-                found = ::lower_bound(begin(), end(), (const CGroup*&) aGrp, mComparator->GetComparator());
+                found = std::lower_bound(begin(), end(), (const CGroup*&) aGrp, mComparator->GetComparator());
 
         insert(found, aGrp);
@@ -192 +192 @@
                 return;
 
-        CGroupList::iterator found = ::find(begin(), end(), grp);
+        CGroupList::iterator found = std::find(begin(), end(), grp);
         if (found != end())
                 vector<CGroup*>::erase(found);

Mulberry/trunk/Sources_Common/Mail/Extensions/CQuotas.cp

@@ -21 +21 @@
 
 #include "CStringUtils.h"
+
+#include <memory>
 
 #pragma mark ____________________________CQuotaItem
@@ -95 +97 @@
 
         // Duplicate for parsing
-        auto_ptr<char> dup(::strdup(txt));
+        std::auto_ptr<char> dup(::strdup(txt));
         char* p = dup.get();
 

Mulberry/trunk/Sources_Common/Mail/Filters/CAFFilter.cp

@@ -866 +866 @@
 
         // Add dates
-        *((long*) p)++ = cpb.hFileInfo.ioFlCrDat - cAppleFile_MacToASDate;
-        *((long*) p)++ = cpb.hFileInfo.ioFlMdDat - cAppleFile_MacToASDate;
-        *((long*) p)++ = cpb.hFileInfo.ioFlBkDat - cAppleFile_MacToASDate;
-        *((long*) p)++ = cAppleFile_DateUnknown;
+        *((long*) p) = cpb.hFileInfo.ioFlCrDat - cAppleFile_MacToASDate;
+        p += sizeof(long);
+        *((long*) p) = cpb.hFileInfo.ioFlMdDat - cAppleFile_MacToASDate;
+        p += sizeof(long);
+        *((long*) p) = cpb.hFileInfo.ioFlBkDat - cAppleFile_MacToASDate;
+        p += sizeof(long);
+        *((long*) p) = cAppleFile_DateUnknown;
+        p += sizeof(long);
 
         // Addcomment

Mulberry/trunk/Sources_Common/Mail/Filters/CBinHexFilter.cp

@@ -423 +423 @@
                                         p = (unsigned char*) ::memchr(p, cBinHexTitle[0], mBufferLength);
                                         if (!p)
-                                                return mDecodedOne ? noErr : writErr;
+                                                return mDecodedOne ? (ExceptionCode)noErr : (ExceptionCode)writErr;
                                         mBufferLength = inByteCount - (p - reinterpret_cast<const unsigned char*>(inBuffer));
                                         if (mBufferLength < 1)
-                                                return mDecodedOne ? noErr : writErr;
+                                                return mDecodedOne ? (ExceptionCode)noErr : (ExceptionCode)writErr;
                                 }
 
@@ -924 +924 @@
         spec.GetFinderInfo(&finfo, NULL, NULL);
 
-        *((OSType*) p)++ = finfo.file.fileType;
-        *((OSType*) p)++ = finfo.file.fileCreator;
-        *((short*) p)++ = finfo.file.finderFlags  & ~(kIsOnDesk | kIsInvisible | kHasBeenInited);
+        *((OSType*) p) = finfo.file.fileType;
+        p += sizeof(OSType);
+        *((OSType*) p) = finfo.file.fileCreator;
+        p += sizeof(OSType);
+        *((short*) p) = finfo.file.finderFlags  & ~(kIsOnDesk | kIsInvisible | kHasBeenInited);
+        p += sizeof(short);
 
         // Ddata & resource fork lengths
@@ -932 +935 @@
         spec.GetCatalogInfo(kFSCatInfoDataSizes | kFSCatInfoRsrcSizes, catInfo);
 
-        *((long*) p)++ = catInfo.dataLogicalSize;
-        *((long*) p)++ = catInfo.rsrcLogicalSize;
+        *((long*) p) = catInfo.dataLogicalSize;
+        p += sizeof(long);
+        *((long*) p) = catInfo.rsrcLogicalSize;
+        p += sizeof(long);
 #else
         cdstring fname = mFileStream->GetFileName();

Mulberry/trunk/Sources_Common/Mail/Filters/CFilter.cp

@@ -281 +281 @@
                                 // Copy byte and adjust ctrs
                                 *((unsigned char*) outBuffer) = *mLinePos++;
-                                outBuffer += sizeof(unsigned char);
+                                outBuffer = (unsigned char*)outBuffer + sizeof(unsigned char);
                                 total++;
                                 if (!--mLineLength)
@@ -316 +316 @@
                 {
                         *mBufferPos++ = *((unsigned char*) inBuffer);
-                        inBuffer += sizeof(unsigned char);
+                        inBuffer = (unsigned char*)inBuffer + sizeof(unsigned char);
                         total++;
                         mBufferLength++;
@@ -323 +323 @@
                 else
                 {
-                        inBuffer += sizeof(unsigned char);
+                        inBuffer = (unsigned char*)inBuffer + sizeof(unsigned char);
                         total++;
                 }

Mulberry/trunk/Sources_Common/Mail/Filters/CMIMEFilters.cp

@@ -325 +325 @@
                                 // Copy byte and adjust ctrs
                                 *((unsigned char*) outBuffer) = *mLinePos++;
-                                outBuffer += sizeof(unsigned char);
+                                outBuffer = (unsigned char*)outBuffer + sizeof(unsigned char);
                                 total++;
                                 if (!--mLineLength)
@@ -584 +584 @@
                                 // Copy byte and adjust ctrs
                                 *((unsigned char*) outBuffer) = *mLinePos++;
-                                outBuffer += sizeof(unsigned char);
+                                outBuffer = (unsigned char*)outBuffer + sizeof(unsigned char);
                                 total++;
                                 if (!--mLineLength)
@@ -919 +919 @@
                                 // Copy byte and adjust ctrs
                                 *((unsigned char*) outBuffer) = *mLinePos++;
-                                outBuffer += sizeof(unsigned char);
+                                outBuffer = (unsigned char*)outBuffer + sizeof(unsigned char);
                                 total++;
                                 if (!--mLineLength)
@@ -952 +952 @@
                 unsigned char c;
                 c = *((unsigned char*) inBuffer);
-                inBuffer += sizeof(unsigned char);
+                inBuffer = (unsigned char*)inBuffer + sizeof(unsigned char);
                 total++;
 

Mulberry/trunk/Sources_Common/Mail/Filters/CUUFilter.cp

@@ -144 +144 @@
                                 // Copy the char
                                 *((unsigned char*) outBuffer) = *p++;
-                                outBuffer += sizeof(unsigned char);
+                                outBuffer = (unsigned char*)outBuffer + sizeof(unsigned char);
                                 mBufferLength--;
                                 total++;
@@ -212 +212 @@
                                 // Copy byte and adjust ctrs
                                 *((unsigned char*) outBuffer) = *mLinePos++;
-                                outBuffer += sizeof(unsigned char);
+                                outBuffer = (unsigned char*)outBuffer + sizeof(unsigned char);
                                 total++;
                                 if (!--mLineLength)
@@ -237 +237 @@
                                 // Copy the char
                                 *((unsigned char*) outBuffer) = *p++;
-                                outBuffer += sizeof(unsigned char);
+                                outBuffer = (unsigned char*)outBuffer + sizeof(unsigned char);
                                 mBufferLength--;
                                 total++;
@@ -290 +290 @@
                                         p = (unsigned char*) ::memchr(p, cUUDBegin[0], inByteCount - total);
                                         if (!p)
-                                                return mDecodedOne ? noErr : writErr;
+                                                return mDecodedOne ? (ExceptionCode)noErr : (ExceptionCode)writErr;
                                         total = p - reinterpret_cast<const unsigned char*>(inBuffer);
                                         if (total > inByteCount)
-                                                return mDecodedOne ? noErr : writErr;
+                                                return mDecodedOne ? (ExceptionCode)noErr : (ExceptionCode)writErr;
                                 }
 

Mulberry/trunk/Sources_Common/Mail/Filters/filterbuf.cp

@@ -59 +59 @@
 }
 
-void filterbuf::WriteBuffer(const char_type* s, streamsize n)
+void filterbuf::WriteBuffer(const char_type* s, std::streamsize n)
 {
         // See if new data would overflow buffer
@@ -92 +92 @@
 }
 
-void filterbuf::write(const char_type* s, streamsize n)
+void filterbuf::write(const char_type* s, std::streamsize n)
 {
         if (mOut)
@@ -110 +110 @@
 #pragma mark ____________________________crlf_filterbuf
 
-streamsize crlf_filterbuf::encode (const char_type* s, streamsize n)
+std::streamsize crlf_filterbuf::encode (const char_type* s, std::streamsize n)
 {
         const char* out_endl = ::get_endl(mOutEndl);
@@ -117 +117 @@
         // Filter from one endl to another
         const char_type* p;
-        streamsize ntemp = n;
+        std::streamsize ntemp = n;
         while(ntemp)
         {
@@ -174 +174 @@
 }
 
-streamsize crlf_filterbuf::decode (const char_type* s, streamsize n)
+std::streamsize crlf_filterbuf::decode (const char_type* s, std::streamsize n)
 {
         // Does nothing!
@@ -182 +182 @@
 #pragma mark ____________________________dotstuff_filterbuf
 
-streamsize dotstuff_filterbuf::encode (const char_type* s, streamsize n)
+std::streamsize dotstuff_filterbuf::encode (const char_type* s, std::streamsize n)
 {
         // Dot stuff contents
         const char_type* p;
-        streamsize ntemp = n;
+        std::streamsize ntemp = n;