Skip to content

Commit

Permalink
Some cleaning up.
Browse files Browse the repository at this point in the history
  • Loading branch information
agarny committed Nov 28, 2017
2 parents 9c1397b + b98ba58 commit 979e9aa
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
2 changes: 1 addition & 1 deletion doc/developer/thirdPartyLibraries.html
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@

<ul>
<li>
<a href="https://packages.ubuntu.com/bionic/oxygen-icon-theme">Oxygen</a> 5.38.0: icons used in various parts of OpenCOR.
<a href="https://packages.ubuntu.com/bionic/oxygen-icon-theme">Oxygen</a> 5.40.0: icons used in various parts of OpenCOR.
<ul>
<li>Location: <a href="https://github.com/opencor/opencor/tree/master/res/oxygen"><code>[OpenCOR]/res/oxygen</code></a>.</li>
<li>Licensing: <a href="https://opensource.org/licenses/LGPL-3.0">LGPL v3.0</a>.</li>
Expand Down
15 changes: 5 additions & 10 deletions src/plugins/miscellaneous/Core/src/corecliutils.cpp.inl
Original file line number Diff line number Diff line change
Expand Up @@ -665,16 +665,11 @@ QString plainString(const QString &pString)
QString urlArguments(const QUrl &pUrl)
{
// Return the arguments (path) of the given URL
// Note #1: we would normally retrieve the path using pUrl.path(), but this
// doesn't work when there are spaces, so instead we convert the
// URL to a string and remove its scheme and authority (since
// QUrl::adjusted() doesn't work the same as before; see
// https://bugreports.qt.io/browse/QTBUG-64793)...
// Note #2: we use "|" to separate arguments, but they get converted to
// "%7C" and there doesn't seem to be a way to convert them back,
// so we do it ourselves...

return pUrl.toString().remove(QString("%1://%2/").arg(pUrl.scheme(), pUrl.authority())).replace("%7C", "|");
// Note: we use "|" to separate arguments, but they get converted to "%7C"
// and there doesn't seem to be a way to convert them back, so we do
// it ourselves...

return pUrl.path().remove(0, 1).replace("%7C", "|");
}

//==============================================================================
Expand Down

0 comments on commit 979e9aa

Please sign in to comment.