summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kde-base/kwin/ChangeLog6
-rw-r--r--kde-base/kwin/files/kwin-4.7.1-performance.patch91
2 files changed, 5 insertions, 92 deletions
diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index ec82de730b32..61c11391527b 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kwin
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.255 2011/12/11 18:52:18 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.256 2011/12/12 01:26:22 abcd Exp $
+
+ 12 Dec 2011; Jonathan Callen <abcd@gentoo.org>
+ -files/kwin-4.7.1-performance.patch:
+ rm old files
*kwin-4.7.4 (11 Dec 2011)
diff --git a/kde-base/kwin/files/kwin-4.7.1-performance.patch b/kde-base/kwin/files/kwin-4.7.1-performance.patch
deleted file mode 100644
index a34c77e5c828..000000000000
--- a/kde-base/kwin/files/kwin-4.7.1-performance.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-commit e142a1a142cbc8b87f021223e6abc947f456a7f9
-Author: Thomas Lübking <thomas.luebking@gmail.com>
-Date: Thu Sep 8 22:20:35 2011 +0200
-
- replace non-const QVector::operator[] accesses with const ::at() to avoid maaany deep vecor copies
-
-diff --git a/kwin/effects.cpp b/kwin/effects.cpp
-index e0c76cb..f5863fc0 100644
---- a/kwin/effects.cpp
-+++ b/kwin/effects.cpp
-@@ -200,7 +200,7 @@ void EffectsHandlerImpl::reconfigure()
- void EffectsHandlerImpl::prePaintScreen(ScreenPrePaintData& data, int time)
- {
- if (current_paint_screen < loaded_effects.size()) {
-- loaded_effects[current_paint_screen++].second->prePaintScreen(data, time);
-+ loaded_effects.at(current_paint_screen++).second->prePaintScreen(data, time);
- --current_paint_screen;
- }
- // no special final code
-@@ -209,7 +209,7 @@ void EffectsHandlerImpl::prePaintScreen(ScreenPrePaintData& data, int time)
- void EffectsHandlerImpl::paintScreen(int mask, QRegion region, ScreenPaintData& data)
- {
- if (current_paint_screen < loaded_effects.size()) {
-- loaded_effects[current_paint_screen++].second->paintScreen(mask, region, data);
-+ loaded_effects.at(current_paint_screen++).second->paintScreen(mask, region, data);
- --current_paint_screen;
- } else
- scene->finalPaintScreen(mask, region, data);
-@@ -218,7 +218,7 @@ void EffectsHandlerImpl::paintScreen(int mask, QRegion region, ScreenPaintData&
- void EffectsHandlerImpl::postPaintScreen()
- {
- if (current_paint_screen < loaded_effects.size()) {
-- loaded_effects[current_paint_screen++].second->postPaintScreen();
-+ loaded_effects.at(current_paint_screen++).second->postPaintScreen();
- --current_paint_screen;
- }
- // no special final code
-@@ -227,7 +227,7 @@ void EffectsHandlerImpl::postPaintScreen()
- void EffectsHandlerImpl::prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time)
- {
- if (current_paint_window < loaded_effects.size()) {
-- loaded_effects[current_paint_window++].second->prePaintWindow(w, data, time);
-+ loaded_effects.at(current_paint_window++).second->prePaintWindow(w, data, time);
- --current_paint_window;
- }
- // no special final code
-@@ -236,7 +236,7 @@ void EffectsHandlerImpl::prePaintWindow(EffectWindow* w, WindowPrePaintData& dat
- void EffectsHandlerImpl::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data)
- {
- if (current_paint_window < loaded_effects.size()) {
-- loaded_effects[current_paint_window++].second->paintWindow(w, mask, region, data);
-+ loaded_effects.at(current_paint_window++).second->paintWindow(w, mask, region, data);
- --current_paint_window;
- } else
- scene->finalPaintWindow(static_cast<EffectWindowImpl*>(w), mask, region, data);
-@@ -245,7 +245,7 @@ void EffectsHandlerImpl::paintWindow(EffectWindow* w, int mask, QRegion region,
- void EffectsHandlerImpl::paintEffectFrame(EffectFrame* frame, QRegion region, double opacity, double frameOpacity)
- {
- if (current_paint_effectframe < loaded_effects.size()) {
-- loaded_effects[current_paint_effectframe++].second->paintEffectFrame(frame, region, opacity, frameOpacity);
-+ loaded_effects.at(current_paint_effectframe++).second->paintEffectFrame(frame, region, opacity, frameOpacity);
- --current_paint_effectframe;
- } else {
- const EffectFrameImpl* frameImpl = static_cast<const EffectFrameImpl*>(frame);
-@@ -256,7 +256,7 @@ void EffectsHandlerImpl::paintEffectFrame(EffectFrame* frame, QRegion region, do
- void EffectsHandlerImpl::postPaintWindow(EffectWindow* w)
- {
- if (current_paint_window < loaded_effects.size()) {
-- loaded_effects[current_paint_window++].second->postPaintWindow(w);
-+ loaded_effects.at(current_paint_window++).second->postPaintWindow(w);
- --current_paint_window;
- }
- // no special final code
-@@ -273,7 +273,7 @@ bool EffectsHandlerImpl::provides(Effect::Feature ef)
- void EffectsHandlerImpl::drawWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data)
- {
- if (current_draw_window < loaded_effects.size()) {
-- loaded_effects[current_draw_window++].second->drawWindow(w, mask, region, data);
-+ loaded_effects.at(current_draw_window++).second->drawWindow(w, mask, region, data);
- --current_draw_window;
- } else
- scene->finalDrawWindow(static_cast<EffectWindowImpl*>(w), mask, region, data);
-@@ -282,7 +282,7 @@ void EffectsHandlerImpl::drawWindow(EffectWindow* w, int mask, QRegion region, W
- void EffectsHandlerImpl::buildQuads(EffectWindow* w, WindowQuadList& quadList)
- {
- if (current_build_quads < loaded_effects.size()) {
-- loaded_effects[current_build_quads++].second->buildQuads(w, quadList);
-+ loaded_effects.at(current_build_quads++).second->buildQuads(w, quadList);
- --current_build_quads;
- }
- }