All items in the Calendar tab now use ContactDataObject.

diff --git a/source/contacteditor/frmContactEditor-Calendar.cpp b/source/contacteditor/frmContactEditor-Calendar.cpp
index 233e7a1..8813635 100644 (file)
--- a/source/contacteditor/frmContactEditor-Calendar.cpp
+++ b/source/contacteditor/frmContactEditor-Calendar.cpp
@@ -25,13 +25,13 @@ void frmContactEditor::AddCalendarAddress( wxCommandEvent& event )
     
     frmContactEditorCalAdr *frameCECalAdr = new frmContactEditorCalAdr ( this );
     frameCECalAdr->SetEditorMode(FALSE);
-    intResult = GetLastInt(&CalendarList);
-    frameCECalAdr->SetupPointers(&CalendarList,
-                                 &CalendarListAltID,
-                                 &CalendarListPID,
-                                 &CalendarListType,
-                                 &CalendarListTokens,
-                                 &CalendarListPref,
+    intResult = GetLastInt(&ContactEditorData.CalendarList);
+    frameCECalAdr->SetupPointers(&ContactEditorData.CalendarList,
+                                 &ContactEditorData.CalendarListAltID,
+                                 &ContactEditorData.CalendarListPID,
+                                 &ContactEditorData.CalendarListType,
+                                 &ContactEditorData.CalendarListTokens,
+                                 &ContactEditorData.CalendarListPref,
                                  lboCalendarAddresses,
                                  (intValueSeek));
     frameCECalAdr->ShowModal();
@@ -51,12 +51,12 @@ void frmContactEditor::ModifyCalendarAddress( wxCommandEvent& event )
     }
     
     frmContactEditorCalAdr *frameCECalAdr = new frmContactEditorCalAdr ( this );
-    frameCECalAdr->SetupPointers(&CalendarList,
-                                 &CalendarListAltID,
-                                 &CalendarListPID,
-                                 &CalendarListType,
-                                 &CalendarListTokens,
-                                 &CalendarListPref,
+    frameCECalAdr->SetupPointers(&ContactEditorData.CalendarList,
+                                 &ContactEditorData.CalendarListAltID,
+                                 &ContactEditorData.CalendarListPID,
+                                 &ContactEditorData.CalendarListType,
+                                 &ContactEditorData.CalendarListTokens,
+                                 &ContactEditorData.CalendarListPref,
                                  lboCalendarAddresses,
                                  intSelectedData);
     frameCECalAdr->SetEditorMode(TRUE);
@@ -78,9 +78,9 @@ void frmContactEditor::DeleteCalendarAddress( wxCommandEvent& event )
     
     lboCalendarAddresses->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &CalendarList, &CalendarListAltID,
-                  &CalendarListPID, &CalendarListType, &CalendarListTokens,
-                  &CalendarListPref);
+    DeleteMapData(intSelectedData, &ContactEditorData.CalendarList, &ContactEditorData.CalendarListAltID,
+                  &ContactEditorData.CalendarListPID, &ContactEditorData.CalendarListType, &ContactEditorData.CalendarListTokens,
+                  &ContactEditorData.CalendarListPref);
     
 }
 
@@ -90,13 +90,13 @@ void frmContactEditor::AddCalendarRequest( wxCommandEvent& event )
     
     frmContactEditorCalAdr *frameCECalAdr = new frmContactEditorCalAdr ( this );
     frameCECalAdr->SetEditorMode(FALSE);
-    intResult = GetLastInt(&CalendarRequestList);
-    frameCECalAdr->SetupPointers(&CalendarRequestList,
-                                 &CalendarRequestListAltID,
-                                 &CalendarRequestListPID,
-                                 &CalendarRequestListType,
-                                 &CalendarRequestListTokens,
-                                 &CalendarRequestListPref,
+    intResult = GetLastInt(&ContactEditorData.CalendarRequestList);
+    frameCECalAdr->SetupPointers(&ContactEditorData.CalendarRequestList,
+                                 &ContactEditorData.CalendarRequestListAltID,
+                                 &ContactEditorData.CalendarRequestListPID,
+                                 &ContactEditorData.CalendarRequestListType,
+                                 &ContactEditorData.CalendarRequestListTokens,
+                                 &ContactEditorData.CalendarRequestListPref,
                                  lboCalendarRequestAddress,
                                  (intValueSeek));
     frameCECalAdr->ShowModal();
@@ -116,12 +116,12 @@ void frmContactEditor::ModifyCalendarRequest( wxCommandEvent& event )
     }
     
     frmContactEditorCalAdr *frameCECalAdr = new frmContactEditorCalAdr ( this );
