From 2c8e030a3f1c2fd75737c883edacab5773755ee5 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 8 Jun 2011 11:55:40 +0200 Subject: Deprecated QUuid::toString Change-Id: I1186358df1c3f7615868725d93621608ed22ac99 Reviewed-on: http://codereview.qt.nokia.com/432 Reviewed-by: Qt Sanity Bot Reviewed-by: Lars Knoll --- src/corelib/plugin/quuid.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/corelib/plugin/quuid.h') diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h index 832d5bc5c6..28feff13d2 100644 --- a/src/corelib/plugin/quuid.h +++ b/src/corelib/plugin/quuid.h @@ -108,7 +108,9 @@ struct Q_CORE_EXPORT QUuid QUuid(const QString &); QUuid(const char *); QString toString() const; - operator QString() const { return toString(); } // ### Qt5 remove +#if QT_DEPRECATED_SINCE(5,0) + QT_DEPRECATED operator QString() const { return toString(); } +#endif QUuid(const QByteArray &); QByteArray toByteArray() const; #endif -- cgit v1.2.3 From 55d68a16aafb93aa15bcdbd78892006777b6067a Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 18 Jul 2011 12:12:57 +0200 Subject: Add a qHash for QUuid MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib0d9a765b8db3b34aa20d510de501c72a54cacbe Reviewed-on: http://codereview.qt.nokia.com/1743 Reviewed-by: Qt Sanity Bot Reviewed-by: Xizhi Zhu Reviewed-by: João Abecasis --- src/corelib/plugin/quuid.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/corelib/plugin/quuid.h') diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h index 28feff13d2..b941079df0 100644 --- a/src/corelib/plugin/quuid.h +++ b/src/corelib/plugin/quuid.h @@ -189,6 +189,8 @@ Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QUuid &); Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QUuid &); #endif +Q_CORE_EXPORT uint qHash(const QUuid &uuid); + QT_END_NAMESPACE QT_END_HEADER -- cgit v1.2.3