Remove QUUID_STRING from qfeatures.{h,txt}

It is too specific and relatively small

Change-Id: I55ec15ecaac0692741996a5c15a111db696490cf
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>

8 files changed, 1 insertions, 41 deletions

diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h
index 28cb8fbede..6a21492827 100644
--- a/src/corelib/global/qconfig-minimal.h
+++ b/src/corelib/global/qconfig-minimal.h
@@ -40,9 +40,6 @@
 ****************************************************************************/
 
 /* Data structures */
-#ifndef QT_NO_QUUID_STRING
-#  define QT_NO_QUUID_STRING
-#endif
 #ifndef QT_NO_TEXTDATE
 #  define QT_NO_TEXTDATE
 #endif
diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h
index d5172aac29..9dac73ea93 100644
--- a/src/corelib/global/qconfig-nacl.h
+++ b/src/corelib/global/qconfig-nacl.h
@@ -46,9 +46,6 @@
 #define QT_FONTS_ARE_RESOURCES
 
 /* Data structures */
-#ifndef QT_NO_QUUID_STRING
-#  define QT_NO_QUUID_STRING
-#endif
 #ifndef QT_NO_TEXTDATE
 #  define QT_NO_TEXTDATE
 #endif
diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h
index 9d72cd5d4c..405521c338 100644
--- a/src/corelib/global/qconfig-small.h
+++ b/src/corelib/global/qconfig-small.h
@@ -39,11 +39,6 @@
 **
 ****************************************************************************/
 
-/* Data structures */
-#ifndef QT_NO_QUUID_STRING
-#  define QT_NO_QUUID_STRING
-#endif
-
 /* Dialogs */
 #ifndef QT_NO_COLORDIALOG
 #  define QT_NO_COLORDIALOG
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
index 26d92592cb..d2c1095a4f 100644
--- a/src/corelib/global/qfeatures.h
+++ b/src/corelib/global/qfeatures.h
@@ -157,9 +157,6 @@
 // Properties
 //#define QT_NO_PROPERTIES
 
-//  Universally Unique Identifier Convertion
-//#define QT_NO_QUUID_STRING
-
 // Resize Handler
 //#define QT_NO_RESIZEHANDLER
 
diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt
index 941150351a..d627f38a70 100644
--- a/src/corelib/global/qfeatures.txt
+++ b/src/corelib/global/qfeatures.txt
@@ -141,13 +141,6 @@ Name: QInputContext
 SeeAlso: ???
 # Data structures
 
-Feature: QUUID_STRING
-Description: Supports convertion between UUID and strings.
-Section: Data structures
-Requires:
-Name:  Universally Unique Identifier Convertion
-SeeAlso: ???
-
 Feature: TEXTDATE
 Description: Supports month and day names in dates.
 Section: Data structures
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 9ff9d10bf0..26deeba6a2 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -341,11 +341,9 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
             *str = v_cast<QUrl>(d)->toString();
             break;
 #endif
-#ifndef QT_NO_QUUID_STRING
         case QVariant::Uuid:
             *str = v_cast<QUuid>(d)->toString();
             break;
-#endif
         default:
             return false;
         }
@@ -722,11 +720,9 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
 #endif
     case QVariant::Uuid:
         switch (d->type) {
-#ifndef QT_NO_QUUID_STRING
         case QVariant::String:
             *static_cast<QUuid *>(result) = QUuid(*v_cast<QString>(d));
             break;
-#endif
         default:
             return false;
         }
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
diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h
index ba475ac33b..d1b56002f3 100644
--- a/src/corelib/plugin/quuid.h
+++ b/src/corelib/plugin/quuid.h
@@ -115,13 +115,11 @@ public:
     }
 #endif
 
-#ifndef QT_NO_QUUID_STRING
     QUuid(const QString &);
     QUuid(const char *);
     QString toString() const;
     QUuid(const QByteArray &);
     QByteArray toByteArray() const;
-#endif
     QByteArray toRfc4122() const;
     static QUuid fromRfc4122(const QByteArray &);
     bool isNull() const;
@@ -193,7 +191,6 @@ public:
 #ifndef QT_BOOTSTRAPPED
     static QUuid createUuidV3(const QUuid &ns, const QByteArray &baseData);
     static QUuid createUuidV5(const QUuid &ns, const QByteArray &baseData);
-#ifndef QT_NO_QUUID_STRING
     static inline QUuid createUuidV3(const QUuid &ns, const QString &baseData)
     {
         return QUuid::createUuidV3(ns, baseData.toUtf8());
@@ -205,7 +202,6 @@ public:
     }
 
 #endif
-#endif
 
     QUuid::Variant variant() const;
     QUuid::Version version() const;