TDE
/
koffice
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/koffice
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix koffice FTBFS under gcc4.6

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1244302 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 84a75dbef9
commit 7cc6b9d8e8
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File

6
chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
Unescape View File

@ -276,7 +276,7 @@ KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(TQWidget *
// Create the horizontal gradient label // Create the horizontal gradient label
TQPixmap hgradientpix(256, 1); TQPixmap hgradientpix(256, 1);
TQPainter hgp(&hgradientpix); 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 ) for( i=0; i<256; ++i )
{ {
hgp.setPen(TQColor(i,i,i)); hgp.setPen(TQColor(i,i,i));
@ -287,7 +287,7 @@ KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(TQWidget *
// Create the vertical gradient label // Create the vertical gradient label
TQPixmap vgradientpix(1, 256); TQPixmap vgradientpix(1, 256);
TQPainter vgp(&vgradientpix); 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 ) for( i=0; i<256; ++i )
{ {
vgp.setPen(TQColor(i,i,i)); vgp.setPen(TQColor(i,i,i));
@ -300,7 +300,7 @@ KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(TQWidget *
TQPixmap pix(256, height); TQPixmap pix(256, height);
pix.fill(); pix.fill();
TQPainter p(&pix); 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(); double highest = (double)histogram.calculations().getHighest();
TQ_INT32 bins = histogram.producer()->numberOfBins(); TQ_INT32 bins = histogram.producer()->numberOfBins();

6
chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc
Unescape View File

@ -273,7 +273,7 @@ void KisPerChannelConfigWidget::setActiveChannel(int ch)
TQPixmap pix(256, height); TQPixmap pix(256, height);
pix.fill(); pix.fill();
TQPainter p(&pix); TQPainter p(&pix);
p.setPen(TQPen::TQPen(TQt::gray,1, TQt::SolidLine)); p.setPen(TQPen(TQt::gray,1, TQt::SolidLine));
m_histogram->setChannel(ch); m_histogram->setChannel(ch);
@ -331,7 +331,7 @@ KisPerChannelConfigWidget::KisPerChannelConfigWidget(TQWidget * tqparent, KisPai
// Create the horizontal gradient label // Create the horizontal gradient label
TQPixmap hgradientpix(256, 1); TQPixmap hgradientpix(256, 1);
TQPainter hgp(&hgradientpix); 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 ) for( i=0; i<256; ++i )
{ {
hgp.setPen(TQColor(i,i,i)); hgp.setPen(TQColor(i,i,i));
@ -342,7 +342,7 @@ KisPerChannelConfigWidget::KisPerChannelConfigWidget(TQWidget * tqparent, KisPai
// Create the vertical gradient label // Create the vertical gradient label
TQPixmap vgradientpix(1, 256); TQPixmap vgradientpix(1, 256);
TQPainter vgp(&vgradientpix); 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 ) for( i=0; i<256; ++i )
{ {
vgp.setPen(TQColor(i,i,i)); vgp.setPen(TQColor(i,i,i));

2
chalk/plugins/filters/levelfilter/kgradientslider.cc
Unescape View File

@ -72,7 +72,7 @@ void KGradientSlider::paintEvent(TQPaintEvent *)
// Draw first gradient // Draw first gradient
y = 0; 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 ) for( x=0; x<255; ++x )
{ {
int gray = (255 * x) / wWidth; int gray = (255 * x) / wWidth;

2
chalk/plugins/filters/levelfilter/kis_level_filter.cc
Unescape View File

@ -277,7 +277,7 @@ void KisLevelConfigWidget::drawHistogram(bool logarithmic)
TQPixmap pix(256, height); TQPixmap pix(256, height);
pix.fill(); pix.fill();
TQPainter p(&pix); 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(); double highest = (double)histogram->calculations().getHighest();
TQ_INT32 bins = histogram->producer()->numberOfBins(); TQ_INT32 bins = histogram->producer()->numberOfBins();

8
chalk/ui/kcurve.cc
Unescape View File

@ -146,7 +146,7 @@ void KCurve::paintEvent(TQPaintEvent *)
pm.fill(); pm.fill();
// Draw grid separators. // 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(wWidth/3, 0, wWidth/3, wHeight);
p1.drawLine(2*wWidth/3, 0, 2*wWidth/3, wHeight); p1.drawLine(2*wWidth/3, 0, 2*wWidth/3, wHeight);
p1.drawLine(0, wHeight/3, wWidth, wHeight/3); p1.drawLine(0, wHeight/3, wWidth, wHeight/3);
@ -154,7 +154,7 @@ void KCurve::paintEvent(TQPaintEvent *)
// Draw curve. // Draw curve.
double curvePrevVal = getCurveValue(0.0); 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++) for (x = 0 ; x < wWidth ; x++)
{ {
double curveX; double curveX;
@ -184,13 +184,13 @@ void KCurve::paintEvent(TQPaintEvent *)
if(p == m_grab_point) 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, p1.drawEllipse( int(curveX * wWidth) - 2,
wHeight - 2 - int(curveY * wHeight), 4, 4 ); wHeight - 2 - int(curveY * wHeight), 4, 4 );
} }
else else
{ {
p1.setPen(TQPen::TQPen(TQt::red, 1, TQt::SolidLine)); p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine));
p1.drawEllipse( int(curveX * wWidth) - 3, p1.drawEllipse( int(curveX * wWidth) - 3,
wHeight - 3 - int(curveY * wHeight), 6, 6 ); wHeight - 3 - int(curveY * wHeight), 6, 6 );

Write Preview
Loading…
Cancel
Save