From 2c23c6e86465d0c0eafa233099fc581354fa96ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 16 Aug 2012 08:03:07 +0200 Subject: [PATCH] Spellchecking SVN_SILENT --- activation.cpp | 2 +- composite.cpp | 2 +- scene_opengl_glx.cpp | 2 +- tabgroup.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/activation.cpp b/activation.cpp index 298728719a..7c07d5e1bb 100644 --- a/activation.cpp +++ b/activation.cpp @@ -414,7 +414,7 @@ Client *Workspace::clientUnderMouse(int screen) const } // rule out clients which are not really visible. - // the screen test is rather superflous for xrandr & twinview since the geometry would differ -> TODO: might be dropped + // the screen test is rather superfluous for xrandr & twinview since the geometry would differ -> TODO: might be dropped if (!(client->isShown(false) && client->isOnCurrentDesktop() && client->isOnCurrentActivity() && client->isOnScreen(screen))) continue; diff --git a/composite.cpp b/composite.cpp index 12bb75a8df..c65716b5ca 100644 --- a/composite.cpp +++ b/composite.cpp @@ -181,7 +181,7 @@ void Workspace::slotCompositingOptionsInitialized() fpsInterval = qMax((fpsInterval / vBlankInterval) * vBlankInterval, vBlankInterval); } else vBlankInterval = 1 << 10; // no sync - DO NOT set "0", would cause div-by-zero segfaults. - m_timeSinceLastVBlank = fpsInterval - 1; // means "start now" - we dont't have even a slight idea when the first vsync will occur + m_timeSinceLastVBlank = fpsInterval - 1; // means "start now" - we don't have even a slight idea when the first vsync will occur checkCompositeTimer(); XCompositeRedirectSubwindows(display(), rootWindow(), CompositeRedirectManual); new EffectsHandlerImpl(scene->compositingType()); // sets also the 'effects' pointer diff --git a/scene_opengl_glx.cpp b/scene_opengl_glx.cpp index b016bba932..e0654b5861 100644 --- a/scene_opengl_glx.cpp +++ b/scene_opengl_glx.cpp @@ -633,7 +633,7 @@ void SceneOpenGL::screenGeometryChanged(const QSize &size) m_overlayWindow->setup(buffer); XSync(display(), false); // ensure X11 stuff has applied //// glXMakeCurrent(display(), glxbuffer, ctxbuffer); // reactivate context //// - glViewport(0,0, size.width(), size.height()); // adjust viewport last - should btw. be superflous on the Pixmap buffer - iirc glXCreatePixmap sets the context anyway. //// + glViewport(0,0, size.width(), size.height()); // adjust viewport last - should btw. be superfluous on the Pixmap buffer - iirc glXCreatePixmap sets the context anyway. //// } ShaderManager::instance()->resetAllShaders(); m_resetModelViewProjectionMatrix = true; diff --git a/tabgroup.cpp b/tabgroup.cpp index 771d789954..b3a51d6123 100644 --- a/tabgroup.cpp +++ b/tabgroup.cpp @@ -276,7 +276,7 @@ void TabGroup::updateMinMaxSize() m_maxSize = m_maxSize.boundedTo((*i)->maxSize()); } - // TODO: this actually resolves a conflict that should be catched when adding? + // TODO: this actually resolves a conflict that should be caught when adding? m_maxSize = m_maxSize.expandedTo(m_minSize); // calculate this _once_ to get a common size. @@ -294,7 +294,7 @@ void TabGroup::blockStateUpdates(bool more) { more ? ++m_stateUpdatesBlocked : --m_stateUpdatesBlocked; if (m_stateUpdatesBlocked < 0) { m_stateUpdatesBlocked = 0; - qWarning("TabGroup: Something is messed up with TabGroup::blockStateUpdates() invokation\nReleased more than blocked!"); + qWarning("TabGroup: Something is messed up with TabGroup::blockStateUpdates() invocation\nReleased more than blocked!"); } }