8 files changed, 29 insertions, 24 deletions
diff --git a/src/dxflinextrude.cc b/src/dxflinextrude.cc
index ca98b66..8bb246f 100644
--- a/src/dxflinextrude.cc
+++ b/src/dxflinextrude.cc
@@ -144,13 +144,17 @@ std::string DxfLinearExtrudeNode::toString() const
 {
 	std::stringstream stream;
 
-	stream << this->name() << "("
-		"file = \"" << this->filename << "\", "
-		"cache = \"" << 	QFileInfo(QString::fromStdString(this->filename)) << "\", "
-		"layer = \"" << this->layername << "\", "
+	stream << this->name() << "(";
+	if (!this->filename.empty()) { // Ignore deprecated parameters if empty 
+		stream <<
+			"file = \"" << this->filename << "\", "
+			"cache = \"" << 	QFileInfo(QString::fromStdString(this->filename)) << "\", "
+			"layer = \"" << this->layername << "\", "
+			"origin = [ " << this->origin_x << " " << this->origin_y << " ], "
+			"scale = " << this->scale << ", ";
+	}
+	stream <<
 		"height = " << std::dec << this->height << ", "
-		"origin = [ " << this->origin_x << " " << this->origin_y << " ], "
-		"scale = " << this->scale << ", "
 		"center = " << (this->center?"true":"false") << ", "
 		"convexity = " << this->convexity;
 	
diff --git a/src/dxfrotextrude.cc b/src/dxfrotextrude.cc
index cd585aa..646b643 100644
--- a/src/dxfrotextrude.cc
+++ b/src/dxfrotextrude.cc
@@ -120,12 +120,16 @@ std::string DxfRotateExtrudeNode::toString() const
 {
 	std::stringstream stream;
 
-	stream << this->name() << "("
-		"file = \"" << this->filename << "\", "
-		"cache = \"" << QFileInfo(QString::fromStdString(this->filename)) << "\", "
-		"layer = \"" << this->layername << "\", "
-		"origin = [ " << std::dec << this->origin_x << " " << this->origin_y << " ], "
-		"scale = " << this->scale << ", "
+	stream << this->name() << "(";
+	if (!this->filename.empty()) { // Ignore deprecated parameters if empty 
+		stream <<
+			"file = \"" << this->filename << "\", "
+			"cache = \"" << QFileInfo(QString::fromStdString(this->filename)) << "\", "
+			"layer = \"" << this->layername << "\", "
+			"origin = [ " << std::dec << this->origin_x << " " << this->origin_y << " ], "
+			"scale = " << this->scale << ", ";
+	}
+	stream <<
 		"convexity = " << this->convexity << ", "
 		"$fn = " << this->fn << ", $fa = " << this->fa << ", $fs = " << this->fs << ")";
 
diff --git a/src/mainwin.cc b/src/mainwin.cc
index 0cf39e7..56502f2 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -1496,12 +1496,9 @@ void MainWindow::actionExportImage()
 
 void MainWindow::actionFlushCaches()
 {
-// FIXME: Polycache -> PolySetEvaluator
 	PolySetCache::instance()->clear();
 #ifdef ENABLE_CGAL
-// FIXME: Flush caches through whatever channels we have
-	// CGALEvaluator::evaluator()->getCache().clear();
-	// this->dumper->clearCache();
+	CGALCache::instance()->clear();
 #endif
 	dxf_dim_cache.clear();
 	dxf_cross_cache.clear();
diff --git a/tests/regression/dumptest/allmodules-expected.txt b/tests/regression/dumptest/allmodules-expected.txt
index e708c43..2f920df 100644
--- a/tests/regression/dumptest/allmodules-expected.txt
+++ b/tests/regression/dumptest/allmodules-expected.txt
@@ -11,10 +11,10 @@ group() {
 	union();
 	difference();
 	intersection();
-	linear_extrude(file = "", cache = "0.0", layer = "", height = 100, origin = [ 0 0 ], scale = 1, center = false, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
-	linear_extrude(file = "", cache = "0.0", layer = "", height = 100, origin = [ 0 0 ], scale = 1, center = false, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
-	rotate_extrude(file = "", cache = "0.0", layer = "", origin = [ 0 0 ], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
-	rotate_extrude(file = "", cache = "0.0", layer = "", origin = [ 0 0 ], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+	linear_extrude(height = 100, center = false, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+	linear_extrude(height = 100, center = false, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+	rotate_extrude(convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+	rotate_extrude(convexity = 1, $fn = 0, $fa = 12, $fs = 1);
 	import(file = "", cache = "0.0", layer = "", origin = [ 0 0 ], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
 	import(file = "", cache = "0.0", layer = "", origin = [ 0 0 ], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
 	import(file = "", cache = "0.0", layer = "", origin = [ 0 0 ], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
diff --git a/tests/regression/dumptest/dxf_linear_extrude-expected.txt b/tests/regression/dumptest/dxf_linear_extrude-expected.txt
index fd6535d..9284114 100644
--- a/tests/regression/dumptest/dxf_linear_extrude-expected.txt
+++ b/tests/regression/dumptest/dxf_linear_extrude-expected.txt
@@ -1,3 +1,3 @@
 group() {
-	linear_extrude(file = "", cache = "0.0", layer = "", height = 100, origin = [ 0 0 ], scale = 1, center = false, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+	linear_extrude(height = 100, center = false, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
 }
diff --git a/tests/regression/dumptest/dxf_rotate_extrude-expected.txt b/tests/regression/dumptest/dxf_rotate_extrude-expected.txt
index 2d65d35..e2f5832 100644
--- a/tests/regression/dumptest/dxf_rotate_extrude-expected.txt
+++ b/tests/regression/dumptest/dxf_rotate_extrude-expected.txt
@@ -1,3 +1,3 @@
 group() {
-	rotate_extrude(file = "", cache = "0.0", layer = "", origin = [ 0 0 ], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+	rotate_extrude(convexity = 1, $fn = 0, $fa = 12, $fs = 1);
 }
diff --git a/tests/regression/dumptest/linear_extrude-expected.txt b/tests/regression/dumptest/linear_extrude-expected.txt
index fd6535d..9284114 100644
--- a/tests/regression/dumptest/linear_extrude-expected.txt
+++ b/tests/regression/dumptest/linear_extrude-expected.txt
@@ -1,3 +1,3 @@
 group() {
-	linear_extrude(file = "", cache = "0.0", layer = "", height = 100, origin = [ 0 0 ], scale = 1, center = false, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+	linear_extrude(height = 100, center = false, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
 }
diff --git a/tests/regression/dumptest/rotate_extrude-expected.txt b/tests/regression/dumptest/rotate_extrude-expected.txt
index 2d65d35..e2f5832 100644
--- a/tests/regression/dumptest/rotate_extrude-expected.txt
+++ b/tests/regression/dumptest/rotate_extrude-expected.txt
@@ -1,3 +1,3 @@
 group() {
-	rotate_extrude(file = "", cache = "0.0", layer = "", origin = [ 0 0 ], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+	rotate_extrude(convexity = 1, $fn = 0, $fa = 12, $fs = 1);
 }