summaryrefslogtreecommitdiffstats
path: root/examples/sql/sqlbrowser/connectionwidget.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-09-21 06:55:09 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2017-09-21 06:55:09 +0000
commite5114e10dcb1fc535b4a33a3008448baf4ec7cbf (patch)
tree7ec9eaac618a4de514f452b0e7aff58510ce7c62 /examples/sql/sqlbrowser/connectionwidget.cpp
parent34aa7a18af5d355380c662bb1a10b3f0d7b7ed3e (diff)
parent01bc69f99f189b03d0b9cad77cc300798937cad1 (diff)
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
Diffstat (limited to 'examples/sql/sqlbrowser/connectionwidget.cpp')
-rw-r--r--examples/sql/sqlbrowser/connectionwidget.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/examples/sql/sqlbrowser/connectionwidget.cpp b/examples/sql/sqlbrowser/connectionwidget.cpp
index 888579c9af..658cfb77dc 100644
--- a/examples/sql/sqlbrowser/connectionwidget.cpp
+++ b/examples/sql/sqlbrowser/connectionwidget.cpp
@@ -63,8 +63,8 @@ ConnectionWidget::ConnectionWidget(QWidget *parent)
tree->header()->setSectionResizeMode(QHeaderView::Stretch);
QAction *refreshAction = new QAction(tr("Refresh"), tree);
metaDataAction = new QAction(tr("Show Schema"), tree);
- connect(refreshAction, SIGNAL(triggered()), SLOT(refresh()));
- connect(metaDataAction, SIGNAL(triggered()), SLOT(showMetaData()));
+ connect(refreshAction, &QAction::triggered, this, &ConnectionWidget::refresh);
+ connect(metaDataAction, &QAction::triggered, this, &ConnectionWidget::showMetaData);
tree->addAction(refreshAction);
tree->addAction(metaDataAction);
tree->setContextMenuPolicy(Qt::ActionsContextMenu);
@@ -146,7 +146,6 @@ void ConnectionWidget::setActive(QTreeWidgetItem *item)
void ConnectionWidget::on_tree_itemActivated(QTreeWidgetItem *item, int /* column */)
{
-
if (!item)
return;