diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2014-12-17 13:39:42 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2014-12-17 14:04:57 +0100 |
| commit | 1209493113dbf8f43837ee935e705f0776aead38 (patch) | |
| tree | 77410c3c389ab157f7ef419b6f24e76e5ba1796a /src/imports | |
| parent | 8a13b5fdd462ee7e064c6f6d565424de5d0a82d1 (diff) | |
Use Qt 5 signals & slot syntax.
Change-Id: I548076eebc2c8f1204ef76bb4e6e09ed00352553
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/winextras/qquickjumplist.cpp | 12 | ||||
| -rw-r--r-- | src/imports/winextras/qquickthumbnailtoolbutton.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/winextras/qquickjumplist.cpp b/src/imports/winextras/qquickjumplist.cpp index 49879b2..49bf067 100644 --- a/src/imports/winextras/qquickjumplist.cpp +++ b/src/imports/winextras/qquickjumplist.cpp @@ -78,7 +78,7 @@ QQuickJumpListCategory *QQuickJumpList::recent() const if (!m_recent) { QQuickJumpList *that = const_cast<QQuickJumpList *>(this); that->m_recent = new QQuickJumpListCategory(that); - connect(m_recent, SIGNAL(visibilityChanged()), that, SLOT(rebuild())); + connect(m_recent, &QQuickJumpListCategory::visibilityChanged, that, &QQuickJumpList::rebuild); m_recent->setVisible(false); } return m_recent; @@ -95,7 +95,7 @@ QQuickJumpListCategory *QQuickJumpList::frequent() const if (!m_frequent) { QQuickJumpList *that = const_cast<QQuickJumpList *>(this); that->m_frequent = new QQuickJumpListCategory(that); - connect(m_frequent, SIGNAL(visibilityChanged()), that, SLOT(rebuild())); + connect(m_frequent, &QQuickJumpListCategory::visibilityChanged, that, &QQuickJumpList::rebuild); m_frequent->setVisible(false); } return m_frequent; @@ -111,7 +111,7 @@ QQuickJumpListCategory *QQuickJumpList::tasks() const if (!m_tasks) { QQuickJumpList *that = const_cast<QQuickJumpList *>(this); that->m_tasks = new QQuickJumpListCategory(that); - connect(m_tasks, SIGNAL(visibilityChanged()), that, SLOT(rebuild())); + connect(m_tasks, &QQuickJumpListCategory::visibilityChanged, that, &QQuickJumpList::rebuild); } return m_tasks; } @@ -120,11 +120,11 @@ void QQuickJumpList::setTasks(QQuickJumpListCategory *tasks) { if (m_tasks != tasks) { if (m_tasks) - disconnect(m_tasks, SIGNAL(visibilityChanged()), this, SLOT(rebuild())); + disconnect(m_tasks, &QQuickJumpListCategory::visibilityChanged, this, &QQuickJumpList::rebuild); delete m_tasks; m_tasks = tasks; if (m_tasks) - connect(m_tasks, SIGNAL(visibilityChanged()), this, SLOT(rebuild())); + connect(m_tasks, &QQuickJumpListCategory::visibilityChanged, this, &QQuickJumpList::rebuild); emit tasksChanged(); } } @@ -177,7 +177,7 @@ void QQuickJumpList::data_append(QQmlListProperty<QObject> *property, QObject *o { if (QQuickJumpListCategory *category = qobject_cast<QQuickJumpListCategory *>(object)) { QQuickJumpList *jumpList = static_cast<QQuickJumpList *>(property->object); - connect(category, SIGNAL(visibilityChanged()), jumpList, SLOT(rebuild())); + connect(category, &QQuickJumpListCategory::visibilityChanged, jumpList, &QQuickJumpList::rebuild); jumpList->m_categories.append(category); emit jumpList->categoriesChanged(); } diff --git a/src/imports/winextras/qquickthumbnailtoolbutton.cpp b/src/imports/winextras/qquickthumbnailtoolbutton.cpp index cc7a771..8beafbd 100644 --- a/src/imports/winextras/qquickthumbnailtoolbutton.cpp +++ b/src/imports/winextras/qquickthumbnailtoolbutton.cpp @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE QQuickThumbnailToolButton::QQuickThumbnailToolButton(QObject *parent) : QObject(parent), m_button(new QWinThumbnailToolButton(this)) { - connect(m_button, SIGNAL(clicked()), SIGNAL(clicked())); + connect(m_button, &QWinThumbnailToolButton::clicked, this, &QQuickThumbnailToolButton::clicked); } QQuickThumbnailToolButton::~QQuickThumbnailToolButton() |