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 for CALURI with ProcessIntegerValue.
[xestiaab/.git]
/
source
/
contacteditor
/
ContactDataObject.cpp
diff --git
a/source/contacteditor/ContactDataObject.cpp
b/source/contacteditor/ContactDataObject.cpp
index
37d1361
..
eb30e5b
100644
(file)
--- a/
source/contacteditor/ContactDataObject.cpp
+++ b/
source/contacteditor/ContactDataObject.cpp
@@
-4302,24
+4302,8
@@
void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg
PicturesListPID.insert(std::make_pair(*PhotoCount, PropertyValue));
} else if (PropertyName == wxT("PREF")){
PicturesListPID.insert(std::make_pair(*PhotoCount, 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){
-
- PicturesListPref.erase(*PhotoCount);
- PicturesListPref.insert(std::make_pair(*PhotoCount, PriorityNumber));
-
- }
+ ProcessIntegerValue(this, &PicturesListPref, &PropertyValue, PhotoCount);
} else if (PropertyName == wxT("MEDIATYPE")){
} else if (PropertyName == wxT("MEDIATYPE")){
@@
-4519,24
+4503,8
@@
void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2
LogosListPID.insert(std::make_pair(*LogoCount, PropertyValue));
} else if (PropertyName == wxT("PREF")){
LogosListPID.insert(std::make_pair(*LogoCount, 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){
-
- LogosListPref.erase(*LogoCount);
- LogosListPref.insert(std::make_pair(*LogoCount, PriorityNumber));
-
- }
+ ProcessIntegerValue(this, &LogosListPref, &PropertyValue, LogoCount);
} else if (PropertyName == wxT("MEDIATYPE")){
} else if (PropertyName == wxT("MEDIATYPE")){
@@
-4736,24
+4704,8
@@
void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg
SoundsListPID.insert(std::make_pair(*SoundCount, PropertyValue));
} else if (PropertyName == wxT("PREF")){
SoundsListPID.insert(std::make_pair(*SoundCount, 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){
-
- SoundsListPref.erase(*SoundCount);
- SoundsListPref.insert(std::make_pair(*SoundCount, PriorityNumber));
-
- }
+ ProcessIntegerValue(this, &SoundsListPref, &PropertyValue, SoundCount);
} else if (PropertyName == wxT("MEDIATYPE")){
} else if (PropertyName == wxT("MEDIATYPE")){
@@
-4958,24
+4910,8
@@
void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope
CalendarListPID.insert(std::make_pair(*CalURICount, PropertyValue));
} else if (PropertyName == wxT("PREF")){
CalendarListPID.insert(std::make_pair(*CalURICount, 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){
-
- CalendarListPref.erase(*CalURICount);
- CalendarListPref.insert(std::make_pair(*CalURICount, PriorityNumber));
-
- }
+ ProcessIntegerValue(this, &CalendarListPref, &PropertyValue, CalURICount);
} else if (PropertyName == wxT("MEDIATYPE")){
} else if (PropertyName == wxT("MEDIATYPE")){
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy