small internal changes

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

include/automatable_object.h

@@ -34,10 +34,12 @@
 #ifndef QT3
 
 #include <Qt/QtXml>
+#include <QtCore/QVariant>
 
 #else
 
 #include <qdom.h>
+#include <qvariant.h>
 
 #endif
 
@@ -252,6 +254,16 @@ public:
 		return( "automatableobject" );
 	}
 
+	inline const QVariant & data( void ) const
+	{
+		return( m_data );
+	}
+
+	void setData( const QVariant & _data )
+	{
+		m_data = _data;
+	}
+
 
 protected:
 	virtual void redoStep( journalEntry & _je )
@@ -307,6 +319,8 @@ private:
 	T m_maxValue;
 	T m_step;
 
+	QVariant m_data;
+
 	typedef vvector<autoObj *> autoObjVector;
 	autoObjVector m_linkedObjects;
 

include/knob.h

@@ -64,8 +64,7 @@ class knob : public QWidget, public automatableObject<float>
 	Q_OBJECT
 public:
 	knob( int _knob_num, QWidget * _parent, const QString & _name,
-						engine * _engine,
-						const int _knob_id = 0 );
+						engine * _engine );
 	virtual ~knob();
 
     
@@ -98,7 +97,7 @@ public slots:
 
 signals:
 	void valueChanged( float value );
-	void idKnobChanged( int id );
+	void valueChanged( const QVariant & _data );
 	void sliderPressed( void );
 	void sliderReleased( void );
 	void sliderMoved( float value );
@@ -158,7 +157,6 @@ protected:
 
 
 	float m_initValue;
-	const int m_knobId;
 
 } ;
 

include/volume_knob.h

@@ -22,6 +22,7 @@
  * Boston, MA 02111-1307, USA.
  *
  */
+
 #ifndef _VOLUME_KNOB_H
 #define _VOLUME_KNOB_H
 
@@ -44,16 +45,18 @@ class volumeKnob: public knob
 	Q_OBJECT
 public:
 	volumeKnob( int _knob_num, QWidget * _parent, const QString & _name,
-		    engine * _engine, const int _knob_id = 0 );
-	~volumeKnob();
+							    engine * _engine );
+	virtual ~volumeKnob();
+
 
 public slots:
-	void enterValue( void );
+	virtual void enterValue( void );
+
 
 protected:
 	virtual void mousePressEvent( QMouseEvent * _me );
 	virtual void mouseMoveEvent( QMouseEvent * _me );
 	virtual void wheelEvent( QWheelEvent * _we );
-};
+} ;
 
 #endif