Differential D15946 Diff 42859 tests/kwayland/waylandconfigreader.cpp

Changeset View

Standalone View

View Options

tests/kwayland/waylandconfigreader.cpp

Show First 20 Lines • Show All 107 Lines • ▼ Show 20 Line(s)81// qDebug() << "\tWhite: " << edid.white();
108 108​
109 int mode_id = 0; 109​ int mode_id = 0;
110 Q_FOREACH (const QVariant &_mode, outputConfig[QStringLiteral("modes")].toList()) { 110​ Q_FOREACH (const QVariant &_mode, outputConfig[QStringLiteral("modes")].toList()) {
111 mode_id++; 111​ mode_id++;
112 const QVariantMap &mode = _mode.toMap(); 112​ const QVariantMap &mode = _mode.toMap();
113 OutputDeviceInterface::Mode m0; 113​ OutputDeviceInterface::Mode m0;
114 const QSize _size = sizeFromJson(mode[QStringLiteral("size")]); 114​ const QSize _size = sizeFromJson(mode[QStringLiteral("size")]);
115 115​
116 if (mode.keys().contains(QStringLiteral("refreshRate"))) { 116​ if (mode.contains(QStringLiteral("refreshRate"))) {
117 m0.refreshRate = qRound(mode[QStringLiteral("refreshRate")].toReal() * 1000); // config has it in Hz 117​ m0.refreshRate = qRound(mode[QStringLiteral("refreshRate")].toReal() * 1000); // config has it in Hz
broulikUnsubmitted
Not Done

We do a double lookup here, contains() and then operator[] afterwards, should be combined to a single find()

broulik: We do a double lookup here, `contains()` and then `operator[]` afterwards, should be combined…
118 } 118​ }
119 bool isCurrent = currentModeId == mode[QStringLiteral("id")].toInt(); 119​ bool isCurrent = currentModeId == mode[QStringLiteral("id")].toInt();
120 bool isPreferred = preferredModes.contains(mode[QStringLiteral("id")]); 120​ bool isPreferred = preferredModes.contains(mode[QStringLiteral("id")]);
121 121​
122 OutputDeviceInterface::ModeFlags flags; 122​ OutputDeviceInterface::ModeFlags flags;
123 if (isCurrent && isPreferred) { 123​ if (isCurrent && isPreferred) {
124 flags = OutputDeviceInterface::ModeFlags(OutputDeviceInterface::ModeFlag::Current | OutputDeviceInterface::ModeFlag::Preferred); 124​ flags = OutputDeviceInterface::ModeFlags(OutputDeviceInterface::ModeFlag::Current | OutputDeviceInterface::ModeFlag::Preferred);
125 } else if (isCurrent) { 125​ } else if (isCurrent) {
126 flags = OutputDeviceInterface::ModeFlags(OutputDeviceInterface::ModeFlag::Current); 126​ flags = OutputDeviceInterface::ModeFlags(OutputDeviceInterface::ModeFlag::Current);
127 } else if (isPreferred) { 127​ } else if (isPreferred) {
128 flags = OutputDeviceInterface::ModeFlags(OutputDeviceInterface::ModeFlag::Preferred); 128​ flags = OutputDeviceInterface::ModeFlags(OutputDeviceInterface::ModeFlag::Preferred);
129 } 129​ }
130 130​
131 if (mode.keys().contains(QLatin1String("id"))) { 131​ if (mode.contains(QLatin1String("id"))) {
132 m0.id = mode[QStringLiteral("id")].toInt(); 132​ m0.id = mode[QStringLiteral("id")].toInt();
133 } else { 133​ } else {
134 m0.id = mode_id; 134​ m0.id = mode_id;
135 } 135​ }
136 m0.size = _size; 136​ m0.size = _size;
137 m0.flags = flags; 137​ m0.flags = flags;
138 outputdevice->addMode(m0); 138​ outputdevice->addMode(m0);
139 139​
▲ Show 20 Lines • Show All 114 Lines • Show Last 20 Lines