kwin: remove some deprecated functionality

diff --git a/kwin/clients/aurorae/src/aurorae.cpp b/kwin/clients/aurorae/src/aurorae.cpp
index 37e4186..a80359c 100644 (file)
--- 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<QObject*>("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 9b677ad..e99493c 100644 (file)
--- a/kwin/clients/oxygen/oxygenclient.cpp
+++ b/kwin/clients/oxygen/oxygenclient.cpp
@@ -42,6 +42,7 @@
 #include <QApplication>
 #include <QLabel>
 #include <QtGui/QPainter>
+#include <QtGui/QPen>
 #include <QtGui/QBitmap>
 #include <QtGui/qx11info_x11.h>
 #include <QtCore/qobject.h>

diff --git a/kwin/clients/oxygen/oxygenclient.h b/kwin/clients/oxygen/oxygenclient.h
index 822b9e9..50fff45 100644 (file)
--- 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 7679998..65f7c63 100644 (file)
--- a/kwin/clients/oxygen/oxygendecohelper.cpp
+++ b/kwin/clients/oxygen/oxygendecohelper.cpp
@@ -22,6 +22,7 @@
 #include "oxygendecohelper.h"
 
 #include <QtGui/QPainter>
+#include <QtGui/QPen>
 #include <KColorUtils>
 #include <KDebug>
 

diff --git a/kwin/clients/oxygen/oxygensizegrip.cpp b/kwin/clients/oxygen/oxygensizegrip.cpp
index 81c39f5..41aa51e 100644 (file)
--- a/kwin/clients/oxygen/oxygensizegrip.cpp
+++ b/kwin/clients/oxygen/oxygensizegrip.cpp
@@ -31,6 +31,7 @@
 
 #include <cassert>
 #include <QtGui/QPainter>
+#include <QtGui/QPen>
 #include <QtGui/QPolygon>
 #include <QTimer>
 

diff --git a/kwin/libkdecorations/kdecoration.cpp b/kwin/libkdecorations/kdecoration.cpp
index 08fe428..bd01f5b 100644 (file)
--- 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 8c31ee7..6a6d34f 100644 (file)
--- 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;