Skip to content

Commit 01c2903

Browse files
committed
chore: fix unity build for AppImage
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
1 parent 2fc2c38 commit 01c2903

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

src/gui/tooltipupdater.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
* SPDX-License-Identifier: GPL-2.0-or-later
55
*/
66

7+
#pragma once
8+
79
#include <QObject>
810
#include <QPoint>
911

src/libsync/bulkpropagatordownloadjob.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ BulkPropagatorDownloadJob::BulkPropagatorDownloadJob(OwncloudPropagator *propaga
3030

3131
namespace
3232
{
33-
static QString makeRecallFileName(const QString &fn)
33+
static QString makeBulkDownloadRecallFileName(const QString &fn)
3434
{
3535
auto recallFileName(fn);
3636
// Add _recall-XXXX before the extension.
@@ -46,9 +46,9 @@ static QString makeRecallFileName(const QString &fn)
4646
return recallFileName;
4747
}
4848

49-
void handleRecallFile(const QString &filePath, const QString &folderPath, SyncJournalDb &journal)
49+
void handleBulkDownloadRecallFile(const QString &filePath, const QString &folderPath, SyncJournalDb &journal)
5050
{
51-
qCDebug(lcBulkPropagatorDownloadJob) << "handleRecallFile: " << filePath;
51+
qCDebug(lcBulkPropagatorDownloadJob) << "handleBulkDownloadRecallFile: " << filePath;
5252

5353
FileSystem::setFileHidden(filePath, true);
5454

@@ -81,7 +81,7 @@ void handleRecallFile(const QString &filePath, const QString &folderPath, SyncJo
8181

8282
qCInfo(lcBulkPropagatorDownloadJob) << "Recalling" << localRecalledFile << "Checksum:" << record._checksumHeader;
8383

84-
const auto &targetPath = makeRecallFileName(recalledFile);
84+
const auto &targetPath = makeBulkDownloadRecallFileName(recalledFile);
8585

8686
qCDebug(lcBulkPropagatorDownloadJob) << "Copy recall file: " << recalledFile << " -> " << targetPath;
8787
// Remove the target first, QFile::copy will not overwrite it.
@@ -197,7 +197,7 @@ bool BulkPropagatorDownloadJob::updateMetadata(const SyncFileItemPtr &item)
197197
// handle the special recall file
198198
if (!item->_remotePerm.hasPermission(RemotePermissions::IsShared)
199199
&& (item->_file == QLatin1String(".sys.admin#recall#") || item->_file.endsWith(QLatin1String("/.sys.admin#recall#")))) {
200-
handleRecallFile(fullFileName, propagator()->localPath(), *propagator()->_journal);
200+
handleBulkDownloadRecallFile(fullFileName, propagator()->localPath(), *propagator()->_journal);
201201
}
202202

203203
const auto isLockOwnedByCurrentUser = item->_lockOwnerId == propagator()->account()->davUser();

0 commit comments

Comments
 (0)