--- qsampler/trunk/src/qsamplerInstrument.cpp	2007/10/27 12:28:33	1460
+++ qsampler/trunk/src/qsamplerInstrument.cpp	2007/10/28 23:30:36	1461
@@ -25,6 +25,7 @@
 
 #include "qsamplerMainForm.h"
 
+using namespace QSampler;
 
 //-------------------------------------------------------------------------
 // qsamplerInstrument - MIDI instrument map structure.
@@ -158,7 +159,7 @@
 {
 #ifdef CONFIG_MIDI_INSTRUMENT
 
-	qsamplerMainForm *pMainForm = qsamplerMainForm::getInstance();
+	MainForm *pMainForm = MainForm::getInstance();
 	if (pMainForm == NULL)
 		return false;
 	if (pMainForm->client() == NULL)
@@ -218,7 +219,7 @@
 	if (m_iMap < 0 || m_iBank < 0 || m_iProg < 0)
 		return false;
 
-	qsamplerMainForm *pMainForm = qsamplerMainForm::getInstance();
+	MainForm *pMainForm = MainForm::getInstance();
 	if (pMainForm == NULL)
 		return false;
 	if (pMainForm->client() == NULL)
@@ -252,7 +253,7 @@
 	if (m_iMap < 0 || m_iBank < 0 || m_iProg < 0)
 		return false;
 
-	qsamplerMainForm *pMainForm = qsamplerMainForm::getInstance();
+	MainForm *pMainForm = MainForm::getInstance();
 	if (pMainForm == NULL)
 		return false;
 	if (pMainForm->client() == NULL)
@@ -313,7 +314,7 @@
 {
 	QStringList maps;
 
-	qsamplerMainForm *pMainForm = qsamplerMainForm::getInstance();
+	MainForm *pMainForm = MainForm::getInstance();
 	if (pMainForm == NULL)
 		return maps;
 	if (pMainForm->client() == NULL)
@@ -341,7 +342,7 @@
 {
 	QString sMapName;
 
-	qsamplerMainForm *pMainForm = qsamplerMainForm::getInstance();
+	MainForm *pMainForm = MainForm::getInstance();
 	if (pMainForm == NULL)
 		return sMapName;
 	if (pMainForm->client() == NULL)