Skip to content

Commit 2e6a4df

Browse files
ZnPdCoZnPdCo
committed
use int64_t instead of long long
1 parent 6d561eb commit 2e6a4df

11 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎src/base/LemonUtils.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace Lemon::detail {
3030
} else
3131
return -1;
3232
}
33-
inline long long jsonReadHelper(long long &val, const QJsonValue &jval) {
33+
inline int64_t jsonReadHelper(int64_t &val, const QJsonValue &jval) {
3434
if (jval.isDouble()) {
3535
val = jval.toInteger();
3636
return 0;

‎src/component/exportutil/exportutil.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ auto ExportUtil::getContestantHtmlCode(Contest *contest, Contestant *contestant,
126126
QList<QList<ResultState>> result = contestant->getResult(i);
127127
QList<QStringList> message = contestant->getMessage(i);
128128
QList<QList<int>> timeUsed = contestant->getTimeUsed(i);
129-
QList<QList<long long>> memoryUsed = contestant->getMemoryUsed(i);
129+
QList<QList<int64_t>> memoryUsed = contestant->getMemoryUsed(i);
130130
QList<QList<int>> score = contestant->getScore(i);
131131

132132
for (int j = 0; j < inputFiles.size(); j++) {
@@ -493,7 +493,7 @@ auto ExportUtil::getSmallerContestantHtmlCode(Contest *contest, Contestant *cont
493493
QList<QList<ResultState>> result = contestant->getResult(i);
494494
QList<QStringList> message = contestant->getMessage(i);
495495
QList<QList<int>> timeUsed = contestant->getTimeUsed(i);
496-
QList<QList<long long>> memoryUsed = contestant->getMemoryUsed(i);
496+
QList<QList<int64_t>> memoryUsed = contestant->getMemoryUsed(i);
497497
QList<QList<int>> score = contestant->getScore(i);
498498

499499
for (int j = 0; j < inputFiles.size(); j++) {

‎src/core/contestant.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ auto Contestant::getScore(int index) const -> const QList<QList<int>> & { return
3636

3737
auto Contestant::getTimeUsed(int index) const -> const QList<QList<int>> & { return timeUsed[index]; }
3838

39-
auto Contestant::getMemoryUsed(int index) const -> const QList<QList<long long>> & {
39+
auto Contestant::getMemoryUsed(int index) const -> const QList<QList<int64_t>> & {
4040
return memoryUsed[index];
4141
}
4242

@@ -62,7 +62,7 @@ void Contestant::setScore(int index, const QList<QList<int>> &_score) { score[in
6262

6363
void Contestant::setTimeUsed(int index, const QList<QList<int>> &_timeUsed) { timeUsed[index] = _timeUsed; }
6464

65-
void Contestant::setMemoryUsed(int index, const QList<QList<long long>> &_memoryUsed) {
65+
void Contestant::setMemoryUsed(int index, const QList<QList<int64_t>> &_memoryUsed) {
6666
memoryUsed[index] = _memoryUsed;
6767
}
6868

@@ -78,7 +78,7 @@ void Contestant::addTask() {
7878
message.append(QList<QStringList>());
7979
score.append(QList<QList<int>>());
8080
timeUsed.append(QList<QList<int>>());
81-
memoryUsed.append(QList<QList<long long>>());
81+
memoryUsed.append(QList<QList<int64_t>>());
8282
}
8383

8484
void Contestant::deleteTask(int index) {

‎src/core/contestant.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Contestant : public QObject {
3030
const QList<QStringList> &getMessage(int) const;
3131
const QList<QList<int>> &getScore(int) const;
3232
const QList<QList<int>> &getTimeUsed(int) const;
33-
const QList<QList<long long>> &getMemoryUsed(int) const;
33+
const QList<QList<int64_t>> &getMemoryUsed(int) const;
3434
QDateTime getJudingTime() const;
3535
int getTaskScore(int) const;
3636
int getTotalScore() const;
@@ -46,7 +46,7 @@ class Contestant : public QObject {
4646
void setMessage(int, const QList<QStringList> &);
4747
void setScore(int, const QList<QList<int>> &);
4848
void setTimeUsed(int, const QList<QList<int>> &);
49-
void setMemoryUsed(int, const QList<QList<long long>> &);
49+
void setMemoryUsed(int, const QList<QList<int64_t>> &);
5050
void setJudgingTime(QDateTime);
5151

5252
int writeToJson(QJsonObject &);
@@ -64,7 +64,7 @@ class Contestant : public QObject {
6464
QList<QList<QStringList>> message;
6565
QList<QList<QList<int>>> score;
6666
QList<QList<QList<int>>> timeUsed;
67-
QList<QList<QList<long long>>> memoryUsed;
67+
QList<QList<QList<int64_t>>> memoryUsed;
6868
QDateTime judgingTime;
6969

7070
// QList<TaskResult> taskResults;

‎src/core/judgingthread.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ void JudgingThread::setInterpreterAsWatcher(bool use) { interpreterAsWatcher = u
9999

100100
auto JudgingThread::getTimeUsed() const -> int { return timeUsed; }
101101

102-
auto JudgingThread::getMemoryUsed() const -> long long { return memoryUsed; }
102+
auto JudgingThread::getMemoryUsed() const -> int64_t { return memoryUsed; }
103103

104104
auto JudgingThread::getScore() const -> int { return score; }
105105

‎src/core/judgingthread.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class JudgingThread : public QThread {
3939
void setRawMemoryLimit(int);
4040
void setInterpreterAsWatcher(bool);
4141
int getTimeUsed() const;
42-
long long getMemoryUsed() const;
42+
int64_t getMemoryUsed() const;
4343
int getScore() const;
4444
int getFullScore() const;
4545
int getJudgeTimes() const;
@@ -70,7 +70,7 @@ class JudgingThread : public QThread {
7070
int memoryLimit{};
7171
int rawMemoryLimit{};
7272
int timeUsed;
73-
long long memoryUsed;
73+
int64_t memoryUsed;
7474
int score{};
7575
int judgedTimes;
7676
ResultState result;

‎src/core/taskjudger.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ int TaskJudger::judge() {
361361

362362
for (int i = 0; i < task->getTestCaseList().size(); i++) {
363363
timeUsed.append(QList<int>());
364-
memoryUsed.append(QList<long long>());
364+
memoryUsed.append(QList<int64_t>());
365365
score.append(QList<int>());
366366
result.append(QList<ResultState>());
367367
overallStatus.append(maxDependValue);

‎src/core/taskjudger.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class TaskJudger : public QObject {
5656
QProcessEnvironment environment;
5757
QList<int> overallStatus;
5858
QList<QList<int>> timeUsed;
59-
QList<QList<long long>> memoryUsed;
59+
QList<QList<int64_t>> memoryUsed;
6060
QList<QList<int>> score;
6161
QList<QList<ResultState>> result;
6262
QList<QStringList> message;

‎src/detaildialog.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ void DetailDialog::refreshViewer(Contest *_contest, Contestant *_contestant) {
133133
QList<QList<ResultState>> result = contestant->getResult(i);
134134
QList<QStringList> message = contestant->getMessage(i);
135135
QList<QList<int>> timeUsed = contestant->getTimeUsed(i);
136-
QList<QList<long long>> memoryUsed = contestant->getMemoryUsed(i);
136+
QList<QList<int64_t>> memoryUsed = contestant->getMemoryUsed(i);
137137
QList<QList<int>> score = contestant->getScore(i);
138138

139139
for (int j = 0; j < inputFiles.size(); j++) {

‎src/judgingdialog.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void JudgingDialog::judgeAll() {
8585
}
8686

8787
void JudgingDialog::singleCaseFinished(QString contestantName, int progress, int x, int y, int result,
88-
int scoreGot, int timeUsed, long long memoryUsed) {
88+
int scoreGot, int timeUsed, int64_t memoryUsed) {
8989
bool isOnMaxValue =
9090
ui->logViewer->verticalScrollBar()->value() == ui->logViewer->verticalScrollBar()->maximum();
9191
QTextBlockFormat blockFormat;

0 commit comments

Comments
 (0)