--- queensgui/src/queensmain.h	2007/07/19 21:34:15	1
+++ queensgui/src/queensmain.h	2009/09/16 18:53:22	327
@@ -23,20 +23,26 @@
 #include <qdialog.h>
 #include <qdatetime.h>
 #include <qtimer.h>
+//Added by qt3to4:
+#include <QLabel>
+#include <QContextMenuEvent>
 
 #include "guiupdate.h"
 
 class QPushButton;
 class QSpinBox;
-class QListBox;
+class Q3ListBox;
 class QLabel;
 class QString;
+class Solution;
 
 class SolutionContainer;
 class Queens;
 class Board;
 
-enum SortingAlgorithm{SortVector, SortList, SortHash, SortMNVector};
+enum SortingAlgorithm{SortVector, SortList, SortHash, SortMNVector, SortMinimalVector};
+enum StorageClass{ StorageInt, StorageMatrix };
+
 
 /**
 @author Torben Nielsen
@@ -49,14 +55,16 @@
     QPushButton *m_quit;
     QPushButton *m_start;
     QPushButton *m_stop;
-    QListBox *m_list;
+    Q3ListBox *m_list;
     QSpinBox *m_sizeSelector;
     QLabel *m_status;
     QTime m_time;
     
+	Solution* m_sol;
     SolutionContainer *m_solutions;
     Queens *m_queens;
     SortingAlgorithm m_sortalgo;
+	StorageClass m_storage;
 
     QTime m_elapsed;
 	int m_totalcount;
@@ -84,6 +92,11 @@
     void sortVector();
     void sortHash();
     void sortMNVector();
+	void sortMinimalVector();
+	
+	void storageInt();
+	void storageMatrix();
+
 };
 
 #endif