Q_DECLARE_INTERFACE use fixes

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

src/declarative/qml/qdeclarativeextensioninterface.h

@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-
 class QDeclarativeEngine;
 
 struct Q_DECLARATIVE_EXPORT QDeclarativeExtensionInterface
@@ -58,10 +57,10 @@ struct Q_DECLARATIVE_EXPORT QDeclarativeExtensionInterface
     virtual void initializeEngine(QDeclarativeEngine *engine, const char *uri) = 0;
 };
 
-Q_DECLARE_INTERFACE(QDeclarativeExtensionInterface, "com.trolltech.Qt.QDeclarativeExtensionInterface/1.0")
-
 QT_END_NAMESPACE
 
+Q_DECLARE_INTERFACE(QDeclarativeExtensionInterface, "com.trolltech.Qt.QDeclarativeExtensionInterface/1.0")
+
 QT_END_HEADER
 
 #endif // QDECLARATIVEEXTENSIONINTERFACE_H

src/declarative/qml/qdeclarativeparserstatus.h

@@ -65,10 +65,11 @@ private:
     friend class QDeclarativeEnginePrivate;
     QDeclarativeParserStatus **d;
 };
-Q_DECLARE_INTERFACE(QDeclarativeParserStatus, "com.trolltech.qml.QDeclarativeParserStatus")
 
 QT_END_NAMESPACE
 
+Q_DECLARE_INTERFACE(QDeclarativeParserStatus, "com.trolltech.qml.QDeclarativeParserStatus")
+
 QT_END_HEADER
 
 #endif // QDECLARATIVEPARSERSTATUS_H

src/declarative/qml/qdeclarativepropertyvalueinterceptor.h

@@ -48,8 +48,8 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-
 class QDeclarativeProperty;
+
 class Q_DECLARATIVE_EXPORT QDeclarativePropertyValueInterceptor
 {
 public:
@@ -58,10 +58,11 @@ public:
     virtual void setTarget(const QDeclarativeProperty &property) = 0;
     virtual void write(const QVariant &value) = 0;
 };
-Q_DECLARE_INTERFACE(QDeclarativePropertyValueInterceptor, "com.trolltech.qml.QDeclarativePropertyValueInterceptor")
 
 QT_END_NAMESPACE
 
+Q_DECLARE_INTERFACE(QDeclarativePropertyValueInterceptor, "com.trolltech.qml.QDeclarativePropertyValueInterceptor")
+
 QT_END_HEADER
 
 #endif // QDECLARATIVEPROPERTYVALUEINTERCEPTOR_H

src/declarative/qml/qdeclarativepropertyvaluesource.h

@@ -48,8 +48,8 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-
 class QDeclarativeProperty;
+
 class Q_DECLARATIVE_EXPORT QDeclarativePropertyValueSource
 {
 public:
@@ -57,10 +57,11 @@ public:
     virtual ~QDeclarativePropertyValueSource();
     virtual void setTarget(const QDeclarativeProperty &) = 0;
 };
-Q_DECLARE_INTERFACE(QDeclarativePropertyValueSource, "com.trolltech.qml.QDeclarativePropertyValueSource")
 
 QT_END_NAMESPACE
 
+Q_DECLARE_INTERFACE(QDeclarativePropertyValueSource, "com.trolltech.qml.QDeclarativePropertyValueSource")
+
 QT_END_HEADER
 
 #endif // QDECLARATIVEPROPERTYVALUESOURCE_H

src/designer/extension/extension.h

@@ -58,8 +58,13 @@ public:
 
     virtual QObject *extension(QObject *object, const QString &iid) const = 0;
 };
+
+QT_END_NAMESPACE
+
 Q_DECLARE_INTERFACE(QAbstractExtensionFactory, "com.trolltech.Qt.QAbstractExtensionFactory")
 
+QT_BEGIN_NAMESPACE
+
 class QAbstractExtensionManager
 {
 public:
@@ -70,8 +75,13 @@ public:
 
     virtual QObject *extension(QObject *object, const QString &iid) const = 0;
 };
+
+QT_END_NAMESPACE
+
 Q_DECLARE_INTERFACE(QAbstractExtensionManager, "com.trolltech.Qt.QAbstractExtensionManager")
 
+QT_BEGIN_NAMESPACE
+
 template <class T>
 inline T qt_extension(QAbstractExtensionManager* manager, QObject *object)
 { return 0; }

src/designer/sdk/abstractformeditorplugin.h

@@ -64,10 +64,11 @@ public:
 
     virtual QDesignerFormEditorInterface *core() const = 0;
 };
