Remove useless EditorScene

Author: juzzlin

snm.pro

@@ -21,7 +21,6 @@ HEADERS += \
  src/config.hpp \
  src/control_tool_bar.hpp \
  src/editor.hpp \
- src/editor_scene.hpp \
  src/editor_view.hpp \
  src/main_window.hpp \
  src/renderer.hpp \
@@ -33,7 +32,6 @@ SOURCES += \
  src/config.cpp \
  src/control_tool_bar.cpp \
  src/editor.cpp \
- src/editor_scene.cpp \
  src/editor_view.cpp \
  src/main.cpp \
  src/main_window.cpp \

src/CMakeLists.txt

@@ -4,7 +4,6 @@ set(SRC
  config.cpp
  control_tool_bar.cpp
  editor.cpp
- editor_scene.cpp
  editor_view.cpp
  main.cpp
  main_window.cpp

src/editor.cpp

@@ -14,16 +14,16 @@
 // along with Simple Normal Mapper. If not, see <http://www.gnu.org/licenses/>.
 
 #include "editor.hpp"
-#include "editor_scene.hpp"
 #include "editor_view.hpp"
 #include "main_window.hpp"
 
 #include <QGraphicsItem>
+#include <QGraphicsScene>
 
 #include <cassert>
 
 Editor::Editor(const std::vector<std::string> & args)
- : m_scene(new EditorScene(this))
+ : m_scene(new QGraphicsScene(this))
  , m_view(new EditorView(*this))
  , m_renderer(new Renderer)
  , m_renderThread(new QThread(this))
@@ -45,7 +45,7 @@ EditorView & Editor::view() const
  return *m_view;
 }
 
-EditorScene & Editor::scene() const
+QGraphicsScene & Editor::scene() const
 {
  assert(m_scene);
  return *m_scene;

src/editor.hpp

@@ -25,7 +25,7 @@
 
 #include "renderer.hpp"
 
-class EditorScene;
+class QGraphicsScene;
 class EditorView;
 class MainWindow;
 
@@ -36,6 +36,7 @@ class Editor : public QObject
 public:
 
  Editor(const std::vector<std::string> & args);
+
  virtual ~Editor();
 
  void setImage(QImage image);
@@ -46,15 +47,22 @@ class Editor : public QObject
 
  EditorView & view() const;
 
- EditorScene & scene() const;
+ QGraphicsScene & scene() const;
 
 private:
 
- EditorScene * m_scene;
- EditorView * m_view;
- Renderer * m_renderer;
- QThread * m_renderThread;
- MainWindow * m_window;
- QImage m_image;
- QPixmap m_pixmap;
+ QGraphicsScene * m_scene;
+
+ EditorView * m_view;
+
+ Renderer * m_renderer;
+
+ QThread * m_renderThread;
+
+ MainWindow * m_window;
+
+ QImage m_image;
+
+ QPixmap m_pixmap;
 };
+

src/editor_scene.cpp

@@ -15,7 +15,6 @@
 
 #include "editor_view.hpp"
 #include "editor.hpp"
-#include "editor_scene.hpp"
 
 EditorView::EditorView(Editor & editor, QWidget * parent)
  : QGraphicsView(&editor.scene(), parent)