Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=d4f6cf26d0bca6e0bda74c8ae04ef5bb9d2febf8

commit d4f6cf26d0bca6e0bda74c8ae04ef5bb9d2febf8
Author: Marius Cirsta <[email protected]>
Date:   Wed May 2 23:20:47 2012 +0000

* remove trailing whitespaces

diff --git a/source/kde-extra/calligra/fix-colors.patch 
b/source/kde-extra/calligra/fix-colors.patch
index 51eb1e1..659e200 100644
--- a/source/kde-extra/calligra/fix-colors.patch
+++ b/source/kde-extra/calligra/fix-colors.patch
@@ -4,7 +4,7 @@
class KoColorPopupAction::KoColorPopupActionPrivate
{
public:
--    KoColorPopupActionPrivate()
+-    KoColorPopupActionPrivate()
+    KoColorPopupActionPrivate()
: colorSetWidget(0), colorChooser(0), opacitySlider(0), menu(0), 
checkerPainter(4)
, showFilter(true), applyMode(true)
@@ -17,26 +17,26 @@
+    if (palettes.size() > 0) {
+        d->colorSetWidget->setColorSet(palettes.first());
+    }
-
+
d->colorChooser = new KoTriangleColorSelector( widget );
// prevent mouse release on color selector from closing popup
@@ -109,9 +111,9 @@ KoColorPopupAction::KoColorPopupAction(Q
-
+
connect(d->colorSetWidget, SIGNAL(colorChanged(const KoColor &, bool)), this, 
SLOT(colorWasSelected(const KoColor &, bool)));
-
--    connect( d->colorChooser, SIGNAL( colorChanged( const QColor &) ),
+
+-    connect( d->colorChooser, SIGNAL( colorChanged( const QColor &) ),
+    connect( d->colorChooser, SIGNAL( colorChanged( const QColor &) ),
this, SLOT( colorWasEdited( const QColor &) ) );
--    connect( d->opacitySlider, SIGNAL(valueChanged(int)),
+-    connect( d->opacitySlider, SIGNAL(valueChanged(int)),
+    connect( d->opacitySlider, SIGNAL(valueChanged(int)),
this, SLOT(opacityWasChanged(int)));
}
-
+
@@ -169,7 +171,7 @@ void KoColorPopupAction::updateIcon( )
{
pm = QImage(iconSize, QImage::Format_ARGB32_Premultiplied);
pm.fill(Qt::transparent);
--        // there was no icon set so we assume
+-        // there was no icon set so we assume
+        // there was no icon set so we assume
// that we create an icon from the current color
d->applyMode = false;
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to