diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-16 10:19:02 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-16 10:19:02 +0200 |
| commit | 276d60a4d6c9d1b72c4aa7df1f86e7ce9097beeb (patch) | |
| tree | 73130ce8a80181fb9d234028c5057d7eb86f02ab /src/gui/painting | |
| parent | 850b602c7a72635eb37a998089ee085d5d505c34 (diff) | |
| parent | 173099696f44073441975febfa35ddfb3585e8c5 (diff) | |
Merge remote branch 'origin/master' into refactor
Conflicts:
src/modules/qt_openvg.pri
src/widgets/to_be_moved/qlinecontrol_p.h
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qcosmeticstroker.cpp | 20 | ||||
| -rw-r--r-- | src/gui/painting/qcosmeticstroker_p.h | 10 |
2 files changed, 22 insertions, 8 deletions
diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp index 498b1546e2..3ee262fcf1 100644 --- a/src/gui/painting/qcosmeticstroker.cpp +++ b/src/gui/painting/qcosmeticstroker.cpp @@ -3,6 +3,8 @@ #include <qdebug.h> #include <math.h> +QT_BEGIN_NAMESPACE + #if 0 inline QString capString(int caps) { @@ -148,28 +150,28 @@ static StrokeLine strokeLine(int strokeSelection) switch (strokeSelection) { case Aliased|Solid|RegularDraw: - stroke = &::drawLine<drawPixel, NoDasher>; + stroke = &QT_PREPEND_NAMESPACE(drawLine)<drawPixel, NoDasher>; break; case Aliased|Solid|FastDraw: - stroke = &::drawLine<drawPixelARGB32Opaque, NoDasher>; + stroke = &QT_PREPEND_NAMESPACE(drawLine)<drawPixelARGB32Opaque, NoDasher>; break; case Aliased|Dashed|RegularDraw: - stroke = &::drawLine<drawPixel, Dasher>; + stroke = &QT_PREPEND_NAMESPACE(drawLine)<drawPixel, Dasher>; break; case Aliased|Dashed|FastDraw: - stroke = &::drawLine<drawPixelARGB32Opaque, Dasher>; + stroke = &QT_PREPEND_NAMESPACE(drawLine)<drawPixelARGB32Opaque, Dasher>; break; case AntiAliased|Solid|RegularDraw: - stroke = &drawLineAA<drawPixel, NoDasher>; + stroke = &QT_PREPEND_NAMESPACE(drawLineAA)<drawPixel, NoDasher>; break; case AntiAliased|Solid|FastDraw: - stroke = &drawLineAA<drawPixelARGB32, NoDasher>; + stroke = &QT_PREPEND_NAMESPACE(drawLineAA)<drawPixelARGB32, NoDasher>; break; case AntiAliased|Dashed|RegularDraw: - stroke = &drawLineAA<drawPixel, Dasher>; + stroke = &QT_PREPEND_NAMESPACE(drawLineAA)<drawPixel, Dasher>; break; case AntiAliased|Dashed|FastDraw: - stroke = &drawLineAA<drawPixelARGB32, Dasher>; + stroke = &QT_PREPEND_NAMESPACE(drawLineAA)<drawPixelARGB32, Dasher>; break; default: Q_ASSERT(false); @@ -952,3 +954,5 @@ static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx } } } + +QT_END_NAMESPACE diff --git a/src/gui/painting/qcosmeticstroker_p.h b/src/gui/painting/qcosmeticstroker_p.h index bc6dd76829..1355a5ad13 100644 --- a/src/gui/painting/qcosmeticstroker_p.h +++ b/src/gui/painting/qcosmeticstroker_p.h @@ -6,6 +6,12 @@ #include <private/qpaintengine_raster_p.h> #include <qpen.h> +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Gui) + class QCosmeticStroker; @@ -98,4 +104,8 @@ public: bool clipLine(qreal &x1, qreal &y1, qreal &x2, qreal &y2); }; +QT_END_NAMESPACE + +QT_END_HEADER + #endif // QCOSMETICLINE_H |