Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved checking of FN for meeting the base specification of vCard 4.0.
[xestiaab/.git]
/
source
/
contacteditor
/
ContactDataObject.h
diff --git
a/source/contacteditor/ContactDataObject.h
b/source/contacteditor/ContactDataObject.h
index
050bd53
..
b62c6a8
100644
(file)
--- a/
source/contacteditor/ContactDataObject.h
+++ b/
source/contacteditor/ContactDataObject.h
@@
-25,6
+25,7
@@
#include <wx/tokenzr.h>
#include "../vcard/vcard.h"
#include <wx/tokenzr.h>
#include "../vcard/vcard.h"
+#include "../common/textprocessing.h"
enum ContactLoadStatus{
CONTACTLOAD_UNITTESTFAIL = -1,
enum ContactLoadStatus{
CONTACTLOAD_UNITTESTFAIL = -1,
@@
-35,10
+36,20
@@
enum ContactLoadStatus{
CONTACTLOAD_FILEBASESPECFAIL
};
CONTACTLOAD_FILEBASESPECFAIL
};
+enum ContactKindType{
+ CONTACTKIND_NONE,
+ CONTACTKIND_INDIVIDUAL,
+ CONTACTKIND_GROUP,
+ CONTACTKIND_ORGANISATION,
+ CONTACTKIND_LOCATION
+};
+
class ContactDataObject{
public:
class ContactDataObject{
public:
+ ContactKindType ContactKind = CONTACTKIND_NONE;
+
/* Items on General Tab */
wxString NameTitle;
/* Items on General Tab */
wxString NameTitle;
@@
-457,6
+468,7
@@
class ContactDataObject{
std::map<int, wxString> GroupsListAltID;
std::map<int, wxString> GroupsListPID;
std::map<int, wxString> GroupsListType;
std::map<int, wxString> GroupsListAltID;
std::map<int, wxString> GroupsListPID;
std::map<int, wxString> GroupsListType;
+ std::map<int, wxString> GroupsListMediaType;
std::map<int, wxString> GroupsListTokens;
std::map<int, int> GroupsListPref;
std::map<int, wxString> GroupsListTokens;
std::map<int, int> GroupsListPref;
@@
-546,7
+558,15
@@
class ContactDataObject{
// Subroutines.
ContactLoadStatus LoadFile(wxString Filename);
// Subroutines.
ContactLoadStatus LoadFile(wxString Filename);
+ void ProcessKind(wxString KindData);
+ void ProcessMember(wxString PropertySeg1, wxString PropertySeg2, int *GroupCount);
+ void ProcessFN(wxString PropertySeg1, wxString PropertySeg2, int *FNCount);
};
};
+void SplitValues(wxString *PropertyLine,
+ std::map<int,int> *SplitPoints,
+ std::map<int,int> *SplitLength,
+ int intSize);
+
#endif
\ No newline at end of file
#endif
\ No newline at end of file
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy