rpms/kdelibs/devel kdelibs-4.3.85-plasma_scrollwidget.patch, NONE, 1.1 kdelibs.spec, 1.556, 1.557

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15448

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.85-plasma_scrollwidget.patch 
Log Message:
http://websvn.kde.org/?revision=1063597&view=revision


kdelibs-4.3.85-plasma_scrollwidget.patch:
 scrollwidget.cpp |   70 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 41 insertions(+), 29 deletions(-)

--- NEW FILE kdelibs-4.3.85-plasma_scrollwidget.patch ---
--- trunk/KDE/kdelibs/plasma/widgets/scrollwidget.cpp	2009/12/15 21:37:07	1062764
+++ trunk/KDE/kdelibs/plasma/widgets/scrollwidget.cpp	2009/12/18 21:44:02	1063597
@@ -58,6 +58,39 @@
     {
     }
 
+    void commonConstructor()
+    {
+        q->setFocusPolicy(Qt::StrongFocus);
+        layout = new QGraphicsGridLayout(q);
+        q->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+        layout->setContentsMargins(1, 1, 1, 1);
+        scrollingWidget = new QGraphicsWidget(q);
+        layout->addItem(scrollingWidget, 0, 0);
+        borderSvg = new Plasma::Svg(q);
+        borderSvg->setImagePath("widgets/scrollwidget");
+
+        adjustScrollbarsTimer = new QTimer(q);
+        adjustScrollbarsTimer->setSingleShot(true);
+        QObject::connect(adjustScrollbarsTimer, SIGNAL(timeout()), q, SLOT(adjustScrollbars()));
+
+        verticalScrollBarPolicy = Qt::ScrollBarAsNeeded;
+        verticalScrollBar = new Plasma::ScrollBar(q);
+        verticalScrollBar->setFocusPolicy(Qt::NoFocus);
+        layout->addItem(verticalScrollBar, 0, 1);
+        verticalScrollBar->nativeWidget()->setMinimum(0);
+        verticalScrollBar->nativeWidget()->setMaximum(100);
+        QObject::connect(verticalScrollBar, SIGNAL(valueChanged(int)), q, SLOT(verticalScroll(int)));
+
+        horizontalScrollBarPolicy = Qt::ScrollBarAsNeeded;
+        horizontalScrollBar = new Plasma::ScrollBar(q);
+        verticalScrollBar->setFocusPolicy(Qt::NoFocus);
+        horizontalScrollBar->setOrientation(Qt::Horizontal);
+        layout->addItem(horizontalScrollBar, 1, 0);
+        horizontalScrollBar->nativeWidget()->setMinimum(0);
+        horizontalScrollBar->nativeWidget()->setMaximum(100);
+        QObject::connect(horizontalScrollBar, SIGNAL(valueChanged(int)), q, SLOT(horizontalScroll(int)));
+    }
+
     void adjustScrollbars()
     {
         if (!widget) {
@@ -277,39 +310,18 @@
 };
 
 
+ScrollWidget::ScrollWidget(QGraphicsItem *parent)
+    : QGraphicsWidget(parent),
+      d(new ScrollWidgetPrivate(this))
+{
+    d->commonConstructor();
+}
+
 ScrollWidget::ScrollWidget(QGraphicsWidget *parent)
     : QGraphicsWidget(parent),
       d(new ScrollWidgetPrivate(this))
 {
-    setFocusPolicy(Qt::StrongFocus);
-    d->layout = new QGraphicsGridLayout(this);
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    d->layout->setContentsMargins(1, 1, 1, 1);
-    d->scrollingWidget = new QGraphicsWidget(this);
-    d->layout->addItem(d->scrollingWidget, 0, 0);
-    d->borderSvg = new Plasma::Svg(this);
-    d->borderSvg->setImagePath("widgets/scrollwidget");
-
-    d->adjustScrollbarsTimer = new QTimer(this);
-    d->adjustScrollbarsTimer->setSingleShot(true);
-    connect(d->adjustScrollbarsTimer, SIGNAL(timeout()), this, SLOT(adjustScrollbars()));
-
-    d->verticalScrollBarPolicy = Qt::ScrollBarAsNeeded;
-    d->verticalScrollBar = new Plasma::ScrollBar(this);
-    d->verticalScrollBar->setFocusPolicy(Qt::NoFocus);
-    d->layout->addItem(d->verticalScrollBar, 0, 1);
-    d->verticalScrollBar->nativeWidget()->setMinimum(0);
-    d->verticalScrollBar->nativeWidget()->setMaximum(100);
-    connect(d->verticalScrollBar, SIGNAL(valueChanged(int)), this, SLOT(verticalScroll(int)));
-
-    d->horizontalScrollBarPolicy = Qt::ScrollBarAsNeeded;
-    d->horizontalScrollBar = new Plasma::ScrollBar(this);
-    d->verticalScrollBar->setFocusPolicy(Qt::NoFocus);
-    d->horizontalScrollBar->setOrientation(Qt::Horizontal);
-    d->layout->addItem(d->horizontalScrollBar, 1, 0);
-    d->horizontalScrollBar->nativeWidget()->setMinimum(0);
-    d->horizontalScrollBar->nativeWidget()->setMaximum(100);
-    connect(d->horizontalScrollBar, SIGNAL(valueChanged(int)), this, SLOT(horizontalScroll(int)));
+    d->commonConstructor();
 }
 
 ScrollWidget::~ScrollWidget()


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.556
retrieving revision 1.557
diff -u -p -r1.556 -r1.557
--- kdelibs.spec	18 Dec 2009 15:11:55 -0000	1.556
+++ kdelibs.spec	18 Dec 2009 22:53:04 -0000	1.557
@@ -4,7 +4,7 @@
 
 Summary: KDE Libraries
 Version: 4.3.85
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -80,6 +80,7 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
 
 # upstream
+Patch100: kdelibs-4.3.85-plasma_scrollwidget.patch
 
 # security fix
 ## Not Upstreamed? why not ? -- Rex
@@ -214,6 +215,7 @@ format for easy browsing.
 %endif
 
 # upstream patches
+%patch100 -p3 -b .plasma_scrollwidget
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702