Commit ec6c778d authored by Martin Flöser's avatar Martin Flöser

Move implementation of checkWorkspacePosition to AbstractClient

No longer a virtual method, the implementation of Client is turned into
AbstractClient. The stub removed from ShellClient.
parent 696cdb9e
......@@ -345,7 +345,7 @@ public:
virtual const WindowRules* rules() const = 0;
virtual void takeFocus() = 0;
virtual bool wantsInput() const = 0;
virtual void checkWorkspacePosition(QRect oldGeometry = QRect(), int oldDesktop = -2, QRect oldClientGeometry = QRect()) = 0;
void checkWorkspacePosition(QRect oldGeometry = QRect(), int oldDesktop = -2, QRect oldClientGeometry = QRect());
virtual xcb_timestamp_t userTime() const;
virtual void updateWindowRules(Rules::Types selection) = 0;
......
......@@ -327,7 +327,6 @@ public:
void gotPing(xcb_timestamp_t timestamp);
void checkWorkspacePosition(QRect oldGeometry = QRect(), int oldDesktop = -2, QRect oldClientGeometry = QRect()) override;
void updateUserTime(xcb_timestamp_t time = XCB_TIME_CURRENT_TIME);
xcb_timestamp_t userTime() const override;
bool hasUserTimeSupport() const;
......
......@@ -1034,7 +1034,7 @@ bool Client::hasOffscreenXineramaStrut() const
return !region.isEmpty();
}
void Client::checkWorkspacePosition(QRect oldGeometry, int oldDesktop, QRect oldClientGeometry)
void AbstractClient::checkWorkspacePosition(QRect oldGeometry, int oldDesktop, QRect oldClientGeometry)
{
enum { Left = 0, Top, Right, Bottom };
const int border[4] = { borderLeft(), borderTop(), borderRight(), borderBottom() };
......
......@@ -300,13 +300,6 @@ QString ShellClient::caption(bool full, bool stripped) const
return m_shellSurface->title();
}
void ShellClient::checkWorkspacePosition(QRect oldGeometry, int oldDesktop, QRect oldClientGeometry)
{
Q_UNUSED(oldGeometry)
Q_UNUSED(oldDesktop)
Q_UNUSED(oldClientGeometry)
}
void ShellClient::closeWindow()
{
if (m_qtExtendedSurface && isCloseable()) {
......
......@@ -59,7 +59,6 @@ public:
void blockActivityUpdates(bool b = true) override;
QString caption(bool full = true, bool stripped = false) const override;
void checkWorkspacePosition(QRect oldGeometry = QRect(), int oldDesktop = -2, QRect oldClientGeometry = QRect()) override;
void closeWindow() override;
AbstractClient *findModal(bool allow_itself = false) override;
bool isCloseable() const override;
......
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