File kde3-digikam-0.9.6-gcc45.patch of Package kde3-digikam
Index: digikam/libs/dimg/dcolor.cpp
===================================================================
--- digikam/libs/dimg/dcolor.cpp.orig 2009-07-03 09:19:41.000000000 +0400
+++ digikam/libs/dimg/dcolor.cpp 2010-07-28 20:16:14.000000000 +0400
@@ -83,7 +83,7 @@ QColor DColor::getQColor() const
return eightBit.getQColor();
}
- return (QColor::QColor(m_red, m_green, m_blue));
+ return (QColor(m_red, m_green, m_blue));
}
void DColor::convertToSixteenBit()
Index: digikam/utilities/imageeditor/editor/imageiface.cpp
===================================================================
--- digikam/utilities/imageeditor/editor/imageiface.cpp.orig 2009-07-03 09:19:41.000000000 +0400
+++ digikam/utilities/imageeditor/editor/imageiface.cpp 2010-07-28 20:24:03.000000000 +0400
@@ -140,7 +140,7 @@ DColor ImageIface::getColorInfoFromTarge
if ( d->targetPreviewImage.isNull() || point.x() > previewWidth() || point.y() > previewHeight() )
{
DWarning() << k_funcinfo << "Coordinate out of range or no image data available!" << endl;
- return DColor::DColor();
+ return DColor();
}
return d->targetPreviewImage.getPixelColor(point.x(), point.y());
Index: digikam/imageplugins/border/bordertool.cpp
===================================================================
--- digikam/imageplugins/border/bordertool.cpp.orig 2009-07-03 09:19:41.000000000 +0400
+++ digikam/imageplugins/border/bordertool.cpp 2010-07-28 20:33:34.000000000 +0400
@@ -144,9 +144,9 @@ BorderTool::BorderTool(QObject* parent)
// -------------------------------------------------------------------
m_labelForeground = new QLabel(m_gboxSettings->plainPage());
- m_firstColorButton = new KColorButton( QColor::QColor( 192, 192, 192 ), m_gboxSettings->plainPage() );
+ m_firstColorButton = new KColorButton( QColor( 192, 192, 192 ), m_gboxSettings->plainPage() );
m_labelBackground = new QLabel(m_gboxSettings->plainPage());
- m_secondColorButton = new KColorButton( QColor::QColor( 128, 128, 128 ), m_gboxSettings->plainPage() );
+ m_secondColorButton = new KColorButton( QColor( 128, 128, 128 ), m_gboxSettings->plainPage() );
// -------------------------------------------------------------------
Index: digikam/imageplugins/superimpose/dirselectwidget.cpp
===================================================================
--- digikam/imageplugins/superimpose/dirselectwidget.cpp.orig 2009-07-03 09:19:41.000000000 +0400
+++ digikam/imageplugins/superimpose/dirselectwidget.cpp 2010-07-28 20:44:45.000000000 +0400
@@ -61,7 +61,7 @@ DirSelectWidget::DirSelectWidget(QWidget
if ( headerLabel.isNull() )
header()->hide();
- setAlternateBackground(QColor::QColor());
+ setAlternateBackground(QColor());
}
DirSelectWidget::DirSelectWidget(KURL rootUrl, KURL currentUrl,
@@ -75,7 +75,7 @@ DirSelectWidget::DirSelectWidget(KURL ro
if ( headerLabel.isNull() )
header()->hide();
- setAlternateBackground(QColor::QColor());
+ setAlternateBackground(QColor());
setRootPath(rootUrl, currentUrl);
}