# HG changeset patch # User Teemu Piippo # Date 1488738416 -7200 # Node ID b78b6cf02213478dc71269e028f98d25a504f958 # Parent 317f4ce38f3fee51a589efca1a6a2a6c0bc07081 The Grid class is no longer a hierarchy element or a QObject. diff -r 317f4ce38f3f -r b78b6cf02213 src/grid.cpp --- 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 { diff -r 317f4ce38f3f -r b78b6cf02213 src/grid.h --- 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, diff -r 317f4ce38f3f -r b78b6cf02213 src/mainwindow.cpp --- 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),