Mercurial > ldforge / changeset

--- a/src/addObjectDialog.cpp	Tue Oct 22 13:49:55 2013 +0300
+++ b/src/addObjectDialog.cpp	Tue Oct 22 13:53:24 2013 +0300
@@ -207,7 +207,7 @@
 	}
 
 	if (defaults->hasMatrix())
-	{	LDMatrixObject* mo = obj ? dynamic_cast<LDMatrixObject*> (obj) : null;
+	{	LDMatrixObject* mo = dynamic_cast<LDMatrixObject*> (obj);
 
 		QLabel* lb_matrix = new QLabel ("Matrix:");
 		le_matrix = new QLineEdit;
@@ -215,7 +215,7 @@
 		matrix defaultMatrix = g_identity;
 
 		if (mo)
-	{	for (const Axis ax : g_Axes)
+		{	for (const Axis ax : g_Axes)
 				dsb_coords[ax]->setValue (mo->position() [ax]);
 
 			defaultMatrix = mo->transform();

--- a/src/common.h	Tue Oct 22 13:49:55 2013 +0300
+++ b/src/common.h	Tue Oct 22 13:53:24 2013 +0300
@@ -143,7 +143,7 @@
 #endif // assert
 
 #ifdef DEBUG
-# define assert(N) { ((N) ? (void) 0 : assertionFailure (__FILE__, __LINE__, FUNCNAME, #N)) }
+# define assert(N) { ((N) ? (void) 0 : assertionFailure (__FILE__, __LINE__, FUNCNAME, #N)); }
 #else
 # define assert(N) {}
 #endif // DEBUG