summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-01 18:39:56 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-01 18:39:56 +0000
commit7cc6b9d8e81b1f674a94cebc6a0e6f02452a872a (patch)
treeb0f6d2e1acba11603634edebd197c2598b4b82a0
parent84a75dbef9da6531bcb6f3ca9ab2216396b7b3bd (diff)
downloadkoffice-7cc6b9d8.tar.gz
koffice-7cc6b9d8.zip
Fix koffice FTBFS under gcc4.6
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1244302 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc6
-rw-r--r--chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc6
-rw-r--r--chalk/plugins/filters/levelfilter/kgradientslider.cc2
-rw-r--r--chalk/plugins/filters/levelfilter/kis_level_filter.cc2
-rw-r--r--chalk/ui/kcurve.cc8
5 files changed, 12 insertions, 12 deletions
diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
index c42223fbe..d89db6ae6 100644
--- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
+++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
@@ -276,7 +276,7 @@ KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(TQWidget *
// Create the horizontal gradient label
TQPixmap hgradientpix(256, 1);
TQPainter hgp(&hgradientpix);
- hgp.setPen(TQPen::TQPen(TQColor(0,0,0),1, TQt::SolidLine));
+ hgp.setPen(TQPen(TQColor(0,0,0),1, TQt::SolidLine));
for( i=0; i<256; ++i )
{
hgp.setPen(TQColor(i,i,i));
@@ -287,7 +287,7 @@ KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(TQWidget *
// Create the vertical gradient label
TQPixmap vgradientpix(1, 256);
TQPainter vgp(&vgradientpix);
- vgp.setPen(TQPen::TQPen(TQColor(0,0,0),1, TQt::SolidLine));
+ vgp.setPen(TQPen(TQColor(0,0,0),1, TQt::SolidLine));
for( i=0; i<256; ++i )
{
vgp.setPen(TQColor(i,i,i));
@@ -300,7 +300,7 @@ KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(TQWidget *
TQPixmap pix(256, height);
pix.fill();
TQPainter p(&pix);
- p.setPen(TQPen::TQPen(TQt::gray,1, TQt::SolidLine));
+ p.setPen(TQPen(TQt::gray,1, TQt::SolidLine));
double highest = (double)histogram.calculations().getHighest();
TQ_INT32 bins = histogram.producer()->numberOfBins();
diff --git a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc
index 8d3aad84e..5c5a1b2c5 100644
--- a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc
+++ b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc
@@ -273,7 +273,7 @@ void KisPerChannelConfigWidget::setActiveChannel(int ch)
TQPixmap pix(256, height);
pix.fill();
TQPainter p(&pix);
- p.setPen(TQPen::TQPen(TQt::gray,1, TQt::SolidLine));
+ p.setPen(TQPen(TQt::gray,1, TQt::SolidLine));
m_histogram->setChannel(ch);
@@ -331,7 +331,7 @@ KisPerChannelConfigWidget::KisPerChannelConfigWidget(TQWidget * tqparent, KisPai
// Create the horizontal gradient label
TQPixmap hgradientpix(256, 1);
TQPainter hgp(&hgradientpix);
- hgp.setPen(TQPen::TQPen(TQColor(0,0,0),1, TQt::SolidLine));
+ hgp.setPen(TQPen(TQColor(0,0,0),1, TQt::SolidLine));
for( i=0; i<256; ++i )
{
hgp.setPen(TQColor(i,i,i));
@@ -342,7 +342,7 @@ KisPerChannelConfigWidget::KisPerChannelConfigWidget(TQWidget * tqparent, KisPai
// Create the vertical gradient label
TQPixmap vgradientpix(1, 256);
TQPainter vgp(&vgradientpix);
- vgp.setPen(TQPen::TQPen(TQColor(0,0,0),1, TQt::SolidLine));
+ vgp.setPen(TQPen(TQColor(0,0,0),1, TQt::SolidLine));
for( i=0; i<256; ++i )
{
vgp.setPen(TQColor(i,i,i));
diff --git a/chalk/plugins/filters/levelfilter/kgradientslider.cc b/chalk/plugins/filters/levelfilter/kgradientslider.cc
index 104ef3758..948fd277c 100644
--- a/chalk/plugins/filters/levelfilter/kgradientslider.cc
+++ b/chalk/plugins/filters/levelfilter/kgradientslider.cc
@@ -72,7 +72,7 @@ void KGradientSlider::paintEvent(TQPaintEvent *)
// Draw first gradient
y = 0;
- p1.setPen(TQPen::TQPen(TQColor(0,0,0),1, TQt::SolidLine));
+ p1.setPen(TQPen(TQColor(0,0,0),1, TQt::SolidLine));
for( x=0; x<255; ++x )
{
int gray = (255 * x) / wWidth;
diff --git a/chalk/plugins/filters/levelfilter/kis_level_filter.cc b/chalk/plugins/filters/levelfilter/kis_level_filter.cc
index 6b8dd6a09..fb437f269 100644
--- a/chalk/plugins/filters/levelfilter/kis_level_filter.cc
+++ b/chalk/plugins/filters/levelfilter/kis_level_filter.cc
@@ -277,7 +277,7 @@ void KisLevelConfigWidget::drawHistogram(bool logarithmic)
TQPixmap pix(256, height);
pix.fill();
TQPainter p(&pix);
- p.setPen(TQPen::TQPen(TQt::gray,1, TQt::SolidLine));
+ p.setPen(TQPen(TQt::gray,1, TQt::SolidLine));
double highest = (double)histogram->calculations().getHighest();
TQ_INT32 bins = histogram->producer()->numberOfBins();
diff --git a/chalk/ui/kcurve.cc b/chalk/ui/kcurve.cc
index 47f9934a2..846139746 100644
--- a/chalk/ui/kcurve.cc
+++ b/chalk/ui/kcurve.cc
@@ -146,7 +146,7 @@ void KCurve::paintEvent(TQPaintEvent *)
pm.fill();
// Draw grid separators.
- p1.setPen(TQPen::TQPen(TQt::gray, 1, TQt::SolidLine));
+ p1.setPen(TQPen(TQt::gray, 1, TQt::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(TQPaintEvent *)
// Draw curve.
double curvePrevVal = getCurveValue(0.0);
- p1.setPen(TQPen::TQPen(TQt::black, 1, TQt::SolidLine));
+ p1.setPen(TQPen(TQt::black, 1, TQt::SolidLine));
for (x = 0 ; x < wWidth ; x++)
{
double curveX;
@@ -184,13 +184,13 @@ void KCurve::paintEvent(TQPaintEvent *)
if(p == m_grab_point)
{
- p1.setPen(TQPen::TQPen(TQt::red, 3, TQt::SolidLine));
+ p1.setPen(TQPen(TQt::red, 3, TQt::SolidLine));
p1.drawEllipse( int(curveX * wWidth) - 2,
wHeight - 2 - int(curveY * wHeight), 4, 4 );
}
else
{
- p1.setPen(TQPen::TQPen(TQt::red, 1, TQt::SolidLine));
+ p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine));
p1.drawEllipse( int(curveX * wWidth) - 3,
wHeight - 3 - int(curveY * wHeight), 6, 6 );