Differential D7847 Diff 20181 src/panels/places/placesitemmodel.cpp

Changeset View

Standalone View

View Options

src/panels/places/placesitemmodel.cpp

Context not available.
22 ***************************************************************************/ 22​ ***************************************************************************/
23 23​
24#include "placesitemmodel.h" 24​#include "placesitemmodel.h"
25​#include "placesitemsignalhandler.h"
25 26​
26#include "dolphin_generalsettings.h" 27​#include "dolphin_generalsettings.h"
27 28​
Context not available.
77 m_systemBookmarksIndexes(), 78​ m_systemBookmarksIndexes(),
78 m_bookmarkedItems(), 79​ m_bookmarkedItems(),
79 m_hiddenItemToRemove(-1), 80​ m_hiddenItemToRemove(-1),
81​ m_deviceToTearDown(0),
80 m_updateBookmarksTimer(0), 82​ m_updateBookmarksTimer(0),
81 m_storageSetupInProgress() 83​ m_storageSetupInProgress()
82{ 84​{
Context not available.
306 Solid::OpticalDrive* drive = item->device().parent().as<Solid::OpticalDrive>(); 308​ Solid::OpticalDrive* drive = item->device().parent().as<Solid::OpticalDrive>();
307 if (drive) { 309​ if (drive) {
308 connect(drive, &Solid::OpticalDrive::ejectDone, 310​ connect(drive, &Solid::OpticalDrive::ejectDone,
309 this, &PlacesItemModel::slotStorageTeardownDone); 311​ this, &PlacesItemModel::slotStorageTearDownDone);
310 drive->eject(); 312​ drive->eject();
311 } else { 313​ } else {
312 const QString label = item->text(); 314​ const QString label = item->text();
Context not available.
316 } 318​ }
317} 319​}
318 320​
319void PlacesItemModel::requestTeardown(int index) 321​void PlacesItemModel::requestTearDown(int index)
320{ 322​{
321 const PlacesItem* item = placesItem(index); 323​ const PlacesItem* item = placesItem(index);
322 if (item) { 324​ if (item) {
323 Solid::StorageAccess* access = item->device().as<Solid::StorageAccess>(); 325​ Solid::StorageAccess *tmp = item->device().as<Solid::StorageAccess>();
324 if (access) { 326​ if (tmp) {
325 connect(access, &Solid::StorageAccess::teardownDone, 327​ m_deviceToTearDown = tmp;
326 this, &PlacesItemModel::slotStorageTeardownDone); 328​ // disconnect the Solid::StorageAccess::teardownRequested
327 access->teardown(); 329​ // to prevent emitting PlacesItemModel::storageTearDownExternallyRequested
330​ // after we have emitted PlacesItemModel::storageTearDownRequested
331​ disconnect(tmp, &Solid::StorageAccess::teardownRequested,
332​ item->signalHandler(), &PlacesItemSignalHandler::onTearDownRequested);
333​ emit storageTearDownRequested(tmp->filePath());
328 } 334​ }
329 } 335​ }
330} 336​}
Context not available.
550 556​
551 m_availableDevices << udi; 557​ m_availableDevices << udi;
552 const KBookmark bookmark = PlacesItem::createDeviceBookmark(m_bookmarkManager, udi); 558​ const KBookmark bookmark = PlacesItem::createDeviceBookmark(m_bookmarkManager, udi);
553 appendItem(new PlacesItem(bookmark)); 559​
560​ PlacesItem *item = new PlacesItem(bookmark);
561​ appendItem(item);
562​ connect(item->signalHandler(), &PlacesItemSignalHandler::teardownSignal,
563​ this, &PlacesItemModel::storageTearDownExternallyRequested);
554} 564​}
555 565​
556void PlacesItemModel::slotDeviceRemoved(const QString& udi) 566​void PlacesItemModel::slotDeviceRemoved(const QString& udi)
Context not available.
576 } 586​ }
577} 587​}
578 588​
579void PlacesItemModel::slotStorageTeardownDone(Solid::ErrorType error, const QVariant& errorData) 589​void PlacesItemModel::slotStorageTearDownDone(Solid::ErrorType error, const QVariant& errorData)
580{ 590​{
581 if (error && errorData.isValid()) { 591​ if (error && errorData.isValid()) {
582 emit errorMessage(errorData.toString()); 592​ emit errorMessage(errorData.toString());
583 } 593​ }
594​ m_deviceToTearDown->disconnect();
595​ m_deviceToTearDown = 0;
elvisangelaccioUnsubmitted
Done

nullptr

elvisangelaccio: nullptr
584} 596​}
585 597​
586void PlacesItemModel::slotStorageSetupDone(Solid::ErrorType error, 598​void PlacesItemModel::slotStorageSetupDone(Solid::ErrorType error,
Context not available.
786 devicesItems.reserve(devicesItems.count() + devices.count()); 798​ devicesItems.reserve(devicesItems.count() + devices.count());
787 foreach (const QString& udi, devices) { 799​ foreach (const QString& udi, devices) {
788 const KBookmark bookmark = PlacesItem::createDeviceBookmark(m_bookmarkManager, udi); 800​ const KBookmark bookmark = PlacesItem::createDeviceBookmark(m_bookmarkManager, udi);
789 devicesItems.append(new PlacesItem(bookmark)); 801​ PlacesItem *item = new PlacesItem(bookmark);
802​ devicesItems.append(item);
803​ connect(item->signalHandler(), &PlacesItemSignalHandler::teardownSignal,
804​ this, &PlacesItemModel::storageTearDownExternallyRequested);
790 } 805​ }
791 806​
792 QList<PlacesItem*> items; 807​ QList<PlacesItem*> items;
Context not available.
940 KStandardItemModel::clear(); 955​ KStandardItemModel::clear();
941} 956​}
942 957​
958​void PlacesItemModel::proceedWithTearDown()
959​{
960​ Q_ASSERT(m_deviceToTearDown);
961​
962​ connect(m_deviceToTearDown, SIGNAL(teardownDone(Solid::ErrorType,QVariant,QString)),
963​ this, SLOT(slotStorageTearDownDone(Solid::ErrorType,QVariant)));
elvisangelaccioUnsubmitted
Done

Please use the new syntax:

connect(m_deviceToTearDown, &Solid::StorageAccess::teardownDone,
            this, &PlacesItemModel::slotStorageTearDownDone);
elvisangelaccio: Please use the new syntax: ``` connect(m_deviceToTearDown, &Solid::StorageAccess::teardownDone…
964​ m_deviceToTearDown->teardown();
965​}
966​
943void PlacesItemModel::initializeAvailableDevices() 967​void PlacesItemModel::initializeAvailableDevices()
944{ 968​{
945 QString predicate(QStringLiteral("[[[[ StorageVolume.ignored == false AND [ StorageVolume.usage == 'FileSystem' OR StorageVolume.usage == 'Encrypted' ]]" 969​ QString predicate(QStringLiteral("[[[[ StorageVolume.ignored == false AND [ StorageVolume.usage == 'FileSystem' OR StorageVolume.usage == 'Encrypted' ]]"
Context not available.