ContactManager cm;
ContactManager::Contact contact;
- getDetails(contact.street, contact.streetNumber,
- contact.zipCode, contact.city);
- contact.name = addContactInput_->text();
+ QString number;
+ QString street;
+ getDetails(street, number,
+ contact.zipCode, contact.city, contact.street);
+ ContactManager::stringToName(addContactInput_->text(), contact.name);
contact.number = numberButton_->valueText();
contact.country = country_;
OviMaps maps;
OviMaps::Address addr;
+ QString streetAndNumber;
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;
+
if(!maps.openMaps(addr))
{
QMaemo5InformationBox::information(this, tr("Unable to find coordinates for address."));
}
void DetailWindow::getDetails(QString& street, QString& streetNumber,
- QString& zip, QString& city)
+ QString& zip, QString& city, QString& streetAndNumber)
{
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;
QStringList words = streetVal.split(" ", QString::SkipEmptyParts);
}
}
+ if(streetNumber.isEmpty())
+ {
+ static QRegExp addrCheck(" ([0-9]+)");
+
+ if((pos = addrCheck.indexIn(street)) != -1)
+ {
+ streetNumber = addrCheck.cap(1);
+ street = street.left(pos);
+ }
+ }
+
streetNumber = streetNumber.trimmed();
street = street.trimmed();