Fix problems with Qt4.

Author: juzzlin

src/Editor.cpp

@@ -20,7 +20,6 @@
 #include "MainWindow.hpp"
 
 #include <QGraphicsItem>
-#include <QDebug>
 
 #include <cassert>
 
@@ -55,15 +54,13 @@ EditorScene & Editor::scene() const
 
 void Editor::setImage(QImage image)
 {
+    m_view->ensureVisible(0, 0, 0, 0);
+
     m_pixmap.convertFromImage(image);
 
-    m_view->ensureVisible(0, 0, 0, 0);
     m_scene->setSceneRect(0, 0, m_pixmap.width(), m_pixmap.height());
     m_scene->clear();
-
-    QGraphicsItem * imageItem = new ImageItem(m_pixmap);
-    m_scene->addItem(imageItem);
-    imageItem->setPos(m_pixmap.width() / 2, m_pixmap.height() / 2);
+    m_scene->addItem(new QGraphicsPixmapItem(m_pixmap));
 
     // Renderer is a thread so use invokeMethod to safely set the input.
     QMetaObject::invokeMethod(m_renderer, "setInput", Q_ARG(QImage, image));

src/EditorView.cpp

@@ -17,8 +17,6 @@
 #include "Editor.hpp"
 #include "EditorScene.hpp"
 
-#include <QDebug>
-
 EditorView::EditorView(Editor & editor, QWidget * parent)
     : QGraphicsView(&editor.scene(), parent)
     , m_editor(editor)

src/MainWindow.cpp

@@ -27,7 +27,6 @@
 #include <QApplication>
 #include <QCloseEvent>
 #include <QDateTime>
-#include <QDebug>
 #include <QDesktopWidget>
 #include <QFileDialog>
 #include <QHBoxLayout>

src/RenderPreview.cpp

@@ -15,6 +15,7 @@
 
 #include "RenderPreview.hpp"
 #include "Editor.hpp"
+#include "ImageItem.hpp"
 #include "Settings.hpp"
 
 #include <QFileDialog>
@@ -37,13 +38,10 @@ RenderPreview::~RenderPreview()
 {
 }
 
-void RenderPreview::prepareForImage(QImage image)
+void RenderPreview::prepareForImage(const QImage & image)
 {
-    QPixmap pixmap;
-    pixmap.convertFromImage(image);
-
     m_scene.clear();
-    m_scene.setSceneRect(0, 0, pixmap.width(), pixmap.height());
+    m_scene.setSceneRect(0, 0, image.width(), image.height());
 }
 
 void RenderPreview::render()
@@ -54,11 +52,11 @@ void RenderPreview::render()
 
 void RenderPreview::updatePreview(const QImage & result)
 {
+    QPixmap pixmap = QPixmap::fromImage(result);
+
     m_scene.clear();
-    QPixmap pixmap;
-    pixmap.fromImage(result);
-    QGraphicsPixmapItem* item = m_scene.addPixmap(pixmap);
-    item->setPos(0, 0);
+    m_scene.setSceneRect(0, 0, pixmap.width(), pixmap.height());
+    m_scene.addItem(new QGraphicsPixmapItem(pixmap));
 }
 
 void RenderPreview::save()

src/RenderPreview.hpp

@@ -36,7 +36,7 @@ public slots:
 
     void save();
 
-    void prepareForImage(QImage image);
+    void prepareForImage(const QImage & image);
 
 private slots:
 

src/Renderer.cpp

@@ -15,7 +15,6 @@
 
 #include "Renderer.hpp"
 
-#include <QDebug>
 #include <QImage>
 #include <QRgb>
 #include <cmath>