diff options
| -rw-r--r-- | src/corelib/io/qurl.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index 49674e5..f72c45d 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -81,17 +81,12 @@ public: Q_DECLARE_FLAGS(FormattingOptions, FormattingOption) QUrl(); -#ifdef Q_EXPLICIT_URL_QSTRING_CONVERSION - explicit -#endif QUrl(const QString &url); QUrl(const QString &url, ParsingMode mode); // ### Qt 5: merge the two constructors, with mode = TolerantMode QUrl(const QUrl ©); QUrl &operator =(const QUrl ©); -#ifndef Q_EXPLICIT_URL_QSTRING_CONVERSION QUrl &operator =(const QString &url); -#endif ~QUrl(); void setUrl(const QString &url); @@ -240,9 +235,7 @@ public: { url = QString::fromLatin1(QUrl::toPercentEncoding(url).constData()); } -#ifndef Q_EXPLICIT_URL_QSTRING_CONVERSION inline QT3_SUPPORT operator QString() const { return toString(); } -#endif inline QT3_SUPPORT bool cdUp() { *this = resolved(QUrl(QLatin1String(".."))); |