|
|
ff3475 |
diff --git a/kwin/clients/aurorae/src/aurorae.cpp b/kwin/clients/aurorae/src/aurorae.cpp
|
|
|
ff3475 |
index a9487c3..6f63f6e 100644
|
|
|
ff3475 |
--- a/kwin/clients/aurorae/src/aurorae.cpp
|
|
|
ff3475 |
+++ b/kwin/clients/aurorae/src/aurorae.cpp
|
|
|
ff3475 |
@@ -435,13 +435,13 @@ KDecorationDefines::Position AuroraeClient::mousePosition(const QPoint &point) c
|
|
|
ff3475 |
}
|
|
|
ff3475 |
if (point.x() >= (m_view->width() - borderRight - paddingRight)) {
|
|
|
ff3475 |
pos |= PositionRight;
|
|
|
ff3475 |
- } else if (point.x() <= borderLeft + paddingLeft) {
|
|
|
ff3475 |
+ } else if (point.x() <= (borderLeft + paddingLeft)) {
|
|
|
ff3475 |
pos |= PositionLeft;
|
|
|
ff3475 |
}
|
|
|
ff3475 |
|
|
|
ff3475 |
- if (point.y() >= m_view->height() - borderBottom - paddingBottom) {
|
|
|
ff3475 |
+ if (point.y() >= (m_view->height() - borderBottom - paddingBottom)) {
|
|
|
ff3475 |
pos |= PositionBottom;
|
|
|
ff3475 |
- } else if (point.y() <= borderTop + paddingTop ) {
|
|
|
ff3475 |
+ } else if (point.y() <= (borderTop + paddingTop)) {
|
|
|
ff3475 |
pos |= PositionTop;
|
|
|
ff3475 |
}
|
|
|
ff3475 |
|
|
|
ff3475 |
diff --git a/kwin/clients/oxygen/config/oxygenexceptionlistwidget.cpp b/kwin/clients/oxygen/config/oxygenexceptionlistwidget.cpp
|
|
|
ff3475 |
index 3710ba2..8a11d07 100644
|
|
|
ff3475 |
--- a/kwin/clients/oxygen/config/oxygenexceptionlistwidget.cpp
|
|
|
ff3475 |
+++ b/kwin/clients/oxygen/config/oxygenexceptionlistwidget.cpp
|
|
|
ff3475 |
@@ -86,8 +86,8 @@ namespace Oxygen
|
|
|
ff3475 |
//__________________________________________________________
|
|
|
ff3475 |
ConfigurationList ExceptionListWidget::exceptions( void )
|
|
|
ff3475 |
{
|
|
|
ff3475 |
- return model().get();
|
|
|
ff3475 |
setChanged( false );
|
|
|
ff3475 |
+ return model().get();
|
|
|
ff3475 |
}
|
|
|
ff3475 |
|
|
|
ff3475 |
//__________________________________________________________
|
|
|
ff3475 |
diff --git a/plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.cpp b/plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.cpp
|
|
|
ff3475 |
index 80fbed3..7b8f8ed 100644
|
|
|
ff3475 |
--- a/plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.cpp
|
|
|
ff3475 |
+++ b/plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.cpp
|
|
|
ff3475 |
@@ -74,8 +74,8 @@ FdoGraphicsWidget::FdoGraphicsWidget(WId winId, QGraphicsWidget *parent)
|
|
|
ff3475 |
}
|
|
|
ff3475 |
}
|
|
|
ff3475 |
|
|
|
ff3475 |
- if (parentView) {
|
|
|
ff3475 |
- parentView->setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
|
|
|
ff3475 |
+ if (parentView) {
|
|
|
ff3475 |
+ parentView->setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
|
|
|
ff3475 |
}
|
|
|
ff3475 |
|
|
|
ff3475 |
connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()),
|
|
|
ff3475 |
@@ -216,10 +216,10 @@ void FdoGraphicsWidget::handleClientError(QX11EmbedContainer::Error error)
|
|
|
ff3475 |
|
|
|
ff3475 |
void FdoGraphicsWidget::resizeEvent(QGraphicsSceneResizeEvent *event)
|
|
|
ff3475 |
{
|
|
|
ff3475 |
+ Q_UNUSED(event);
|
|
|
ff3475 |
if (d->widget) {
|
|
|
ff3475 |
d->widget.data()->resize(size().toSize());
|
|
|
ff3475 |
}
|
|
|
ff3475 |
-
|
|
|
ff3475 |
}
|
|
|
ff3475 |
|
|
|
ff3475 |
}
|
|
|
ff3475 |
diff --git a/powerdevil/daemon/backends/upower/xrandrx11helper.h b/powerdevil/daemon/backends/upower/xrandrx11helper.h
|
|
|
ff3475 |
index 184f582..7c4a154 100644
|
|
|
ff3475 |
--- a/powerdevil/daemon/backends/upower/xrandrx11helper.h
|
|
|
ff3475 |
+++ b/powerdevil/daemon/backends/upower/xrandrx11helper.h
|
|
|
ff3475 |
@@ -42,7 +42,6 @@ class XRandRX11Helper : public QWidget
|
|
|
ff3475 |
int m_versionMajor;
|
|
|
ff3475 |
int m_versionMinor;
|
|
|
ff3475 |
|
|
|
ff3475 |
- bool m_debugMode;
|
|
|
ff3475 |
Window m_window;
|
|
|
ff3475 |
};
|
|
|
ff3475 |
|