Mercurial > ldforge / changeset

--- a/src/primitives.cpp	Mon Mar 06 00:55:45 2017 +0200
+++ b/src/primitives.cpp	Mon Mar 06 01:17:15 2017 +0200
@@ -87,6 +87,7 @@
 {
 	if (m_activeScanner == nullptr)
 	{
+		print("Scanning primitives...");
 		loadCategories();
 		m_activeScanner = new PrimitiveScanner {this};
 		m_activeScanner->work();
@@ -572,13 +573,11 @@
  * Constructs a primitive scanner.
  */
 PrimitiveScanner::PrimitiveScanner(PrimitiveManager* parent) :
-	QObject(parent),
-	HierarchyElement(parent),
+    QObject(parent),
 	m_manager(parent),
 	m_iterator(LDPaths::primitivesDir(), QDirIterator::Subdirectories)
 {
 	m_basePathLength = countof(LDPaths::primitivesDir().absolutePath());
-	print("Scanning primitives...");
 }
 
 /*
@@ -637,7 +636,7 @@
 		}
 		else
 		{
-			QMessageBox::critical(m_window, tr("Error"), format("Couldn't write primitive list %1: %2", path, configFile.errorString()));
+			QMessageBox::critical(nullptr, tr("Error"), format("Couldn't write primitive list %1: %2", path, configFile.errorString()));
 		}
 
 		emit workDone();

--- a/src/primitives.h	Mon Mar 06 00:55:45 2017 +0200
+++ b/src/primitives.h	Mon Mar 06 01:17:15 2017 +0200
@@ -117,7 +117,7 @@
  *
  * Worker object that scans the primitives folder for primitives and builds an index of them.
  */
-class PrimitiveScanner : public QObject, HierarchyElement
+class PrimitiveScanner : public QObject
 {
 	Q_OBJECT