aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/libs/aggregation/aggregate.cpp6
-rw-r--r--src/libs/aggregation/aggregate.h3
-rw-r--r--src/libs/aggregation/examples/text/main.cpp3
-rw-r--r--src/libs/aggregation/examples/text/main.h3
4 files changed, 7 insertions, 8 deletions
diff --git a/src/libs/aggregation/aggregate.cpp b/src/libs/aggregation/aggregate.cpp
index 7ac0d2b2237..b505c6cb4d2 100644
--- a/src/libs/aggregation/aggregate.cpp
+++ b/src/libs/aggregation/aggregate.cpp
@@ -203,7 +203,7 @@ Aggregate::~Aggregate()
{
QWriteLocker locker(&lock());
foreach (QObject *component, m_components) {
- disconnect(component, SIGNAL(destroyed(QObject*)), this, SLOT(deleteSelf(QObject*)));
+ disconnect(component, &QObject::destroyed, this, &Aggregate::deleteSelf);
aggregateMap().remove(component);
}
components = m_components;
@@ -246,7 +246,7 @@ void Aggregate::add(QObject *component)
return;
}
m_components.append(component);
- connect(component, SIGNAL(destroyed(QObject*)), this, SLOT(deleteSelf(QObject*)));
+ connect(component, &QObject::destroyed, this, &Aggregate::deleteSelf);
aggregateMap().insert(component, this);
}
emit changed();
@@ -267,7 +267,7 @@ void Aggregate::remove(QObject *component)
QWriteLocker locker(&lock());
aggregateMap().remove(component);
m_components.removeAll(component);
- disconnect(component, SIGNAL(destroyed(QObject*)), this, SLOT(deleteSelf(QObject*)));
+ disconnect(component, &QObject::destroyed, this, &Aggregate::deleteSelf);
}
emit changed();
}
diff --git a/src/libs/aggregation/aggregate.h b/src/libs/aggregation/aggregate.h
index 8404e96d307..a60faed6c53 100644
--- a/src/libs/aggregation/aggregate.h
+++ b/src/libs/aggregation/aggregate.h
@@ -72,10 +72,9 @@ public:
signals:
void changed();
-private slots:
+private:
void deleteSelf(QObject *obj);
-private:
static QHash<QObject *, Aggregate *> &aggregateMap();
QList<QObject *> m_components;
diff --git a/src/libs/aggregation/examples/text/main.cpp b/src/libs/aggregation/examples/text/main.cpp
index 2a9e26b792b..c205ccb8383 100644
--- a/src/libs/aggregation/examples/text/main.cpp
+++ b/src/libs/aggregation/examples/text/main.cpp
@@ -31,7 +31,8 @@ MyMain::MyMain(QWidget *parent, Qt::WFlags flags)
: QWidget(parent, flags)
{
ui.setupUi(this);
- connect(ui.comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(select(int)));
+ connect(ui.comboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+ this, &MyMain::select);
}
void MyMain::add(IComboEntry *obj)
diff --git a/src/libs/aggregation/examples/text/main.h b/src/libs/aggregation/examples/text/main.h
index 76d0ec01917..c4472af1f4d 100644
--- a/src/libs/aggregation/examples/text/main.h
+++ b/src/libs/aggregation/examples/text/main.h
@@ -42,10 +42,9 @@ public:
void add(IComboEntry *obj);
-private slots:
+private:
void select(int index);
-private:
Ui::mainClass ui;
QList<IComboEntry *> m_entries;