Changeset View
Changeset View
Standalone View
Standalone View
src/widgets/dropjob.cpp
Show All 25 Lines | |||||
26 | #include "jobuidelegate.h" | 26 | #include "jobuidelegate.h" | ||
27 | #include "jobuidelegateextension.h" | 27 | #include "jobuidelegateextension.h" | ||
28 | #include "kio_widgets_debug.h" | 28 | #include "kio_widgets_debug.h" | ||
29 | 29 | | |||
30 | #include <KConfigGroup> | 30 | #include <KConfigGroup> | ||
31 | #include <KCoreDirLister> | 31 | #include <KCoreDirLister> | ||
32 | #include <KDesktopFile> | 32 | #include <KDesktopFile> | ||
33 | #include <KIO/CopyJob> | 33 | #include <KIO/CopyJob> | ||
34 | #include <KIO/DeleteJob> | ||||
34 | #include <KIO/DndPopupMenuPlugin> | 35 | #include <KIO/DndPopupMenuPlugin> | ||
35 | #include <KIO/FileUndoManager> | 36 | #include <KIO/FileUndoManager> | ||
36 | #include <KFileItem> | 37 | #include <KFileItem> | ||
37 | #include <KFileItemListProperties> | 38 | #include <KFileItemListProperties> | ||
38 | #include <KJobWidgets> | 39 | #include <KJobWidgets> | ||
39 | #include <KLocalizedString> | 40 | #include <KLocalizedString> | ||
40 | #include <KPluginMetaData> | 41 | #include <KPluginMetaData> | ||
41 | #include <KPluginLoader> | 42 | #include <KPluginLoader> | ||
▲ Show 20 Lines • Show All 508 Lines • ▼ Show 20 Line(s) | 550 | Q_FOREACH(const QUrl &url, m_urls) { | |||
550 | args << url.toLocalFile(); // assume local files | 551 | args << url.toLocalFile(); // assume local files | ||
551 | } | 552 | } | ||
552 | QProcess::startDetached(m_destUrl.toLocalFile(), args); | 553 | QProcess::startDetached(m_destUrl.toLocalFile(), args); | ||
553 | q->emitResult(); | 554 | q->emitResult(); | ||
554 | } | 555 | } | ||
555 | 556 | | |||
556 | void DropJob::slotResult(KJob *job) | 557 | void DropJob::slotResult(KJob *job) | ||
557 | { | 558 | { | ||
558 | if (job->error()) { | 559 | int jobError = job->error(); | ||
dfaure: const int... | |||||
560 | if (jobError) { | ||||
561 | if (jobError == KIO::ERR_USER_CANCELED || jobError == KIO::ERR_DISK_FULL) { | ||||
562 | // Must remove last file that was not finished moving/copying | ||||
563 | KIO::CopyJob *copyJob = qobject_cast<KIO::CopyJob *>(job); | ||||
Since you don't test the result of the cast (I assume because by construction only a CopyJob is connected to this slot?), just use static_cast. dfaure: Since you don't test the result of the cast (I assume because by construction only a CopyJob is… | |||||
564 | this->addSubjob(KIO::del(copyJob->currentDestUrl(), JobFlag::HideProgressInfo)); | ||||
dfaure: this-> isn't really useful, I'd remove it | |||||
565 | return; | ||||
566 | } else { | ||||
559 | KIO::Job::slotResult(job); // will set the error and emit result(this) | 567 | KIO::Job::slotResult(job); // will set the error and emit result(this) | ||
560 | return; | 568 | return; | ||
561 | } | 569 | } | ||
570 | } | ||||
562 | removeSubjob(job); | 571 | removeSubjob(job); | ||
563 | emitResult(); | 572 | emitResult(); | ||
564 | } | 573 | } | ||
565 | 574 | | |||
566 | DropJob * KIO::drop(const QDropEvent *dropEvent, const QUrl &destUrl, JobFlags flags) | 575 | DropJob * KIO::drop(const QDropEvent *dropEvent, const QUrl &destUrl, JobFlags flags) | ||
567 | { | 576 | { | ||
568 | return DropJobPrivate::newJob(dropEvent, destUrl, flags); | 577 | return DropJobPrivate::newJob(dropEvent, destUrl, flags); | ||
569 | } | 578 | } | ||
570 | 579 | | |||
571 | #include "moc_dropjob.cpp" | 580 | #include "moc_dropjob.cpp" |
const int...