diff --git a/src/output.cpp b/src/output.cpp --- a/src/output.cpp +++ b/src/output.cpp @@ -34,30 +34,30 @@ { public: Private(): + edid(nullptr), + scale(1.0), id(0), - type(Unknown), rotation(None), - scale(1.0), + type(Unknown), connected(false), enabled(false), - primary(false), - edid(nullptr) + primary(false) {} Private(const Private &other): - id(other.id), name(other.name), - type(other.type), icon(other.icon), clones(other.clones), currentMode(other.currentMode), preferredMode(other.preferredMode), preferredModes(other.preferredModes), sizeMm(other.sizeMm), pos(other.pos), size(other.size), - rotation(other.rotation), scale(other.scale), + id(other.id), + rotation(other.rotation), + type(other.type), connected(other.connected), enabled(other.enabled), primary(other.primary) @@ -73,9 +73,8 @@ QString biggestMode(const ModeList& modes) const; bool compareModeList(const ModeList& before, const ModeList& after); - int id; + mutable QPointer edid; QString name; - Type type; QString icon; ModeList modeList; QList clones; @@ -85,13 +84,13 @@ QSize sizeMm; QPoint pos; QSize size; - Rotation rotation; qreal scale; + int id; + Rotation rotation; + Type type; bool connected; bool enabled; bool primary; - - mutable QPointer edid; }; bool Output::Private::compareModeList(const ModeList& before, const ModeList &after)