Differential D7155 Diff 19184 Modules/devinfo/soldevice.cpp

Changeset View

Standalone View

View Options

Modules/devinfo/soldevice.cpp

Context not available.
146{ 146​{
147 return deviceSet; 147​ return deviceSet;
148} 148​}
149​
150​bool SolDevice::operator< ( const QTreeWidgetItem & other ) const
151​{
152​ const SolDevice * otherDevice = dynamic_cast<const SolDevice*>(&other);
153​ if (otherDevice) {
broulikUnsubmitted
Done

Coding style: brace on the same line, also no need for explicit nullptr check:

if (otherDevice) {
broulik: Coding style: brace on the same line, also no need for explicit `nullptr` check: ``` if…
154​ if (deviceType() != otherDevice->deviceType()) {
155​ return deviceType() < otherDevice->deviceType();
156​ }
157​ switch (deviceType()) {
158​ case Solid::DeviceInterface::Processor: {
159​ const Solid::Processor *left = tiedDevice.as<const Solid::Processor>();
160​ const Solid::Processor *right = otherDevice->tiedDevice.as<const Solid::Processor>();
161​ // Processors are sorted in ascending order, so this is reversed
162​ return left->number() > right->number();
163​ }
164​ case Solid::DeviceInterface::StorageVolume: {
165​ // Storage volumes are sorted in ascending order (i.e. sda, sda1, sda2...)
anthonyfieroniUnsubmitted
Done

left->number() < right->number() ?

anthonyfieroni: left->number() < right->number() ?
isaactAuthorUnsubmitted
Not Done

This is reversed as it's sorted in the opposite order (ascending) to the other entries (descending)

isaact: This is reversed as it's sorted in the opposite order (ascending) to the other entries…
166​ return text(0) > other.text(0);
167​ }
168​ default:
169​ break;
anthonyfieroniUnsubmitted
Done

Reverse again ?

anthonyfieroni: Reverse again ?
isaactAuthorUnsubmitted
Not Done

These are also sorted in ascending order, so that it goes from sda1, sda2, etc.

isaact: These are also sorted in ascending order, so that it goes from sda1, sda2, etc.
170​ }
171​ }
172​ return text(0) < other.text(0);
173​}
Context not available.
anthonyfieroniUnsubmitted
Done

Add a new line.

anthonyfieroni: Add a new line.