From 5d8ab81119b56e50f9dd9aaf3182ca2c9f1e6b04 Mon Sep 17 00:00:00 2001 From: Giorgos Tsiapaliwkas Date: Mon, 19 Mar 2012 17:13:31 +0200 Subject: [PATCH] Remove an unnecessary enum --- declarativeimports/locale/calendarsystem.h | 2 +- declarativeimports/locale/locale.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/declarativeimports/locale/calendarsystem.h b/declarativeimports/locale/calendarsystem.h index cbd56e8b8..f23b9aab4 100644 --- a/declarativeimports/locale/calendarsystem.h +++ b/declarativeimports/locale/calendarsystem.h @@ -250,7 +250,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;//TODO should it be part of the QML Wrapper? + Q_INVOKABLE QVariantHash getDate(const QDate date) const; /** * Returns the year portion of a given date in the current calendar system diff --git a/declarativeimports/locale/locale.h b/declarativeimports/locale/locale.h index d60dd2780..27e5ecda3 100644 --- a/declarativeimports/locale/locale.h +++ b/declarativeimports/locale/locale.h @@ -71,7 +71,6 @@ Q_ENUMS(DateTimeParseMode) Q_ENUMS(DigitSet) Q_ENUMS(MeasureSystem) Q_ENUMS(ReadDateFlags) -Q_ENUMS(ReadTimeFlags) Q_ENUMS(SignPosition) Q_ENUMS(TimeFormatOption) Q_ENUMS(TimeProcessingOption) @@ -1067,11 +1066,6 @@ public: * @return The string converted to a QTime */ - enum ReadTimeFlags { - WithSeconds = 0, ///< Only accept a time string with seconds. Default (no flag set) - WithoutSeconds = 1 ///< Only accept a time string without seconds. - }; // (maybe use this enum as a bitfield, if adding independent features?) - Q_INVOKABLE QTime readLocaleTime(const QString &str, bool *ok = 0, TimeFormatOptions options = Locale::TimeDefault, TimeProcessingOptions processing = ProcessNonStrict) const;