From 85e36faa2c677dc0bd9160538f89a2f4c71cbbe0 Mon Sep 17 00:00:00 2001
From: Tasuku Suzuki <stasuku@gmail.com>
Date: Fri, 23 Nov 2012 18:21:02 +0900
Subject: Remove QUUID_STRING from qfeatures.{h,txt}
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It is too specific and relatively small

Change-Id: I55ec15ecaac0692741996a5c15a111db696490cf
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
---
 src/corelib/plugin/quuid.cpp | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'src/corelib/plugin/quuid.cpp')

diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp
index c1ebc57cf6..f9a9666de3 100644
--- a/src/corelib/plugin/quuid.cpp
+++ b/src/corelib/plugin/quuid.cpp
@@ -50,7 +50,6 @@
 #endif
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_QUUID_STRING
 template <class Char, class Integral>
 void _q_toHex(Char *&dst, Integral value)
 {
@@ -134,7 +133,6 @@ bool _q_uuidFromHex(const Char *&src, uint &d1, ushort &d2, ushort &d3, uchar (&
 
     return true;
 }
-#endif
 
 #ifndef QT_BOOTSTRAPPED
 static QUuid createFromName(const QUuid &ns, const QByteArray &baseData, QCryptographicHash::Algorithm algorithm, int version)
@@ -341,7 +339,6 @@ static QUuid createFromName(const QUuid &ns, const QByteArray &baseData, QCrypto
     \snippet code/src_corelib_plugin_quuid.cpp 0
 */
 
-#ifndef QT_NO_QUUID_STRING
 /*!
   Creates a QUuid object from the string \a text, which must be
   formatted as five hex fields separated by '-', e.g.,
@@ -422,8 +419,6 @@ QUuid::QUuid(const QByteArray &text)
     }
 }
 
-#endif
-
 /*!
   \since 5.0
   \fn QUuid QUuid::createUuidV3(const QUuid &ns, const QByteArray &baseData);
@@ -527,7 +522,7 @@ QUuid QUuid::fromRfc4122(const QByteArray &bytes)
     Returns true if this QUuid and the \a other QUuid are different;
     otherwise returns false.
 */
-#ifndef QT_NO_QUUID_STRING
+
 /*!
     Returns the string representation of this QUuid. The string is
     formatted as five hex fields separated by '-' and enclosed in
@@ -617,7 +612,6 @@ QByteArray QUuid::toByteArray() const
 
     return result;
 }
-#endif
 
 /*!
     Returns the binary representation of this QUuid. The byte array is in big
@@ -1016,12 +1010,7 @@ QUuid QUuid::createUuid()
 */
 QDebug operator<<(QDebug dbg, const QUuid &id)
 {
-#ifndef QT_NO_QUUID_STRING
     dbg.nospace() << "QUuid(" << id.toString() << ')';
-#else
-    Q_UNUSED(id)
-    dbg.nospace() << "QUuid(QT_NO_QUUID_STRING)";
-#endif
     return dbg.space();
 }
 #endif
-- 
cgit v1.2.3