sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit before modify

Browse Source
This commit is contained in:
xueyan hu
2021-12-13 17:01:17 +08:00
parent e3ffa9bd88
commit faa69197f3
10 changed files with 65 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/json/jsonobject.cpp
View File

@@ -291,11 +291,20 @@ void JsonObject::setServer(ServerType type, const host& list)
localhost JsonObject::getLocalHost()
{
localhost lhost;
//lhost.ip = IPConfig::getDeviceIP();
lhost.ip = QString(getJsonString("localhost", "ip"));
lhost.mask = QString(getJsonString("localhost", "mask"));
lhost.gateway = QString(getJsonString("localhost", "gateway"));
return lhost;
// localhost lhost;
// lhost.ip = QString(getJsonString("localhost", "ip"));
// lhost.mask = QString(getJsonString("localhost", "mask"));
// lhost.gateway = QString(getJsonString("localhost", "gateway"));
// return lhost;
}
@@ -306,4 +315,4 @@ void JsonObject::setLocalHost(const localhost& lh)
setJsonString("localhost", "gateway", lh.gateway.toStdString().c_str(), false);
savecfg();
}
}

2
src/json/jsonobject.h
View File

@@ -2,7 +2,7 @@
#define JSONOBJECT_H
//#include <QObject>
#include <QString>
class QStringList;
class QTranslator;