diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-07-31 13:53:29 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-07-31 14:21:15 +0000 |
commit | af38340720aa26ce95ceae661e3fd1dfc2770195 (patch) | |
tree | dc8bdd90fc73e95f87a9aa4e6733a593b7932c6e /examples/widgets/itemviews/chart/mainwindow.cpp | |
parent | 7b72cc205ccd3e568b59a32a5cd751bd62b42e94 (diff) |
Port examples/widgets/itemviews to new connection syntax.
Rename some slots to avoid ugly casts.
Change-Id: I5d7b2c044ab6a725f7259e5e34f00c3d06fff050
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'examples/widgets/itemviews/chart/mainwindow.cpp')
-rw-r--r-- | examples/widgets/itemviews/chart/mainwindow.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/examples/widgets/itemviews/chart/mainwindow.cpp b/examples/widgets/itemviews/chart/mainwindow.cpp index 646b8a293a..9a3b372233 100644 --- a/examples/widgets/itemviews/chart/mainwindow.cpp +++ b/examples/widgets/itemviews/chart/mainwindow.cpp @@ -56,14 +56,14 @@ MainWindow::MainWindow() setupModel(); setupViews(); - connect(openAction, SIGNAL(triggered()), this, SLOT(openFile())); - connect(saveAction, SIGNAL(triggered()), this, SLOT(saveFile())); - connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); + connect(openAction, &QAction::triggered, this, &MainWindow::openFile); + connect(saveAction, &QAction::triggered, this, &MainWindow::saveFile); + connect(quitAction, &QAction::triggered, qApp, &QCoreApplication::quit); menuBar()->addMenu(fileMenu); statusBar(); - openFile(":/Charts/qtdata.cht"); + loadFile(":/Charts/qtdata.cht"); setWindowTitle(tr("Chart")); resize(870, 550); @@ -99,17 +99,16 @@ void MainWindow::setupViews() setCentralWidget(splitter); } -void MainWindow::openFile(const QString &path) +void MainWindow::openFile() { - QString fileName; - if (path.isNull()) - fileName = QFileDialog::getOpenFileName(this, tr("Choose a data file"), "", "*.cht"); - else - fileName = path; - - if (fileName.isEmpty()) - return; + const QString fileName = + QFileDialog::getOpenFileName(this, tr("Choose a data file"), "", "*.cht"); + if (!fileName.isEmpty()) + loadFile(fileName); +} +void MainWindow::loadFile(const QString &fileName) +{ QFile file(fileName); if (!file.open(QFile::ReadOnly | QFile::Text)) return; |