diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-07-01 16:57:36 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-20 05:05:57 +0200 |
| commit | afe66eb9b4a9d4352409d8342495e2e6713bfb9f (patch) | |
| tree | bb0d5d8d28dc6c0ad398dcc0cae3528f19706618 /src/corelib/io/qurl.cpp | |
| parent | 53bcd630612a713eef994d83ce06d383ff17a8b8 (diff) | |
QUrl: Add an "appendingTo" parameter to QUrl::appendFragment
Will be needed in a future commit.
Change-Id: Ia5f384442d25d277e7582a20d1c37da4303c64c3
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'src/corelib/io/qurl.cpp')
| -rw-r--r-- | src/corelib/io/qurl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 3a1433ec39..f897e063c0 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -424,7 +424,7 @@ public: void appendHost(QString &appendTo, QUrl::FormattingOptions options) const; void appendPath(QString &appendTo, QUrl::FormattingOptions options, Section appendingTo) const; void appendQuery(QString &appendTo, QUrl::FormattingOptions options, Section appendingTo) const; - void appendFragment(QString &appendTo, QUrl::FormattingOptions options) const; + void appendFragment(QString &appendTo, QUrl::FormattingOptions options, Section appendingTo) const; // the "end" parameters are like STL iterators: they point to one past the last valid element bool setScheme(const QString &value, int len, bool doSetError); @@ -828,7 +828,7 @@ inline void QUrlPrivate::appendPath(QString &appendTo, QUrl::FormattingOptions o } } -inline void QUrlPrivate::appendFragment(QString &appendTo, QUrl::FormattingOptions options) const +inline void QUrlPrivate::appendFragment(QString &appendTo, QUrl::FormattingOptions options, Section appendingTo) const { appendToUser(appendTo, fragment, options, encodedFragmentActions, decodedFragmentInIsolationActions); } @@ -2842,7 +2842,7 @@ QString QUrl::fragment(ComponentFormattingOptions options) const if (!d) return QString(); QString result; - d->appendFragment(result, options); + d->appendFragment(result, options, QUrlPrivate::Fragment); if (d->hasFragment() && result.isNull()) result.detach(); return result; @@ -3096,7 +3096,7 @@ QString QUrl::toString(FormattingOptions options) const } if (!(options & QUrl::RemoveFragment) && d->hasFragment()) { url += QLatin1Char('#'); - d->appendFragment(url, options); + d->appendFragment(url, options, QUrlPrivate::FullUrl); } return url; |