flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-02 15:15:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #77 CIcon doesn't need to inherit from Mixin::Icon

Browse Source 
Helps to reduce cyclic dependencies.
This commit is contained in:
Mat Sutcliffe
2020-08-25 23:05:57 +01:00
parent 4094b18c39
commit 5b1504aecf
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackmisc/icon.h
View File

@@ -73,8 +73,7 @@ namespace BlackMisc
public Mixin::EqualsByMetaClass<CIcon>, public Mixin::EqualsByMetaClass<CIcon>,
public Mixin::LessThanByMetaClass<CIcon>, public Mixin::LessThanByMetaClass<CIcon>,
public Mixin::CompareByMetaClass<CIcon>, public Mixin::CompareByMetaClass<CIcon>,
public Mixin::String<CIcon>, public Mixin::String<CIcon>
public Mixin::Icon<CIcon>
{ {
public: public:
//! Default constructor. //! Default constructor.
@@ -116,6 +115,9 @@ namespace BlackMisc
//! Corresponding pixmap //! Corresponding pixmap
QPixmap toPixmap() const; QPixmap toPixmap() const;
//! Identity function
CIcon toIcon() const { return *this; }
//! A QIcon //! A QIcon
QIcon toQIcon() const; QIcon toQIcon() const;