Differential D24372 Diff 67808 src/widgets/clipboardupdater.cpp

Changeset View

Standalone View

View Options

src/widgets/clipboardupdater.cpp

Show First 20 Lines • Show All 71 Lines • ▼ Show 20 Line(s)62{
72 if (!mimeData) { 72​ if (!mimeData) {
73 return; 73​ return;
74 } 74​ }
75 75​
76 QList<QUrl> clipboardUrls = KUrlMimeData::urlsFromMimeData(mimeData); 76​ QList<QUrl> clipboardUrls = KUrlMimeData::urlsFromMimeData(mimeData);
77 bool update = false; 77​ bool update = false;
78 78​
79 if (copyJob) { 79​ if (copyJob) {
80 Q_FOREACH (const QUrl &url, copyJob->srcUrls()) { 80​ const QList<QUrl> urls = copyJob->srcUrls();
81​ for (const QUrl &url : urls) {
81 const int index = clipboardUrls.indexOf(url); 82​ const int index = clipboardUrls.indexOf(url);
82 if (index > -1) { 83​ if (index > -1) {
83 QUrl dUrl = copyJob->destUrl().adjusted(QUrl::StripTrailingSlash); 84​ QUrl dUrl = copyJob->destUrl().adjusted(QUrl::StripTrailingSlash);
84 dUrl.setPath(concatPaths(dUrl.path(), url.fileName())); 85​ dUrl.setPath(concatPaths(dUrl.path(), url.fileName()));
85 clipboardUrls.replace(index, dUrl); 86​ clipboardUrls.replace(index, dUrl);
86 update = true; 87​ update = true;
87 } 88​ }
88 } 89​ }
Show All 36 Lines106{
125 auto mimeData = clipboard->mimeData(); 126​ auto mimeData = clipboard->mimeData();
126 if (!mimeData) { 127​ if (!mimeData) {
127 return; 128​ return;
128 } 129​ }
129 130​
130 QList<QUrl> clipboardUrls = KUrlMimeData::urlsFromMimeData(mimeData); 131​ QList<QUrl> clipboardUrls = KUrlMimeData::urlsFromMimeData(mimeData);
131 quint32 removedCount = 0; 132​ quint32 removedCount = 0;
132 133​
133 Q_FOREACH (const QUrl &url, deletedUrls) { 134​ for (const QUrl &url : qAsConst(deletedUrls)) {
134 removedCount += clipboardUrls.removeAll(url); 135​ removedCount += clipboardUrls.removeAll(url);
135 } 136​ }
136 137​
137 if (removedCount > 0) { 138​ if (removedCount > 0) {
138 QMimeData *mime = new QMimeData(); 139​ QMimeData *mime = new QMimeData();
139 if (!clipboardUrls.isEmpty()) { 140​ if (!clipboardUrls.isEmpty()) {
140 mime->setUrls(clipboardUrls); 141​ mime->setUrls(clipboardUrls);
141 } 142​ }
▲ Show 20 Lines • Show All 51 Lines • Show Last 20 Lines