1 files changed, 31 insertions, 31 deletions

diff --git a/noncore/graphics/drawpad/drawpadcanvas.cpp b/noncore/graphics/drawpad/drawpadcanvas.cpp
index 9f1e50b..79bef35 100644
--- a/noncore/graphics/drawpad/drawpadcanvas.cpp
+++ b/noncore/graphics/drawpad/drawpadcanvas.cpp
@@ -17,2 +17,3 @@
 #include "newpagedialog.h"
+#include "page.h"
 #include "tool.h"
@@ -27,3 +28,2 @@
 #include <qpainter.h>
-#include <qpixmap.h>
 #include <qtextcodec.h>
@@ -40,3 +40,3 @@ public:
 
-    QList<QPixmap> pixmaps();
+    QList<Page> pages();
 
@@ -57,3 +57,3 @@ private:
     QString m_dataFormat;
-    QList<QPixmap> m_pixmaps;
+    QList<Page> m_pages;
 };
@@ -69,5 +69,5 @@ DrawPadCanvasXmlHandler::~DrawPadCanvasXmlHandler()
 
-QList<QPixmap> DrawPadCanvasXmlHandler::pixmaps()
+QList<Page> DrawPadCanvasXmlHandler::pages()
 {
-    return m_pixmaps;
+    return m_pages;
 }
@@ -149,5 +149,5 @@ bool DrawPadCanvasXmlHandler::characters(const QString& ch)
 
-        QPixmap* pixmap = new QPixmap(image.width(), image.height());
-        pixmap->convertFromImage(image);
-        m_pixmaps.append(pixmap);
+        Page* page = new Page(image.width(), image.height());
+        page->convertFromImage(image);
+        m_pages.append(page);
     }
@@ -183,6 +183,6 @@ void DrawPadCanvas::load(QIODevice* ioDevice)
 
-    m_pages = drawPadCanvasXmlHandler.pixmaps();
+    m_pages = drawPadCanvasXmlHandler.pages();
 
     if (m_pages.isEmpty()) {
-        m_pages.append(new QPixmap(contentsRect().size()));
+        m_pages.append(new Page(contentsRect().size()));
         m_pages.current()->fill(Qt::white);
@@ -191,3 +191,3 @@ void DrawPadCanvas::load(QIODevice* ioDevice)
     m_pageBackups.clear();
-    m_pageBackups.append(new QPixmap(*(m_pages.current())));
+    m_pageBackups.append(new Page(*(m_pages.current())));
 
@@ -202,3 +202,3 @@ void DrawPadCanvas::initialPage()
 {
-    m_pages.append(new QPixmap(236, 232));
+    m_pages.append(new Page(236, 232));
     m_pages.current()->fill(Qt::white);
@@ -206,3 +206,3 @@ void DrawPadCanvas::initialPage()
     m_pageBackups.clear();
-    m_pageBackups.append(new QPixmap(*(m_pages.current())));
+    m_pageBackups.append(new Page(*(m_pages.current())));
 
@@ -223,3 +223,3 @@ void DrawPadCanvas::save(QIODevice* ioDevice)
 
-    QListIterator<QPixmap> bufferIterator(m_pages);
+    QListIterator<Page> bufferIterator(m_pages);
 
@@ -258,9 +258,9 @@ void DrawPadCanvas::importPage(const QString& fileName)
 {
-    QPixmap* importedPixmap = new QPixmap();
+    Page* importedPage = new Page();
 
-    importedPixmap->load(fileName);
-    m_pages.insert(m_pages.at() + 1, importedPixmap);
+    importedPage->load(fileName);
+    m_pages.insert(m_pages.at() + 1, importedPage);
 
     m_pageBackups.clear();
-    m_pageBackups.append(new QPixmap(*(m_pages.current())));
+    m_pageBackups.append(new Page(*(m_pages.current())));
 
@@ -310,3 +310,3 @@ void DrawPadCanvas::exportPage(uint fromPage, uint toPage, const QString& name,c
 
-QPixmap* DrawPadCanvas::currentPage()
+Page* DrawPadCanvas::currentPage()
 {
@@ -315,3 +315,3 @@ QPixmap* DrawPadCanvas::currentPage()
 
-QList<QPixmap> DrawPadCanvas::pages()
+QList<Page> DrawPadCanvas::pages()
 {
@@ -341,3 +341,3 @@ void DrawPadCanvas::backupPage()
 
-    m_pageBackups.append(new QPixmap(*(m_pages.current())));
+    m_pageBackups.append(new Page(*(m_pages.current())));
 
@@ -359,3 +359,3 @@ void DrawPadCanvas::deleteAll()
 
-        m_pages.append(new QPixmap(contentsRect().size()));
+        m_pages.append(new Page(contentsRect().size()));
         m_pages.current()->fill(Qt::white);
@@ -363,3 +363,3 @@ void DrawPadCanvas::deleteAll()
         m_pageBackups.clear();
-        m_pageBackups.append(new QPixmap(*(m_pages.current())));
+        m_pageBackups.append(new Page(*(m_pages.current())));
 
@@ -381,3 +381,3 @@ void DrawPadCanvas::newPage()
     if (newPageDialog.exec() == QDialog::Accepted) {
-        m_pages.insert(m_pages.at() + 1, new QPixmap(newPageDialog.selectedWidth(),
+        m_pages.insert(m_pages.at() + 1, new Page(newPageDialog.selectedWidth(),
                                                      newPageDialog.selectedHeight()));
@@ -386,3 +386,3 @@ void DrawPadCanvas::newPage()
         m_pageBackups.clear();
-        m_pageBackups.append(new QPixmap(*(m_pages.current())));
+        m_pageBackups.append(new Page(*(m_pages.current())));
 
@@ -427,3 +427,3 @@ void DrawPadCanvas::deletePage()
         if (m_pages.isEmpty()) {
-            m_pages.append(new QPixmap(contentsRect().size()));
+            m_pages.append(new Page(contentsRect().size()));
             m_pages.current()->fill(Qt::white);
@@ -432,3 +432,3 @@ void DrawPadCanvas::deletePage()
         m_pageBackups.clear();
-        m_pageBackups.append(new QPixmap(*(m_pages.current())));
+        m_pageBackups.append(new Page(*(m_pages.current())));
 
@@ -484,3 +484,3 @@ void DrawPadCanvas::goFirstPage()
     m_pageBackups.clear();
-    m_pageBackups.append(new QPixmap(*(m_pages.current())));
+    m_pageBackups.append(new Page(*(m_pages.current())));
 
@@ -497,3 +497,3 @@ void DrawPadCanvas::goPreviousPage()
     m_pageBackups.clear();
-    m_pageBackups.append(new QPixmap(*(m_pages.current())));
+    m_pageBackups.append(new Page(*(m_pages.current())));
 
@@ -510,3 +510,3 @@ void DrawPadCanvas::goNextPage()
     m_pageBackups.clear();
-    m_pageBackups.append(new QPixmap(*(m_pages.current())));
+    m_pageBackups.append(new Page(*(m_pages.current())));
 
@@ -523,3 +523,3 @@ void DrawPadCanvas::goLastPage()
     m_pageBackups.clear();
-    m_pageBackups.append(new QPixmap(*(m_pages.current())));
+    m_pageBackups.append(new Page(*(m_pages.current())));