From d85d7addc5084ee7d5de31dec562437f9c31c35d Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Thu, 29 Oct 2009 16:27:07 +1000
Subject: fix macros

---
 src/declarative/debugger/qmldebug.h        | 14 ++++++++++++--
 src/declarative/debugger/qmldebugservice.h |  2 ++
 src/declarative/debugger/qpacketprotocol.h |  2 +-
 src/declarative/extra/qmlxmllistmodel.h    |  2 +-
 src/declarative/fx/qfximagebase.h          |  4 ++++
 src/declarative/fx/qfxvisualitemmodel.h    |  2 +-
 src/declarative/qml/qmlcomponent_p.h       |  2 +-
 src/declarative/util/qmleasefollow.h       |  2 +-
 src/declarative/widgets/graphicswidgets.h  |  4 ++++
 9 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/declarative/debugger/qmldebug.h b/src/declarative/debugger/qmldebug.h
index 23d98aa..d7e4f5a 100644
--- a/src/declarative/debugger/qmldebug.h
+++ b/src/declarative/debugger/qmldebug.h
@@ -45,6 +45,12 @@
 #include <QtCore/qurl.h>
 #include <QtCore/qvariant.h>
 
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
 class QmlDebugConnection;
 class QmlDebugWatch;
 class QmlDebugPropertyWatch;
@@ -105,7 +111,7 @@ public:
     int objectDebugId() const;
     State state() const;
 
-signals:
+Q_SIGNALS:
     void stateChanged(State);
     //void objectChanged(int, const QmlDebugObjectReference &);
     //void valueChanged(int, const QVariant &);
@@ -161,7 +167,7 @@ public:
 
 //    bool waitUntilCompleted();
 
-signals:
+Q_SIGNALS:
     void stateChanged(State);
 
 protected:
@@ -351,4 +357,8 @@ private:
 
 };
 
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif // QMLDEBUG_H
diff --git a/src/declarative/debugger/qmldebugservice.h b/src/declarative/debugger/qmldebugservice.h
index 436d7ea..b406a3c 100644
--- a/src/declarative/debugger/qmldebugservice.h
+++ b/src/declarative/debugger/qmldebugservice.h
@@ -48,6 +48,8 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Declarative)
+
 class QmlDebugServicePrivate;
 class Q_DECLARATIVE_EXPORT QmlDebugService : public QObject
 {
diff --git a/src/declarative/debugger/qpacketprotocol.h b/src/declarative/debugger/qpacketprotocol.h
index 29bd5bb..265af81 100644
--- a/src/declarative/debugger/qpacketprotocol.h
+++ b/src/declarative/debugger/qpacketprotocol.h
@@ -77,7 +77,7 @@ public:
 
     QIODevice * device();
 
-signals:
+Q_SIGNALS:
     void readyRead();
     void invalidPacket();
     void packetWritten();
diff --git a/src/declarative/extra/qmlxmllistmodel.h b/src/declarative/extra/qmlxmllistmodel.h
index 5d1b940..7857629 100644
--- a/src/declarative/extra/qmlxmllistmodel.h
+++ b/src/declarative/extra/qmlxmllistmodel.h
@@ -103,7 +103,7 @@ public:
     virtual void classBegin();
     virtual void componentComplete();
 
-signals:
+Q_SIGNALS:
     void statusChanged(Status);
     void progressChanged(qreal progress);
     void countChanged();
diff --git a/src/declarative/fx/qfximagebase.h b/src/declarative/fx/qfximagebase.h
index 75549b4..08adc9c 100644
--- a/src/declarative/fx/qfximagebase.h
+++ b/src/declarative/fx/qfximagebase.h
@@ -45,8 +45,11 @@
 #include <QtDeclarative/qfxitem.h>
 
 QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Declarative)
+
 class QFxImageBasePrivate;
 class QFxImageBase : public QFxItem
 {
@@ -85,6 +88,7 @@ private:
 };
 
 QT_END_NAMESPACE
+
 QT_END_HEADER
 
 #endif // QFXIMAGEBASE_H
diff --git a/src/declarative/fx/qfxvisualitemmodel.h b/src/declarative/fx/qfxvisualitemmodel.h
index 8396a34..62363f9 100644
--- a/src/declarative/fx/qfxvisualitemmodel.h
+++ b/src/declarative/fx/qfxvisualitemmodel.h
@@ -128,7 +128,7 @@ public:
 
     static QFxVisualItemModelAttached *qmlAttachedProperties(QObject *obj);
 
-signals:
+Q_SIGNALS:
     void childrenChanged();
 
 private:
diff --git a/src/declarative/qml/qmlcomponent_p.h b/src/declarative/qml/qmlcomponent_p.h
index 6b53086..4b1a076 100644
--- a/src/declarative/qml/qmlcomponent_p.h
+++ b/src/declarative/qml/qmlcomponent_p.h
@@ -122,7 +122,7 @@ public:
     QmlComponentAttached **prev;
     QmlComponentAttached *next;
 
-signals:
+Q_SIGNALS:
     void completed();
 
 private:
diff --git a/src/declarative/util/qmleasefollow.h b/src/declarative/util/qmleasefollow.h
index d242821..3de72f2 100644
--- a/src/declarative/util/qmleasefollow.h
+++ b/src/declarative/util/qmleasefollow.h
@@ -95,7 +95,7 @@ public:
 
     virtual void setTarget(const QmlMetaProperty &);
 
-signals:
+Q_SIGNALS:
     void sourceChanged();
     void velocityChanged();
     void durationChanged();
diff --git a/src/declarative/widgets/graphicswidgets.h b/src/declarative/widgets/graphicswidgets.h
index 9e08980..2b39db3 100644
--- a/src/declarative/widgets/graphicswidgets.h
+++ b/src/declarative/widgets/graphicswidgets.h
@@ -50,6 +50,8 @@
 
 QT_BEGIN_HEADER
 
+QT_BEGIN_NAMESPACE
+
 QT_MODULE(Declarative)
 
 QML_DECLARE_TYPE(QGraphicsView)
@@ -57,6 +59,8 @@ QML_DECLARE_TYPE_HASMETATYPE(QGraphicsScene)
 QML_DECLARE_TYPE(QGraphicsWidget)
 QML_DECLARE_INTERFACE_HASMETATYPE(QGraphicsItem)
 
+QT_END_NAMESPACE
+
 QT_END_HEADER
 
 #endif // GRAPHICSWIDGETS_H
-- 
cgit v0.12