Changeset View
Changeset View
Standalone View
Standalone View
src/server/outputdevice_interface.cpp
| Show First 20 Lines • Show All 233 Lines • ▼ Show 20 Line(s) | 233 | if (existingModeIt != d->modes.end()) { | |||
|---|---|---|---|---|---|
| 234 | if ((*existingModeIt).flags == mode.flags) { | 234 | if ((*existingModeIt).flags == mode.flags) { | ||
| 235 | // nothing to do | 235 | // nothing to do | ||
| 236 | return; | 236 | return; | ||
| 237 | } | 237 | } | ||
| 238 | (*existingModeIt).flags = mode.flags; | 238 | (*existingModeIt).flags = mode.flags; | ||
| 239 | emitChanges(); | 239 | emitChanges(); | ||
| 240 | return; | 240 | return; | ||
| 241 | } else { | 241 | } else { | ||
| 242 | auto idIt = std::find_if(d->modes.begin(), d->modes.end(), | 242 | auto idIt = std::find_if(d->modes.constBegin(), d->modes.constEnd(), | ||
| 243 | [mode](const Mode &mode_it) { | 243 | [mode](const Mode &mode_it) { | ||
| 244 | return mode.id == mode_it.id; | 244 | return mode.id == mode_it.id; | ||
| 245 | } | 245 | } | ||
| 246 | ); | 246 | ); | ||
| 247 | if (idIt != d->modes.end()) { | 247 | if (idIt != d->modes.constEnd()) { | ||
| 248 | qCWarning(KWAYLAND_SERVER) << "Duplicate Mode id" << mode.id << ": not adding mode" << mode.size << mode.refreshRate; | 248 | qCWarning(KWAYLAND_SERVER) << "Duplicate Mode id" << mode.id << ": not adding mode" << mode.size << mode.refreshRate; | ||
| 249 | return; | 249 | return; | ||
| 250 | } | 250 | } | ||
| 251 | 251 | | |||
| 252 | } | 252 | } | ||
| 253 | d->modes << mode; | 253 | d->modes << mode; | ||
| 254 | emitChanges(); | 254 | emitChanges(); | ||
| 255 | } | 255 | } | ||
| ▲ Show 20 Lines • Show All 487 Lines • Show Last 20 Lines | |||||