[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasma-workspace] shell: port to new connect api
From:       Montel Laurent <montel () kde ! org>
Date:       2014-10-31 22:05:54
Message-ID: E1XkKKQ-000300-6y () scm ! kde ! org
[Download RAW message or body]

Git commit a89d644c5edc2d289aeef8ac0b45d390651b0565 by Montel Laurent.
Committed on 31/10/2014 at 08:14.
Pushed by mlaurent into branch 'master'.

port to new connect api

M  +8    -8    shell/activity.cpp
M  +1    -2    shell/osd.cpp
M  +1    -1    shell/scripting/configgroup.cpp
M  +2    -2    shell/scripting/scriptengine.cpp

http://commits.kde.org/plasma-workspace/a89d644c5edc2d289aeef8ac0b45d390651b0565

diff --git a/shell/activity.cpp b/shell/activity.cpp
index b333a8e..bedd650 100644
--- a/shell/activity.cpp
+++ b/shell/activity.cpp
@@ -50,14 +50,14 @@ Activity::Activity(const QString &id, Plasma::Corona *parent)
     m_name = m_info->name();
     m_icon = m_info->icon();
 
-    connect(m_info, SIGNAL(infoChanged()), this, SLOT(activityChanged()));
-    connect(m_info, SIGNAL(stateChanged(KActivities::Info::State)), this, \
                SIGNAL(stateChanged()));
-    connect(m_info, SIGNAL(started()), this, SIGNAL(opened()));
-    connect(m_info, SIGNAL(stopped()), this, SIGNAL(closed()));
-    connect(m_info, SIGNAL(removed()), this, SIGNAL(removed()));
-    connect(m_info, SIGNAL(removed()), this, SLOT(cleanupActivity()));
-
-    connect(m_activityConsumer, SIGNAL(currentActivityChanged(QString)), this, \
SLOT(checkIfCurrent())); +    connect(m_info, &KActivities::Info::infoChanged, this, \
&Activity::activityChanged); +    connect(m_info, &KActivities::Info::stateChanged, \
this, &Activity::stateChanged); +    connect(m_info, &KActivities::Info::started, \
this, &Activity::opened); +    connect(m_info, &KActivities::Info::stopped, this, \
&Activity::closed); +    connect(m_info, &KActivities::Info::removed, this, \
&Activity::removed); +    connect(m_info, &KActivities::Info::removed, this, \
&Activity::cleanupActivity); +
+    connect(m_activityConsumer, &KActivities::Consumer::currentActivityChanged, \
this, &Activity::checkIfCurrent);  checkIfCurrent();
 }
 
diff --git a/shell/osd.cpp b/shell/osd.cpp
index 5a67586..e3118ee 100644
--- a/shell/osd.cpp
+++ b/shell/osd.cpp
@@ -46,8 +46,7 @@ Osd::Osd(ShellCorona *corona)
 
     m_osdTimer = new QTimer(this);
     m_osdTimer->setSingleShot(true);
-    connect(m_osdTimer, SIGNAL(timeout()),
-            this, SLOT(hideOsd()));
+    connect(m_osdTimer, &QTimer::timeout, this, &Osd::hideOsd);
 }
 
 Osd::~Osd()
diff --git a/shell/scripting/configgroup.cpp b/shell/scripting/configgroup.cpp
index 97508f3..0d507a0 100644
--- a/shell/scripting/configgroup.cpp
+++ b/shell/scripting/configgroup.cpp
@@ -56,7 +56,7 @@ ConfigGroup::ConfigGroup(QObject *parent)
     d->synchTimer = new QTimer(this);
     d->synchTimer->setSingleShot(true);
     d->synchTimer->setInterval(1500);
-    connect(d->synchTimer, SIGNAL(timeout()), SLOT(sync()));
+    connect(d->synchTimer, &QTimer::timeout, this, &ConfigGroup::sync);
 }
 
 ConfigGroup::~ConfigGroup()
diff --git a/shell/scripting/scriptengine.cpp b/shell/scripting/scriptengine.cpp
index 0a9a2ea..ca0aa25 100644
--- a/shell/scripting/scriptengine.cpp
+++ b/shell/scripting/scriptengine.cpp
@@ -63,12 +63,12 @@ ScriptEngine::ScriptEngine(Plasma::Corona *corona, QObject \
*parent)  {
     Q_ASSERT(m_corona);
     AppInterface *interface = new AppInterface(this);
-    connect(interface, SIGNAL(print(QString)), this, SIGNAL(print(QString)));
+    connect(interface, &AppInterface::print, this, &ScriptEngine::print);
     m_scriptSelf = newQObject(interface, QScriptEngine::QtOwnership,
                               QScriptEngine::ExcludeSuperClassProperties |
                               QScriptEngine::ExcludeSuperClassMethods);
     setupEngine();
-    connect(this, SIGNAL(signalHandlerException(QScriptValue)), this, \
SLOT(exception(QScriptValue))); +    connect(this, \
&ScriptEngine::signalHandlerException, this, &ScriptEngine::exception);  \
bindI18N(this);  }
 


[prev in list] [next in list] [prev in thread] [next in thread]