2bb7773 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

unbreak the clash between our timezone model and the one from system settings

2bb7773Lukáš Tinkl11 years ago

plugins/Wizard/timezonemodel.cpp+4−4

compare with xenial

unifiedsplit

@@ -28,7 +28,7 @@ TimeZoneLocationModel::TimeZoneLocationModel(QObject *parent):

28 QAbstractListModel(parent),

29 m_workerThread(new TimeZonePopulateWorker())

30{

31− qRegisterMetaType<TzLocation>();

31+ qRegisterMetaType<TzLocationWizard>();

33 m_roleNames[Qt::DisplayRole] = "displayName";

34 m_roleNames[TimeZoneRole] = "timeZone";

@@ -66,7 +66,7 @@ void TimeZoneLocationModel::store()

66 endResetModel();

67}

69−void TimeZoneLocationModel::processModelResult(const TzLocation &location)

69+void TimeZoneLocationModel::processModelResult(const TzLocationWizard &location)

70{

71 m_locations.append(location);

72}

@@ -83,7 +83,7 @@ QVariant TimeZoneLocationModel::data(const QModelIndex &index, int role) const

83 if (index.row() >= m_locations.count() || index.row() < 0)

84 return QVariant();

86− const TzLocation tz = m_locations.at(index.row());

86+ const TzLocationWizard tz = m_locations.at(index.row());

88 const QString country(tz.full_country.isEmpty() ? tz.country : tz.full_country);

@@ -130,7 +130,7 @@ void TimeZonePopulateWorker::buildCityMap()

130 TzDB *tzdb = tz_load_db();

131 GPtrArray *tz_locations = tz_get_locations(tzdb);

132

133− TimeZoneLocationModel::TzLocation tmpTz;

133+ TimeZoneLocationModel::TzLocationWizard tmpTz;

134

135 for (guint i = 0; i < tz_locations->len; ++i) {

136 auto tmp = static_cast<CcTimezoneLocation *>(g_ptr_array_index(tz_locations, i));

plugins/Wizard/timezonemodel.h+5−5

@@ -42,7 +42,7 @@ public:

42 LongitudeRole

43 };

45− struct TzLocation {

45+ struct TzLocationWizard {

46 QString city;

47 QString country;

48 QString timezone;

@@ -57,17 +57,17 @@ public:

57 QHash<int, QByteArray> roleNames() const override;

59private Q_SLOTS:

60− void processModelResult(const TzLocation &location);

60+ void processModelResult(const TzLocationWizard &location);

61 void store();

63private:

64 void init();

65 QHash<int, QByteArray> m_roleNames;

66− QList<TzLocation> m_locations;

66+ QList<TzLocationWizard> m_locations;

67 TimeZonePopulateWorker *m_workerThread;

68};

70−Q_DECLARE_METATYPE (TimeZoneLocationModel::TzLocation)

70+Q_DECLARE_METATYPE (TimeZoneLocationModel::TzLocationWizard)

72class TimeZonePopulateWorker: public QThread

73{

@@ -76,7 +76,7 @@ public:

76 void run() override;

78Q_SIGNALS:

79− void resultReady(const TimeZoneLocationModel::TzLocation &tz);

79+ void resultReady(const TimeZoneLocationModel::TzLocationWizard &tz);

81private:

82 void buildCityMap();