1 files changed, 25 insertions, 33 deletions
diff --git a/src/fbgui/networkdiscovery.h b/src/fbgui/networkdiscovery.h
index f98566f..51dc8a7 100644
--- a/src/fbgui/networkdiscovery.h
+++ b/src/fbgui/networkdiscovery.h
@@ -40,25 +40,22 @@ public:
 	~NetworkDiscovery();
 
 	void initAndRun(bool userChoice, QStringList* args = NULL);
-	int ip4_replaceDefaultRoute(QString ifName, QString gateway, int mss);
 
+	bool checkConnectivity(QString ifName);
+	bool checkConnectivityViaTcp();
 
 	int ip4_setManualConfiguration(QVariantMap result);
+
 	void tryAgain();
 	void prepareTryAgain();
-	bool checkConnectivity(QString ifName);
-	bool checkConnectivityViaTcp();
 
 	// Public member access
 	QList<QString> getIfUpList();
 	InterfaceConfiguration* getInterfaceConfig(QString ifName);
 	QString GetErrorStr();
 
-	QString getGatewayForInterface(QString ifName);
-
-
 public slots:
-
+	void readyForRun();
 	void checkForIsRunning();
 
 	void handleNewConnection();
@@ -70,58 +67,53 @@ public slots:
 	void handleProcessStarted();
 	void handleProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
 
-	void readyForRun();
-
 signals:
+	void updateStatus(QString status);
+
 	void addInterface(const QString &ifName);
+	void updateIfStatus(QString ifName, QString status);
 	void changeProgressBarValue(const QString & ifName, const int $newValue);
 	void connectionEstablished(QString ifName);
-	void abortBoot(QString msg);
-	void updateIfStatus(QString ifName, QString status);
-	void updateStatus(QString status);
+
 	void allProcessesFinished();
-	void continueBoot(QString ifName);
 	void continueBootWithoutCheck(QString ifName);
-	void setManualConfInterfaces(QString jsonArr);
 
-	//void readyForRun();
+	void abortBoot(QString msg);
 
 private:
-
 	void mainWork();
 
-	void killDHCPCD();
-
-	void handleNewInput(QLocalSocket * client);
+	void getListOfNetworkInterfaces();
+	void getListOfNetworkInterfacesWithAutoUp();
+	bool checkBlackList(QString i);
+	bool checkConnectivityViaTcp(QString server);
 
 	void runDHCPCD(QList<QString> &interfaces);
 	void runDHCPCD(QString interface);
+	void killDHCPCD();
 
-	bool checkCarrierState(QString interface);
-	bool checkConnectivityViaTcp(QString server);
-
-	bool checkBlackList(QString i);
-
-	void getListOfNetworkInterfaces();
-	void getListOfNetworkInterfacesWithAutoUp();
+	void handleNewInput(QLocalSocket * client);
 
 	QLocalServer *_server;
-	QMap<QLocalSocket*, QLocalSocket*> _clients;
 	QLocalSocket *_client;
+	QMap<QLocalSocket*, QLocalSocket*> _clients;
 	QMap<QString, QLocalSocket*> _ifNameToClient;
 	QMap<QProcess*, QString> _clientProcessToIfNameMap;
-	QStringList _dhcpcdArguments;
-	int _numberOfProcesses;
-	NetworkManager* _networkManager;
+	//QList<Q_PID> _pidsList;
+
 	bool _userChoice;
 	bool _blocked;
+	QTimer*_timer;
 	QList<QString> _ifUpList;
 	QList<QString> _ifDownList;
 	int _ifUpCountdown;
-	QTimer*_timer;
-	QList<Q_PID> _pidsList;
-	QString _errorStr;
+	int _numberOfProcesses;
+	QStringList _dhcpcdArguments;
+
+	NetworkManager* _networkManager;
 	QMap<QString, InterfaceConfiguration*> _ifcMap;
+
+	QString _errorStr;
 };
 
 #endif // NetworkDiscovery_H