summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-02-22 14:25:05 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-02-22 14:25:05 (GMT)
commitdbdb4c507ac209adc4391c95d312be0ad01e77a9 (patch)
treece169473f0f28518c89faa9a62567fafea0be49a /src
parentd1b4e4666e4fe1a5fae0571c37535159c097f485 (diff)
parentf57e848b561c3971e48c73aca778b2d664e56ba0 (diff)
downloadQt-dbdb4c507ac209adc4391c95d312be0ad01e77a9.zip
Qt-dbdb4c507ac209adc4391c95d312be0ad01e77a9.tar.gz
Qt-dbdb4c507ac209adc4391c95d312be0ad01e77a9.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'src')
-rw-r--r--src/gui/kernel/qcocoaapplication_mac.mm3
-rw-r--r--src/gui/kernel/qcocoaview_mac.mm2
-rw-r--r--src/gui/kernel/qt_cocoa_helpers_mac.mm1
-rw-r--r--src/gui/text/qstatictext.h4
-rw-r--r--src/gui/util/qsystemtrayicon_mac.mm2
-rw-r--r--src/multimedia/base/qmediaserviceprovider.cpp4
-rw-r--r--src/multimedia/playback/qmediaplayer.cpp2
-rw-r--r--src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm5
-rw-r--r--src/plugins/mediaservices/qt7/qcvdisplaylink.mm3
-rw-r--r--src/plugins/mediaservices/qt7/qt7movievideowidget.h2
-rw-r--r--src/plugins/mediaservices/qt7/qt7movieviewoutput.mm4
-rw-r--r--src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm2
12 files changed, 15 insertions, 19 deletions
diff --git a/src/gui/kernel/qcocoaapplication_mac.mm b/src/gui/kernel/qcocoaapplication_mac.mm
index 5629940..4962863 100644
--- a/src/gui/kernel/qcocoaapplication_mac.mm
+++ b/src/gui/kernel/qcocoaapplication_mac.mm
@@ -79,6 +79,8 @@
#include <private/qcocoaapplicationdelegate_mac_p.h>
#include <private/qt_cocoa_helpers_mac_p.h>
+QT_USE_NAMESPACE
+
@implementation NSApplication (QT_MANGLE_NAMESPACE(QApplicationIntegration))
- (void)QT_MANGLE_NAMESPACE(qt_setDockMenu):(NSMenu *)newMenu
@@ -107,7 +109,6 @@
| NSFontPanelStrikethroughEffectModeMask;
}
-
- (void)qt_sendPostedMessage:(NSEvent *)event
{
// WARNING: data1 and data2 is truncated to from 64-bit to 32-bit on OS 10.5!
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index d5e7534..455176e 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -83,6 +83,7 @@ extern bool qt_sendSpontaneousEvent(QObject *, QEvent *); // qapplication.cpp
extern OSViewRef qt_mac_nativeview_for(const QWidget *w); // qwidget_mac.mm
extern QPointer<QWidget> qt_mouseover; //qapplication_mac.mm
extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp
+extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum);
struct dndenum_mapper
{
@@ -692,7 +693,6 @@ extern "C" {
qt_button_down = 0;
}
-extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum);
- (void)otherMouseDown:(NSEvent *)theEvent
{
if (!qt_button_down)
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm
index 9702829..e9fdbda 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac.mm
+++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm
@@ -138,7 +138,6 @@ void QMacWindowFader::performFade()
}
extern bool qt_sendSpontaneousEvent(QObject *receiver, QEvent *event); // qapplication.cpp;
-extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum); // qcocoaview.mm
extern QWidget * mac_mouse_grabber;
extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp
diff --git a/src/gui/text/qstatictext.h b/src/gui/text/qstatictext.h
index 1e59944..00d42e0 100644
--- a/src/gui/text/qstatictext.h
+++ b/src/gui/text/qstatictext.h
@@ -97,10 +97,10 @@ private:
friend class QStaticTextPrivate;
};
-Q_DECLARE_METATYPE(QStaticText)
-
QT_END_NAMESPACE
+Q_DECLARE_METATYPE(QStaticText)
+
QT_END_HEADER
#endif // QSTATICTEXT_H
diff --git a/src/gui/util/qsystemtrayicon_mac.mm b/src/gui/util/qsystemtrayicon_mac.mm
index 5cadbbd..348657e 100644
--- a/src/gui/util/qsystemtrayicon_mac.mm
+++ b/src/gui/util/qsystemtrayicon_mac.mm
@@ -93,6 +93,7 @@ extern bool qt_mac_execute_apple_script(const QString &script, AEDesc *ret); //q
extern void qtsystray_sendActivated(QSystemTrayIcon *i, int r); //qsystemtrayicon.cpp
extern NSString *keySequenceToKeyEqivalent(const QKeySequence &accel); // qmenu_mac.mm
extern NSUInteger keySequenceModifierMask(const QKeySequence &accel); // qmenu_mac.mm
+extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum);
QT_END_NAMESPACE
QT_USE_NAMESPACE
@@ -382,7 +383,6 @@ QT_END_NAMESPACE
[self menuTrackingDone:nil];
}
-extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum);
- (void)otherMouseDown:(NSEvent *)mouseEvent
{
[self mousePressed:mouseEvent button:cocoaButton2QtButton([mouseEvent buttonNumber])];
diff --git a/src/multimedia/base/qmediaserviceprovider.cpp b/src/multimedia/base/qmediaserviceprovider.cpp
index 8d1e0fa..02c9b29 100644
--- a/src/multimedia/base/qmediaserviceprovider.cpp
+++ b/src/multimedia/base/qmediaserviceprovider.cpp
@@ -48,7 +48,7 @@
#include "qmediapluginloader_p.h"
#include <QtMultimedia/qmediaplayer.h>
-
+QT_BEGIN_NAMESPACE
class QMediaServiceProviderHintPrivate : public QSharedData
{
@@ -697,5 +697,7 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider()
Returns a set of features supported by a plug-in \a service.
*/
+QT_END_NAMESPACE
+
#include "moc_qmediaserviceprovider.cpp"
#include "moc_qmediaserviceproviderplugin.cpp"
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index 5f50fdb..070a9f6 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -951,5 +951,3 @@ QStringList QMediaPlayer::supportedMimeTypes(Flags flags)
QT_END_NAMESPACE
-QT_END_NAMESPACE
-
diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm
index 5507633..d516a99 100644
--- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm
+++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm
@@ -55,9 +55,6 @@
#include <QtCore/qurl.h>
#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
@interface QTMovieObserver : NSObject
{
@private
@@ -149,6 +146,8 @@ QT_BEGIN_NAMESPACE
@end
+QT_BEGIN_NAMESPACE
+
static CFStringRef qString2CFStringRef(const QString &string)
{
return CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(string.unicode()),
diff --git a/src/plugins/mediaservices/qt7/qcvdisplaylink.mm b/src/plugins/mediaservices/qt7/qcvdisplaylink.mm
index 98ae71d..00b4dc5 100644
--- a/src/plugins/mediaservices/qt7/qcvdisplaylink.mm
+++ b/src/plugins/mediaservices/qt7/qcvdisplaylink.mm
@@ -44,8 +44,7 @@
#include <QtCore/qcoreapplication.h>
#include <QtCore/qdebug.h>
-
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
static CVReturn CVDisplayLinkCallback(CVDisplayLinkRef displayLink,
const CVTimeStamp *inNow,
diff --git a/src/plugins/mediaservices/qt7/qt7movievideowidget.h b/src/plugins/mediaservices/qt7/qt7movievideowidget.h
index 3acd373..558c3d7 100644
--- a/src/plugins/mediaservices/qt7/qt7movievideowidget.h
+++ b/src/plugins/mediaservices/qt7/qt7movievideowidget.h
@@ -57,10 +57,10 @@
QT_BEGIN_HEADER
-class GLVideoWidget;
QT_BEGIN_NAMESPACE
+class GLVideoWidget;
class QCvDisplayLink;
class QT7PlayerSession;
class QT7PlayerService;
diff --git a/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm b/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm
index b549487..b90470c 100644
--- a/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm
+++ b/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm
@@ -49,8 +49,6 @@
#include <QtCore/qdebug.h>
-QT_BEGIN_NAMESPACE
-
#define VIDEO_TRANSPARENT(m) -(void)m:(NSEvent *)e{[[self superview] m:e];}
@interface TransparentQTMovieView : QTMovieView
@@ -308,5 +306,3 @@ void QT7MovieViewOutput::setSaturation(int saturation)
{
m_saturation = saturation;
}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm b/src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm
index 342feb8..7271f5b 100644
--- a/src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm
+++ b/src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm
@@ -99,6 +99,7 @@ private:
MapMode m_mode;
};
+QT_END_NAMESPACE
#define VIDEO_TRANSPARENT(m) -(void)m:(NSEvent *)e{[[self superview] m:e];}
@@ -223,6 +224,7 @@ VIDEO_TRANSPARENT(scrollWheel)
@end
+QT_BEGIN_NAMESPACE
QT7MovieViewRenderer::QT7MovieViewRenderer(QObject *parent)
:QT7VideoRendererControl(parent),