All items in the Key tab of the Contact Editor now use ContactDataObject.

diff --git a/source/contacteditor/frmContactEditor-Key.cpp b/source/contacteditor/frmContactEditor-Key.cpp
index 435eb38..f97800f 100644 (file)
--- a/source/contacteditor/frmContactEditor-Key.cpp
+++ b/source/contacteditor/frmContactEditor-Key.cpp
@@ -25,15 +25,15 @@ void frmContactEditor::AddKey( wxCommandEvent& event )
     
     frmContactEditorKey *frameCEKey = new frmContactEditorKey ( this );
     frameCEKey->SetEditorMode(FALSE);
-    intResult = GetLastInt(&KeyList);
-    frameCEKey->SetupPointers(&KeyList,
-                              &KeyListAltID,
-                              &KeyListPID,
-                              &KeyListKeyType,
-                              &KeyListDataType,
-                              &KeyListType,
-                              &KeyListTokens,
-                              &KeyListPref,
+    intResult = GetLastInt(&ContactEditorData.KeyList);
+    frameCEKey->SetupPointers(&ContactEditorData.KeyList,
+                              &ContactEditorData.KeyListAltID,
+                              &ContactEditorData.KeyListPID,
+                              &ContactEditorData.KeyListKeyType,
+                              &ContactEditorData.KeyListDataType,
+                              &ContactEditorData.KeyListType,
+                              &ContactEditorData.KeyListTokens,
+                              &ContactEditorData.KeyListPref,
                               lboKeys,
                               (intValueSeek));
     frameCEKey->ShowModal();
@@ -53,14 +53,14 @@ void frmContactEditor::ModifyKey( wxCommandEvent& event )
     }
     
     frmContactEditorKey *frameCEKey = new frmContactEditorKey ( this );
-    frameCEKey->SetupPointers(&KeyList,
-                              &KeyListAltID,
-                              &KeyListPID,
-                              &KeyListKeyType,
-                              &KeyListDataType,
-                              &KeyListType,
-                              &KeyListTokens,
-                              &KeyListPref,
+    frameCEKey->SetupPointers(&ContactEditorData.KeyList,
+                              &ContactEditorData.KeyListAltID,
+                              &ContactEditorData.KeyListPID,
+                              &ContactEditorData.KeyListKeyType,
+                              &ContactEditorData.KeyListDataType,
+                              &ContactEditorData.KeyListType,
+                              &ContactEditorData.KeyListTokens,
+                              &ContactEditorData.KeyListPref,
                               lboKeys,
                               intSelectedData);
     frameCEKey->SetEditorMode(TRUE);
@@ -82,8 +82,8 @@ void frmContactEditor::DeleteKey( wxCommandEvent& event )
     
     lboKeys->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &KeyList, &KeyListAltID,
-                  &KeyListPID, &KeyListKeyType, &KeyListDataType, &KeyListType,
-                  &KeyListTokens, &KeyListPref);
+    DeleteMapData(intSelectedData, &ContactEditorData.KeyList, &ContactEditorData.KeyListAltID,
+                  &ContactEditorData.KeyListPID, &ContactEditorData.KeyListKeyType, &ContactEditorData.KeyListDataType, &ContactEditorData.KeyListType,
+                  &ContactEditorData.KeyListTokens, &ContactEditorData.KeyListPref);
     
 }