aboutsummaryrefslogtreecommitdiff
path: root/lib/eventitem.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/eventitem.cpp')
-rw-r--r--lib/eventitem.cpp34
1 files changed, 12 insertions, 22 deletions
diff --git a/lib/eventitem.cpp b/lib/eventitem.cpp
index 2e2b11c0..a2e2a156 100644
--- a/lib/eventitem.cpp
+++ b/lib/eventitem.cpp
@@ -1,20 +1,5 @@
-/******************************************************************************
- * Copyright (C) 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "eventitem.h"
@@ -23,20 +8,25 @@
using namespace Quotient;
-void PendingEventItem::setFileUploaded(const QUrl& remoteUrl)
+void PendingEventItem::setFileUploaded(const FileSourceInfo& uploadedFileData)
{
// TODO: eventually we might introduce hasFileContent to RoomEvent,
// and unify the code below.
if (auto* rme = getAs<RoomMessageEvent>()) {
Q_ASSERT(rme->hasFileContent());
- rme->editContent([remoteUrl](EventContent::TypedBase& ec) {
- ec.fileInfo()->url = remoteUrl;
+ rme->editContent([&uploadedFileData](EventContent::TypedBase& ec) {
+ ec.fileInfo()->source = uploadedFileData;
});
}
if (auto* rae = getAs<RoomAvatarEvent>()) {
Q_ASSERT(rae->content().fileInfo());
- rae->editContent(
- [remoteUrl](EventContent::FileInfo& fi) { fi.url = remoteUrl; });
+ rae->editContent([&uploadedFileData](EventContent::FileInfo& fi) {
+ fi.source = uploadedFileData;
+ });
}
setStatus(EventStatus::FileUploaded);
}
+
+// Not exactly sure why but this helps with the linker not finding
+// Quotient::EventStatus::staticMetaObject when building Quaternion
+#include "moc_eventitem.cpp"