diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-16 17:27:31 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-20 07:38:17 +0100 |
| commit | 2e4b1a8334d4de585e90637c070ba9832a0608f1 (patch) | |
| tree | 4eb33e95bf8f5d064b219bf271bc5c30cffd5de9 /src/corelib/tools/qmap.cpp | |
| parent | 5d366f7e422129ec0c229b78f247b66e4ba63a59 (diff) | |
Remove Q_NO_USING_KEYWORD
There's a lot of code now requiring it. Any compiler that doesn't
support the keyword is too old for Qt now. The last time anyone asked
about this macro was for QTBUG-27393 and we don't know which compiler
that was.
As a necessity, this patch contains a reversal of
a0c3a57aed5cde37017733e7cf5e41cc6a1174aa
[ChangeLog][Compiler Specific Changes] Qt 5.5 now unconditionally uses
the "using" keyword. Compilers that do not support this keyword are
deprecated and will not be able to build Qt. Previous versions of Qt may
or may not compile, as no testing was done to ensure it worked.
Change-Id: Ief042f34aba555a095d1f342a0ee7ee9feadf42d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Diffstat (limited to 'src/corelib/tools/qmap.cpp')
| -rw-r--r-- | src/corelib/tools/qmap.cpp | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp index 38b4c0ad7e..ef5fbac377 100644 --- a/src/corelib/tools/qmap.cpp +++ b/src/corelib/tools/qmap.cpp @@ -1798,12 +1798,6 @@ void QMapDataBase::freeData(QMapDataBase *d) */ /*! - \fn bool QMultiMap::contains(const Key &key) const - \overload - \sa QMap::contains() -*/ - -/*! \fn int QMultiMap::remove(const Key &key, const T &value) \since 4.3 @@ -1814,12 +1808,6 @@ void QMapDataBase::freeData(QMapDataBase *d) */ /*! - \fn int QMultiMap::remove(const Key &key) - \overload - \sa QMap::remove() -*/ - -/*! \fn int QMultiMap::count(const Key &key, const T &value) const \since 4.3 @@ -1829,18 +1817,6 @@ void QMapDataBase::freeData(QMapDataBase *d) */ /*! - \fn int QMultiMap::count(const Key &key) const - \overload - \sa QMap::count() -*/ - -/*! - \fn int QMultiMap::count() const - \overload - \sa QMap::count() -*/ - -/*! \fn typename QMap<Key, T>::iterator QMultiMap::find(const Key &key, const T &value) \since 4.3 @@ -1857,12 +1833,6 @@ void QMapDataBase::freeData(QMapDataBase *d) */ /*! - \fn typename QMap<Key, T>::iterator QMultiMap::find(const Key &key) - \overload - \sa QMap::find() -*/ - -/*! \fn typename QMap<Key, T>::const_iterator QMultiMap::find(const Key &key, const T &value) const \since 4.3 \overload @@ -1880,13 +1850,6 @@ void QMapDataBase::freeData(QMapDataBase *d) */ /*! - \fn typename QMap<Key, T>::const_iterator QMultiMap::find(const Key &key) const - \since 4.3 - \overload - \sa QMap::find() -*/ - -/*! \fn typename QMap<Key, T>::const_iterator QMultiMap::constFind(const Key &key, const T &value) const \since 4.3 @@ -1899,10 +1862,4 @@ void QMapDataBase::freeData(QMapDataBase *d) \sa QMap::constFind() */ -/*! - \fn typename QMap<Key, T>::const_iterator QMultiMap::constFind(const Key &key) const - \overload - \sa QMap::constFind() -*/ - QT_END_NAMESPACE |