Port examples to new connection syntax.
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Tue, 21 Jul 2015 14:20:38 +0000 (16:20 +0200)
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Wed, 22 Jul 2015 22:16:19 +0000 (22:16 +0000)
Change-Id: I121c59ac0ad56acb4cd54b99ecd37567368385ce
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
examples/qml/qmlextensionplugins/plugin.cpp
examples/qml/referenceexamples/binding/happybirthdaysong.cpp
examples/qml/referenceexamples/valuesource/happybirthdaysong.cpp
examples/quick/embeddedinwidgets/main.cpp
examples/quick/quickwidgets/quickwidget/main.cpp
examples/quick/rendercontrol/window_multithreaded.cpp
examples/quick/rendercontrol/window_singlethreaded.cpp
examples/quick/scenegraph/openglunderqml/squircle.cpp
examples/quick/scenegraph/textureinthread/threadrenderer.cpp
examples/quick/scenegraph/threadedanimation/spinner.cpp
examples/quick/scenegraph/twotextureproviders/xorblender.cpp

index 729c88da737d877fd936ca8ca3ff777a1ebc21d0..56057b7f06385fb9f9211671917deb28187b83d3 100644 (file)
@@ -110,7 +110,7 @@ public:
         if (++instances == 1) {
             if (!timer)
                 timer = new MinuteTimer(QCoreApplication::instance());
-            connect(timer, SIGNAL(timeChanged()), this, SIGNAL(timeChanged()));
+            connect(timer, &MinuteTimer::timeChanged, this, &TimeModel::timeChanged);
             timer->start();
         }
     }
index 85a5416190bf9eb8ee6a6c0368adbe2bf003ab2b..975f6d409a9462335446d9115bc8291aefa21b76 100644 (file)
@@ -45,7 +45,7 @@ HappyBirthdaySong::HappyBirthdaySong(QObject *parent)
 {
     setName(QString());
     QTimer *timer = new QTimer(this);
-    QObject::connect(timer, SIGNAL(timeout()), this, SLOT(advance()));
+    QObject::connect(timer, &QTimer::timeout, this, &HappyBirthdaySong::advance);
     timer->start(1000);
 }
 
index 7655b3ebc9ade6c8c9542b552bd0815c897b2550..96b4abe775a03d8f007599f046f384f2fd99504c 100644 (file)
@@ -45,7 +45,7 @@ HappyBirthdaySong::HappyBirthdaySong(QObject *parent)
 {
     setName(QString());
     QTimer *timer = new QTimer(this);
-    QObject::connect(timer, SIGNAL(timeout()), this, SLOT(advance()));
+    QObject::connect(timer, &QTimer::timeout, this, &HappyBirthdaySong::advance);
     timer->start(1000);
 }
 
index aa6da01bd988936101dae8bf76a714a7dee8f58f..ef404f9fb6c2553d3c1856fe2373bf7d982c0750 100644 (file)
@@ -63,10 +63,10 @@ MainWindow::MainWindow()
     QVBoxLayout *layout = new QVBoxLayout(centralWidget);
 
     m_quickView->setResizeMode(QQuickView::SizeRootObjectToView);
-    connect(m_quickView, SIGNAL(statusChanged(QQuickView::Status)),
-            this, SLOT(quickViewStatusChanged(QQuickView::Status)));
-    connect(m_quickView, SIGNAL(sceneGraphError(QQuickWindow::SceneGraphError,QString)),
-            this, SLOT(sceneGraphError(QQuickWindow::SceneGraphError,QString)));
+    connect(m_quickView, &QQuickView::statusChanged,
+            this, &MainWindow::quickViewStatusChanged);
+    connect(m_quickView, &QQuickWindow::sceneGraphError,
+            this, &MainWindow::sceneGraphError);
     m_quickView->setSource(QUrl(QStringLiteral("qrc:///embeddedinwidgets/main.qml")));
 
     QWidget *container = QWidget::createWindowContainer(m_quickView);
@@ -79,8 +79,7 @@ MainWindow::MainWindow()
     setCentralWidget(centralWidget);
 
     QMenu *fileMenu = menuBar()->addMenu(tr("File"));
-    QAction *quitAction = fileMenu->addAction(tr("Quit"));
-    connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+    fileMenu->addAction(tr("Quit"), qApp, &QCoreApplication::quit);
 }
 
 void MainWindow::quickViewStatusChanged(QQuickView::Status status)
