projects
/
jenirok
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed add to contacts button so that it adds street number to street field instead...
[jenirok]
/
src
/
gui
/
detailwindow.cpp
diff --git
a/src/gui/detailwindow.cpp
b/src/gui/detailwindow.cpp
index
12d5ef7
..
39cc7bf
100644
(file)
--- a/
src/gui/detailwindow.cpp
+++ b/
src/gui/detailwindow.cpp
@@
-154,8
+154,10
@@
void DetailWindow::addToContacts()
ContactManager cm;
ContactManager::Contact contact;
ContactManager cm;
ContactManager::Contact contact;
- getDetails(contact.street, contact.streetNumber,
- contact.zipCode, contact.city);
+ QString number;
+ QString street;
+ getDetails(street, number,
+ contact.zipCode, contact.city, contact.street);
contact.name = addContactInput_->text();
contact.number = numberButton_->valueText();
contact.country = country_;
contact.name = addContactInput_->text();
contact.number = numberButton_->valueText();
contact.country = country_;
@@
-222,8
+224,9
@@
void DetailWindow::openMaps()
OviMaps maps;
OviMaps::Address addr;
OviMaps maps;
OviMaps::Address addr;
+ QString streetAndNumber;
getDetails(addr.street, addr.number,
getDetails(addr.street, addr.number,
- addr.zipCode, addr.city);
+ addr.zipCode, addr.city, streetAndNumber);
addr.country = country_;
//qDebug() << addr.street << addr.number << addr.zipCode << addr.city << addr.country;
addr.country = country_;
//qDebug() << addr.street << addr.number << addr.zipCode << addr.city << addr.country;
@@
-237,11
+240,14
@@
void DetailWindow::openMaps()
}
void DetailWindow::getDetails(QString& street, QString& streetNumber,
}
void DetailWindow::getDetails(QString& street, QString& streetNumber,
- QString& zip, QString& city)
+ QString& zip, QString& city, QString& streetAndNumber)
{
int pos = 0;
QString streetVal = streetButton_->valueText();
{
int pos = 0;
QString streetVal = streetButton_->valueText();
+ streetVal = streetVal.replace("Str.", QString::fromUtf8("Straße"));
+ streetVal = streetVal.replace("str.", QString::fromUtf8("straße"));
+ streetAndNumber = streetVal;
QString cityVal = cityButton_->valueText();
city = cityVal;
QString cityVal = cityButton_->valueText();
city = cityVal;
@@
-285,8
+291,6
@@
void DetailWindow::getDetails(QString& street, QString& streetNumber,
}
streetNumber = streetNumber.trimmed();
}
streetNumber = streetNumber.trimmed();
- street = street.replace("Str.", QString::fromUtf8("Straße"));
- street = street.replace("str.", QString::fromUtf8("straße"));
street = street.trimmed();
if((pos = cityVal.indexOf(" ")) > 0)
street = street.trimmed();
if((pos = cityVal.indexOf(" ")) > 0)