-    frameCECalAdr->SetupPointers(&CalendarList,
-                                 &CalendarRequestListAltID,
-                                 &CalendarRequestListPID,
-                                 &CalendarRequestListType,
-                                 &CalendarRequestListTokens,
-                                 &CalendarRequestListPref,
+    frameCECalAdr->SetupPointers(&ContactEditorData.CalendarRequestList,
+                                 &ContactEditorData.CalendarRequestListAltID,
+                                 &ContactEditorData.CalendarRequestListPID,
+                                 &ContactEditorData.CalendarRequestListType,
+                                 &ContactEditorData.CalendarRequestListTokens,
+                                 &ContactEditorData.CalendarRequestListPref,
                                  lboCalendarRequestAddress,
                                  intSelectedData);
     frameCECalAdr->SetEditorMode(TRUE);
@@ -143,10 +143,10 @@ void frmContactEditor::DeleteCalendarRequest( wxCommandEvent& event )
     
     lboCalendarRequestAddress->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &CalendarRequestList,
-                  &CalendarRequestListAltID, &CalendarRequestListPID,
-                  &CalendarRequestListType, &CalendarRequestListTokens,
-                  &CalendarRequestListPref);
+    DeleteMapData(intSelectedData, &ContactEditorData.CalendarRequestList,
+                  &ContactEditorData.CalendarRequestListAltID, &ContactEditorData.CalendarRequestListPID,
+                  &ContactEditorData.CalendarRequestListType, &ContactEditorData.CalendarRequestListTokens,
+                  &ContactEditorData.CalendarRequestListPref);
 }
 
 void frmContactEditor::AddFreeBusy( wxCommandEvent& event )
@@ -155,13 +155,13 @@ void frmContactEditor::AddFreeBusy( wxCommandEvent& event )
     
     frmContactEditorCalAdr *frameCECalAdr = new frmContactEditorCalAdr ( this );
     frameCECalAdr->SetEditorMode(FALSE);
-    intResult = GetLastInt(&FreeBusyList);
-    frameCECalAdr->SetupPointers(&FreeBusyList,
-                                 &FreeBusyListAltID,
-                                 &FreeBusyListPID,
-                                 &FreeBusyListType,
-                                 &FreeBusyListTokens,
-                                 &FreeBusyListPref,
+    intResult = GetLastInt(&ContactEditorData.FreeBusyList);
+    frameCECalAdr->SetupPointers(&ContactEditorData.FreeBusyList,
+                                 &ContactEditorData.FreeBusyListAltID,
+                                 &ContactEditorData.FreeBusyListPID,
+                                 &ContactEditorData.FreeBusyListType,
+                                 &ContactEditorData.FreeBusyListTokens,
+                                 &ContactEditorData.FreeBusyListPref,
                                  lboFreeBusyAddresses,
                                  (intValueSeek));
     frameCECalAdr->ShowModal();
@@ -181,12 +181,12 @@ void frmContactEditor::ModifyFreeBusy( wxCommandEvent& event )
     }
     
     frmContactEditorCalAdr *frameCECalAdr = new frmContactEditorCalAdr ( this );
-    frameCECalAdr->SetupPointers(&FreeBusyList,
-                                 &FreeBusyListAltID,
-                                 &FreeBusyListPID,
-                                 &FreeBusyListType,
-                                 &FreeBusyListTokens,
-                                 &FreeBusyListPref,
+    frameCECalAdr->SetupPointers(&ContactEditorData.FreeBusyList,
+                                 &ContactEditorData.FreeBusyListAltID,
+                                 &ContactEditorData.FreeBusyListPID,
+                                 &ContactEditorData.FreeBusyListType,
+                                 &ContactEditorData.FreeBusyListTokens,
+                                 &ContactEditorData.FreeBusyListPref,
                                  lboFreeBusyAddresses,
                                  intSelectedData);
     frameCECalAdr->SetEditorMode(TRUE);
@@ -208,8 +208,8 @@ void frmContactEditor::DeleteFreeBusy( wxCommandEvent& event )
     
     lboFreeBusyAddresses->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &FreeBusyList, &FreeBusyListAltID,
-                  &FreeBusyListPID, &FreeBusyListType, &FreeBusyListTokens,
-                  &FreeBusyListPref);
+    DeleteMapData(intSelectedData, &ContactEditorData.FreeBusyList, &ContactEditorData.FreeBusyListAltID,
+                  &ContactEditorData.FreeBusyListPID, &ContactEditorData.FreeBusyListType, &ContactEditorData.FreeBusyListTokens,
+                  &ContactEditorData.FreeBusyListPref);
     
 }