From b0cf81684dd834d238b0233412fbfebd24fc5e27 Mon Sep 17 00:00:00 2001 From: Denis Dzyubenko Date: Mon, 2 Jan 2012 16:47:59 +0100 Subject: [PATCH] Removed obsolete function QUuid::operator QString() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is a source incompatible change, but I believe it is safe to say that it is a small change, which doesn't affect many people. Change-Id: Iad11befe4cca60484cf4e04cd3049c93a4ea5faf Reviewed-by: Prasanth Ullattil Reviewed-by: João Abecasis Reviewed-by: Lars Knoll --- dist/changes-5.0.0 | 5 +++++ src/corelib/plugin/quuid.cpp | 9 --------- src/corelib/plugin/quuid.h | 3 --- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0 index 3dec253f59..71aa52c79f 100644 --- a/dist/changes-5.0.0 +++ b/dist/changes-5.0.0 @@ -136,6 +136,11 @@ information about a particular change. QAbstractEventDispatcher::registeredTimers() will need to be updated to pass 3 arguments to the TimerInfo constructor (instead of 2). +- QUuid + + * Removed implicit conversion operator QUuid::operator QString(), instead + QUuid::toString() function should be used. + **************************************************************************** * General * **************************************************************************** diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp index 6fca1b6709..9f94d3bf6d 100644 --- a/src/corelib/plugin/quuid.cpp +++ b/src/corelib/plugin/quuid.cpp @@ -439,15 +439,6 @@ QUuid QUuid::fromRfc4122(const QByteArray &bytes) otherwise returns false. */ #ifndef QT_NO_QUUID_STRING -/*! - \fn QUuid::operator QString() const - \obsolete - - Returns the string representation of the uuid. - - \sa toString() -*/ - /*! Returns the string representation of this QUuid. The string is formatted as five hex fields separated by '-' and enclosed in diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h index 4557199dc3..0c4f3037a7 100644 --- a/src/corelib/plugin/quuid.h +++ b/src/corelib/plugin/quuid.h @@ -108,9 +108,6 @@ struct Q_CORE_EXPORT QUuid QUuid(const QString &); QUuid(const char *); QString toString() const; -#if QT_DEPRECATED_SINCE(5,0) - QT_DEPRECATED operator QString() const { return toString(); } -#endif QUuid(const QByteArray &); QByteArray toByteArray() const; #endif