summaryrefslogtreecommitdiffstats
path: root/src/networkdiscovery.h
diff options
context:
space:
mode:
authorNiklas2011-11-04 11:56:28 +0100
committerNiklas2011-11-04 11:56:28 +0100
commit5d215d54cbb33f3ef5fb4f5da9a860b0a105ae9b (patch)
tree8965df059ab3acff163d0b7c907f35754472ee23 /src/networkdiscovery.h
parentchanged the tryout, also some big changes in program flow. there is now userc... (diff)
downloadfbgui-5d215d54cbb33f3ef5fb4f5da9a860b0a105ae9b.tar.gz
fbgui-5d215d54cbb33f3ef5fb4f5da9a860b0a105ae9b.tar.xz
fbgui-5d215d54cbb33f3ef5fb4f5da9a860b0a105ae9b.zip
last changes
Diffstat (limited to 'src/networkdiscovery.h')
-rw-r--r--src/networkdiscovery.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/networkdiscovery.h b/src/networkdiscovery.h
index 3256ced..d1792a8 100644
--- a/src/networkdiscovery.h
+++ b/src/networkdiscovery.h
@@ -47,6 +47,7 @@ public:
bool checkConnectivity(QString ifName);
bool checkConnectivityViaTcp();
QVariantMap getInterfaceConfig(QString ifName);
+ QString GetErrorStr();
private slots:
void handleNewConnection();
@@ -70,6 +71,7 @@ signals:
void updateStatus(QString status);
void allProcessesFinished();
void continueBoot(QString ifName);
+ void continueBootWithoutCheck(QString ifName);
void setManualConfInterfaces(QString jsonArr);
void readyForRun();
@@ -96,6 +98,7 @@ private:
int _ifUpCountdown;
QTimer*_timer;
QList<Q_PID> _pidsList;
+ QString _errorStr;
QMap<QString,interfaceconfiguration*> _ifcMap;
void mainWork();