--- koffice-2.1.2/filters/kword/msword-odf/texthandler.cpp	2010-03-29 15:05:58.000000000 +0200
+++ koffice-2.1.2.new/filters/kword/msword-odf/texthandler.cpp	2010-05-07 19:02:43.000000000 +0200
@@ -863,7 +863,7 @@
                 unsigned int code = text[0].unicode();
                 if ( (code & 0xFF00) == 0xF000 ) // see wv2
                     code &= 0x00FF;
-                listStyleWriter.addAttribute( "text:bullet-char", QString::QString( code ).toUtf8() );
+                listStyleWriter.addAttribute( "text:bullet-char", QString( code ).toUtf8() );
             }
             else
                 kWarning(30513) << "Bullet with more than one character, not supported";
--- koffice-2.1.2/krita/ui/widgets/kis_curve_widget.cpp	2010-03-29 15:07:17.000000000 +0200
+++ koffice-2.1.2.new/krita/ui/widgets/kis_curve_widget.cpp	2010-05-07 20:14:22.000000000 +0200
@@ -312,11 +312,11 @@
             curveY = d->m_points.at(i).y();
 
             if (i == d->m_grab_point_index) {
-                p.setPen(QPen::QPen(Qt::red, 3, Qt::SolidLine));
+                p.setPen(QPen(Qt::red, 3, Qt::SolidLine));
                 p.drawEllipse(QRectF(curveX * wWidth - 2,
                                      wHeight - 2 - curveY * wHeight, 4, 4));
             } else {
-                p.setPen(QPen::QPen(Qt::red, 1, Qt::SolidLine));
+                p.setPen(QPen(Qt::red, 1, Qt::SolidLine));
                 p.drawEllipse(QRectF(curveX * wWidth - 3,
                                      wHeight - 3 - curveY * wHeight, 6, 6));
             }
--- koffice-2.1.2/krita/ui/widgets/kis_curve_widget_p.h	2010-03-29 15:07:17.000000000 +0200
+++ koffice-2.1.2.new/krita/ui/widgets/kis_curve_widget_p.h	2010-05-07 20:15:38.000000000 +0200
@@ -439,7 +439,7 @@
      * That is not mandatory but desirable
      */
 
-    p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine));
+    p.setPen(QPen(Qt::gray, 1, Qt::SolidLine));
     p.drawLine(div4_round(wWidth), 0, div4_round(wWidth), wHeight);
     p.drawLine(div2_round(wWidth), 0, div2_round(wWidth), wHeight);
     p.drawLine(div4_round(3*wWidth), 0, div4_round(3*wWidth), wHeight);
--- koffice-2.1.2/krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp	2010-03-29 15:06:06.000000000 +0200
+++ koffice-2.1.2.new/krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp	2010-05-07 20:20:28.000000000 +0200
@@ -123,7 +123,7 @@
 
     QPixmap gradientpix(width, height);
     QPainter p(&gradientpix);
-    p.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
+    p.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
     for (; *i < 256; (*i)++, col += inc) {
         p.setPen(QColor(col, col, col));
         p.drawPoint(x, y);
@@ -138,7 +138,7 @@
     QPixmap pix(256, height);
     pix.fill();
     QPainter p(&pix);
-    p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine));
+    p.setPen(QPen(Qt::gray, 1, Qt::SolidLine));
 
     if(m_histogram)
     {
--- koffice-2.1.2/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp	2010-03-29 15:06:06.000000000 +0200
+++ koffice-2.1.2.new/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp	2010-05-07 20:45:21.000000000 +0200
@@ -249,7 +249,7 @@
     // Create the horizontal gradient label
     QPixmap hgradientpix(256, 1);
     QPainter hgp(&hgradientpix);
-    hgp.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
+    hgp.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
     for (i = 0; i < 256; ++i) {
         hgp.setPen(QColor(i, i, i));
         hgp.drawPoint(i, 0);
@@ -259,7 +259,7 @@
     // Create the vertical gradient label
     QPixmap vgradientpix(1, 256);
     QPainter vgp(&vgradientpix);
-    vgp.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
+    vgp.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
     for (i = 0; i < 256; ++i) {
         vgp.setPen(QColor(i, i, i));
         vgp.drawPoint(0, 255 - i);
@@ -271,7 +271,7 @@
     QPixmap pix(256, height);
     pix.fill();
     QPainter p(&pix);
-    p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine));
+    p.setPen(QPen(Qt::gray, 1, Qt::SolidLine));
 
     double highest = (double)histogram.calculations().getHighest();
     qint32 bins = histogram.producer()->numberOfBins();
--- koffice-2.1.2/krita/plugins/filters/levelfilter/kis_level_filter.cpp	2010-03-29 15:06:23.000000000 +0200
+++ koffice-2.1.2.new/krita/plugins/filters/levelfilter/kis_level_filter.cpp	2010-05-07 20:48:49.000000000 +0200
@@ -178,7 +178,7 @@
     pix.fill();
     QPainter p(&pix);
 
-    p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine));
+    p.setPen(QPen(Qt::gray, 1, Qt::SolidLine));
 
     double highest = (double)histogram->calculations().getHighest();
     qint32 bins = histogram->producer()->numberOfBins();