github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-20 02:40:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "add: added support with comment-json"

Browse Source 
This reverts commit a5cf9222ff.
This commit is contained in:
Qv2ray-dev 2020-03-11 20:57:04 +08:00
parent a5cf9222ff
commit 8d7ac0a708
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/QvHelpers.cpp
View File

@ -1,7 +1,5 @@
#include "common/QvHelpers.hpp" #include "common/QvHelpers.hpp"
#include "libs/puresource/src/PureJson.hpp"
#include <QGraphicsEffect> #include <QGraphicsEffect>
#include <QGraphicsProxyWidget> #include <QGraphicsProxyWidget>
#include <QGraphicsScene> #include <QGraphicsScene>
@ -44,8 +42,7 @@ namespace Qv2ray::common
QTextCodec::ConverterState state; QTextCodec::ConverterState state;
QTextCodec *codec = QTextCodec::codecForName("UTF-8"); QTextCodec *codec = QTextCodec::codecForName("UTF-8");
const QString text = codec->toUnicode(byteArray.constData(), byteArray.size(), &state); const QString text = codec->toUnicode(byteArray.constData(), byteArray.size(), &state);
if (state.invalidChars > 0) if (state.invalidChars > 0) {
{
LOG(MODULE_FILEIO, "Not a valid UTF-8 sequence: " + source->fileName()) LOG(MODULE_FILEIO, "Not a valid UTF-8 sequence: " + source->fileName())
return source->readAll(); return source->readAll();
} }
@ -76,7 +73,7 @@ namespace Qv2ray::common
QJsonObject JSONFromFile(QFile *sourceFile) QJsonObject JSONFromFile(QFile *sourceFile)
{ {
QString json = RemoveComment(StringFromFile(sourceFile)); QString json = StringFromFile(sourceFile);
return JsonFromString(json); return JsonFromString(json);
} }