Fix low hanging fruits for building with modern GCC.


(joerg)

$NetBSD: patch-krita_core_kis__perspective__math.cpp,v 1.1 2011/12/05 22:52:24 joerg Exp $

--- krita/core/kis_perspective_math.cpp.orig	2011-12-05 18:29:04.000000000 +0000
+++ krita/core/kis_perspective_math.cpp
@@ -24,13 +24,15 @@
 
 #if 1
 
-#include <iostream.h>
+#include <iostream>
 #include <stdlib.h>
 #include <math.h>
 //#define NDEBUG // uncomment to remove checking of assert()
 #include <assert.h>
 #define DEFAULT_ALLOC 2
 
+using namespace std;
+
 namespace math { // TODO: use eigen
 
 template <class ElType> class matrix;

$NetBSD: patch-krita_plugins_filters_colorsfilters_kis__brightness__contrast__filter.cc,v 1.1 2011/12/05 22:52:24 joerg Exp $

--- krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc.orig	2011-12-05 18:43:21.000000000 +0000
+++ krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
@@ -276,7 +276,7 @@ KisBrightnessContrastConfigWidget::KisBr
     // 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));
@@ -287,7 +287,7 @@ KisBrightnessContrastConfigWidget::KisBr
     // 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));
@@ -300,7 +300,7 @@ KisBrightnessContrastConfigWidget::KisBr
     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();
     Q_INT32 bins = histogram.producer()->numberOfBins();

$NetBSD: patch-krita_plugins_filters_colorsfilters_kis__perchannel__filter.cc,v 1.1 2011/12/05 22:52:24 joerg Exp $

--- krita/plugins/filters/colorsfilters/kis_perchannel_filter.cc.orig	2011-12-05 18:42:12.000000000 +0000
+++ krita/plugins/filters/colorsfilters/kis_perchannel_filter.cc
@@ -273,7 +273,7 @@ void KisPerChannelConfigWidget::setActiv
     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));
 
     m_histogram->setChannel(ch);
 
@@ -331,7 +331,7 @@ KisPerChannelConfigWidget::KisPerChannel
     // 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));
@@ -342,7 +342,7 @@ KisPerChannelConfigWidget::KisPerChannel
     // 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));

$NetBSD: patch-krita_plugins_filters_levelfilter_kgradientslider.cc,v 1.1 2011/12/05 22:52:24 joerg Exp $

--- krita/plugins/filters/levelfilter/kgradientslider.cc.orig	2011-12-05 18:43:40.000000000 +0000
+++ krita/plugins/filters/levelfilter/kgradientslider.cc
@@ -72,7 +72,7 @@ void KGradientSlider::paintEvent(QPaintE
 
         // Draw first gradient
         y = 0;
-        p1.setPen(QPen::QPen(QColor(0,0,0),1, Qt::SolidLine));
+        p1.setPen(QPen(QColor(0,0,0),1, Qt::SolidLine));
         for( x=0; x<255; ++x )
         {
             int gray = (255 * x) / wWidth;

$NetBSD: patch-krita_plugins_filters_levelfilter_kis__level__filter.cc,v 1.1 2011/12/05 22:52:24 joerg Exp $

--- krita/plugins/filters/levelfilter/kis_level_filter.cc.orig	2011-12-05 18:43:45.000000000 +0000
+++ krita/plugins/filters/levelfilter/kis_level_filter.cc
@@ -277,7 +277,7 @@ void KisLevelConfigWidget::drawHistogram
     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();
     Q_INT32 bins = histogram->producer()->numberOfBins();

$NetBSD: patch-krita_ui_kcurve.cc,v 1.1 2011/12/05 22:52:24 joerg Exp $

--- krita/ui/kcurve.cc.orig	2011-12-05 18:33:50.000000000 +0000
+++ krita/ui/kcurve.cc
@@ -146,7 +146,7 @@ void KCurve::paintEvent(QPaintEvent *)
         pm.fill();
     
     // Draw grid separators.
-    p1.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine));
+    p1.setPen(QPen(Qt::gray, 1, Qt::SolidLine));
     p1.drawLine(wWidth/3, 0, wWidth/3, wHeight);                 
     p1.drawLine(2*wWidth/3, 0, 2*wWidth/3, wHeight);                 
     p1.drawLine(0, wHeight/3, wWidth, wHeight/3);                 
@@ -154,7 +154,7 @@ void KCurve::paintEvent(QPaintEvent *)
 
     // Draw curve.
     double curvePrevVal = getCurveValue(0.0);
-    p1.setPen(QPen::QPen(Qt::black, 1, Qt::SolidLine));    
+    p1.setPen(QPen(Qt::black, 1, Qt::SolidLine));    
     for (x = 0 ; x < wWidth ; x++)
     {
         double curveX;
@@ -184,13 +184,13 @@ void KCurve::paintEvent(QPaintEvent *)
         
             if(p == m_grab_point)
             {
-                p1.setPen(QPen::QPen(Qt::red, 3, Qt::SolidLine));
+                p1.setPen(QPen(Qt::red, 3, Qt::SolidLine));
                 p1.drawEllipse( int(curveX * wWidth) - 2, 
                     wHeight - 2 - int(curveY * wHeight), 4, 4 ); 
             }
             else
             {
-                p1.setPen(QPen::QPen(Qt::red, 1, Qt::SolidLine));
+                p1.setPen(QPen(Qt::red, 1, Qt::SolidLine));
             
                 p1.drawEllipse( int(curveX * wWidth) - 3, 
                     wHeight - 3 - int(curveY * wHeight), 6, 6 ); 

$NetBSD: patch-kspread_digest.cc,v 1.1 2011/12/05 22:52:24 joerg Exp $

--- kspread/digest.cc.orig	2011-12-05 18:53:47.000000000 +0000
+++ kspread/digest.cc
@@ -50,7 +50,7 @@ typedef unsigned short sal_uInt16;
 
 #if  SIZEOF_INT == 4
 typedef unsigned int sal_uInt32;
-#elif
+#else
 typedef unsigned long sal_uInt32;
 #endif