Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

13 files changed, 23 insertions, 35 deletions

diff --git a/src/declarative/debugger/qmldebugclient.cpp b/src/declarative/debugger/qmldebugclient.cpp
index 7c5c37b..d13de57 100644
--- a/src/declarative/debugger/qmldebugclient.cpp
+++ b/src/declarative/debugger/qmldebugclient.cpp
@@ -57,7 +57,7 @@ public:
 
     QStringList enabled;
     QHash<QString, QmlDebugClient *> plugins;
-public slots:
+public Q_SLOTS:
     void connected();
     void readyRead();
 };
diff --git a/src/declarative/debugger/qmldebugservice.cpp b/src/declarative/debugger/qmldebugservice.cpp
index 3576a94..b83a4b1 100644
--- a/src/declarative/debugger/qmldebugservice.cpp
+++ b/src/declarative/debugger/qmldebugservice.cpp
@@ -59,7 +59,7 @@ public:
     static QmlDebugServer *instance();
     void wait();
 
-private slots:
+private Q_SLOTS:
     void readyRead();
 
 private:
diff --git a/src/declarative/debugger/qpacketprotocol.cpp b/src/declarative/debugger/qpacketprotocol.cpp
index d109836..6bccf4b 100644
--- a/src/declarative/debugger/qpacketprotocol.cpp
+++ b/src/declarative/debugger/qpacketprotocol.cpp
@@ -131,12 +131,12 @@ public:
                          this, SLOT(bytesWritten(qint64)));
     }
 
-signals:
+Q_SIGNALS:
     void readyRead();
     void packetWritten();
     void invalidPacket();
 
-public slots:
+public Q_SLOTS:
     void aboutToClose()
     {
         inProgress.clear();
diff --git a/src/declarative/extra/qfxflowview.cpp b/src/declarative/extra/qfxflowview.cpp
index 4af8af9..b2470ba 100644
--- a/src/declarative/extra/qfxflowview.cpp
+++ b/src/declarative/extra/qfxflowview.cpp
@@ -57,7 +57,7 @@ public:
     int row() const;
     int column() const;
 
-signals:
+Q_SIGNALS:
     void posChanged();
 
 private:
diff --git a/src/declarative/extra/qmlsqlquery.h b/src/declarative/extra/qmlsqlquery.h
index 55e16ac..0f27709 100644
--- a/src/declarative/extra/qmlsqlquery.h
+++ b/src/declarative/extra/qmlsqlquery.h
@@ -115,13 +115,13 @@ public:
     QmlList<QmlSqlBind *> *bindings();
     const QmlList<QmlSqlBind *> *bindings() const;
 
-public slots:
+public Q_SLOTS:
     void exec();
 
 protected:
     void timerEvent(QTimerEvent *);
 
-private slots:
+private Q_SLOTS:
     void resetBinds();
     void resetQuery();
 
diff --git a/src/declarative/extra/qmlxmllistmodel.cpp b/src/declarative/extra/qmlxmllistmodel.cpp
index 9b74799..816c3fd 100644
--- a/src/declarative/extra/qmlxmllistmodel.cpp
+++ b/src/declarative/extra/qmlxmllistmodel.cpp
@@ -123,7 +123,7 @@ public:
         return m_modelData;
     }
 
-signals:
+Q_SIGNALS:
     void queryCompleted(int queryId, int size);
 
 protected:
diff --git a/src/declarative/fx/qfxcomponentinstance.h b/src/declarative/fx/qfxcomponentinstance.h
index 76e4f16..b223ca2 100644
--- a/src/declarative/fx/qfxcomponentinstance.h
+++ b/src/declarative/fx/qfxcomponentinstance.h
@@ -71,7 +71,7 @@ public:
 Q_SIGNALS:
     void instanceChanged();
 
-private slots:
+private Q_SLOTS:
     void updateSize();
 
 private:
diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp
index b445e49..e2c7fa3 100644
--- a/src/declarative/fx/qfxgridview.cpp
+++ b/src/declarative/fx/qfxgridview.cpp
@@ -92,7 +92,7 @@ public:
     void emitAdd() { emit add(); }
     void emitRemove() { emit remove(); }
 
