fixed zooming-comboboxes in automation-editor and header-dependencies

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

include/automation_editor.h

@@ -33,13 +33,13 @@
 #include "journalling_object.h"
 #include "midi_time.h"
 #include "automation_pattern.h"
+#include "combobox.h"
 
 
 class QPainter;
 class QPixmap;
 class QScrollBar;
 
-class comboBox;
 class notePlayHandle;
 class timeLine;
 class toolButton;
@@ -118,8 +118,8 @@ protected slots:
 
 	void updatePosition( const midiTime & _t );
 
-	void zoomingXChanged( const QString & _zfac );
-	void zoomingYChanged( const QString & _zfac );
+	void zoomingXChanged( void );
+	void zoomingYChanged( void );
 
 
 private:
@@ -182,6 +182,9 @@ private:
 	comboBox * m_zoomingYComboBox;
 	comboBox * m_quantizeComboBox;
 
+	comboBoxModel m_zoomingXModel;
+	comboBoxModel m_zoomingYModel;
+	comboBoxModel m_quantizeModel;
 
 	automationPattern * m_pattern;
 	int m_min_level;

include/combobox.h

@@ -1,7 +1,7 @@
 /*
  * combobox.h - class comboBox, a very cool combo-box
  *
- * Copyright (c) 2006-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2006-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -32,7 +32,7 @@
 #include <QtCore/QPair>
 
 #include "automatable_model.h"
-#include "automatable_model_templates.h"
+#include "templates.h"
 
 
 class comboBoxModel : public intModel
@@ -138,11 +138,6 @@ private slots:
 	void deletePixmap( QPixmap * _pixmap );
 	void setItem( QAction * _item );
 
-/*
-signals:
-	void activated( const QString & );
-	void valueChanged( int );*/
-
 } ;
 
 #endif