Commit 41e61ab3 authored by Olivier SOLDANO's avatar Olivier SOLDANO Committed by Anthony Léonard

fix namespaces

the namespace Interfaces was wrapping PixbufManipulator
for no apparent reason, removed the wrapping.

Change-Id: I2deb2e35513407777898e1d08712788f2cce97ca
Reviewed-by: default avatarAnthony Léonard <anthony.leonard@savoirfairelinux.com>
parent 30ac2c75
...@@ -68,7 +68,7 @@ main(int argc, char *argv[]) ...@@ -68,7 +68,7 @@ main(int argc, char *argv[])
QApplication a(argc, argv); QApplication a(argc, argv);
GlobalInstances::setPixmapManipulator(std::unique_ptr<Interfaces::PixbufManipulator>(new Interfaces::PixbufManipulator())); GlobalInstances::setPixmapManipulator(std::unique_ptr<PixbufManipulator>(new PixbufManipulator()));
auto startMinimized = false; auto startMinimized = false;
QString uri = ""; QString uri = "";
......
...@@ -48,8 +48,6 @@ QByteArray QImageToByteArray(QImage image) ...@@ -48,8 +48,6 @@ QByteArray QImageToByteArray(QImage image)
return ba; return ba;
} }
namespace Interfaces {
QImage QImage
PixbufManipulator::scaleAndFrame(const QImage photo, const QSize& size) PixbufManipulator::scaleAndFrame(const QImage photo, const QSize& size)
{ {
...@@ -139,9 +137,9 @@ PixbufManipulator::toByteArray(const QVariant& pxm) ...@@ -139,9 +137,9 @@ PixbufManipulator::toByteArray(const QVariant& pxm)
} }
QVariant QVariant
PixbufManipulator::collectionIcon(const CollectionInterface* interface, PixmapManipulatorI::CollectionIconHint hint) const PixbufManipulator::collectionIcon(const CollectionInterface* colItf, PixmapManipulatorI::CollectionIconHint hint) const
{ {
Q_UNUSED(interface) Q_UNUSED(colItf)
Q_UNUSED(hint) Q_UNUSED(hint)
return QVariant(); return QVariant();
} }
...@@ -249,5 +247,3 @@ QImage PixbufManipulator::fallbackAvatar(const QSize size, const char color, con ...@@ -249,5 +247,3 @@ QImage PixbufManipulator::fallbackAvatar(const QSize size, const char color, con
return avatar; return avatar;
} }
} // namespace Interfaces
...@@ -29,9 +29,7 @@ class Person; ...@@ -29,9 +29,7 @@ class Person;
QByteArray QImageToByteArray(QImage image); QByteArray QImageToByteArray(QImage image);
namespace Interfaces { class PixbufManipulator : public Interfaces::PixmapManipulatorI {
class PixbufManipulator : public PixmapManipulatorI {
public: public:
QVariant callPhoto(Call* c, const QSize& size, bool displayPresence = true) override; QVariant callPhoto(Call* c, const QSize& size, bool displayPresence = true) override;
QVariant callPhoto(const ContactMethod* n, const QSize& size, bool displayPresence = true) override; QVariant callPhoto(const ContactMethod* n, const QSize& size, bool displayPresence = true) override;
...@@ -42,7 +40,9 @@ public: ...@@ -42,7 +40,9 @@ public:
QVariant numberCategoryIcon(const QVariant& p, const QSize& size, bool displayPresence = false, bool isPresent = false) override; QVariant numberCategoryIcon(const QVariant& p, const QSize& size, bool displayPresence = false, bool isPresent = false) override;
QVariant securityIssueIcon(const QModelIndex& index) override; QVariant securityIssueIcon(const QModelIndex& index) override;
QByteArray toByteArray(const QVariant& pxm) override; QByteArray toByteArray(const QVariant& pxm) override;
QVariant collectionIcon(const CollectionInterface* interface, PixmapManipulatorI::CollectionIconHint hint = PixmapManipulatorI::CollectionIconHint::NONE) const override; QVariant collectionIcon(const CollectionInterface* colItf,
Interfaces::PixmapManipulatorI::CollectionIconHint hint =
Interfaces::PixmapManipulatorI::CollectionIconHint::NONE) const override;
QVariant securityLevelIcon(const SecurityEvaluationModel::SecurityLevel level) const override; QVariant securityLevelIcon(const SecurityEvaluationModel::SecurityLevel level) const override;
QVariant historySortingCategoryIcon(const CategorizedHistoryModel::SortedProxy::Categories cat) const override; QVariant historySortingCategoryIcon(const CategorizedHistoryModel::SortedProxy::Categories cat) const override;
QVariant contactSortingCategoryIcon(const CategorizedContactModel::SortedProxy::Categories cat) const override; QVariant contactSortingCategoryIcon(const CategorizedContactModel::SortedProxy::Categories cat) const override;
...@@ -52,12 +52,12 @@ public: ...@@ -52,12 +52,12 @@ public:
QVariant decorationRole(const ContactMethod* cm) override; QVariant decorationRole(const ContactMethod* cm) override;
QVariant decorationRole(const Person* p) override; QVariant decorationRole(const Person* p) override;
QVariant decorationRole(const Account* acc) override; QVariant decorationRole(const Account* acc) override;
static QImage scaleAndFrame(const QImage photo, const QSize& size);
static QImage scaleAndFrame(const QImage photo, const int& size);
private: private:
QImage scaleAndFrame(const QImage photo, const QSize& size);
const QSize imgSize_ {48, 48}; const QSize imgSize_ {48, 48};
static QImage fallbackAvatar(const QSize size, const char color, const char letter); static QImage fallbackAvatar(const QSize size, const char color, const char letter);
}; };
} // namespace Interfaces
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment