Commit 1db4d0e3 authored by Andrea Scarpino's avatar Andrea Scarpino

Use Qt5 syntax for slots

parent 81712239
...@@ -31,7 +31,7 @@ PingAction::PingAction(QObject *parent) : ...@@ -31,7 +31,7 @@ PingAction::PingAction(QObject *parent) :
QObject(parent), QObject(parent),
m_process(new QProcess(this)), m_host(QString()), m_ipv6(false) m_process(new QProcess(this)), m_host(QString()), m_ipv6(false)
{ {
connect(m_process, SIGNAL(finished(int)), this, SLOT(slotResult(int))); connect(m_process, (void (QProcess::*)(int))&QProcess::finished, this, &PingAction::pingResult);
} }
PingAction::~PingAction() PingAction::~PingAction()
...@@ -49,19 +49,24 @@ void PingAction::ping(const QString &host, const bool ipv6) ...@@ -49,19 +49,24 @@ void PingAction::ping(const QString &host, const bool ipv6)
if (url.isValid()) { if (url.isValid()) {
m_host = host; m_host = host;
m_ipv6 = ipv6; m_ipv6 = ipv6;
QStringList parameters;
parameters << QStringLiteral("-c");
parameters << QStringLiteral("1");
parameters << host;
if (ipv6) { if (ipv6) {
qDebug() << "Pinging" << host << "using IPv6"; qDebug() << "Pinging" << host << "using IPv6";
m_process->start(QStringLiteral("/bin/ping6 -c 1 %1").arg(host)); m_process->start(QStringLiteral("/bin/ping6"), parameters);
} else { } else {
qDebug() << "Pinging" << host << "using IPv4"; qDebug() << "Pinging" << host << "using IPv4";
m_process->start(QStringLiteral("/bin/ping -c 1 %1").arg(host)); m_process->start(QStringLiteral("/bin/ping"), parameters);
} }
} else { } else {
qDebug() << "Not a valid URL:" << host; qDebug() << "Not a valid URL:" << host;
} }
} }
void PingAction::slotResult(const int exitCode) void PingAction::pingResult(const int exitCode)
{ {
emit result(m_host, exitCode, m_ipv6); Q_EMIT result(m_host, exitCode, m_ipv6);
} }
...@@ -36,13 +36,12 @@ public: ...@@ -36,13 +36,12 @@ public:
void ping(const QString &host, const bool ipv6); void ping(const QString &host, const bool ipv6);
public Q_SLOTS:
void slotResult(const int exitCode);
Q_SIGNALS: Q_SIGNALS:
void result(const QString &host, const int exitCode, const bool ipv6); void result(const QString &host, const int exitCode, const bool ipv6);
private: private:
void pingResult(const int exitCode);
QProcess *m_process; QProcess *m_process;
QString m_host; QString m_host;
bool m_ipv6; bool m_ipv6;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment