-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 6 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index 73ce1e5..332fb4b 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h @@ -91,9 +91,6 @@ private slots: void skipBack(); void stopSkip(); private: - typedef std::vector<QBitmap> MaskVector; - typedef std::vector<QPixmap> PixmapVector; - void setToggleButton( int, bool ); virtual void paintButton( QPainter &p, int i ); int skipDirection; @@ -101,9 +98,6 @@ private: QPixmap pixBg; QImage imgUp; QImage imgDn; - MaskVector masks; - PixmapVector buttonPixUp; - PixmapVector buttonPixDown; OTicker songInfo; QSlider slider; diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 9fb3499..2641df6 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h @@ -54,6 +54,9 @@ public: ButtonType type; }; + typedef std::vector<QBitmap> MaskVector; + typedef std::vector<QPixmap> PixmapVector; + MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 ); virtual ~MediaWidget(); @@ -87,6 +90,10 @@ protected: QImage buttonMask; + MaskVector masks; + PixmapVector buttonPixUp; + PixmapVector buttonPixDown; + QPoint upperLeftOfButtonMask; }; |