--- queensgui/src/queensmain.cpp	2009/09/16 18:47:18	326
+++ queensgui/src/queensmain.cpp	2009/09/16 18:53:22	327
@@ -20,8 +20,8 @@
 #include <qapplication.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qlistbox.h>
-#include <qpopupmenu.h>
+#include <q3listbox.h>
+#include <q3popupmenu.h>
 #include <qpushbutton.h>
 #include <qspinbox.h>
 #include <qstring.h>
@@ -29,6 +29,10 @@
 
 
 #include "queensmain.h"
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QContextMenuEvent>
+#include <Q3VBoxLayout>
 #include "board.h"
 #include "queens.h"
 
@@ -49,7 +53,7 @@
 QueensMain::QueensMain(QWidget *parent, const char *name)
  : QDialog(parent, name)
 {
-    QVBoxLayout *mainlayout = new QVBoxLayout( this );
+    Q3VBoxLayout *mainlayout = new Q3VBoxLayout( this );
      
     m_board = new Board( this );
       
@@ -58,11 +62,11 @@
     m_stop = new QPushButton("Stop", this);
     m_stop->setEnabled( false );
     
-    QHBoxLayout *upperlayout = new QHBoxLayout( mainlayout );
-    QVBoxLayout *left = new QVBoxLayout( upperlayout );
+    Q3HBoxLayout *upperlayout = new Q3HBoxLayout( mainlayout );
+    Q3VBoxLayout *left = new Q3VBoxLayout( upperlayout );
 
     upperlayout->add( m_board );        
-    m_list = new QListBox( this );
+    m_list = new Q3ListBox( this );
 
     m_list->setMinimumWidth( 180 );
     m_sizeSelector = new QSpinBox( this );
@@ -71,7 +75,7 @@
     left->add( m_list );
     left->add( m_sizeSelector );
     
-    QHBoxLayout *buttons = new QHBoxLayout( mainlayout );    
+    Q3HBoxLayout *buttons = new Q3HBoxLayout( mainlayout );    
     buttons->add( m_start );
     buttons->add( m_stop );
     buttons->add( m_quit );
@@ -287,11 +291,9 @@
 
 void QueensMain::contextMenuEvent( QContextMenuEvent *event)
 {
-	QPopupMenu *contextMenu = new QPopupMenu( this );
+	Q3PopupMenu *contextMenu = new Q3PopupMenu( this );
 	contextMenu->setCheckable( true );
-	QLabel *sortCaption = new QLabel("<b><i>Container class</i></b>", this);
-	sortCaption->setAlignment( Qt::AlignCenter );
-	contextMenu->insertItem( sortCaption );
+	contextMenu->insertItem( "---Container class---" );
 
 	contextMenu->insertItem("List", this, SLOT( sortList() ), 0, 1);
 	contextMenu->insertItem("Vector", this, SLOT( sortVector() ), 0, 2);
@@ -299,9 +301,7 @@
 	contextMenu->insertItem("M*N Vector", this, SLOT(sortMNVector()), 0, 4);
 	contextMenu->insertItem("Minimal Vector", this, SLOT(sortMinimalVector()), 0, 5);
 	
-	QLabel *storageCaption = new QLabel("<b><i>Solution class</i></b>", this);
-	storageCaption->setAlignment( Qt::AlignCenter );
-	contextMenu->insertItem( storageCaption );
+	contextMenu->insertItem( "---Solution Class---" );
 	contextMenu->insertItem("Matrix Solution", this, SLOT( storageMatrix() ), 0, 6);
 	contextMenu->insertItem("Int Solution", this, SLOT( storageInt() ), 0, 7);