Differential D15789 Diff 42405 src/configserializer.cpp

Changeset View

Standalone View

View Options

src/configserializer.cpp

Show First 20 Lines • Show All 80 Lines • ▼ Show 20 Line(s)75{
81 obj[QLatin1String("icon")] = output->icon(); 81​ obj[QLatin1String("icon")] = output->icon();
82 obj[QLatin1String("pos")] = serializePoint(output->pos()); 82​ obj[QLatin1String("pos")] = serializePoint(output->pos());
83 obj[QLatin1String("scale")] = output->scale(); 83​ obj[QLatin1String("scale")] = output->scale();
84 obj[QLatin1String("size")] = serializeSize(output->size()); 84​ obj[QLatin1String("size")] = serializeSize(output->size());
85 obj[QLatin1String("rotation")] = static_cast<int>(output->rotation()); 85​ obj[QLatin1String("rotation")] = static_cast<int>(output->rotation());
86 obj[QLatin1String("currentModeId")] = output->currentModeId(); 86​ obj[QLatin1String("currentModeId")] = output->currentModeId();
87 obj[QLatin1String("preferredModes")] = serializeList(output->preferredModes()); 87​ obj[QLatin1String("preferredModes")] = serializeList(output->preferredModes());
88 obj[QLatin1String("connected")] = output->isConnected(); 88​ obj[QLatin1String("connected")] = output->isConnected();
89​ obj[QLatin1String("followPreferredMode")] = output->followPreferredMode();
89 obj[QLatin1String("enabled")] = output->isEnabled(); 90​ obj[QLatin1String("enabled")] = output->isEnabled();
90 obj[QLatin1String("primary")] = output->isPrimary(); 91​ obj[QLatin1String("primary")] = output->isPrimary();
91 obj[QLatin1String("clones")] = serializeList(output->clones()); 92​ obj[QLatin1String("clones")] = serializeList(output->clones());
92 //obj[QLatin1String("edid")] = output->edid()->raw(); 93​ //obj[QLatin1String("edid")] = output->edid()->raw();
93 obj[QLatin1String("sizeMM")] = serializeSize(output->sizeMm()); 94​ obj[QLatin1String("sizeMM")] = serializeSize(output->sizeMm());
94 95​
95 QJsonArray modes; 96​ QJsonArray modes;
96 Q_FOREACH (const ModePtr &mode, output->modes()) { 97​ Q_FOREACH (const ModePtr &mode, output->modes()) {
▲ Show 20 Lines • Show All 140 Lines • ▼ Show 20 Line(s)219 while (!arg.atEnd()) {
237 } else if (key == QLatin1String("rotation")) { 238​ } else if (key == QLatin1String("rotation")) {
238 output->setRotation(static_cast<Output::Rotation>(value.toInt())); 239​ output->setRotation(static_cast<Output::Rotation>(value.toInt()));
239 } else if (key == QLatin1String("currentModeId")) { 240​ } else if (key == QLatin1String("currentModeId")) {
240 output->setCurrentModeId(value.toString()); 241​ output->setCurrentModeId(value.toString());
241 } else if (key == QLatin1String("preferredModes")) { 242​ } else if (key == QLatin1String("preferredModes")) {
242 output->setPreferredModes(deserializeList<QString>(value.value<QDBusArgument>())); 243​ output->setPreferredModes(deserializeList<QString>(value.value<QDBusArgument>()));
243 } else if (key == QLatin1String("connected")) { 244​ } else if (key == QLatin1String("connected")) {
244 output->setConnected(value.toBool()); 245​ output->setConnected(value.toBool());
246​ } else if (key == QLatin1String("followPreferredMode")) {
247​ output->setFollowPreferredMode(value.toBool());
245 } else if (key == QLatin1String("enabled")) { 248​ } else if (key == QLatin1String("enabled")) {
246 output->setEnabled(value.toBool()); 249​ output->setEnabled(value.toBool());
247 } else if (key == QLatin1String("primary")) { 250​ } else if (key == QLatin1String("primary")) {
248 output->setPrimary(value.toBool()); 251​ output->setPrimary(value.toBool());
249 } else if (key == QLatin1String("clones")) { 252​ } else if (key == QLatin1String("clones")) {
250 output->setClones(deserializeList<int>(value.value<QDBusArgument>())); 253​ output->setClones(deserializeList<int>(value.value<QDBusArgument>()));
251 } else if (key == QLatin1String("sizeMM")) { 254​ } else if (key == QLatin1String("sizeMM")) {
252 output->setSizeMm(deserializeSize(value.value<QDBusArgument>())); 255​ output->setSizeMm(deserializeSize(value.value<QDBusArgument>()));
▲ Show 20 Lines • Show All 83 Lines • Show Last 20 Lines