-Q_DECLARE_INTERFACE(QDesignerFormEditorPluginInterface, "com.trolltech.Qt.Designer.QDesignerFormEditorPluginInterface")
 
 QT_END_NAMESPACE
 
+Q_DECLARE_INTERFACE(QDesignerFormEditorPluginInterface, "com.trolltech.Qt.Designer.QDesignerFormEditorPluginInterface")
+
 QT_END_HEADER
 
 #endif // ABSTRACTFORMEDITORPLUGIN_H

src/gui/accessible/qaccessible.h

@@ -53,11 +53,10 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
-
-
 #ifndef QT_NO_ACCESSIBILITY
 
+QT_BEGIN_NAMESPACE
+
 class QAccessibleInterface;
 
 class Q_GUI_EXPORT QAccessible
@@ -451,13 +450,13 @@ private:
 inline QAccessibleEvent::QAccessibleEvent(Type atype, int achild)
     : QEvent(atype), c(achild) {}
 
+QT_END_NAMESPACE
+
 #define QAccessibleInterface_iid "com.trolltech.Qt.QAccessibleInterface"
 Q_DECLARE_INTERFACE(QAccessibleInterface, QAccessibleInterface_iid)
 
 #endif // QT_NO_ACCESSIBILITY
 
-QT_END_NAMESPACE
-
 QT_END_HEADER
 
 #endif // QACCESSIBLE_H

src/gui/accessible/qaccessiblebridge.h

@@ -67,9 +67,13 @@ struct Q_GUI_EXPORT QAccessibleBridgeFactoryInterface : public QFactoryInterface
     virtual QAccessibleBridge *create(const QString& name) = 0;
 };
 
+QT_END_NAMESPACE
+
 #define QAccessibleBridgeFactoryInterface_iid "com.trolltech.Qt.QAccessibleBridgeFactoryInterface"
 Q_DECLARE_INTERFACE(QAccessibleBridgeFactoryInterface, QAccessibleBridgeFactoryInterface_iid)
 
+QT_BEGIN_NAMESPACE
+
 class Q_GUI_EXPORT QAccessibleBridgePlugin : public QObject, public QAccessibleBridgeFactoryInterface
 {
     Q_OBJECT

src/gui/accessible/qaccessibleplugin.h

@@ -60,9 +60,13 @@ struct Q_GUI_EXPORT QAccessibleFactoryInterface : public QAccessible, public QFa
     virtual QAccessibleInterface* create(const QString &key, QObject *object) = 0;
 };
 
+QT_END_NAMESPACE
+
 #define QAccessibleFactoryInterface_iid "com.trolltech.Qt.QAccessibleFactoryInterface"
 Q_DECLARE_INTERFACE(QAccessibleFactoryInterface, QAccessibleFactoryInterface_iid)
 
+QT_BEGIN_NAMESPACE
+
 class QAccessiblePluginPrivate;
 
 class Q_GUI_EXPORT QAccessiblePlugin : public QObject, public QAccessibleFactoryInterface

src/gui/graphicsview/qgraphicsitem.h

@@ -479,7 +479,10 @@ private:
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsItem::GraphicsItemFlags)
+
+QT_END_NAMESPACE
 Q_DECLARE_INTERFACE(QGraphicsItem, "com.trolltech.Qt.QGraphicsItem")
+QT_BEGIN_NAMESPACE
 
 inline void QGraphicsItem::setPos(qreal ax, qreal ay)
 { setPos(QPointF(ax, ay)); }

src/gui/graphicsview/qgraphicslayout.h

@@ -46,10 +46,10 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
-
 #ifndef QT_NO_GRAPHICSVIEW
 
+QT_BEGIN_NAMESPACE
+
 class QGraphicsLayoutPrivate;
 class QGraphicsLayoutItem;
 class QGraphicsWidget;
@@ -86,12 +86,12 @@ private:
     friend class QGraphicsWidget;
 };
 
+QT_END_NAMESPACE
+
 Q_DECLARE_INTERFACE(QGraphicsLayout, "com.trolltech.Qt.QGraphicsLayout")
 
 #endif
 
-QT_END_NAMESPACE
-
 QT_END_HEADER
 
 #endif

src/gui/graphicsview/qgraphicslayoutitem.h

@@ -48,10 +48,10 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
-
 #ifndef QT_NO_GRAPHICSVIEW
 
+QT_BEGIN_NAMESPACE
+
 class QGraphicsLayoutItemPrivate;
 class QGraphicsItem;
 class Q_GUI_EXPORT QGraphicsLayoutItem
