From ebfec6cb6e5821ee8d6bf3def47b46eba508324c Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 23 Feb 2012 09:38:21 +0100
Subject: connected interfaces saved in networkdiscovery class and now accessed
 by getter & minor

---
 src/fbgui/networkdiscovery.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/fbgui/networkdiscovery.cpp')

diff --git a/src/fbgui/networkdiscovery.cpp b/src/fbgui/networkdiscovery.cpp
index 865d76b..7b75ec5 100644
--- a/src/fbgui/networkdiscovery.cpp
+++ b/src/fbgui/networkdiscovery.cpp
@@ -61,7 +61,7 @@ void NetworkDiscovery::initAndRun(bool userChoice, QStringList* args) {
 	_ifUpCountdown = 10;
 
 	_errorStr = "";
-	_networkManager = new NetworkManager();
+
 	_clientProcessToIfNameMap.clear();
 	_clients.clear();
 	_dhcpcdArguments.clear();
@@ -69,7 +69,10 @@ void NetworkDiscovery::initAndRun(bool userChoice, QStringList* args) {
 	_ifNameToClient.clear();
 	_ifUpList.clear();
 	_ifcMap.clear();
+
+
 	_server = new QLocalServer();
+	_networkManager = new NetworkManager();
 
 	if (gSocketServerPath != DEFAULT_QTSOCKETADDRESS) {
 		_dhcpcdArguments.append("-q");
@@ -370,7 +373,7 @@ void NetworkDiscovery::handleProcessFinished(int exitCode,
 				emit
 				updateIfStatus(ifName, "check connectivity");
 				if (checkConnectivity(ifName)) {
-					emit connectionEstablished(ifName);
+					_ifConnectedList.append(ifName);
 					if (!_userChoice) {
 						// blockiere jeden weiteren check
 						_blocked = true;
@@ -739,6 +742,9 @@ void NetworkDiscovery::handleNewInputLine(QLocalSocket * client,
 //-------------------------------------------------------------------------
 //                       Public member access
 //-------------------------------------------------------------------------
+const QList<QString>& NetworkDiscovery::getIfConnectedList(){
+	return _ifConnectedList;
+}
 /**
  * @brief Return the InterfaceConfiguration for the given interface.
  *
@@ -755,14 +761,14 @@ InterfaceConfiguration* NetworkDiscovery::getInterfaceConfig(QString ifName) {
  *
  * @return The QList<QString> member.
  */
-QList<QString> NetworkDiscovery::getIfUpList() {
+const QList<QString>& NetworkDiscovery::getIfUpList() {
 	return _ifUpList;
 }
 
 
 
 /**/
-QString NetworkDiscovery::GetErrorStr() {
+const QString& NetworkDiscovery::getErrorStr() {
 	return _errorStr;
 }
 
-- 
cgit v1.2.3-55-g7522