The Grid class is no longer a hierarchy element or a QObject.

Sun, 05 Mar 2017 20:26:56 +0200

author
Teemu Piippo <teemu@hecknology.net>
date
Sun, 05 Mar 2017 20:26:56 +0200
changeset 1193
b78b6cf02213
parent 1192
317f4ce38f3f
child 1194
99085cfaeabd

The Grid class is no longer a hierarchy element or a QObject.

src/grid.cpp file | annotate | diff | comparison | revisions
src/grid.h file | annotate | diff | comparison | revisions
src/mainwindow.cpp file | annotate | diff | comparison | revisions
--- a/src/grid.cpp	Sun Mar 05 20:25:22 2017 +0200
+++ b/src/grid.cpp	Sun Mar 05 20:26:56 2017 +0200
@@ -17,11 +17,7 @@
  */
 
 #include "grid.h"
-#include "configuration.h"
-
-Grid::Grid(QObject* parent) :
-	HierarchyElement(parent) {}
-
+#include "linetypes/modelobject.h"
 
 qreal Grid::coordinateSnap() const
 {
--- a/src/grid.h	Sun Mar 05 20:25:22 2017 +0200
+++ b/src/grid.h	Sun Mar 05 20:26:56 2017 +0200
@@ -17,13 +17,11 @@
  */
 
 #pragma once
-#include "hierarchyelement.h"
+#include "main.h"
 
-class Grid : public HierarchyElement
+class Grid
 {
 public:
-	Grid(QObject* parent);
-
 	enum Size
 	{
 		Coarse,
--- a/src/mainwindow.cpp	Sun Mar 05 20:25:22 2017 +0200
+++ b/src/mainwindow.cpp	Sun Mar 05 20:26:56 2017 +0200
@@ -53,7 +53,7 @@
 	QMainWindow (parent, flags),
 	m_guiUtilities (new GuiUtilities (this)),
 	m_primitives(new PrimitiveManager(this)),
-	m_grid(new Grid(this)),
+    m_grid(new Grid),
 	m_mathFunctions(new MathFunctions(this)),
 	ui (*new Ui_MainWindow),
 	m_externalPrograms (nullptr),

mercurial