Skip to content

Commit ec224a3

Browse files
committed
Resolve use of QByteArray::append(QString) for Qt 6
1 parent 60e64e5 commit ec224a3

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/repository.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,7 +1027,7 @@ QIODevice *FastImportRepository::Transaction::addFile(const QString &path, int m
10271027
modifiedFiles.append(" :");
10281028
modifiedFiles.append(QByteArray::number(mark));
10291029
modifiedFiles.append(' ');
1030-
modifiedFiles.append(repository->prefix + path.toUtf8());
1030+
modifiedFiles.append(repository->prefix.toUtf8() + path.toUtf8());
10311031
modifiedFiles.append("\n");
10321032

10331033
// it is returned for being written to, so start the process in any case
@@ -1080,11 +1080,11 @@ bool FastImportRepository::Transaction::commitNote(const QByteArray &noteText, b
10801080
QByteArray s("");
10811081
s.append("commit refs/notes/commits\n");
10821082
s.append("mark :" + QByteArray::number(maxMark) + "\n");
1083-
s.append("committer " + author + " " + QString::number(datetime) + " +0000" + "\n");
1084-
s.append("data " + QString::number(message.length()) + "\n");
1083+
s.append("committer " + author + " " + QByteArray::number(datetime) + " +0000" + "\n");
1084+
s.append("data " + QByteArray::number(message.length()) + "\n");
10851085
s.append(message + "\n");
10861086
s.append("N inline " + commitRef + "\n");
1087-
s.append("data " + QString::number(text.length()) + "\n");
1087+
s.append("data " + QByteArray::number(text.length()) + "\n");
10881088
s.append(text + "\n");
10891089
repository->startFastImport();
10901090
repository->fastImport.write(s);
@@ -1152,7 +1152,7 @@ int FastImportRepository::Transaction::commit()
11521152
s.append("commit " + branchRef + "\n");
11531153
s.append("mark :" + QByteArray::number(mark) + "\n");
11541154
s.append("committer " + author + " " + QString::number(datetime).toUtf8() + " +0000" + "\n");
1155-
s.append("data " + QString::number(message.length()) + "\n");
1155+
s.append("data " + QByteArray::number(message.length()) + "\n");
11561156
s.append(message + "\n");
11571157
repository->fastImport.write(s);
11581158

0 commit comments

Comments
 (0)