@@ -60,12 +60,12 @@ QVariant TimeZoneLocationModel::data(const QModelIndex &index, int role) const
61 switch (role) {
61 switch (role) {
62 case Qt::DisplayRole:
62 case Qt::DisplayRole:
63− return QVariant(QString("%1, %2, %3").arg(geonames_city_get_name(city))
63+ return QStringLiteral("%1, %2, %3").arg(geonames_city_get_name(city))
64− .arg(geonames_city_get_state(city))
64+ .arg(geonames_city_get_state(city))
65− .arg(geonames_city_get_country(city)));
65+ .arg(geonames_city_get_country(city));
66 case SimpleRole:
66 case SimpleRole:
67− return QVariant(QString("%1, %2").arg(geonames_city_get_name(city))
67+ return QStringLiteral("%1, %2").arg(geonames_city_get_name(city))
68− .arg(geonames_city_get_country(city)));
68+ .arg(geonames_city_get_country(city));
69 case TimeZoneRole:
69 case TimeZoneRole:
70 return geonames_city_get_timezone(city);
70 return geonames_city_get_timezone(city);
71 case CountryRole:
71 case CountryRole:
@@ -91,7 +91,7 @@ QHash<int, QByteArray> TimeZoneLocationModel::roleNames() const
91 return m_roleNames;
91 return m_roleNames;
94−void TimeZoneLocationModel::setModel(QList<GeonamesCity *> locations)
94+void TimeZoneLocationModel::setModel(const QList<GeonamesCity *> &locations)
96 beginResetModel();
96 beginResetModel();