diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-21 14:42:46 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-21 14:42:46 +0200 |
| commit | 7b3b6b5afaaf1db1bfbfa9b56fa7b955a61344bd (patch) | |
| tree | 8be0d601853d021434e03cef9a9cfd64b3708e92 /src/corelib/io/qurl.cpp | |
| parent | 070fc2f694beaa56fc191f1a3f6a1b9812f4ed35 (diff) | |
| parent | 56defa4725508608a85e2813b85af3a7fcefefa0 (diff) | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
examples/opengl/cube/main.cpp
examples/widgets/applicationicon/main.cpp
examples/widgets/orientation/main.cpp
src/gui/image/qicon.cpp
src/gui/image/qimage.h
src/gui/image/qpixmap.h
src/gui/image/qpixmap_mac.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qpalette.cpp
src/gui/kernel/qwidget.cpp
src/gui/styles/qmacstyle_mac.mm
src/gui/widgets/qmenubar.cpp
src/gui/widgets/qslider.cpp
src/opengl/qwindowsurface_gl.cpp
tests/auto/qvariant/qvariant.pro
tests/benchmarks/corelib/kernel/qobject/qobject.pro
tests/benchmarks/gui/animation/qanimation/qanimation.pro
tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro
tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro
tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro
tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro
tests/benchmarks/gui/image/qimagereader/qimagereader.pro
tests/benchmarks/gui/itemviews/qtableview/qtableview.pro
tests/benchmarks/gui/kernel/qapplication/qapplication.pro
tests/benchmarks/gui/kernel/qwidget/qwidget.pro
tests/benchmarks/gui/painting/qpainter/qpainter.pro
tests/benchmarks/gui/painting/qtbench/qtbench.pro
tests/benchmarks/gui/painting/qtracebench/qtracebench.pro
tests/benchmarks/gui/text/qtext/qtext.pro
Change-Id: I4b911c795ecb29d73b6a7fd18819711b49478a30
Diffstat (limited to 'src/corelib/io/qurl.cpp')
| -rw-r--r-- | src/corelib/io/qurl.cpp | 152 |
1 files changed, 0 insertions, 152 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index b948a43080..8e3c98c739 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -6208,158 +6208,6 @@ bool QUrl::isParentOf(const QUrl &childUrl) const && childPath.length() > ourPath.length() && childPath.at(ourPath.length()) == QLatin1Char('/')))); } -/*! - \fn void QUrl::setProtocol(const QString &s) - - Use setScheme() instead. -*/ - -/*! - \fn void QUrl::setUser(const QString &s) - - Use setUserName() instead. -*/ - -/*! - \fn bool QUrl::hasUser() const - - Use !userName().isEmpty() instead. -*/ - -/*! - \fn bool QUrl::hasPassword() const - - Use !password().isEmpty() instead. -*/ - -/*! - \fn bool QUrl::hasHost() const - - Use !host().isEmpty() instead. -*/ - -/*! - \fn bool QUrl::hasPort() const - - Use port() != -1 instead. -*/ - -/*! - \fn bool QUrl::hasPath() const - - Use !path().isEmpty() instead. -*/ - -/*! - \fn void QUrl::setQuery(const QString &txt) - - Use setEncodedQuery() instead. -*/ - -/*! - \fn void QUrl::setRef(const QString &txt) - - Use setFragment() instead. -*/ - -/*! - \fn bool QUrl::hasRef() const - - Use !fragment().isEmpty() instead. -*/ - -/*! - \fn void QUrl::addPath(const QString &p) - - Use setPath() instead. -*/ - -/*! - \fn void QUrl::setFileName(const QString &txt) - - Use setPath() instead. -*/ - -/*! - \fn void QUrl::decode(QString &url) - - Use fromPercentEncoding() instead. -*/ - -/*! - \fn void QUrl::encode(QString &url) - - Use toPercentEncoding() instead. -*/ - -/*! - \fn bool QUrl::cdUp() - - Use resolved("..") instead. - - \oldcode - QUrl url("http://example.com/Developer/"); - url.cdUp(); - \newcode - QUrl url("http://example.com/Developer/"); - url = url.resolved(".."); - \endcode -*/ - -/*! - \fn bool QUrl::isRelativeUrl(const QString &url) - - Use isRelative() instead. -*/ - -/*! - \fn void QUrl::reset() - - Use clear() instead. -*/ - -/*! - \fn QUrl::operator QString() const - - Use toString() instead. -*/ - -/*! - \fn QString QUrl::protocol() const - - Use scheme() instead. -*/ - -/*! - \fn QString QUrl::user() const - - Use userName() instead. -*/ - -/*! - \fn QString QUrl::query() const - - Use encodedQuery() instead. -*/ - -/*! - \fn QString QUrl::ref() const - - Use fragment() instead. -*/ - -/*! - \fn QString QUrl::fileName() const - - Use QFileInfo(path()).fileName() instead. -*/ - -/*! - \fn QString QUrl::dirPath() const - - Use QFileInfo(path()).absolutePath() or QFileInfo(path()) instead. -*/ - #ifndef QT_NO_DATASTREAM /*! \relates QUrl |