diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-06-28 23:33:34 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-06-29 15:10:14 +0200 |
commit | 6fa1bbdce09bbbee2ea50b9360c821e54c81be51 (patch) | |
tree | 98796b534428c36023bf107b1c0b1e49ae75f755 /src/corelib/io/qurl.h | |
parent | 369696dc231450c774a5cc253d061aad2f3b6a19 (diff) |
remove QT3_SUPPORT in corelib/io
Change-Id: Ia9ad0bebacc538a7392afb0fdcca40e8a2bb687b
Reviewed-on: http://codereview.qt.nokia.com/865
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>
Diffstat (limited to 'src/corelib/io/qurl.h')
-rw-r--r-- | src/corelib/io/qurl.h | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index d57a0c77df..e62cd0a85b 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -221,58 +221,8 @@ public: static QStringList idnWhitelist(); static void setIdnWhitelist(const QStringList &); -#if defined QT3_SUPPORT - inline QT3_SUPPORT QString protocol() const { return scheme(); } - inline QT3_SUPPORT void setProtocol(const QString &s) { setScheme(s); } - inline QT3_SUPPORT void setUser(const QString &s) { setUserName(s); } - inline QT3_SUPPORT QString user() const { return userName(); } - inline QT3_SUPPORT bool hasUser() const { return !userName().isEmpty(); } - inline QT3_SUPPORT bool hasPassword() const { return !password().isEmpty(); } - inline QT3_SUPPORT bool hasHost() const { return !host().isEmpty(); } - inline QT3_SUPPORT bool hasPort() const { return port() != -1; } - inline QT3_SUPPORT bool hasPath() const { return !path().isEmpty(); } - inline QT3_SUPPORT void setQuery(const QString &txt) - { - setEncodedQuery(txt.toLatin1()); - } - inline QT3_SUPPORT QString query() const - { - return QString::fromLatin1(encodedQuery().constData()); - } - inline QT3_SUPPORT QString ref() const { return fragment(); } - inline QT3_SUPPORT void setRef(const QString &txt) { setFragment(txt); } - inline QT3_SUPPORT bool hasRef() const { return !fragment().isEmpty(); } - inline QT3_SUPPORT void addPath(const QString &p) { setPath(path() + QLatin1Char('/') + p); } - QT3_SUPPORT void setFileName(const QString &txt); - QT3_SUPPORT QString fileName() const; - QT3_SUPPORT QString dirPath() const; - static inline QT3_SUPPORT void decode(QString &url) - { - url = QUrl::fromPercentEncoding(url.toLatin1()); - } - static inline QT3_SUPPORT void encode(QString &url) - { - url = QString::fromLatin1(QUrl::toPercentEncoding(url).constData()); - } - inline QT3_SUPPORT operator QString() const { return toString(); } - inline QT3_SUPPORT bool cdUp() - { - *this = resolved(QUrl(QLatin1String(".."))); - return true; - } - static inline QT3_SUPPORT bool isRelativeUrl(const QString &url) - { - return QUrl(url).isRelative(); - } -#endif - QString errorString() const; -protected: -#if defined (QT3_SUPPORT) - inline QT3_SUPPORT void reset() { clear(); } -#endif - private: QUrlPrivate *d; public: |