11#include " v2rockconfig.h"
2+ #include " config.h"
23
34V2RockConfig::V2RockConfig (QObject *parent) : QObject(parent), empty(true )
45{
@@ -23,9 +24,6 @@ V2RockConfig::~V2RockConfig()
2324 nodes.clear ();
2425}
2526
26- const char *V2RockConfig::CONFIG_FILE_NAME = " v2rock.conf" ;
27- const char *V2RockConfig::V2RAY_FILE_NAME = " config.json" ;
28-
2927bool V2RockConfig::isEmpty () const
3028{
3129 return empty;
@@ -140,7 +138,7 @@ void V2RockConfig::init()
140138
141139void V2RockConfig::read ()
142140{
143- QFile file (workDir + " /" + CONFIG_FILE_NAME );
141+ QFile file (workDir + " /" + v2rock_config::main_config );
144142 if (!file.exists ()) {
145143 return ;
146144 }
@@ -167,9 +165,9 @@ void V2RockConfig::write()
167165 QJsonObject jsonObj;
168166 toJson (jsonObj);
169167 QJsonDocument doc (jsonObj);
170- QFile file (workDir + " /" + CONFIG_FILE_NAME );
168+ QFile file (workDir + " /" + v2rock_config::main_config );
171169 if (!file.open (QFile::WriteOnly | QFile::Text | QFile::Truncate)) {
172- emit logReceived (" Error: file is not writable: " + workDir + " /" + CONFIG_FILE_NAME );
170+ emit logReceived (" Error: file is not writable: " + workDir + " /" + v2rock_config::main_config );
173171 }
174172 file.write (doc.toJson ());
175173 file.close ();
@@ -435,7 +433,7 @@ QString *V2RockConfig::toV2RayJson(QJsonObject &json)
435433
436434 v2rayConfig.toJson (json);
437435 QJsonDocument doc (json);
438- QString *configFilePath = new QString (workDir + " /" + V2RAY_FILE_NAME );
436+ QString *configFilePath = new QString (workDir + " /" + v2rock_config::v2ray_config );
439437 QFile file (*configFilePath);
440438 if (!file.open (QFile::WriteOnly | QFile::Text | QFile::Truncate)) {
441439 emit logReceived (" Error: file not writable: " + *configFilePath);
0 commit comments