refactor: drop SkipEmptyParts conditional compile

since Qt 5.15 needed

Author: CoelacanthusHex

makespec/BUILDVERSION

@@ -1 +1 @@
-124
+125

src/base/LemonUtils.hpp

@@ -21,15 +21,9 @@
 #define READ_JSON_STR(___x)                                                                                  \
 	if (json.contains("___x") && json["___x"].isString())                                                    \
 		___x = json["___x"].toString();
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
 #define READ_JSON_STRLIST(___x)                                                                              \
 	if (json.contains("___x") && json["___x"].isString())                                                    \
 		___x = json["___x"].toString().split(QLatin1Char(';'), Qt::SkipEmptyParts);
-#else
-#define READ_JSON_STRLIST(___x)                                                                              \
-	if (json.contains("___x") && json["___x"].isString())                                                    \
-		___x = json["___x"].toString().split(QLatin1Char(';'), QString::SkipEmptyParts);
-#endif
 
 #define WRITE_JSON(___x) json["___x"] = ___x;
 #define WRITE_JSON_STRLIST(___x) json["___x"] = ___x.join(QLatin1Char(';'));

src/base/compiler.cpp

@@ -11,12 +11,6 @@
 //
 #include "base/LemonUtils.hpp"
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-#define QT_SkipEmptyParts Qt::SkipEmptyParts
-#else
-#define QT_SkipEmptyParts QString::SkipEmptyParts
-#endif
-
 Compiler::Compiler(QObject *parent) : QObject(parent) {
 	compilerType = Typical;
 	timeLimitRatio = 1;
@@ -55,15 +49,15 @@ void Compiler::setCompilerType(Compiler::CompilerType type) { compilerType = typ
 void Compiler::setCompilerName(const QString &name) { compilerName = name; }
 
 void Compiler::setSourceExtensions(const QString &extensions) {
-	sourceExtensions = extensions.split(";", QT_SkipEmptyParts);
+	sourceExtensions = extensions.split(";", Qt::SkipEmptyParts);
 }
 
 void Compiler::setCompilerLocation(const QString &location) { compilerLocation = location; }
 
 void Compiler::setInterpreterLocation(const QString &location) { interpreterLocation = location; }
 
 void Compiler::setBytecodeExtensions(const QString &extensions) {
-	bytecodeExtensions = extensions.split(";", QT_SkipEmptyParts);
+	bytecodeExtensions = extensions.split(";", Qt::SkipEmptyParts);
 }
 
 void Compiler::setEnvironment(const QProcessEnvironment &env) { environment = env; }
@@ -139,11 +133,7 @@ void Compiler::read(const QJsonObject &json) {
 
 	QStringList _environment;
 	if (json.contains("environment") && json["environment"].isString()) {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
 		_environment = json["environment"].toString().split(QLatin1Char(';'), Qt::SkipEmptyParts);
-#else
-		_environment = json["environment"].toString().split(QLatin1Char(';'), QString::SkipEmptyParts);
-#endif
 	}
 
 	for (auto &i : _environment) {

src/base/settings.cpp

@@ -16,12 +16,6 @@
 //
 #define LEMON_MODULE_NAME "Setting"
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-#define QT_SkipEmptyParts Qt::SkipEmptyParts
-#else
-#define QT_SkipEmptyParts QString::SkipEmptyParts
-#endif
-
 Settings::Settings(QObject *parent) : QObject(parent) {}
 
 auto Settings::getDefaultFullScore() const -> int { return defaultFullScore; }
@@ -262,12 +256,12 @@ void Settings::setDefaultOutputFileExtension(const QString &extension) {
 }
 
 void Settings::setInputFileExtensions(const QString &extensions) {
-	inputFileExtensions = extensions.split(";", QT_SkipEmptyParts);
+	inputFileExtensions = extensions.split(";", Qt::SkipEmptyParts);
 	DEBUG("Set InputFile Extensions to " + extensions);
 }
 
 void Settings::setOutputFileExtensions(const QString &extensions) {
-	outputFileExtensions = extensions.split(";", QT_SkipEmptyParts);
+	outputFileExtensions = extensions.split(";", Qt::SkipEmptyParts);
 	DEBUG("Set OutputFile Extensions to " + extensions);
 }
 

src/core/assignmentthread.cpp

@@ -19,12 +19,6 @@
 #include "core/testcase.h"
 #include <utility>
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-#define QT_SkipEmptyParts Qt::SkipEmptyParts
-#else
-#define QT_SkipEmptyParts QString::SkipEmptyParts
-#endif
-
 AssignmentThread::AssignmentThread(QObject *parent) : QThread(parent) {
 	moveToThread(this);
 	curTestCaseIndex = 0;
@@ -220,7 +214,7 @@ auto AssignmentThread::traditionalTaskPrepare() -> bool {
 						// TODO: 需要重构代码来处理含空格路径问题
 
 						compiler->start(i->getCompilerLocation(),
-						                arguments.split(QLatin1Char(' '), QT_SkipEmptyParts));
+						                arguments.split(QLatin1Char(' '), Qt::SkipEmptyParts));
 
 						if (! compiler->waitForStarted(-1)) {
 							compileState = InvalidCompiler;

src/detaildialog.cpp

@@ -22,12 +22,6 @@
 #include <QMessageBox>
 #include <QScrollBar>
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-#define QT_SkipEmptyParts Qt::SkipEmptyParts
-#else
-#define QT_SkipEmptyParts QString::SkipEmptyParts
-#endif
-
 DetailDialog::DetailDialog(QWidget *parent) : QDialog(parent), ui(new Ui::DetailDialog) {
 	ui->setupUi(this);
 	connect(ui->detailViewer, &QTextBrowser::anchorClicked, this, &DetailDialog::anchorClicked);
@@ -259,7 +253,7 @@ void DetailDialog::showDialog() {
 }
 
 void DetailDialog::anchorClicked(const QUrl &url) {
-	QStringList list = url.path().split(' ', QT_SkipEmptyParts);
+	QStringList list = url.path().split(' ', Qt::SkipEmptyParts);
 
 	if (list[0] == "Rejudge") {
 		auto *dialog = new JudgingDialog(this);