-signals:
+Q_SIGNALS:
     void currentItemChanged();
     void delayRemoveChanged();
     void add();
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index c3c6bc4..a8be81f 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -301,11 +301,11 @@ void QFxContents::setItem(QFxItem *item)
 
 /*
     Key filters can be installed on a QFxItem, but not removed.  Currently they
-    are only used by attached objects (which are only destroyed on Item 
-    destruction), so this isn't a problem.  If in future this becomes any form 
+    are only used by attached objects (which are only destroyed on Item
+    destruction), so this isn't a problem.  If in future this becomes any form
     of public API, they will have to support removal too.
-*/ 
-class QFxItemKeyFilter 
+*/
+class QFxItemKeyFilter
 {
 public:
     QFxItemKeyFilter(QFxItem * = 0);
@@ -321,7 +321,7 @@ private:
 QFxItemKeyFilter::QFxItemKeyFilter(QFxItem *item)
 : m_next(0)
 {
-    QFxItemPrivate *p = 
+    QFxItemPrivate *p =
         item?static_cast<QFxItemPrivate *>(QGraphicsItemPrivate::get(item)):0;
     if (p) {
         m_next = p->keyHandler;
@@ -346,7 +346,7 @@ void QFxItemKeyFilter::keyReleased(QKeyEvent *event)
 class QFxKeyNavigationAttachedPrivate : public QObjectPrivate
 {
 public:
-    QFxKeyNavigationAttachedPrivate() 
+    QFxKeyNavigationAttachedPrivate()
         : QObjectPrivate(), left(0), right(0), up(0), down(0) {}
 
     QFxItem *left;
@@ -378,7 +378,7 @@ public:
 
     static QFxKeyNavigationAttached *qmlAttachedProperties(QObject *);
 
-signals:
+Q_SIGNALS:
     void changed();
 
 private:
@@ -860,7 +860,7 @@ public:
 
     static QFxKeysAttached *qmlAttachedProperties(QObject *);
 
-signals:
+Q_SIGNALS:
     void enabledChanged();
     void pressed(QFxKeyEvent *event);
     void released(QFxKeyEvent *event);
@@ -965,7 +965,7 @@ bool QFxKeysAttachedPrivate::isConnected(const char *signalName)
 }
 
 QFxKeysAttached::QFxKeysAttached(QObject *parent)
-: QObject(*(new QFxKeysAttachedPrivate), parent), 
+: QObject(*(new QFxKeysAttachedPrivate), parent),
   QFxItemKeyFilter(qobject_cast<QFxItem*>(parent))
 {
 }
@@ -1076,18 +1076,6 @@ QFxKeysAttached *QFxKeysAttached::qmlAttachedProperties(QObject *obj)
 */
 
 /*!
-    \fn void QFxItem::xChanged()
-
-    This signal is emitted when the x coordinate of the item changes.
-*/
-
-/*!
-    \fn void QFxItem::yChanged()
-
-    This signal is emitted when the y coordinate of the item changes.
-*/
-
-/*!
     \fn void QFxItem::widthChanged()
 
     This signal is emitted when the width of the item changes.
diff --git a/src/declarative/fx/qfxlistview.cpp b/src/declarative/fx/qfxlistview.cpp
index 4b28462..048cb0f 100644
--- a/src/declarative/fx/qfxlistview.cpp
+++ b/src/declarative/fx/qfxlistview.cpp
@@ -110,7 +110,7 @@ public:
     void emitAdd() { emit add(); }
     void emitRemove() { emit remove(); }
 
-signals:
+Q_SIGNALS:
     void currentItemChanged();
     void sectionChanged();
     void prevSectionChanged();
diff --git a/src/declarative/fx/qfxvisualitemmodel.cpp b/src/declarative/fx/qfxvisualitemmodel.cpp
index fd2796c..82bec09 100644
--- a/src/declarative/fx/qfxvisualitemmodel.cpp
+++ b/src/declarative/fx/qfxvisualitemmodel.cpp
@@ -87,7 +87,7 @@ public:
         return rv;
     }
 
-signals:
+Q_SIGNALS:
     void indexChanged();
 
 public:
diff --git a/src/declarative/qml/qmlbindingoptimizations_p.h b/src/declarative/qml/qmlbindingoptimizations_p.h
index ab264c7..4862007 100644
--- a/src/declarative/qml/qmlbindingoptimizations_p.h
+++ b/src/declarative/qml/qmlbindingoptimizations_p.h
@@ -99,7 +99,7 @@ public:
     virtual void setEnabled(bool);
     virtual int propertyIndex();
 
-private slots:
+private Q_SLOTS:
     virtual void update();
 
 private:
diff --git a/src/declarative/qml/qmlcomponentjs_p.h b/src/declarative/qml/qmlcomponentjs_p.h
index 8c69b5f..cee3035 100644
--- a/src/declarative/qml/qmlcomponentjs_p.h
+++ b/src/declarative/qml/qmlcomponentjs_p.h
@@ -87,7 +87,7 @@ Q_SIGNALS:
     void isErrorChanged();
     void isReadyChanged();
     void isLoadingChanged();
-private slots:
+private Q_SLOTS:
     void statusChange(QmlComponent::Status newStatus);
 };