diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2010-11-02 14:20:38 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-11-03 10:50:48 (GMT) |
| commit | 86ea8521c6f145be24c40c799b6b4e8f6e854e2b (patch) | |
| tree | bbceb07abeb3f8b974287ea648fd995b4ba8345c /src/corelib/io | |
| parent | d12681a4cf1227d0e92fc7cf12aa3977e6ffe3fe (diff) | |
| download | Qt-86ea8521c6f145be24c40c799b6b4e8f6e854e2b.zip Qt-86ea8521c6f145be24c40c799b6b4e8f6e854e2b.tar.gz Qt-86ea8521c6f145be24c40c799b6b4e8f6e854e2b.tar.bz2 | |
Add member-swap to shared datatypes that don't have it.
For consistency.
Merge-request: 871
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qurl.cpp | 8 | ||||
| -rw-r--r-- | src/corelib/io/qurl.h | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 6452c0f..6ec5562 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -6048,6 +6048,14 @@ QUrl &QUrl::operator =(const QString &url) return *this; } +/*! + \fn void QUrl::swap(QUrl &other) + \since 4.8 + + Swaps URL \a other with this URL. This operation is very + fast and never fails. +*/ + /*! \internal Forces a detach. diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index 563be5f..63fe98d 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -100,6 +100,8 @@ public: #endif ~QUrl(); + inline void swap(QUrl &other) { qSwap(d, other.d); } + void setUrl(const QString &url); void setUrl(const QString &url, ParsingMode mode); // ### Qt 5: merge the two setUrl() functions, with mode = TolerantMode |