mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-22 14:55:36 +08:00
Issue #77 CIcon doesn't need to inherit from Mixin::Icon
Helps to reduce cyclic dependencies.
This commit is contained in:
@@ -73,8 +73,7 @@ namespace BlackMisc
|
||||
public Mixin::EqualsByMetaClass<CIcon>,
|
||||
public Mixin::LessThanByMetaClass<CIcon>,
|
||||
public Mixin::CompareByMetaClass<CIcon>,
|
||||
public Mixin::String<CIcon>,
|
||||
public Mixin::Icon<CIcon>
|
||||
public Mixin::String<CIcon>
|
||||
{
|
||||
public:
|
||||
//! Default constructor.
|
||||
@@ -116,6 +115,9 @@ namespace BlackMisc
|
||||
//! Corresponding pixmap
|
||||
QPixmap toPixmap() const;
|
||||
|
||||
//! Identity function
|
||||
CIcon toIcon() const { return *this; }
|
||||
|
||||
//! A QIcon
|
||||
QIcon toQIcon() const;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user