--- qsampler/trunk/src/qsamplerInstrumentListForm.h	2007/11/19 21:08:18	1492
+++ qsampler/trunk/src/qsamplerInstrumentListForm.h	2007/11/22 11:10:44	1509
@@ -27,37 +27,43 @@
 
 #include "qsamplerInstrumentList.h"
 
-#include <QComboBox>
+class QComboBox;
+
 
 namespace QSampler {
 
-class InstrumentListForm : public QMainWindow {
-Q_OBJECT
+class InstrumentListForm : public QMainWindow
+{
+	Q_OBJECT
+
 public:
-    MidiInstrumentsModel model;
-    MidiInstrumentsDelegate delegate;
 
-    InstrumentListForm(QWidget* parent = 0, Qt::WindowFlags flags = 0);
-   ~InstrumentListForm();
+	InstrumentListForm(QWidget* pParent = NULL, Qt::WindowFlags wflags = 0);
+~InstrumentListForm();
 
 public slots:
-    void refreshInstruments();
-    void activateMap(int);
 
-protected:
-    QComboBox* m_pMapComboBox;
+	void editInstrument();
+	void editInstrument(const QModelIndex& index);
+	void newInstrument();
+	void deleteInstrument();
+	void refreshInstruments();
+	void activateMap(int);
 
-    void showEvent(QShowEvent* pShowEvent);
-    void hideEvent(QHideEvent* pHideEvent);
+protected:
 
-protected slots:
-    void editInstrument();
-    void editInstrument(const QModelIndex& index);
-    void newInstrument();
-    void deleteInstrument();
+	void showEvent(QShowEvent *);
+	void hideEvent(QHideEvent *);
+	void closeEvent(QCloseEvent *);
 
 private:
-    Ui::qsamplerInstrumentListForm ui;
+
+	Ui::qsamplerInstrumentListForm m_ui;
+
+	MidiInstrumentsModel m_model;
+	MidiInstrumentsDelegate m_delegate;
+
+	QComboBox* m_pMapComboBox;
 };
 
 } // namespace QSampler