kwin: remove some deprecated functionality

This commit is contained in:
Ivailo Monev 2015-08-18 01:46:01 +03:00
parent aac583ddd2
commit 3afe81cf45
7 changed files with 8 additions and 71 deletions

View file

@ -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)

View file

@ -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>

View file

@ -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

View file

@ -22,6 +22,7 @@
#include "oxygendecohelper.h"
#include <QtGui/QPainter>
#include <QtGui/QPen>
#include <KColorUtils>
#include <KDebug>

View file

@ -31,6 +31,7 @@
#include <cassert>
#include <QtGui/QPainter>
#include <QtGui/QPen>
#include <QtGui/QPolygon>
#include <QTimer>

View file

@ -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 :

View file

@ -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
{
@ -432,12 +384,6 @@ public:
*/
BorderSize preferredBorderSize(KDecorationFactory* factory) const;
/**
* This functions returns false
* @deprecated
*/
bool moveResizeMaximizedWindows() const;
/**
* @internal
*/