Index: sources/wifi/WifiInterface.h =================================================================== diff -u -r3403122944ec8f31dfd33b387e21204783579f60 -r60db0ce19666f04ea58992a7670497d83f9bf7c4 --- sources/wifi/WifiInterface.h (.../WifiInterface.h) (revision 3403122944ec8f31dfd33b387e21204783579f60) +++ sources/wifi/WifiInterface.h (.../WifiInterface.h) (revision 60db0ce19666f04ea58992a7670497d83f9bf7c4) @@ -51,13 +51,13 @@ bool generateWPASupplicant(const Network &vNetwork, const QString &vPassword); bool startWPASupplicant(); bool requestAutoAssignedIP(int vTries = 4); + void parseWifiScan(const QString &vOutput); QString parseIP(const QString &vOutput); QString parseBroadcast(const QString &vOutput); QString parseSubnetMask(const QString &vOutput); QString parseGateway(const QString &vOutput); QString parseDNS(const QString &vOutput); - void onInitConnections(); - void onQuitThread(); + void initConnections(); void timerEvent(QTimerEvent* event); void initThread(QThread &vThread); void quitThread(); @@ -70,24 +70,21 @@ void doDisconnectNetwork(const Network &vNetwork); void doRequestIPSettings(); -private slots: - void quit(); - signals: void didAddNetwork(const Network); void didDisconnectNetwork(const Network); - void didGetIPSettings(const Network::IPSettings); - void didRequestScan(); + void didRejectRequest(const QString &vFunction, const QString &vReason); + void didBusyChanged(const bool &vBusy); // emitted from separate threads void didScanStatusChanged(const bool); void didConnectToNetwork(const Network); void didError(const QString); private slots: + void quit(); void onQuit(); - void onParseWifiScan(const QString &vOutput); - void onLogFailure(const QString &vMessage); + void onError(const QString &vMessage); void onProcessFinishedScan(int vExitCode, QProcess::ExitStatus vExitStatus); void onProcessFinishedReadIP(int vExitCode, QProcess::ExitStatus vExitStatus); void onProcessFinishedReadGateway(int vExitCode, QProcess::ExitStatus vExitStatus);