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
Replaced the PREF code in TITLE with ProcessIntegerValue.
[xestiaab/.git]
/
source
/
contacteditor
/
ContactDataObject.cpp
diff --git
a/source/contacteditor/ContactDataObject.cpp
b/source/contacteditor/ContactDataObject.cpp
index
238484a
..
6247596
100644
(file)
--- a/
source/contacteditor/ContactDataObject.cpp
+++ b/
source/contacteditor/ContactDataObject.cpp
@@
-3107,9
+3107,8
@@
void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS
}
} else if (PropertyName == wxT("LANGUAGE")){
}
} else if (PropertyName == wxT("LANGUAGE")){
-
- GeneralRelatedListLanguage.erase(*RelatedCount);
- GeneralRelatedListLanguage.insert(std::make_pair(*RelatedCount, PropertyValue));
+
+ ProcessIntegerValue(this, &GeneralRelatedListPref, &PropertyValue, RelatedCount);
} else if (PropertyName != wxT("TYPE")) {
} else if (PropertyName != wxT("TYPE")) {
@@
-3260,25
+3259,9
@@
void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2,
WebsiteListPID->insert(std::make_pair(*URLCount, PropertyValue));
} else if (PropertyName == wxT("PREF")){
WebsiteListPID->insert(std::make_pair(*URLCount, PropertyValue));
} else if (PropertyName == wxT("PREF")){
-
- int PriorityNumber = 0;
- bool ValidNumber = TRUE;
-
- try{
- PriorityNumber = std::stoi(PropertyValue.ToStdString());
- }
-
- catch(std::invalid_argument &e){
- ValidNumber = FALSE;
- }
- if (ValidNumber == TRUE){
-
- WebsiteListPref->erase(*URLCount);
- WebsiteListPref->insert(std::make_pair(*URLCount, PriorityNumber));
-
- }
-
+ ProcessIntegerValue(this, WebsiteListPref, &PropertyValue, URLCount);
+
} else if (PropertyName == wxT("MEDIATYPE")){
WebsiteListMediatype->erase(*URLCount);
} else if (PropertyName == wxT("MEDIATYPE")){
WebsiteListMediatype->erase(*URLCount);
@@
-3434,25
+3417,9
@@
void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg
TitleListPID->insert(std::make_pair(*TitleCount, PropertyValue));
} else if (PropertyName == wxT("PREF")){
TitleListPID->insert(std::make_pair(*TitleCount, PropertyValue));
} else if (PropertyName == wxT("PREF")){
-
- int PriorityNumber = 0;
- bool ValidNumber = TRUE;
-
- try{
- PriorityNumber = std::stoi(PropertyValue.ToStdString());
- }
-
- catch(std::invalid_argument &e){
- ValidNumber = FALSE;
- }
-
- if (ValidNumber == TRUE){
- TitleListPref->erase(*TitleCount);
- TitleListPref->insert(std::make_pair(*TitleCount, PriorityNumber));
-
- }
-
+ ProcessIntegerValue(this, TitleListPref, &PropertyValue, TitleCount);
+
} else if (PropertyName == wxT("LANGUAGE")){
TitleListLanguage->erase(*TitleCount);
} else if (PropertyName == wxT("LANGUAGE")){
TitleListLanguage->erase(*TitleCount);
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy