1 files changed, 32 insertions, 32 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
@@ -12,36 +12,36 @@
  ***************************************************************************/
 
 #include "drawpadcanvas.h"
 
 #include "drawpad.h"
 #include "newpagedialog.h"
+#include "page.h"
 #include "tool.h"
 
 #include <qpe/applnk.h>
 #include <qpe/filemanager.h>
 #include <qpe/mimetype.h>
 
 #include <qbuffer.h>
 #include <qimage.h>
 #include <qmessagebox.h>
 #include <qpainter.h>
-#include <qpixmap.h>
 #include <qtextcodec.h>
 #include <qtextstream.h>
 #include <qxml.h>
 
 #include <zlib.h>
 
 class DrawPadCanvasXmlHandler: public QXmlDefaultHandler
 {
 public:
     DrawPadCanvasXmlHandler();
     ~DrawPadCanvasXmlHandler();
 
-    QList<QPixmap> pixmaps();
+    QList<Page> pages();
 
     bool startElement(const QString& namespaceURI, const QString& localName,
                       const QString& qName, const QXmlAttributes& atts);
     bool endElement(const QString& namespaceURI, const QString& localName,
                     const QString& qName);
     bool characters(const QString& ch);
@@ -52,27 +52,27 @@ private:
         InData
     };
 
     State m_state;
     ulong m_dataLenght;
     QString m_dataFormat;
-    QList<QPixmap> m_pixmaps;
+    QList<Page> m_pages;
 };
 
 DrawPadCanvasXmlHandler::DrawPadCanvasXmlHandler()
 {
     m_state = Unknown;
 }
 
 DrawPadCanvasXmlHandler::~DrawPadCanvasXmlHandler()
 {
 }
 
-QList<QPixmap> DrawPadCanvasXmlHandler::pixmaps()
+QList<Page> DrawPadCanvasXmlHandler::pages()
 {
-    return m_pixmaps;
+    return m_pages;
 }
 
 bool DrawPadCanvasXmlHandler::startElement(const QString& namespaceURI, const QString& localName,
                                            const QString& qName, const QXmlAttributes& atts)
 {
     Q_CONST_UNUSED(namespaceURI)
@@ -144,15 +144,15 @@ bool DrawPadCanvasXmlHandler::characters(const QString& ch)
 
             image.loadFromData((const uchar*)byteArrayUnzipped.data(), m_dataLenght, m_dataFormat);
         } else {
             image.loadFromData((const uchar*)byteArray.data(), m_dataLenght, m_dataFormat);
         }
 
-        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);
     }
 
     return true;
 }
 
 DrawPadCanvas::DrawPadCanvas(DrawPad* drawPad, QWidget* parent, const char* name)
@@ -178,36 +178,36 @@ void DrawPadCanvas::load(QIODevice* ioDevice)
     QXmlSimpleReader xmlSimpleReader;
     DrawPadCanvasXmlHandler drawPadCanvasXmlHandler;
 
     xmlSimpleReader.setContentHandler(&drawPadCanvasXmlHandler);
     xmlSimpleReader.parse(xmlInputSource);
 
-    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);
     }
 
     m_pageBackups.clear();
-    m_pageBackups.append(new QPixmap(*(m_pages.current())));
+    m_pageBackups.append(new Page(*(m_pages.current())));
 
     resizeContents(m_pages.current()->width(), m_pages.current()->height());
     viewport()->update();
 
     emit pagesChanged();
     emit pageBackupsChanged();
 }
 
 void DrawPadCanvas::initialPage()
 {
-    m_pages.append(new QPixmap(236, 232));
+    m_pages.append(new Page(236, 232));
     m_pages.current()->fill(Qt::white);
 
     m_pageBackups.clear();
-    m_pageBackups.append(new QPixmap(*(m_pages.current())));
+    m_pageBackups.append(new Page(*(m_pages.current())));
 
     resizeContents(m_pages.current()->width(), m_pages.current()->height());
     viewport()->update();
 
     emit pagesChanged();
     emit pageBackupsChanged();
@@ -218,13 +218,13 @@ void DrawPadCanvas::save(QIODevice* ioDevice)
     QTextStream textStream(ioDevice);
     textStream.setCodec(QTextCodec::codecForName("UTF-8"));
 
     textStream << "<drawpad>" << endl;
     textStream << "    <images>" << endl;
 
-    QListIterator<QPixmap> bufferIterator(m_pages);
+    QListIterator<Page> bufferIterator(m_pages);
 
     for (bufferIterator.toFirst(); bufferIterator.current() != 0; ++bufferIterator) {
         textStream << "        <image>" << endl;
 
         QImage image = bufferIterator.current()->convertToImage();
         QByteArray byteArray;
@@ -253,19 +253,19 @@ void DrawPadCanvas::save(QIODevice* ioDevice)
     textStream << "    </images>" << endl;
     textStream << "</drawpad>";
 }
 
 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())));
 
     resizeContents(m_pages.current()->width(), m_pages.current()->height());
     viewport()->update();
 
     emit pagesChanged();
     emit pageBackupsChanged();
@@ -305,18 +305,18 @@ void DrawPadCanvas::exportPage(uint fromPage, uint toPage, const QString& name,c
             imageIO.write();
             delete ioDevice;
         }
     }
 }
 
