From 6d000fe1839242559837e7b0a06f938231a8c87a Mon Sep 17 00:00:00 2001 From: Giorgos Tsiapaliokas Date: Mon, 29 Jul 2013 19:09:06 +0300 Subject: [PATCH] s/QVariantHash/QVariantMap. QVariantHash isn't consumable from QML --- src/declarativeimports/locale/calendarsystem.cpp | 8 ++++---- src/declarativeimports/locale/calendarsystem.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/declarativeimports/locale/calendarsystem.cpp b/src/declarativeimports/locale/calendarsystem.cpp index ad318ce0c..fb559f672 100644 --- a/src/declarativeimports/locale/calendarsystem.cpp +++ b/src/declarativeimports/locale/calendarsystem.cpp @@ -80,9 +80,9 @@ bool CalendarSystem::isValid(const QDate &date) const return m_calendarSystem->isValid(date); } -QVariantHash CalendarSystem::getDate(const QDate date) const +QVariantMap CalendarSystem::getDate(const QDate date) const { - QVariantHash hash; + QVariantMap hash; int year; int month; @@ -143,9 +143,9 @@ QDate CalendarSystem::addDays(const QDate &date, int numDays) const return m_calendarSystem->addDays(date, numDays); } -QVariantHash CalendarSystem::dateDifference(const QDate &fromDate, const QDate &toDate) const +QVariantMap CalendarSystem::dateDifference(const QDate &fromDate, const QDate &toDate) const { - QVariantHash hash; + QVariantMap hash; int yearsDiff; int monthsDiff; diff --git a/src/declarativeimports/locale/calendarsystem.h b/src/declarativeimports/locale/calendarsystem.h index 7efca9120..ccb4fc1d5 100644 --- a/src/declarativeimports/locale/calendarsystem.h +++ b/src/declarativeimports/locale/calendarsystem.h @@ -252,7 +252,7 @@ public: * ["day"] the day of the date * @param date date to get year, month and day for */ - Q_INVOKABLE QVariantHash getDate(const QDate date) const; + Q_INVOKABLE QVariantMap getDate(const QDate date) const; /** * Returns the year portion of a given date in the current calendar system @@ -355,7 +355,7 @@ public: * @param fromDate The date to start from * @param toDate The date to end at */ - Q_INVOKABLE QVariantHash dateDifference(const QDate &fromDate, const QDate &toDate)const; + Q_INVOKABLE QVariantMap dateDifference(const QDate &fromDate, const QDate &toDate)const; /** * Returns the difference between two dates in completed calendar years.