Mercurial > ldforge / file diff

--- a/src/gui.cpp	Thu Aug 01 03:26:47 2013 +0300
+++ b/src/gui.cpp	Thu Aug 01 03:32:57 2013 +0300
@@ -71,15 +71,11 @@
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
-ForgeWindow::ForgeWindow() :
-	m_renderer( new GLRenderer ),
-	ui( new Ui_LDForgeUI ),
-	m_primLoaderBar( new QProgressBar ),
-	m_primLoaderWidget( new QWidget ),
-	m_msglog( new MessageManager ),
-	m_quickColors( quickColorsFromConfig() )
-{
+ForgeWindow::ForgeWindow() {
 	g_win = this;
+	m_renderer = new GLRenderer;
+	
+	ui = new Ui_LDForgeUI;
 	ui->setupUi (this);
 	
 	// Stuff the renderer into its frame
@@ -90,13 +86,17 @@
 	connect (ui->objectList, SIGNAL (itemDoubleClicked (QListWidgetItem*)), this, SLOT (slot_editObject (QListWidgetItem*)));
 	connect (ui->fileList, SIGNAL (currentItemChanged (QListWidgetItem*, QListWidgetItem*)), this, SLOT (changeCurrentFile()));
 	
-	// Init message log manager=
+	// Init message log manager
+	m_msglog = new MessageManager;
 	m_msglog->setRenderer (R());
-	m_renderer->setMessageLog (m_msglog);=
+	m_renderer->setMessageLog (m_msglog);
+	m_quickColors = quickColorsFromConfig();
 	slot_selectionChanged();
 	setStatusBar (new QStatusBar);
 	
 	// Init primitive loader task stuff
+	m_primLoaderBar = new QProgressBar;
+	m_primLoaderWidget = new QWidget;
 	QHBoxLayout* primLoaderLayout = new QHBoxLayout (m_primLoaderWidget);
 	primLoaderLayout->addWidget (new QLabel ("Loading primitives:"));
 	primLoaderLayout->addWidget (m_primLoaderBar);