@@ -120,8 +120,6 @@ private:
     friend class QGraphicsLayout;
 };
 
-Q_DECLARE_INTERFACE(QGraphicsLayoutItem, "com.trolltech.Qt.QGraphicsLayoutItem")
-
 inline void QGraphicsLayoutItem::setMinimumSize(qreal aw, qreal ah)
 { setMinimumSize(QSizeF(aw, ah)); }
 inline void QGraphicsLayoutItem::setPreferredSize(qreal aw, qreal ah)
@@ -144,10 +142,12 @@ inline qreal QGraphicsLayoutItem::maximumWidth() const
 inline qreal QGraphicsLayoutItem::maximumHeight() const
 { return effectiveSizeHint(Qt::MaximumSize).height(); }
 
-#endif
-
 QT_END_NAMESPACE
 
+Q_DECLARE_INTERFACE(QGraphicsLayoutItem, "com.trolltech.Qt.QGraphicsLayoutItem")
+
+#endif
+
 QT_END_HEADER
 
 #endif

src/gui/kernel/qguiplatformplugin_p.h

@@ -61,7 +61,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-
 class QStyle;
 class QPalette;
 class QIcon;
@@ -73,10 +72,13 @@ struct Q_GUI_EXPORT QGuiPlatformPluginInterface  : public QFactoryInterface
 {
 };
 
-#define QGuiPlatformPluginInterface_iid "com.nokia.qt.QGuiPlatformPluginInterface"
+QT_END_NAMESPACE
 
+#define QGuiPlatformPluginInterface_iid "com.nokia.qt.QGuiPlatformPluginInterface"
 Q_DECLARE_INTERFACE(QGuiPlatformPluginInterface, QGuiPlatformPluginInterface_iid)
 
+QT_BEGIN_NAMESPACE
+
 class Q_GUI_EXPORT QGuiPlatformPlugin : public QObject, public QGuiPlatformPluginInterface
 {
     Q_OBJECT

src/gui/painting/qgraphicssystemplugin_p.h

@@ -60,7 +60,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-
 class QGraphicsSystem;
 
 struct QGraphicsSystemFactoryInterface : public QFactoryInterface
@@ -68,10 +67,13 @@ struct QGraphicsSystemFactoryInterface : public QFactoryInterface
     virtual QGraphicsSystem *create(const QString &key) = 0;
 };
 
-#define QGraphicsSystemFactoryInterface_iid "com.trolltech.Qt.QGraphicsSystemFactoryInterface"
+QT_END_NAMESPACE
 
+#define QGraphicsSystemFactoryInterface_iid "com.trolltech.Qt.QGraphicsSystemFactoryInterface"
 Q_DECLARE_INTERFACE(QGraphicsSystemFactoryInterface, QGraphicsSystemFactoryInterface_iid)
 
+QT_BEGIN_NAMESPACE
+
 class Q_GUI_EXPORT QGraphicsSystemPlugin : public QObject, public QGraphicsSystemFactoryInterface
 {
     Q_OBJECT

src/gui/styles/qstyleplugin.h

@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-
 class QStyle;
 
 struct Q_GUI_EXPORT QStyleFactoryInterface : public QFactoryInterface
@@ -57,10 +56,13 @@ struct Q_GUI_EXPORT QStyleFactoryInterface : public QFactoryInterface
     virtual QStyle *create(const QString &key) = 0;
 };
 
-#define QStyleFactoryInterface_iid "com.trolltech.Qt.QStyleFactoryInterface"
+QT_END_NAMESPACE
 
+#define QStyleFactoryInterface_iid "com.trolltech.Qt.QStyleFactoryInterface"
 Q_DECLARE_INTERFACE(QStyleFactoryInterface, QStyleFactoryInterface_iid)
 
+QT_BEGIN_NAMESPACE
+
 class Q_GUI_EXPORT QStylePlugin : public QObject, public QStyleFactoryInterface
 {
     Q_OBJECT

src/gui/text/qabstracttextdocumentlayout.h

@@ -140,10 +140,10 @@ public:
     virtual void drawObject(QPainter *painter, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format) = 0;
 };
 
-Q_DECLARE_INTERFACE(QTextObjectInterface, "com.trolltech.Qt.QTextObjectInterface")
-
 QT_END_NAMESPACE
 
+Q_DECLARE_INTERFACE(QTextObjectInterface, "com.trolltech.Qt.QTextObjectInterface")
+
 QT_END_HEADER
 
 #endif // QABSTRACTTEXTDOCUMENTLAYOUT_H