summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h6
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h7
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:
91 void skipBack(); 91 void skipBack();
92 void stopSkip(); 92 void stopSkip();
93private: 93private:
94 typedef std::vector<QBitmap> MaskVector;
95 typedef std::vector<QPixmap> PixmapVector;
96
97 void setToggleButton( int, bool ); 94 void setToggleButton( int, bool );
98 virtual void paintButton( QPainter &p, int i ); 95 virtual void paintButton( QPainter &p, int i );
99 int skipDirection; 96 int skipDirection;
@@ -101,9 +98,6 @@ private:
101 QPixmap pixBg; 98 QPixmap pixBg;
102 QImage imgUp; 99 QImage imgUp;
103 QImage imgDn; 100 QImage imgDn;
104 MaskVector masks;
105 PixmapVector buttonPixUp;
106 PixmapVector buttonPixDown;
107 101
108 OTicker songInfo; 102 OTicker songInfo;
109 QSlider slider; 103 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:
54 ButtonType type; 54 ButtonType type;
55 }; 55 };
56 56
57 typedef std::vector<QBitmap> MaskVector;
58 typedef std::vector<QPixmap> PixmapVector;
59
57 MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 ); 60 MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 );
58 virtual ~MediaWidget(); 61 virtual ~MediaWidget();
59 62
@@ -87,6 +90,10 @@ protected:
87 90
88 QImage buttonMask; 91 QImage buttonMask;
89 92
93 MaskVector masks;
94 PixmapVector buttonPixUp;
95 PixmapVector buttonPixDown;
96
90 QPoint upperLeftOfButtonMask; 97 QPoint upperLeftOfButtonMask;
91}; 98};
92 99