From df1a9d7b9ef0fb755170efd2ac2d943be4271e9c Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Thu, 12 Mar 2015 00:07:28 +0000 Subject: [PATCH] refs #356 toPixmap is public in the base class, so it should be public in the derived class. --- src/blackmisc/pixmap.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/blackmisc/pixmap.h b/src/blackmisc/pixmap.h index 4a8bff7f8..cd8918406 100644 --- a/src/blackmisc/pixmap.h +++ b/src/blackmisc/pixmap.h @@ -44,13 +44,13 @@ namespace BlackMisc //! With Pixmap? bool isNull() const; + //! \copydoc CValueObject::toPixmap + virtual QPixmap toPixmap() const override; + protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; - //! \copydoc CValueObject::toPixmap - virtual QPixmap toPixmap() const override; - private: BLACK_ENABLE_TUPLE_CONVERSION(BlackMisc::CPixmap)