diff options
Diffstat (limited to 'NetworkDiscovery')
| -rw-r--r-- | NetworkDiscovery/ndgui.cpp | 2 | ||||
| -rw-r--r-- | NetworkDiscovery/networkdiscovery.cpp | 4 | ||||
| -rw-r--r-- | NetworkDiscovery/networkdiscovery.h | 2 | ||||
| -rw-r--r-- | NetworkDiscovery/networkmanager.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/NetworkDiscovery/ndgui.cpp b/NetworkDiscovery/ndgui.cpp index c6b1a6d..a1ccecb 100644 --- a/NetworkDiscovery/ndgui.cpp +++ b/NetworkDiscovery/ndgui.cpp @@ -15,7 +15,7 @@ ndgui::ndgui(QMainWindow *parent) : connect(&networkDiscovery, SIGNAL(changeProgressBarValue(const QString & , const int& )), this, SLOT(updateIfProgressBar(const QString & , const int&))); connect(&networkDiscovery, SIGNAL(connectionEstablished(QString)), this, SLOT(handleConnectionEstablished(QString))); connect(&networkDiscovery, SIGNAL(abortBoot(QString)), this, SLOT(abortBoot(const QString))); - connect(&networkDiscovery, SIGNAL(updateStatusLabel(QString,QString)), this, SLOT(updateIfStatus(const QString &, const QString &))); + connect(&networkDiscovery, SIGNAL(updateIfStatus(QString,QString)), this, SLOT(updateIfStatus(const QString &, const QString &))); connect(&networkDiscovery, SIGNAL(allProcessesFinished()), this, SLOT(handleAllProcessesFinished())); connect(&networkDiscovery, SIGNAL(continueBoot(QString, int)), this, SLOT(continueBoot(QString, int))); diff --git a/NetworkDiscovery/networkdiscovery.cpp b/NetworkDiscovery/networkdiscovery.cpp index 397ea43..9ca0ec5 100644 --- a/NetworkDiscovery/networkdiscovery.cpp +++ b/NetworkDiscovery/networkdiscovery.cpp @@ -760,10 +760,10 @@ void NetworkDiscovery::handleNewInputLine(QLocalSocket * client, QString data) { * the exitCode. Further actions are taken according to the exitCode check. * Normal exit: * emit changeProgressBar() to 100% - * emit updateStatusLabel() to check connection + * emit updateIfStatus() to check connection * checkConnectivity() @see NetworkDiscovery::checkConnectivity() * Unexpected exit: - * emit updateStatusLabel() to process exited unexpected + * emit updateIfStatus() to process exited unexpected * TODO:: the reason for the unexpected exit should be presented in the logfile. * * @param exitCode diff --git a/NetworkDiscovery/networkdiscovery.h b/NetworkDiscovery/networkdiscovery.h index cc79c36..9269610 100644 --- a/NetworkDiscovery/networkdiscovery.h +++ b/NetworkDiscovery/networkdiscovery.h @@ -61,7 +61,7 @@ signals: void changeProgressBarValue(const QString & ifName, const int $newValue); void connectionEstablished(QString ifName); void abortBoot(QString msg); - void updateStatusLabel(QString ifName, QString status); + void updateIfStatus(QString ifName, QString status); void allProcessesFinished(); void continueBoot(QString ifName, int userChoice); void setManualConfInterfaces(QString jsonArr); diff --git a/NetworkDiscovery/networkmanager.cpp b/NetworkDiscovery/networkmanager.cpp index c40c83d..6f8ae7e 100644 --- a/NetworkDiscovery/networkmanager.cpp +++ b/NetworkDiscovery/networkmanager.cpp @@ -60,7 +60,7 @@ int NetworkManager::replaceDefaultRoute(QString ifname, QString gateway, qDebug() << _tag << "---doRoute() gwaddr" << gwaddr; if (!(gw = nl_addr_parse(gwaddr, af))) { - qDebug() << _tag << "Invalid router address given:" << gwaddr; + qDebug() << _tag << "Invalid gateway address given:" << gwaddr; return -1; } |