diff options
Diffstat (limited to 'src/corelib/tools/qtimezoneprivate_p.h')
| -rw-r--r-- | src/corelib/tools/qtimezoneprivate_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/tools/qtimezoneprivate_p.h b/src/corelib/tools/qtimezoneprivate_p.h index 9f99f49fcf..186a352a2f 100644 --- a/src/corelib/tools/qtimezoneprivate_p.h +++ b/src/corelib/tools/qtimezoneprivate_p.h @@ -146,12 +146,12 @@ public: static bool isValidId(const QByteArray &olsenId); static QString isoOffsetFormat(int offsetFromUtc); - static QByteArray olsenIdToWindowsId(const QByteArray &olsenId); - static QByteArray windowsIdToDefaultOlsenId(const QByteArray &windowsId); - static QByteArray windowsIdToDefaultOlsenId(const QByteArray &windowsId, + static QByteArray ianaIdToWindowsId(const QByteArray &ianaId); + static QByteArray windowsIdToDefaultIanaId(const QByteArray &windowsId); + static QByteArray windowsIdToDefaultIanaId(const QByteArray &windowsId, QLocale::Country country); - static QList<QByteArray> windowsIdToOlsenIds(const QByteArray &windowsId); - static QList<QByteArray> windowsIdToOlsenIds(const QByteArray &windowsId, + static QList<QByteArray> windowsIdToIanaIds(const QByteArray &windowsId); + static QList<QByteArray> windowsIdToIanaIds(const QByteArray &windowsId, QLocale::Country country); protected: |