From 3f88070b9be5209cdd88caa0afd7f7294d3b1764 Mon Sep 17 00:00:00 2001
From: simon <simon>
Date: Mon, 09 Dec 2002 14:29:48 +0000
Subject: - merged the separate mask and pixmap arrays into the Button structure

  and the buttons vector
---
(limited to 'noncore/multimedia/opieplayer2/mediawidget.h')

diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 2641df6..504b705 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -24,6 +24,7 @@
 #define MEDIAWIDGET_H
 
 #include <qwidget.h>
+#include <qmap.h>
 
 #include "mediaplayerstate.h"
 #include "playlistwidget.h"
@@ -44,6 +45,10 @@ public:
         ButtonType type : 1;
         bool isHeld : 1;
         bool isDown : 1;
+
+        QBitmap mask;
+        QPixmap pixUp;
+        QPixmap pixDown;
     };
     typedef std::vector<Button> ButtonVector;
 
@@ -90,10 +95,6 @@ protected:
 
     QImage buttonMask;
 
-    MaskVector masks;
-    PixmapVector buttonPixUp;
-    PixmapVector buttonPixDown;
-
     QPoint upperLeftOfButtonMask;
 };
 
--
cgit v0.9.0.2