1 files changed, 6 insertions, 27 deletions

diff --git a/src/fbgui/ndgui.cpp b/src/fbgui/ndgui.cpp
index 0d99a22..447b396 100644
--- a/src/fbgui/ndgui.cpp
+++ b/src/fbgui/ndgui.cpp
@@ -24,7 +24,6 @@ LoggerPtr ndLogger(Logger::getLogger("fbgui.nd"));
  */
 ndgui::ndgui() :
 		agui() {
-
 }
 
 /**
@@ -52,23 +51,21 @@ void ndgui::init() {
 	_jsi = new JavascriptInterfaceNDGUI(_webView->page()->mainFrame(), _networkDiscovery);
 
 
+	connect(_networkDiscovery, SIGNAL(abortBoot(QString)), _jsi,
+			SLOT(abortBoot(const QString)));
+	connect(_networkDiscovery, SIGNAL(updateStatus(QString)), _jsi,
+			SLOT(updateStatus(const QString&)));
 	connect(_networkDiscovery, SIGNAL(addInterface(const QString &)), _jsi,
 			SLOT(addInterface( const QString &)));
+	connect(_networkDiscovery, SIGNAL(updateIfStatus(QString,QString)), _jsi,
+			SLOT(updateIfStatus(const QString &, const QString &)));
 	connect(_networkDiscovery,
 			SIGNAL(changeProgressBarValue(const QString & , const int& )),
 			_jsi, SLOT(updateIfProgressBar(const QString & , const int&)));
 	connect(_networkDiscovery, SIGNAL(connectionEstablished(QString)), this,
 			SLOT(handleConnectionEstablished(QString)));
-	connect(_networkDiscovery, SIGNAL(abortBoot(QString)), _jsi,
-			SLOT(abortBoot(const QString)));
-	connect(_networkDiscovery, SIGNAL(updateIfStatus(QString,QString)), _jsi,
-			SLOT(updateIfStatus(const QString &, const QString &)));
-	connect(_networkDiscovery, SIGNAL(updateStatus(QString)), _jsi,
-			SLOT(updateStatus(const QString&)));
 	connect(_networkDiscovery, SIGNAL(allProcessesFinished()), this,
 			SLOT(handleAllProcessesFinished()));
-	connect(_networkDiscovery, SIGNAL(continueBoot(QString)), this,
-			SLOT(continueBoot(QString)));
 	connect(_jsi, SIGNAL(startFbgui(const QString&)), this,
 			SLOT(continueBoot(const QString&)));
 	connect(_networkDiscovery, SIGNAL(continueBootWithoutCheck(QString )),
@@ -122,7 +119,6 @@ void ndgui::setUserChoiceTrue() {
  * and starts the networkDiscovery.
  */
 void ndgui::startNetworkDiscovery() {
-	//disconnect(_webView, SIGNAL(loadFinished(bool)), this, SLOT(startSingleShot()));
 	if (!_started) {
 		_started = true;
 		_networkDiscovery->initAndRun(_userChoice);
@@ -204,21 +200,6 @@ void ndgui::continueBootWithoutCheck(QString ifName) {
 	this->close();
 }
 
-/* slots */
-/**
- * @brief adds an interface to the DOM tree. Creates its progress bar and it's status label.
- *
- * @param 	ifName
- * 			name of the new interface.
- */
-//void ndgui::addInterface(const QString &ifName) {
-//   if (ifName == "")
-//      return;
-//   _manConfList.append(ifName);
-//   QString code = QString("addInterface('\%1')").arg(ifName);
-//   _webView->page()->mainFrame()->evaluateJavaScript(code);
-//}
-
 /**
  * @brief crashes everything :)
  */
@@ -227,11 +208,9 @@ void ndgui::tryAgain() {
 	_networkDiscovery->prepareTryAgain();
 	delete _allowUserChoice;
 	delete _tryAgain;
-	//delete _webView;
 	delete _networkDiscovery;
 
 	_ifNameList.clear();
-	_manConfList.clear();
 
 	init();
 }