From ba3037a816264b68af5951a1199576e76cb5208e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Fri, 8 Sep 2017 14:18:14 -0400
Subject: [PATCH] pixmapanipulator: add base implementation for
conversationPhoto
That fixes retro-compatibility issue with clients.
Change-Id: I245ce67a4d9372d772b93f6f6fd8412be1ddcd55
Reviewed-by: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Signed-off-by: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
---
src/interfaces/pixmapmanipulatori.h | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/interfaces/pixmapmanipulatori.h b/src/interfaces/pixmapmanipulatori.h
index b3da54c3..6726c02a 100644
--- a/src/interfaces/pixmapmanipulatori.h
+++ b/src/interfaces/pixmapmanipulatori.h
@@ -77,7 +77,10 @@ public:
virtual QVariant conversationPhoto(const lrc::api::conversation::Info& conversation,
const lrc::api::account::Info& accountInfo,
const QSize& size,
- bool displayPresence = true) = 0;
+ bool displayPresence = true) {
+ Q_UNUSED(conversation); Q_UNUSED(accountInfo); Q_UNUSED(size); Q_UNUSED(displayPresence);
+ return {};
+ }
virtual QVariant numberCategoryIcon(const QVariant& p, const QSize& size, bool displayPresence = false, bool isPresent = false) = 0;
virtual QVariant securityIssueIcon(const QModelIndex& index) = 0;
virtual QByteArray toByteArray(const QVariant& pxm) = 0;
@@ -91,7 +94,10 @@ public:
virtual QVariant decorationRole(const ContactMethod* cm ) = 0;
virtual QVariant decorationRole(const Person* p ) = 0;
virtual QVariant decorationRole(const lrc::api::conversation::Info& conversation,
- const lrc::api::account::Info& accountInfo) = 0;
+ const lrc::api::account::Info& accountInfo) {
+ Q_UNUSED(conversation); Q_UNUSED(accountInfo);
+ return {};
+ }
virtual QVariant decorationRole(const Account* acc ) = 0;
/**
--
GitLab