yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix unused variable warnings

Browse source 
SVN_SILENT
This commit is contained in:
Martin Gräßlin 2012-05-24 11:15:24 +02:00
parent a6463653b9
commit 812c310dcf
8 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects/blur/blurshader.h
View file

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

4
effects/coverswitch/coverswitch.cpp
View file

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

2
effects/presentwindows/presentwindows.cpp
View file

@ -1487,7 +1487,7 @@ bool PresentWindowsEffect::isOverlappingAny(EffectWindow *w, const QHash<EffectW
//-----------------------------------------------------------------------------
// Activation
void PresentWindowsEffect::setActive(bool active, bool closingTab)
void PresentWindowsEffect::setActive(bool active)
{
if (effects->activeFullScreenEffect() && effects->activeFullScreenEffect() != this)
return;

2
effects/presentwindows/presentwindows.h
View file

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

4
effects/taskbarthumbnail/taskbarthumbnail.cpp
View file

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

3
effects/wobblywindows/wobblywindows.cpp
View file

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

1
libkwineffects/kwinanimationeffect.cpp
View file

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

4
libkwineffects/kwinglutils.cpp
View file

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