Differential D26114 Diff 83161 src/panels/places/placesitem.cpp

Changeset View

Standalone View

View Options

src/panels/places/placesitem.cpp

Show First 20 Lines • Show All 203 Lines • ▼ Show 20 Line(s)203 if (!m_device.isValid()) {
204 return; 204​ return;
205 } 205​ }
206 206​
207 m_access = m_device.as<Solid::StorageAccess>(); 207​ m_access = m_device.as<Solid::StorageAccess>();
208 m_volume = m_device.as<Solid::StorageVolume>(); 208​ m_volume = m_device.as<Solid::StorageVolume>();
209 m_disc = m_device.as<Solid::OpticalDisc>(); 209​ m_disc = m_device.as<Solid::OpticalDisc>();
210 m_mtp = m_device.as<Solid::PortableMediaPlayer>(); 210​ m_mtp = m_device.as<Solid::PortableMediaPlayer>();
211 211​
212 setText(m_device.description()); 212​ setText(m_device.displayName());
mevenAuthorUnsubmitted
Not Done

The change will be here m_device.displayName()

meven: The change will be here `m_device.displayName()`
213 setIcon(m_device.icon()); 213​ setIcon(m_device.icon());
214 setIconOverlays(m_device.emblems()); 214​ setIconOverlays(m_device.emblems());
215 setUdi(udi); 215​ setUdi(udi);
216 216​
217 if (m_access) { 217​ if (m_access) {
218 setUrl(QUrl::fromLocalFile(m_access->filePath())); 218​ setUrl(QUrl::fromLocalFile(m_access->filePath()));
broulikUnsubmitted
Done

What when it isn't mounted?

broulik: What when it isn't mounted?
mevenAuthorUnsubmitted
Done

if (m_access) { takes care of this.

meven: `if (m_access) {` takes care of this.
219 QObject::connect(m_access.data(), &Solid::StorageAccess::accessibilityChanged, 219​ QObject::connect(m_access.data(), &Solid::StorageAccess::accessibilityChanged,
220 m_signalHandler.data(), &PlacesItemSignalHandler::onAccessibilityChanged); 220​ m_signalHandler.data(), &PlacesItemSignalHandler::onAccessibilityChanged);
221 QObject::connect(m_access.data(), &Solid::StorageAccess::teardownRequested, 221​ QObject::connect(m_access.data(), &Solid::StorageAccess::teardownRequested,
222 m_signalHandler.data(), &PlacesItemSignalHandler::onTearDownRequested); 222​ m_signalHandler.data(), &PlacesItemSignalHandler::onTearDownRequested);
223 } else if (m_disc && (m_disc->availableContent() & Solid::OpticalDisc::Audio) != 0) { 223​ } else if (m_disc && (m_disc->availableContent() & Solid::OpticalDisc::Audio) != 0) {
224 Solid::Block *block = m_device.as<Solid::Block>(); 224​ Solid::Block *block = m_device.as<Solid::Block>();
225 if (block) { 225​ if (block) {
226 const QString device = block->device(); 226​ const QString device = block->device();
▲ Show 20 Lines • Show All 58 Lines • Show Last 20 Lines