Changeset 143 for Mulberry/trunk/Sources_Common/Application/Server/CServerTableCommon.cp

Timestamp:

11/20/07 23:45:14 (1 year ago)

Author:

daboo

Message:

Merge of win32-merge branch.

Files:

• Mulberry/trunk/Sources_Common/Application/Server/CServerTableCommon.cp (modified) (24 diffs)

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

@@ -74 +74 @@
 #include <string.h>
 
-#if __dest_os == __win32_os
-// BUG in Metrowerks Compiler - need this specialization
-inline void allocator<CServerBrowse::SServerBrowseData>::deallocate(CServerBrowse::SServerBrowseData* p, size_t)
-{
-        delete p;
-}
-#endif
-
 #pragma mark ____________________________Management
 
@@ -240 +232 @@
                 // Add mailbox selection to list
                 CMboxList selected;
-                DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectionToList, &selected);
+                DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectionToList, &selected);
 
                 // Only do one if preview does not do substitute
@@ -357 +349 @@
                 // Add selection to list
                 CMboxList selected;
-                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddDSelectionToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddDSelectionToList, &selected))
                 {
                         // New draft with identity tied to first selected mailbox
@@ -415 +407 @@
 
         // Add selection to list
-        if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectedNodesToList, &selected))
+        if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectedNodesToList, &selected))
         {
                 // Logon to all protocols
@@ -433 +425 @@
 
         // Add selection to list
-        if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectedNodesToList, &selected))
+        if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectedNodesToList, &selected))
         {
                 // Logoff to all protocols
@@ -635 +627 @@
 
         // Remove selection from list
-        if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectedNodesToList, &selected))
+        if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectedNodesToList, &selected))
         {
                 for(CServerNodeArray::reverse_iterator iter = selected.rbegin(); iter != selected.rend(); iter++)
@@ -665 +657 @@
 
                 // Remove selection from list
-                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectedNodesToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectedNodesToList, &selected))
                 {
                         for(CServerNodeArray::reverse_iterator iter = selected.rbegin(); iter != selected.rend(); iter++)
@@ -687 +679 @@
 
                 // Add selection to list
-                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectedNodesToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectedNodesToList, &selected))
                 {
                         for(CServerNodeArray::reverse_iterator iter = selected.rbegin(); iter != selected.rend(); iter++)
@@ -827 +819 @@
 
         // Add selection to list
-        if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectedNodesToList, &selected))
+        if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectedNodesToList, &selected))
         {
                 // Remove wds from account (do in reverse)
@@ -866 +858 @@
 
                 // Add selection to list
-                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectedNodesToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectedNodesToList, &selected))
                 {
                         // Remove wds from account (do in reverse)
@@ -891 +883 @@
 
                 // Add selection to list
-                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectedNodesToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectedNodesToList, &selected))
                 {
                         // Reset hierarchy for each node (avoid doing more than once per server)
@@ -966 +958 @@
         {
                 // Add selection to list
-                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddDSelectionToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddDSelectionToList, &selected))
                 {
                         // Check all mboxes first
@@ -1108 +1100 @@
         try
         {
-                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectionToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectionToList, &selected))
                 {
                         // Check all mboxes
@@ -1244 +1236 @@
 
         // Add named selection to list
-        DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectionToList, &mboxes);
+        DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectionToList, &mboxes);
 
         // Check that each mailbox to be opened is on a logged in server
@@ -1442 +1434 @@
         {
                 // Get all selected mailboxes
-                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectionToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectionToList, &selected))
                 {
                         // Punt unseen in all mboxes
@@ -1501 +1493 @@
 
                         // Add selection to list
-                        if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectedNodesToList, &selected))
+                        if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectedNodesToList, &selected))
                         {
                                 for(CServerNodeArray::reverse_iterator iter = selected.rbegin(); iter != selected.rend(); iter++)
@@ -1527 +1519 @@
                 // Get all selected mailboxes
                 CMboxList selected;
-                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddDSelectionToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddDSelectionToList, &selected))
                 {
                         // Generate string for list of items being deleted
@@ -1601 +1593 @@
         try
         {
-                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddDSelectionToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddDSelectionToList, &selected))
                 {
                         //StValueChanger<bool> change(mListChanging, true);
@@ -1676 +1668 @@
         {
                 // Get all selected mailboxes
-                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectionToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectionToList, &selected))
                         CSynchroniseDialog::PoseDialog(&selected);
         }
@@ -1697 +1689 @@
                 {
                         // Get all selected mailboxes
-                        if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectionToList, &selected))
+                        if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectionToList, &selected))
                         {
                                 // Clear all mboxes
@@ -1738 +1730 @@
         try
         {
-                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectionToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectionToList, &selected))
                 {
                         //StValueChanger<bool> change(mListChanging, true);
@@ -1782 +1774 @@
         try
         {
-                if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectionToList, &selected))
+                if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectionToList, &selected))
                 {
                         bool unsubscribed = false;
@@ -1823 +1815 @@
 
         // Add selection to list
-        if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectedNodesToList, &selected))
+        if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectedNodesToList, &selected))
         {
                 // Logon to all protocols
@@ -1902 +1894 @@
         CMboxList selected;
 
-        if (DoToSelection1((DoToSelection1PP) &CServerBrowse::AddSelectionToList, &selected))
+        if (DoToSelection1((DoToSelection1PP) &CServerTable::AddSelectionToList, &selected))
         {
                 // Do it again