index 1e5cf89319c68f7a1c6b44aac1e817236db7415b..65258d958e43236470c28be2a899c738c7ec52cd 100644 (file)
@@ -78,10 +78,10 @@ MainWindow::MainWindow()
 
     QUrl source("qrc:quickwidget/rotatingsquare.qml");
 
-    connect(m_quickWidget, SIGNAL(statusChanged(QQuickWidget::Status)),
-            this, SLOT(quickWidgetStatusChanged(QQuickWidget::Status)));
-    connect(m_quickWidget, SIGNAL(sceneGraphError(QQuickWindow::SceneGraphError,QString)),
-            this, SLOT(sceneGraphError(QQuickWindow::SceneGraphError,QString)));
+    connect(m_quickWidget, &QQuickWidget::statusChanged,
+            this, &MainWindow::quickWidgetStatusChanged);
+    connect(m_quickWidget, &QQuickWidget::sceneGraphError,
+            this, &MainWindow::sceneGraphError);
     m_quickWidget->resize(300,300);
     m_quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView );
     m_quickWidget->setSource(source);
@@ -91,12 +91,9 @@ MainWindow::MainWindow()
     setCentralWidget(centralWidget);
 
     QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
-    QAction *grabAction = fileMenu->addAction(tr("Grab to image"));
-    connect(grabAction, SIGNAL(triggered()), this, SLOT(grabToFile()));
-    QAction *renderAction = fileMenu->addAction(tr("Render to pixmap"));
-    connect(renderAction, SIGNAL(triggered()), this, SLOT(renderToFile()));
-    QAction *quitAction = fileMenu->addAction(tr("Quit"));
-    connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+    fileMenu->addAction(tr("Grab to imFage"), this, &MainWindow::grabToFile);
+    fileMenu->addAction(tr("Render to pixmap"), this, &MainWindow::renderToFile);
+    fileMenu->addAction(tr("Quit"), qApp, &QCoreApplication::quit);
 }
 
 void MainWindow::quickWidgetStatusChanged(QQuickWidget::Status status)
