--- queensgui/src/queensmain.cpp	2007/07/19 23:44:01	4
+++ queensgui/src/queensmain.cpp	2007/07/20 09:54:09	6
@@ -31,7 +31,10 @@
 #include "queensmain.h"
 #include "board.h"
 #include "queens.h"
+
 #include "solution.h"
+#include "solutionmatrix.h"
+#include "solutionint.h"
 
 #include "containervector.h"
 #include "containerlist.h"
@@ -40,7 +43,7 @@
 
 #include "config.h"
 
-#define MatrixSolution Solution
+
 
 QueensMain::QueensMain(QWidget *parent, const char *name)
  : QDialog(parent, name)
@@ -136,6 +139,8 @@
     m_list->clear();
     m_status->setText( QString("Searching ...") );
     
+	m_board->setMatrix(0);
+	
     if (m_queens != NULL) {
         m_queens->wait();
         delete m_queens;
@@ -163,11 +168,10 @@
 	
 	switch(this->m_storage) {
 		case StorageInt:
-			#warning MatrixSolution<=>IntSolution
-			m_sol = new MatrixSolution(m_sizeSelector->value());
+			m_sol = new SolutionInt(m_sizeSelector->value());
 			break;
 		case StorageMatrix:
-			m_sol = new MatrixSolution(m_sizeSelector->value());
+			m_sol = new SolutionMatrix(m_sizeSelector->value());
 			break;
 	}