summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@nokia.com>2009-09-28 08:43:10 (GMT)
committerRichard Moe Gustavsen <richard.gustavsen@nokia.com>2009-09-28 08:45:13 (GMT)
commitce94e9575a9f623f599a16d69051480a94300b7e (patch)
treededb515b53289dbfb3fd3973882f3fbd10139900
parent003d454ce8350cc279c2de53848c7a4533dc939d (diff)
downloadQt-ce94e9575a9f623f599a16d69051480a94300b7e.zip
Qt-ce94e9575a9f623f599a16d69051480a94300b7e.tar.gz
Qt-ce94e9575a9f623f599a16d69051480a94300b7e.tar.bz2
Cocoa: Fix build cocoa port with namespace
This fix just fixes up coding bugs here and there Reviewed-by: Brad
-rw-r--r--examples/webkit/fancybrowser/mainwindow.h2
-rw-r--r--src/gui/painting/qdrawhelper_mmx.cpp2
-rw-r--r--src/gui/painting/qdrawhelper_mmx3dnow.cpp3
3 files changed, 4 insertions, 3 deletions
diff --git a/examples/webkit/fancybrowser/mainwindow.h b/examples/webkit/fancybrowser/mainwindow.h
index 3764f72..33fd8f5 100644
--- a/examples/webkit/fancybrowser/mainwindow.h
+++ b/examples/webkit/fancybrowser/mainwindow.h
@@ -41,8 +41,8 @@
#include <QtGui>
-QT_BEGIN_NAMESPACE
class QWebView;
+QT_BEGIN_NAMESPACE
class QLineEdit;
QT_END_NAMESPACE
diff --git a/src/gui/painting/qdrawhelper_mmx.cpp b/src/gui/painting/qdrawhelper_mmx.cpp
index 0dcc3dd..d81e2a9 100644
--- a/src/gui/painting/qdrawhelper_mmx.cpp
+++ b/src/gui/painting/qdrawhelper_mmx.cpp
@@ -128,7 +128,7 @@ void qt_blend_rgb32_on_rgb32_mmx(uchar *destPixels, int dbpl,
}
}
+QT_END_NAMESPACE
#endif // QT_HAVE_MMX
-QT_END_NAMESPACE
diff --git a/src/gui/painting/qdrawhelper_mmx3dnow.cpp b/src/gui/painting/qdrawhelper_mmx3dnow.cpp
index 0db89f0..2d40ae3 100644
--- a/src/gui/painting/qdrawhelper_mmx3dnow.cpp
+++ b/src/gui/painting/qdrawhelper_mmx3dnow.cpp
@@ -101,6 +101,7 @@ void qt_blend_color_argb_mmx3dnow(int count, const QSpan *spans, void *userData)
(CompositionFunctionSolid*)qt_functionForModeSolid_MMX3DNOW);
}
+QT_END_NAMESPACE
+
#endif // QT_HAVE_3DNOW
-QT_END_NAMESPACE