index 8de5a7776db966fd2b1e67cf4d81e367b2cb0734..4df3488ab345bec22dcab1d42d707bd3f491f544 100644 (file)
@@ -353,7 +353,7 @@ void WindowMultiThreaded::polishSyncAndRender()
 
 void WindowMultiThreaded::run()
 {
-    disconnect(m_qmlComponent, SIGNAL(statusChanged(QQmlComponent::Status)), this, SLOT(run()));
+    disconnect(m_qmlComponent, &QQmlComponent::statusChanged, this, &WindowMultiThreaded::run);
 
     if (m_qmlComponent->isError()) {
         QList<QQmlError> errorList = m_qmlComponent->errors();
index 1e81f08f7e69e17e97fc74b84054f78c6cf49e31..e43093e241aacbb1c59cea1ec305a1e1f9462faf 100644 (file)
@@ -206,7 +206,7 @@ void WindowSingleThreaded::requestUpdate()
 
 void WindowSingleThreaded::run()
 {
-    disconnect(m_qmlComponent, SIGNAL(statusChanged(QQmlComponent::Status)), this, SLOT(run()));
+    disconnect(m_qmlComponent, &QQmlComponent::statusChanged, this, &WindowSingleThreaded::run);
 
     if (m_qmlComponent->isError()) {
         QList<QQmlError> errorList = m_qmlComponent->errors();
index 2834b93e10668531cf5d6355d3ce79c3db118865..8bb9af1ed41b0009643cd06482f405e2f2dd67b1 100644 (file)
@@ -42,7 +42,7 @@ Squircle::Squircle()
     : m_t(0)
     , m_renderer(0)
 {
-    connect(this, SIGNAL(windowChanged(QQuickWindow*)), this, SLOT(handleWindowChanged(QQuickWindow*)));
+    connect(this, &QQuickItem::windowChanged, this, &Squircle::handleWindowChanged);
 }
 //! [7]
 
@@ -62,8 +62,8 @@ void Squircle::setT(qreal t)
 void Squircle::handleWindowChanged(QQuickWindow *win)
 {
     if (win) {
-        connect(win, SIGNAL(beforeSynchronizing()), this, SLOT(sync()), Qt::DirectConnection);
-        connect(win, SIGNAL(sceneGraphInvalidated()), this, SLOT(cleanup()), Qt::DirectConnection);
+        connect(win, &QQuickWindow::beforeSynchronizing, this, &Squircle::sync, Qt::DirectConnection);
+        connect(win, &QQuickWindow::sceneGraphInvalidated, this, &Squircle::cleanup, Qt::DirectConnection);
 //! [1]
         // If we allow QML to do the clearing, they would clear what we paint
         // and nothing would show.
@@ -93,7 +93,7 @@ void Squircle::sync()
 {
     if (!m_renderer) {
         m_renderer = new SquircleRenderer();
-        connect(window(), SIGNAL(beforeRendering()), m_renderer, SLOT(paint()), Qt::DirectConnection);
+        connect(window(), &QQuickWindow::beforeRendering, m_renderer, &SquircleRenderer::paint, Qt::DirectConnection);
     }
     m_renderer->setViewportSize(window()->size() * window()->devicePixelRatio());
     m_renderer->setT(m_t);
index 272b903ef2dcc640d096c99a487b29d211f94a9f..95fd377dcfe1a217ecfad24aa7bb917cc003d13b 100644 (file)
@@ -228,7 +228,7 @@ void ThreadRenderer::ready()
 
     m_renderThread->moveToThread(m_renderThread);
 
-    connect(window(), SIGNAL(sceneGraphInvalidated()), m_renderThread, SLOT(shutDown()), Qt::QueuedConnection);
+    connect(window(), &QQuickWindow::sceneGraphInvalidated, m_renderThread, &RenderThread::shutDown, Qt::QueuedConnection);
 
     m_renderThread->start();
     update();
@@ -274,10 +274,10 @@ QSGNode *ThreadRenderer::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *
          *
          * This FBO rendering pipeline is throttled by vsync on the scene graph rendering thread.
          */
-        connect(m_renderThread, SIGNAL(textureReady(int,QSize)), node, SLOT(newTexture(int,QSize)), Qt::DirectConnection);
-        connect(node, SIGNAL(pendingNewTexture()), window(), SLOT(update()), Qt::QueuedConnection);
-        connect(window(), SIGNAL(beforeRendering()), node, SLOT(prepareNode()), Qt::DirectConnection);
-        connect(node, SIGNAL(textureInUse()), m_renderThread, SLOT(renderNext()), Qt::QueuedConnection);
+        connect(m_renderThread, &RenderThread::textureReady, node, &TextureNode::newTexture, Qt::DirectConnection);
+        connect(node, &TextureNode::pendingNewTexture, window(), &QQuickWindow::update, Qt::QueuedConnection);
+        connect(window(), &QQuickWindow::beforeRendering, node, &TextureNode::prepareNode, Qt::DirectConnection);
+        connect(node, &TextureNode::textureInUse, m_renderThread, &RenderThread::renderNext, Qt::QueuedConnection);
 
         // Get the production of FBO textures started..
         QMetaObject::invokeMethod(m_renderThread, "renderNext", Qt::QueuedConnection);
index 04b91e5449b6ac8183aa76572cd9050004f22e49..6fefc33f4d80b762367730db336381179ac45b28 100644 (file)
@@ -49,8 +49,8 @@ public:
         , m_spinning(false)
         , m_window(window)
     {
-        connect(window, SIGNAL(beforeRendering()), this, SLOT(maybeRotate()));
-        connect(window, SIGNAL(frameSwapped()), this, SLOT(maybeUpdate()));
+        connect(window, &QQuickWindow::beforeRendering, this, &SpinnerNode::maybeRotate);
+        connect(window, &QQuickWindow::frameSwapped, this, &SpinnerNode::maybeUpdate);
 
         QImage image(":/scenegraph/threadedanimation/spinner.png");
         m_texture = window->createTextureFromImage(image);
index 384d118809c78c593b4f4b44bc3d9f084e452fa8..0dd035ffea4a1b78151b212622b8ea1249852cc0 100644 (file)
@@ -151,8 +151,8 @@ public:
 
         // If this node is used as in a shader effect source, we need to propegate
         // changes that will occur in this node outwards.
-        connect(m_provider1, SIGNAL(textureChanged()), this, SLOT(textureChange()), Qt::DirectConnection);
-        connect(m_provider2, SIGNAL(textureChanged()), this, SLOT(textureChange()), Qt::DirectConnection);
+        connect(m_provider1.data(), &QSGTextureProvider::textureChanged, this, &XorNode::textureChange, Qt::DirectConnection);
+        connect(m_provider2.data(), &QSGTextureProvider::textureChanged, this, &XorNode::textureChange, Qt::DirectConnection);
     }
 
     void preprocess() {