diff options
| author | Tasuku Suzuki <stasuku@gmail.com> | 2012-11-23 18:21:02 +0900 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-05 11:35:16 +0100 |
| commit | 85e36faa2c677dc0bd9160538f89a2f4c71cbbe0 (patch) | |
| tree | 869a0a2326bdf9d4656163bf668d289dbc94c1e4 /src/corelib/plugin | |
| parent | 73969155416d8bcf9236b87d8d48ba8abf5b09e5 (diff) | |
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>
Diffstat (limited to 'src/corelib/plugin')
| -rw-r--r-- | src/corelib/plugin/quuid.cpp | 13 | ||||
| -rw-r--r-- | src/corelib/plugin/quuid.h | 4 |
2 files changed, 1 insertions, 16 deletions
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; |