summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-05-12 16:21:03 +0200
committerLars Knoll <lars.knoll@nokia.com>2011-05-12 16:36:48 +0200
commit4214ddc1d9c9662ab646f2ab4ba0bccb0ead6b64 (patch)
tree6fda2ad1b67462d31df478b4be64ddbf8d24df82
parent38ed8c2dddfe55c4a940adb534fa41ecae02af69 (diff)
Fix compilation with namespaces enabled
Reviewed-by: Samuel Rødal (cherry picked from commit bff68fc7094a50af57f7da23ecf9b25cab00f188)
-rw-r--r--src/gui/painting/qcosmeticstroker.cpp4
-rw-r--r--src/gui/painting/qcosmeticstroker_p.h10
2 files changed, 14 insertions, 0 deletions
diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp
index 498b1546e2..24d625e933 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)
{
@@ -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