Fix Qt namespace compilation.
authorToby Tomkins <toby.tomkins@nokia.com>
Tue, 15 Nov 2011 01:23:33 +0000 (11:23 +1000)
committerQt by Nokia <qt-info@nokia.com>
Wed, 16 Nov 2011 10:56:48 +0000 (11:56 +0100)
Change-Id: I259b5fde8e4d75d28def8650c4c9208accdf0bbe
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
src/corelib/kernel/qmetatypeswitcher_p.h
src/gui/accessible/qplatformaccessibility_qpa.cpp
src/network/ssl/qsslcertificateextension.cpp

index 2a443aa..cba6504 100644 (file)
@@ -55,6 +55,8 @@
 // We mean it.
 //
 
+QT_BEGIN_NAMESPACE
+
 class QMetaTypeSwitcher {
 public:
 
@@ -98,4 +100,6 @@ ReturnType QMetaTypeSwitcher::switcher(DelegateObject &logic, int type, const vo
 #undef QT_METATYPE_SWICHER_CASE_QCLASS
 #undef QT_METATYPE_SWICHER_CASE_POINTER
 
+QT_END_NAMESPACE
+
 #endif // QMETATYPESWITCHER_P_H
index f912907..fa8da1f 100644 (file)
@@ -45,6 +45,8 @@
 #include "qaccessiblebridge.h"
 #include <QtGui/QGuiApplication>
 
+QT_BEGIN_NAMESPACE
+
 /* accessiblebridge plugin discovery stuff */
 #ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, bridgeloader,
@@ -134,7 +136,6 @@ void QPlatformAccessibility::initialize()
             QAccessibleBridge * bridge = factory->create(l.at(i));
             if (bridge) {
                 bridges()->append(bridge);
-#
             }
         }
     }
@@ -146,3 +147,4 @@ void QPlatformAccessibility::cleanup()
     qDeleteAll(*bridges());
 }
 
+QT_END_NAMESPACE
index b154ce7..b4d002e 100644 (file)
@@ -198,3 +198,5 @@ bool QSslCertificateExtension::isSupported() const
 {
     return d->supported;
 }
+
+QT_END_NAMESPACE