Changeset View
Changeset View
Standalone View
Standalone View
part/part.cpp
Show First 20 Lines • Show All 1293 Lines • ▼ Show 20 Line(s) | 1280 | for (const QString& file : filesToAdd) { | |||
---|---|---|---|---|---|
1294 | } | 1294 | } | ||
1295 | } | 1295 | } | ||
1296 | 1296 | | |||
1297 | withChildPaths = ReadOnlyArchiveInterface::entryPathsFromDestination(withChildPaths, destination, 0); | 1297 | withChildPaths = ReadOnlyArchiveInterface::entryPathsFromDestination(withChildPaths, destination, 0); | ||
1298 | QList<const Archive::Entry*> conflictingEntries; | 1298 | QList<const Archive::Entry*> conflictingEntries; | ||
1299 | bool error = m_model->conflictingEntries(conflictingEntries, withChildPaths, true); | 1299 | bool error = m_model->conflictingEntries(conflictingEntries, withChildPaths, true); | ||
1300 | 1300 | | |||
1301 | if (conflictingEntries.count() > 0) { | 1301 | if (conflictingEntries.count() > 0) { | ||
1302 | QPointer<OverwriteDialog> overwriteDialog = new OverwriteDialog(widget(), conflictingEntries, m_model->entryIcons(), error); | 1302 | QPointer<OverwriteDialog> overwriteDialog = new OverwriteDialog(widget(), conflictingEntries, error); | ||
1303 | int ret = overwriteDialog->exec(); | 1303 | int ret = overwriteDialog->exec(); | ||
1304 | delete overwriteDialog; | 1304 | delete overwriteDialog; | ||
1305 | if (ret == QDialog::Rejected) { | 1305 | if (ret == QDialog::Rejected) { | ||
1306 | qDeleteAll(m_jobTempEntries); | 1306 | qDeleteAll(m_jobTempEntries); | ||
1307 | m_jobTempEntries.clear(); | 1307 | m_jobTempEntries.clear(); | ||
1308 | return; | 1308 | return; | ||
1309 | } | 1309 | } | ||
1310 | } | 1310 | } | ||
▲ Show 20 Lines • Show All 199 Lines • ▼ Show 20 Line(s) | 1508 | if (ArchiveModel::hasDuplicatedEntries(newPaths)) { | |||
1510 | delete m_destination; | 1510 | delete m_destination; | ||
1511 | return; | 1511 | return; | ||
1512 | } | 1512 | } | ||
1513 | 1513 | | |||
1514 | QList<const Archive::Entry*> conflictingEntries; | 1514 | QList<const Archive::Entry*> conflictingEntries; | ||
1515 | bool error = m_model->conflictingEntries(conflictingEntries, newPaths, false); | 1515 | bool error = m_model->conflictingEntries(conflictingEntries, newPaths, false); | ||
1516 | 1516 | | |||
1517 | if (conflictingEntries.count() != 0) { | 1517 | if (conflictingEntries.count() != 0) { | ||
1518 | QPointer<OverwriteDialog> overwriteDialog = new OverwriteDialog(widget(), conflictingEntries, m_model->entryIcons(), error); | 1518 | QPointer<OverwriteDialog> overwriteDialog = new OverwriteDialog(widget(), conflictingEntries, error); | ||
1519 | int ret = overwriteDialog->exec(); | 1519 | int ret = overwriteDialog->exec(); | ||
1520 | delete overwriteDialog; | 1520 | delete overwriteDialog; | ||
1521 | if (ret == QDialog::Rejected) { | 1521 | if (ret == QDialog::Rejected) { | ||
1522 | delete m_destination; | 1522 | delete m_destination; | ||
1523 | return; | 1523 | return; | ||
1524 | } | 1524 | } | ||
1525 | } | 1525 | } | ||
1526 | 1526 | | |||
▲ Show 20 Lines • Show All 223 Lines • Show Last 20 Lines |