diff options
| author | Lubos Dolezel <lubos@dolezel.info> | 2016-01-11 10:30:10 +0100 |
|---|---|---|
| committer | Lubos Dolezel <lubos@dolezel.info> | 2016-01-11 10:30:10 +0100 |
| commit | 497c6093dca384e0c33c107484535421f1bf0fca (patch) | |
| tree | e99a037ddde1b6618b9477df47433bcd6193a733 /src/gui/osd.h | |
| parent | dcd1d23d6d49074d61dce8e43f192f4312ab9fee (diff) | |
| download | twinkle-497c6093dca384e0c33c107484535421f1bf0fca.tar twinkle-497c6093dca384e0c33c107484535421f1bf0fca.tar.gz twinkle-497c6093dca384e0c33c107484535421f1bf0fca.tar.lz twinkle-497c6093dca384e0c33c107484535421f1bf0fca.tar.xz twinkle-497c6093dca384e0c33c107484535421f1bf0fca.zip | |
Port to QtQuick, drop Qt 4 support (resolves #52)
Diffstat (limited to 'src/gui/osd.h')
| -rw-r--r-- | src/gui/osd.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/gui/osd.h b/src/gui/osd.h index c5f83af..a8b78d3 100644 --- a/src/gui/osd.h +++ b/src/gui/osd.h @@ -2,19 +2,12 @@ #define OSD_H #include <QObject> #include <QString> -#if 0 //QT_VERSION >= 0x050000 -# define OSD_VIEWCLASS QQuickView -# define QML_ITEMTYPE QQuickItem -#else -# define OSD_VIEWCLASS QDeclarativeView -# define QML_ITEMTYPE QDeclarativeItem -#endif // Must use forward declaration, otherwise build fails // due to double QMetaTypeID<QAction*> definition (wtf). // Hence I also cannot inherit from OSD_VIEWCLASS... -class OSD_VIEWCLASS; -class QML_ITEMTYPE; +class QQuickView; +class QQuickItem; class OSD : public QObject { @@ -46,10 +39,10 @@ signals: void muteClicked(); private: - OSD_VIEWCLASS* m_view; - QML_ITEMTYPE* m_caller; - QML_ITEMTYPE* m_time; - QML_ITEMTYPE* m_mute; + QQuickView* m_view; + QQuickItem* m_caller; + QQuickItem* m_time; + QQuickItem* m_mute; }; #endif // OSD_H |