Fixed bug in LED-checkbox

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@16 0778d3d1-df1d-0410-868b-ea421aaaa00d

include/led_checkbox.h

@@ -29,11 +29,11 @@
 
 #ifdef QT4
 
-#include <QCheckBox>
+#include <QWidget>
 
 #else
 
-#include <qcheckbox.h>
+#include <qwidget.h>
 
 #endif
 
@@ -41,8 +41,9 @@
 class QPixmap;
 
 
-class ledCheckBox : public QCheckBox
+class ledCheckBox : public QWidget
 {
+	Q_OBJECT
 public:
 	enum ledColors
 	{
@@ -53,37 +54,36 @@ public:
 						ledColors _color = YELLOW );
 	virtual ~ledCheckBox();
 
-#ifdef QT4
-	inline virtual bool isChecked( void ) const
+
+	inline bool isChecked( void ) const
 	{
-		return( checkState() == Qt::Checked );
-	}
-#else
-	inline virtual bool isOn( void ) const
-	{
-		return( state() == On );
-	}
-#endif
-#ifdef QT4
-	inline virtual void setChecked( bool _on )
-#else
-	inline virtual void setOn( bool _on )
-#endif
-	{
-		if( _on != isChecked() )
-		{
-			toggle();
-		}
+		return( m_checked );
 	}
 
+	inline const QString & text( void )
+	{
+		return( m_text );
+	}
+
+
+public slots:
+	void toggle( void );
+	void setChecked( bool _on );
 
 protected:
 	virtual void paintEvent( QPaintEvent * _pe );
+	virtual void mousePressEvent( QMouseEvent * _me );
 
 
 private:
 	QPixmap * m_ledOnPixmap;
 	QPixmap * m_ledOffPixmap;
+	
+	bool m_checked;
+	QString m_text;
+	
+signals:
+	void toggled( bool );
 
 } ;
 

include/mixer.h

@@ -208,12 +208,12 @@ public:
 	}
 
 
-	inline void pause( void )
+	void pause( void )
 	{
 		m_safetySyncMutex.lock();
 	}
 
-	inline void play( void )
+	void play( void )
 	{
 		m_safetySyncMutex.unlock();
 	}