diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2016-05-02 19:01:55 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2016-05-03 15:20:30 +0000 |
| commit | 224db5e6eb07154ba2e974a96ee617bf7d740134 (patch) | |
| tree | 4fba1c56f9ef01bf1723ca07da297283004746cb /src/corelib/io | |
| parent | 597df79c27a2573d540e231bb7b88baf40e5e58e (diff) | |
darwin: Move conversion function documentation to function definition
It's easier to maintain the function and the docs when they live together.
Change-Id: I1e047b4ac1eb61a36849188da560dd899e05509f
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qurl.cpp | 27 | ||||
| -rw-r--r-- | src/corelib/io/qurl_mac.mm | 23 |
2 files changed, 23 insertions, 27 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 1e409c105c..3c1d314d20 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -3452,33 +3452,6 @@ QByteArray QUrl::toPercentEncoding(const QString &input, const QByteArray &exclu return input.toUtf8().toPercentEncoding(exclude, include); } -/*! \fn QUrl QUrl::fromCFURL(CFURLRef url) - \since 5.2 - - Constructs a QUrl containing a copy of the CFURL \a url. -*/ - -/*! \fn CFURLRef QUrl::toCFURL() const - \since 5.2 - - Creates a CFURL from a QUrl. The caller owns the CFURL and is - responsible for releasing it. -*/ - -/*! - \fn QUrl QUrl::fromNSURL(const NSURL *url) - \since 5.2 - - Constructs a QUrl containing a copy of the NSURL \a url. -*/ - -/*! - \fn NSURL* QUrl::toNSURL() const - \since 5.2 - - Creates a NSURL from a QUrl. The NSURL is autoreleased. -*/ - /*! \internal \since 5.0 diff --git a/src/corelib/io/qurl_mac.mm b/src/corelib/io/qurl_mac.mm index 04d05f1b23..89c1b50b31 100644 --- a/src/corelib/io/qurl_mac.mm +++ b/src/corelib/io/qurl_mac.mm @@ -45,11 +45,22 @@ QT_BEGIN_NAMESPACE +/*! \fn QUrl QUrl::fromCFURL(CFURLRef url) + \since 5.2 + + Constructs a QUrl containing a copy of the CFURL \a url. +*/ QUrl QUrl::fromCFURL(CFURLRef url) { return QUrl(QString::fromCFString(CFURLGetString(url))); } +/*! \fn CFURLRef QUrl::toCFURL() const + \since 5.2 + + Creates a CFURL from a QUrl. The caller owns the CFURL and is + responsible for releasing it. +*/ CFURLRef QUrl::toCFURL() const { CFURLRef url = 0; @@ -61,11 +72,23 @@ CFURLRef QUrl::toCFURL() const return url; } +/*! + \fn QUrl QUrl::fromNSURL(const NSURL *url) + \since 5.2 + + Constructs a QUrl containing a copy of the NSURL \a url. +*/ QUrl QUrl::fromNSURL(const NSURL *url) { return QUrl(QString::fromNSString([url absoluteString])); } +/*! + \fn NSURL* QUrl::toNSURL() const + \since 5.2 + + Creates a NSURL from a QUrl. The NSURL is autoreleased. +*/ NSURL *QUrl::toNSURL() const { return [NSURL URLWithString:toString(FullyEncoded).toNSString()]; |