-QPixmap* DrawPadCanvas::currentPage()
+Page* DrawPadCanvas::currentPage()
 {
     return m_pages.current();
 }
 
-QList<QPixmap> DrawPadCanvas::pages()
+QList<Page> DrawPadCanvas::pages()
 {
     return m_pages;
 }
 
 uint DrawPadCanvas::pagePosition()
 {
@@ -336,13 +336,13 @@ void DrawPadCanvas::backupPage()
     }
 
     while (m_pageBackups.count() >= (5 + 1)) {
         m_pageBackups.removeFirst();
     }
 
-    m_pageBackups.append(new QPixmap(*(m_pages.current())));
+    m_pageBackups.append(new Page(*(m_pages.current())));
 
     emit pageBackupsChanged();
 }
 
 void DrawPadCanvas::deleteAll()
 {
@@ -354,17 +354,17 @@ void DrawPadCanvas::deleteAll()
     messageBox.setButtonText(QMessageBox::Yes, tr("Yes"));
     messageBox.setButtonText(QMessageBox::No, tr("No"));
 
     if (messageBox.exec() == QMessageBox::Yes) {
         m_pages.clear();
 
-        m_pages.append(new QPixmap(contentsRect().size()));
+        m_pages.append(new Page(contentsRect().size()));
         m_pages.current()->fill(Qt::white);
 
         m_pageBackups.clear();
-        m_pageBackups.append(new QPixmap(*(m_pages.current())));
+        m_pageBackups.append(new Page(*(m_pages.current())));
 
         resizeContents(m_pages.current()->width(), m_pages.current()->height());
         viewport()->update();
 
         emit pagesChanged();
         emit pageBackupsChanged();
@@ -376,18 +376,18 @@ void DrawPadCanvas::newPage()
     QRect rect = contentsRect();
 
     NewPageDialog newPageDialog(rect.width(), rect.height(), m_pDrawPad->pen().color(),
                                 m_pDrawPad->brush().color(), this);
 
     if (newPageDialog.exec() == QDialog::Accepted) {
-        m_pages.insert(m_pages.at() + 1, new QPixmap(newPageDialog.selectedWidth(),
-                                                     newPageDialog.selectedHeight()));
+        m_pages.insert(m_pages.at() + 1, new Page(newPageDialog.selectedWidth(),
+                                                  newPageDialog.selectedHeight()));
         m_pages.current()->fill(newPageDialog.selectedColor());
 
         m_pageBackups.clear();
-        m_pageBackups.append(new QPixmap(*(m_pages.current())));
+        m_pageBackups.append(new Page(*(m_pages.current())));
 
         resizeContents(m_pages.current()->width(), m_pages.current()->height());
         viewport()->update();
 
         emit pagesChanged();
         emit pageBackupsChanged();
@@ -422,18 +422,18 @@ void DrawPadCanvas::deletePage()
     messageBox.setButtonText(QMessageBox::No, tr("No"));
 
     if (messageBox.exec() == QMessageBox::Yes) {
         m_pages.remove(m_pages.current());
 
         if (m_pages.isEmpty()) {
-            m_pages.append(new QPixmap(contentsRect().size()));
+            m_pages.append(new Page(contentsRect().size()));
             m_pages.current()->fill(Qt::white);
         }
 
         m_pageBackups.clear();
-        m_pageBackups.append(new QPixmap(*(m_pages.current())));
+        m_pageBackups.append(new Page(*(m_pages.current())));
 
         resizeContents(m_pages.current()->width(), m_pages.current()->height());
         viewport()->update();
 
         emit pagesChanged();
         emit pageBackupsChanged();
@@ -479,52 +479,52 @@ void DrawPadCanvas::redo()
 }
 
 void DrawPadCanvas::goFirstPage()
 {
     m_pages.first();
     m_pageBackups.clear();
-    m_pageBackups.append(new QPixmap(*(m_pages.current())));
+    m_pageBackups.append(new Page(*(m_pages.current())));
 
     resizeContents(m_pages.current()->width(), m_pages.current()->height());
     viewport()->update();
 
     emit pagesChanged();
     emit pageBackupsChanged();
 }
 
 void DrawPadCanvas::goPreviousPage()
 {
     m_pages.prev();
     m_pageBackups.clear();
-    m_pageBackups.append(new QPixmap(*(m_pages.current())));
+    m_pageBackups.append(new Page(*(m_pages.current())));
 
     resizeContents(m_pages.current()->width(), m_pages.current()->height());
     viewport()->update();
 
     emit pagesChanged();
     emit pageBackupsChanged();
 }
 
 void DrawPadCanvas::goNextPage()
 {
     m_pages.next();
     m_pageBackups.clear();
-    m_pageBackups.append(new QPixmap(*(m_pages.current())));
+    m_pageBackups.append(new Page(*(m_pages.current())));
 
     resizeContents(m_pages.current()->width(), m_pages.current()->height());
     viewport()->update();
 
     emit pagesChanged();
     emit pageBackupsChanged();
 }
 
 void DrawPadCanvas::goLastPage()
 {
     m_pages.last();
     m_pageBackups.clear();
-    m_pageBackups.append(new QPixmap(*(m_pages.current())));
+    m_pageBackups.append(new Page(*(m_pages.current())));
 
     resizeContents(m_pages.current()->width(), m_pages.current()->height());
     viewport()->update();
 
     emit pagesChanged();
     emit pageBackupsChanged();