# HG changeset patch
# User Santeri Piippo <crimsondusk64@gmail.com>
# Date 1374142406 -10800
# Node ID 13d24c6eb4239164bffe3897257c3fb4b2cc5320
# Parent  7f278b48079af81ffe255d7f012270b07a126269
stuff

diff -r 7f278b48079a -r 13d24c6eb423 src/gui.cpp
--- a/src/gui.cpp	Tue Jul 16 21:02:12 2013 +0300
+++ b/src/gui.cpp	Thu Jul 18 13:13:26 2013 +0300
@@ -184,13 +184,7 @@
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
 void ForgeWindow::updateToolBars() {
-	// Update the quick color toolbar.
-	for (QToolButton* btn : m_colorButtons)
-		delete btn;
-	
 	m_colorButtons.clear();
-	
-	// Clear the toolbar - we deleted the buttons but there's still separators
 	ui->colorToolbar->clear();
 	
 	for (LDQuickColor& entry : m_quickColors) {
diff -r 7f278b48079a -r 13d24c6eb423 src/history.cpp
--- a/src/history.cpp	Tue Jul 16 21:02:12 2013 +0300
+++ b/src/history.cpp	Thu Jul 18 13:13:26 2013 +0300
@@ -177,7 +177,6 @@
 EditHistory::~EditHistory() {}
 
 // =============================================================================
-
 void SwapHistory::undo() const {
 	LDObject::fromID (a)->swap (LDObject::fromID (b));
 }