Commit db9d7a7f authored by Cyril Rossi's avatar Cyril Rossi

KCM KWinScreenEdge fix build issue

Summary: Remove Q_ASSERT() and add a None value to Monitor::Edge enum to convert ElectricBorder NONE or COUNT

Test Plan: Fix kwin build

Reviewers: #kwin, ngraham, zzag

Reviewed By: #kwin, ngraham, zzag

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D29104
parent 8c7956b9
...@@ -168,7 +168,7 @@ int KWinScreenEdge::electricBorderToMonitorEdge(ElectricBorder border) ...@@ -168,7 +168,7 @@ int KWinScreenEdge::electricBorderToMonitorEdge(ElectricBorder border)
case ElectricTopLeft: case ElectricTopLeft:
return Monitor::TopLeft; return Monitor::TopLeft;
default: // ELECTRIC_COUNT and ElectricNone default: // ELECTRIC_COUNT and ElectricNone
Q_ASSERT(false); return Monitor::None;
} }
} }
......
...@@ -72,7 +72,7 @@ private: ...@@ -72,7 +72,7 @@ private:
virtual bool isSaveNeeded() const; virtual bool isSaveNeeded() const;
virtual bool isDefault() const; virtual bool isDefault() const;
// internal use, assert if border equals ELECTRIC_COUNT or ElectricNone // internal use, return Monitor::None if border equals ELECTRIC_COUNT or ElectricNone
static int electricBorderToMonitorEdge(ElectricBorder border); static int electricBorderToMonitorEdge(ElectricBorder border);
static ElectricBorder monitorEdgeToElectricBorder(int edge); static ElectricBorder monitorEdgeToElectricBorder(int edge);
......
...@@ -67,7 +67,8 @@ public: ...@@ -67,7 +67,8 @@ public:
TopLeft, TopLeft,
TopRight, TopRight,
BottomLeft, BottomLeft,
BottomRight BottomRight,
None
}; };
Q_SIGNALS: Q_SIGNALS:
void changed(); void changed();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment