diff --git a/effects/blur/blurshader.h b/effects/blur/blurshader.h index ad32bcdc3b..a1ff487495 100644 --- a/effects/blur/blurshader.h +++ b/effects/blur/blurshader.h @@ -119,7 +119,7 @@ public: void bind(); void unbind(); void setTextureMatrix(const QMatrix4x4 &) {} - void setModelViewProjectionMatrix(const QMatrix4x4 &matrix) {} + void setModelViewProjectionMatrix(const QMatrix4x4 &) {} static bool supported(); diff --git a/effects/coverswitch/coverswitch.cpp b/effects/coverswitch/coverswitch.cpp index 0f30927ff7..ba79799b69 100644 --- a/effects/coverswitch/coverswitch.cpp +++ b/effects/coverswitch/coverswitch.cpp @@ -268,7 +268,6 @@ void CoverSwitchEffect::paintScreen(int mask, QRegion region, ScreenPaintData& d #ifndef KWIN_HAVE_OPENGLES glPolygonMode(GL_FRONT, GL_FILL); #endif - QRect fullRect = effects->clientArea(FullArea, activeScreen, effects->currentDesktop()); // we can use a huge scale factor (needed to calculate the rearground vertices) // as we restrict with a PaintClipper painting on the current screen float reflectionScaleFactor = 100000 * tan(60.0 * M_PI / 360.0f) / area.width(); @@ -336,6 +335,7 @@ void CoverSwitchEffect::paintScreen(int mask, QRegion region, ScreenPaintData& d } else { #ifndef KWIN_HAVE_OPENGLES glPushMatrix(); + QRect fullRect = effects->clientArea(FullArea, activeScreen, effects->currentDesktop()); if (effects->numScreens() > 1 && area.x() != fullRect.x()) { // have to change the reflection area in horizontal layout and right screen glTranslatef(-area.x(), 0.0, 0.0); @@ -737,8 +737,6 @@ void CoverSwitchEffect::paintWindowCover(EffectWindow* w, bool reflectedWindow, } } - QRect thumbnail = infiniteRegion(); - if (reflectedWindow) { if (ShaderManager::instance()->isValid()) { GLShader *shader = ShaderManager::instance()->pushShader(ShaderManager::GenericShader); diff --git a/effects/presentwindows/presentwindows.cpp b/effects/presentwindows/presentwindows.cpp index 81c058dd47..40c34c9845 100755 --- a/effects/presentwindows/presentwindows.cpp +++ b/effects/presentwindows/presentwindows.cpp @@ -1487,7 +1487,7 @@ bool PresentWindowsEffect::isOverlappingAny(EffectWindow *w, const QHashactiveFullScreenEffect() && effects->activeFullScreenEffect() != this) return; diff --git a/effects/presentwindows/presentwindows.h b/effects/presentwindows/presentwindows.h index 0054c22fdd..71052660b5 100644 --- a/effects/presentwindows/presentwindows.h +++ b/effects/presentwindows/presentwindows.h @@ -131,7 +131,7 @@ public: }; public slots: - void setActive(bool active, bool closingTab = false); // HACK: closingTab shouldn't be needed + void setActive(bool active); void toggleActive() { m_mode = ModeCurrentDesktop; setActive(!m_activated); diff --git a/effects/taskbarthumbnail/taskbarthumbnail.cpp b/effects/taskbarthumbnail/taskbarthumbnail.cpp index ae362129c6..30e360272d 100644 --- a/effects/taskbarthumbnail/taskbarthumbnail.cpp +++ b/effects/taskbarthumbnail/taskbarthumbnail.cpp @@ -131,9 +131,7 @@ void TaskbarThumbnailEffect::slotPropertyNotify(EffectWindow* w, long a) { if (!w || a != atom) return; - foreach (const Data & thumb, thumbnails.values(w)) { - w->addRepaintFull(); - } + w->addRepaintFull(); thumbnails.remove(w); QByteArray data = w->readProperty(atom, atom, 32); if (data.length() < 1) diff --git a/effects/wobblywindows/wobblywindows.cpp b/effects/wobblywindows/wobblywindows.cpp index 077b393769..d940a8aaa6 100644 --- a/effects/wobblywindows/wobblywindows.cpp +++ b/effects/wobblywindows/wobblywindows.cpp @@ -372,6 +372,7 @@ void WobblyWindowsEffect::slotWindowStartUserMovedResized(EffectWindow *w) void WobblyWindowsEffect::slotWindowStepUserMovedResized(EffectWindow *w, const QRect &geometry) { + Q_UNUSED(geometry) if (windows.contains(w)) { WindowWobblyInfos& wwi = windows[w]; QRect rect = w->geometry(); @@ -397,6 +398,8 @@ void WobblyWindowsEffect::slotWindowFinishUserMovedResized(EffectWindow *w) void WobblyWindowsEffect::slotWindowMaximizeStateChanged(EffectWindow *w, bool horizontal, bool vertical) { + Q_UNUSED(horizontal) + Q_UNUSED(vertical) if (w->isUserMove() || !m_moveEffectEnabled || w->isSpecialWindow()) return; diff --git a/libkwineffects/kwinanimationeffect.cpp b/libkwineffects/kwinanimationeffect.cpp index 4ef79e43ac..363cab0815 100644 --- a/libkwineffects/kwinanimationeffect.cpp +++ b/libkwineffects/kwinanimationeffect.cpp @@ -732,6 +732,7 @@ region_creation: void AnimationEffect::_expandedGeometryChanged(KWin::EffectWindow *w, const QRect &old) { + Q_UNUSED(old) Q_D(AnimationEffect); AniMap::const_iterator entry = d->m_animations.constFind(w); if (entry != d->m_animations.constEnd()) { diff --git a/libkwineffects/kwinglutils.cpp b/libkwineffects/kwinglutils.cpp index 0b125ef185..f59afbf4e7 100644 --- a/libkwineffects/kwinglutils.cpp +++ b/libkwineffects/kwinglutils.cpp @@ -1157,7 +1157,9 @@ GLVertexBuffer *GLVertexBufferPrivate::streamingBuffer = NULL; void GLVertexBufferPrivate::legacyPainting(QRegion region, GLenum primitiveMode, bool hardwareClipping) { #ifdef KWIN_HAVE_OPENGLES + Q_UNUSED(region) Q_UNUSED(primitiveMode) + Q_UNUSED(hardwareClipping) #else // Enable arrays glEnableClientState(GL_VERTEX_ARRAY); @@ -1230,7 +1232,9 @@ void GLVertexBufferPrivate::corePainting(const QRegion& region, GLenum primitive void GLVertexBufferPrivate::fallbackPainting(const QRegion& region, GLenum primitiveMode, bool hardwareClipping) { #ifdef KWIN_HAVE_OPENGLES + Q_UNUSED(region) Q_UNUSED(primitiveMode) + Q_UNUSED(hardwareClipping) #else glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_TEXTURE_COORD_ARRAY);