From 3afe81cf459fb1899f5e0f7000de89a173d1903f Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 18 Aug 2015 01:46:01 +0300 Subject: [PATCH] kwin: remove some deprecated functionality --- kwin/clients/aurorae/src/aurorae.cpp | 14 +++------ kwin/clients/oxygen/oxygenclient.cpp | 1 + kwin/clients/oxygen/oxygenclient.h | 2 +- kwin/clients/oxygen/oxygendecohelper.cpp | 1 + kwin/clients/oxygen/oxygensizegrip.cpp | 1 + kwin/libkdecorations/kdecoration.cpp | 6 ---- kwin/libkdecorations/kdecoration.h | 54 -------------------------------- 7 files changed, 8 insertions(+), 71 deletions(-) diff --git a/kwin/clients/aurorae/src/aurorae.cpp b/kwin/clients/aurorae/src/aurorae.cpp index 37e41863..a80359c4 100644 --- a/kwin/clients/aurorae/src/aurorae.cpp +++ b/kwin/clients/aurorae/src/aurorae.cpp @@ -337,9 +337,7 @@ void AuroraeClient::desktopChange() void AuroraeClient::maximizeChange() { - if (!options()->moveResizeMaximizedWindows()) { - emit maximizeChanged(); - } + emit maximizeChanged(); } void AuroraeClient::resize(const QSize &s) @@ -364,7 +362,7 @@ void AuroraeClient::borders(int &left, int &right, int &top, int &bottom) const left = right = top = bottom = 0; return; } - const bool maximized = maximizeMode() == MaximizeFull && !options()->moveResizeMaximizedWindows(); + const bool maximized = maximizeMode() == MaximizeFull; QObject *borders = NULL; if (maximized) { borders = m_item->findChild("maximizedBorders"); @@ -376,11 +374,7 @@ void AuroraeClient::borders(int &left, int &right, int &top, int &bottom) const void AuroraeClient::padding(int &left, int &right, int &top, int &bottom) const { - if (!m_item) { - left = right = top = bottom = 0; - return; - } - if (maximizeMode() == MaximizeFull && !options()->moveResizeMaximizedWindows()) { + if (!m_item || maximizeMode() == MaximizeFull) { left = right = top = bottom = 0; return; } @@ -480,7 +474,7 @@ void AuroraeClient::toggleKeepBelow() bool AuroraeClient::isMaximized() const { - return maximizeMode()==KDecorationDefines::MaximizeFull && !options()->moveResizeMaximizedWindows(); + return maximizeMode()==KDecorationDefines::MaximizeFull; } void AuroraeClient::titlePressed(int button, int buttons) diff --git a/kwin/clients/oxygen/oxygenclient.cpp b/kwin/clients/oxygen/oxygenclient.cpp index 9b677ad3..e99493c5 100644 --- a/kwin/clients/oxygen/oxygenclient.cpp +++ b/kwin/clients/oxygen/oxygenclient.cpp @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include diff --git a/kwin/clients/oxygen/oxygenclient.h b/kwin/clients/oxygen/oxygenclient.h index 822b9e96..50fff458 100644 --- a/kwin/clients/oxygen/oxygenclient.h +++ b/kwin/clients/oxygen/oxygenclient.h @@ -72,7 +72,7 @@ namespace Oxygen //! true if window is maximized virtual bool isMaximized( void ) const - { return maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows(); } + { return maximizeMode()==MaximizeFull; } //! true when decoration is forced active bool isForcedActive( void ) const diff --git a/kwin/clients/oxygen/oxygendecohelper.cpp b/kwin/clients/oxygen/oxygendecohelper.cpp index 7679998d..65f7c633 100644 --- a/kwin/clients/oxygen/oxygendecohelper.cpp +++ b/kwin/clients/oxygen/oxygendecohelper.cpp @@ -22,6 +22,7 @@ #include "oxygendecohelper.h" #include +#include #include #include diff --git a/kwin/clients/oxygen/oxygensizegrip.cpp b/kwin/clients/oxygen/oxygensizegrip.cpp index 81c39f50..41aa51e3 100644 --- a/kwin/clients/oxygen/oxygensizegrip.cpp +++ b/kwin/clients/oxygen/oxygensizegrip.cpp @@ -31,6 +31,7 @@ #include #include +#include #include #include diff --git a/kwin/libkdecorations/kdecoration.cpp b/kwin/libkdecorations/kdecoration.cpp index 08fe4289..bd01f5b5 100644 --- a/kwin/libkdecorations/kdecoration.cpp +++ b/kwin/libkdecorations/kdecoration.cpp @@ -619,12 +619,6 @@ KDecorationOptions::BorderSize KDecorationOptions::preferredBorderSize(KDecorati return d->cached_border_size; } -bool KDecorationOptions::moveResizeMaximizedWindows() const -{ - // TODO KF5: remove function with API break - return false; -} - KDecorationDefines::WindowOperation KDecorationOptions::operationMaxButtonClick(Qt::MouseButtons button) const { return button == Qt::RightButton ? d->opMaxButtonRightClick : diff --git a/kwin/libkdecorations/kdecoration.h b/kwin/libkdecorations/kdecoration.h index 8c31ee7b..6a6d34f0 100644 --- a/kwin/libkdecorations/kdecoration.h +++ b/kwin/libkdecorations/kdecoration.h @@ -139,19 +139,7 @@ public: CloseTabGroupOp, // Close the group ActivateNextTabOp, // Move left in the group ActivatePreviousTabOp, // Move right in the group - ///< @deprecated, tiling got removed in 4.10 - ToggleClientTiledStateOp, // put a floating client into tiling TabDragOp, - - //BEGIN ABI stability stuff - // NOTICE for ABI stability - // TODO remove with mandatory version tagging fo 4.9.x or 4.10 - /** @deprecated ABI compatibility only - don't use */ - RemoveClientFromGroupOp = RemoveTabFromGroupOp, // Remove from group - CloseClientGroupOp = CloseTabGroupOp, // Close the group - MoveClientInGroupLeftOp = ActivateNextTabOp, // Move left in the group - MoveClientInGroupRightOp = ActivatePreviousTabOp // Move right in the group - //END ABI stability stuff }; /** * Basic color types that should be recognized by all decoration styles. @@ -247,13 +235,6 @@ public: AbilityTabbing = 4000, ///< The decoration supports tabbing // TODO colors for individual button types ABILITY_DUMMY = 10000000, - - //BEGIN ABI stability stuff - // NOTICE for ABI stability - // TODO remove with mandatory version tagging fo 4.9.x or 4.10 - /** @deprecated ABI compatibility only - don't use */ - AbilityClientGrouping = AbilityTabbing - //END ABI stability stuff }; enum Requirement { REQUIREMENT_DUMMY = 1000000 }; @@ -282,39 +263,10 @@ public: /** * Returns the mimeType used to drag and drop clientGroupItems */ - //BEGIN ABI stability stuff - // NOTICE for ABI stability - // TODO remove with mandatory version tagging fo 4.9.x or 4.10 - /** @deprecated ABI compatibility only - don't use */ - static QString clientGroupItemDragMimeType() { return tabDragMimeType(); } - //END ABI stability stuff static QString tabDragMimeType(); }; -//BEGIN ABI stability stuff -// NOTICE for ABI stability -// TODO remove with mandatory version tagging fo 4.9.x or 4.10 -/** @deprecated ABI compatibility only - don't use */ -class KWIN_EXPORT ClientGroupItem -{ -public: - ClientGroupItem(QString t, QIcon i) { - title_ = t; - icon_ = i; - } - inline QIcon icon() const { - return icon_; - } - inline QString title() const { - return title_; - } -private: - QString title_; - QIcon icon_; -}; -//END ABI stability stuff - class KDecorationProvides : public KDecorationDefines { @@ -433,12 +385,6 @@ public: BorderSize preferredBorderSize(KDecorationFactory* factory) const; /** - * This functions returns false - * @deprecated - */ - bool moveResizeMaximizedWindows() const; - - /** * @internal */ WindowOperation operationMaxButtonClick(Qt::MouseButtons button) const; -- 2.11.0