aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick/quickwidgets
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-07-21 16:20:38 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-07-22 22:16:19 +0000
commit1e2e356f0f4f9f7dd424bc69cff0dce956f528e5 (patch)
tree0f000a235afa8aac621dc785e8655a99d5dc0a42 /examples/quick/quickwidgets
parentbc7dff35723e8f2cf09660b94f7fba9e8478860f (diff)
Port examples to new connection syntax.
Change-Id: I121c59ac0ad56acb4cd54b99ecd37567368385ce Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'examples/quick/quickwidgets')
-rw-r--r--examples/quick/quickwidgets/quickwidget/main.cpp17
1 files changed, 7 insertions, 10 deletions
diff --git a/examples/quick/quickwidgets/quickwidget/main.cpp b/examples/quick/quickwidgets/quickwidget/main.cpp
index 1e5cf89319..65258d958e 100644
--- a/examples/quick/quickwidgets/quickwidget/main.cpp
+++ b/examples/quick/quickwidgets/quickwidget/main.cpp
@@ -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)