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
icc-effect-master
Cyril Rossi 2020-04-22 18:32:30 +02:00
parent 8c7956b923
commit db9d7a7f5d
3 changed files with 4 additions and 3 deletions

View File

@ -168,7 +168,7 @@ int KWinScreenEdge::electricBorderToMonitorEdge(ElectricBorder border)
case ElectricTopLeft:
return Monitor::TopLeft;
default: // ELECTRIC_COUNT and ElectricNone
Q_ASSERT(false);
return Monitor::None;
}
}

View File

@ -72,7 +72,7 @@ private:
virtual bool isSaveNeeded() 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 ElectricBorder monitorEdgeToElectricBorder(int edge);

View File

@ -67,7 +67,8 @@ public:
TopLeft,
TopRight,
BottomLeft,
BottomRight
BottomRight,
None
};
Q_SIGNALS:
void changed();