<table><tr><td style="">sitter added inline comments.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D23384">View Revision</a></tr></table><br /><div><strong>INLINE COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D23384#inline-143059">View Inline</a><span style="color: #4b4d51; font-weight: bold;">feverfew</span> wrote in <span style="color: #4b4d51; font-weight: bold;">krun.cpp:598</span></div>
<div style="margin: 8px 0; padding: 0 12px; color: #74777D;"><p style="padding: 0; margin: 8px;">That's within the same loop though?</p>
<p style="padding: 0; margin: 8px;">I explicitly want to change the QUrl in that list, so that I can simply return the same list without having to do a copy of it all.</p>
<p style="padding: 0; margin: 8px;">I can't get this to work. I need to change the definition of the struct to be:</p>
<p style="padding: 0; margin: 8px;"><tt style="background: #ebebeb; font-size: 13px;">struct MountRequest {QDBusReply<QString> reply; QUrl &url;};</tt></p>
<p style="padding: 0; margin: 8px;">This doesn't compile because "is implicitly deleted because the default definition would be ill-formed"...</p></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Can't reproduce with gcc.</p>
<div class="remarkup-code-block" style="margin: 12px 0;" data-code-lang="diff" data-sigil="remarkup-code-block"><pre class="remarkup-code" style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; padding: 12px; margin: 0; background: rgba(71, 87, 120, 0.08);"><span style="color: #000080">diff --git a/src/widgets/krun.cpp b/src/widgets/krun.cpp</span>
<span style="color: #000080">index c05875f7..2ea79257 100644</span>
<span style="color: #a00000">--- a/src/widgets/krun.cpp</span>
<span style="color: #00a000">+++ b/src/widgets/krun.cpp</span>
<span style="color: #800080">@@ -576,10 +576,9 @@ static QList<QUrl> resolveURLs(const QList<QUrl> &_urls, const KService &_servic</span>
org::kde::KIOFuse::VFS kiofuse_iface(QStringLiteral("org.kde.KIOFuse"),
QStringLiteral("/org/kde/KIOFuse"),
QDBusConnection::sessionBus());
<span style="color: #a00000">- struct MountRequest { QDBusPendingReply<QString> reply; int urlIndex; };</span>
<span style="color: #00a000">+ struct MountRequest { QDBusPendingReply<QString> reply; QUrl &url; };</span>
QVector<MountRequest> requests;
<span style="color: #a00000">- for (int i = 0; i < urls.length(); ++i) {</span>
<span style="color: #a00000">- const QUrl url = urls[i];</span>
<span style="color: #00a000">+ for (QUrl &url : urls) {</span>
if (KIO::DesktopExecParser::isProtocolInSupportedList(url, appSupportedProtocols))
continue;
if (KProtocolInfo::protocolClass(url.scheme()) == QLatin1String(":local")) {
<span style="color: #800080">@@ -588,7 +587,7 @@ static QList<QUrl> resolveURLs(const QList<QUrl> &_urls, const KService &_servic</span>
if (job->exec()) { // ## nasty nested event loop!
const QUrl localURL = job->mostLocalUrl();
if (localURL != url) {
<span style="color: #a00000">- urls[i] = localURL;</span>
<span style="color: #00a000">+ url = localURL;</span>
//qDebug() << "Changed to" << localURL;
// KIOFuse doesn't work too well with mtp/gdrive.
// @see https://invent.kde.org/kde/kio-fuse/issues/1 (GDrive)
<span style="color: #800080">@@ -598,11 +597,11 @@ static QList<QUrl> resolveURLs(const QList<QUrl> &_urls, const KService &_servic</span>
&& url.scheme() != QLatin1String("gdrive")) {
// Can't convert...
// Lets try a KIOFuse mount instead.
<span style="color: #a00000">- requests.push_back({ kiofuse_iface.mountUrl(url.toString()), i });</span>
<span style="color: #00a000">+ requests.push_back({ kiofuse_iface.mountUrl(url.toString()), url });</span>
}
}
} else {
<span style="color: #a00000">- requests.push_back({ kiofuse_iface.mountUrl(url.toString()), i });</span>
<span style="color: #00a000">+ requests.push_back({ kiofuse_iface.mountUrl(url.toString()), url });</span>
}
}
// Doesn't matter that we've blocked here to process the replies.
<span style="color: #800080">@@ -610,7 +609,7 @@ static QList<QUrl> resolveURLs(const QList<QUrl> &_urls, const KService &_servic</span>
for (auto request : requests) {
request.reply.waitForFinished();
if (!request.reply.isError()) {
<span style="color: #a00000">- urls[request.urlIndex] = QUrl::fromLocalFile(request.reply.value());</span>
<span style="color: #00a000">+ request.url = QUrl::fromLocalFile(request.reply.value());</span>
}
}
}</pre></div>
<p style="padding: 0; margin: 8px;">That said, I forgot about the second loop and I am not too sure that carrying the reference across two loops is all that nice to read anyway. Perhaps best wait for dfaure on this matter.</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R241 KIO</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D23384">https://phabricator.kde.org/D23384</a></div></div><br /><div><strong>To: </strong>feverfew, fvogt, davidedmundson, dfaure, ngraham<br /><strong>Cc: </strong>sitter, davidedmundson, kde-frameworks-devel, ngraham, LeGast00n, GB_2, michaelh, bruns<br /></div>