[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.6.5-3-24-g55cb6e2

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit ca47638d729db23126d54ea4ba37c35d01d08d03
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Tue Oct 4 20:36:47 2011 +0200

    Remove kwin_avoid_deep_vector_copies.diff, applied upstream.
---
 debian/changelog                                  |    2 +-
 debian/patches/kwin_avoid_deep_vector_copies.diff |   98 ---------------------
 debian/patches/series                             |    1 -
 3 files changed, 1 insertions(+), 100 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a82f44f..52f50ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,7 @@ kde-workspace (4:4.7.2-0r0) UNRELEASED; urgency=low
     - Import plasma_desktop_shell_drop_kactivities.diff from Ubuntu.
     - Remove backport_kwin_multihead_improvements.diff, applied usptream.
     - Remove ksmserver_fadeeffect_use_sse2_free.diff, applied upstream.
-    - Update kwin_avoid_deep_vector_copies.diff from upstream's git.
+    - Remove kwin_avoid_deep_vector_copies.diff, applied upstream.
     - Refreshed various patches to make them apply without offsets.
   * Update build dependencies:
     - Add libgles2-mesa-dev.
diff --git a/debian/patches/kwin_avoid_deep_vector_copies.diff b/debian/patches/kwin_avoid_deep_vector_copies.diff
deleted file mode 100644
index 4bd8f80..0000000
--- a/debian/patches/kwin_avoid_deep_vector_copies.diff
+++ /dev/null
@@ -1,98 +0,0 @@
-From e142a1a142cbc8b87f021223e6abc947f456a7f9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking at gmail.com>
-Date: Thu, 8 Sep 2011 22:20:35 +0200
-Subject: [PATCH] replace non-const QVector::operator[] accesses with const
- ::at() to avoid maaany deep vecor copies
-
----
- kwin/effects.cpp |   18 +++++++++---------
- 1 files changed, 9 insertions(+), 9 deletions(-)
-
-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;
-     }
- }
--- 
-1.7.6.3
-
diff --git a/debian/patches/series b/debian/patches/series
index ade0d5a..98c7f67 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,5 +16,4 @@ enable_debianabimanager.diff
 initialize_variables_crashfix.diff
 enable_dlrestrcitions.diff
 kdm_vt_switching_on_kfreebsd.diff
-kwin_avoid_deep_vector_copies.diff
 plasma_desktop_shell_drop_kactivities.diff

-- 
KDE Base Workspace module packaging