From 8fb3ab8465ad5d56a2405ec830e48954e254735c Mon Sep 17 00:00:00 2001
From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Fri, 1 Jan 2016 14:19:55 +0000
Subject: [PATCH] All items within the Other tab of the Contact Editor now use
 ContactDataObject.

---
 .../contacteditor/frmContactEditor-Other.cpp  | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/source/contacteditor/frmContactEditor-Other.cpp b/source/contacteditor/frmContactEditor-Other.cpp
index 4bd4575..d1af11f 100644
--- a/source/contacteditor/frmContactEditor-Other.cpp
+++ b/source/contacteditor/frmContactEditor-Other.cpp
@@ -1,6 +1,6 @@
 // frmContactEditor-Other.cpp - frmContactEditor Other tab subroutines.
 //
-// (c) 2012-2015 Xestia Software Development.
+// (c) 2012-2016 Xestia Software Development.
 //
 // This file is part of Xestia Address Book.
 //
@@ -26,10 +26,10 @@ void frmContactEditor::AddVendorNamespace( wxCommandEvent& event )
     
     frmContactEditorVendor *frameCEVen = new frmContactEditorVendor ( this );
     frameCEVen->SetEditorMode(FALSE);
-    intResult = GetLastInt(&VendorList);
-    frameCEVen->SetupPointers(&VendorList,
-                              &VendorListPEN,
-                              &VendorListElement,
+    intResult = GetLastInt(&ContactEditorData.VendorList);
+    frameCEVen->SetupPointers(&ContactEditorData.VendorList,
+                              &ContactEditorData.VendorListPEN,
+                              &ContactEditorData.VendorListElement,
                               lboVendorNamespace,
                               (intValueSeek));
     frameCEVen->ShowModal();
@@ -49,9 +49,9 @@ void frmContactEditor::ModifyVendorNamespace( wxCommandEvent& event )
     }
     
     frmContactEditorVendor *frameCEVen = new frmContactEditorVendor ( this );
-    frameCEVen->SetupPointers(&VendorList,
-                              &VendorListPEN,
-                              &VendorListElement,
+    frameCEVen->SetupPointers(&ContactEditorData.VendorList,
+                              &ContactEditorData.VendorListPEN,
+                              &ContactEditorData.VendorListElement,
                               lboVendorNamespace,
                               intSelectedData);
     frameCEVen->SetEditorMode(TRUE);
@@ -73,8 +73,8 @@ void frmContactEditor::DeleteVendorNamespace( wxCommandEvent& event )
     
     lboVendorNamespace->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &VendorList, &VendorListPEN,
-                  &VendorListElement);
+    DeleteMapData(intSelectedData, &ContactEditorData.VendorList, &ContactEditorData.VendorListPEN,
+                  &ContactEditorData.VendorListElement);
     
 }
 
@@ -84,9 +84,9 @@ void frmContactEditor::AddXToken( wxCommandEvent& event )
     
     frmContactEditorXToken *frameCEXT = new frmContactEditorXToken ( this );
     frameCEXT->SetEditorMode(FALSE);
-    intResult = GetLastInt(&XTokenList);
-    frameCEXT->SetupPointers(&XTokenList,
-                             &XTokenListTokens,
+    intResult = GetLastInt(&ContactEditorData.XTokenList);
+    frameCEXT->SetupPointers(&ContactEditorData.XTokenList,
+                             &ContactEditorData.XTokenListTokens,
                              lboXToken,
                              (intValueSeek));
     frameCEXT->ShowModal();
@@ -106,8 +106,8 @@ void frmContactEditor::ModifyXToken( wxCommandEvent& event )
     }
     
     frmContactEditorXToken *frameCEXT = new frmContactEditorXToken ( this );
-    frameCEXT->SetupPointers(&XTokenList,
-                             &XTokenListTokens,
+    frameCEXT->SetupPointers(&ContactEditorData.XTokenList,
+                             &ContactEditorData.XTokenListTokens,
                              lboXToken,
                              intSelectedData);
     frameCEXT->SetEditorMode(TRUE);
@@ -129,6 +129,6 @@ void frmContactEditor::DeleteXToken( wxCommandEvent& event )
     
     lboXToken->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &XTokenList, &XTokenListTokens);
+    DeleteMapData(intSelectedData, &ContactEditorData.XTokenList, &ContactEditorData.XTokenListTokens);
     
 }
-- 
2.39.2