1 files changed, 0 insertions, 31 deletions

diff --git a/noncore/graphics/drawpad/drawpadcanvas.cpp b/noncore/graphics/drawpad/drawpadcanvas.cpp
index 79bef35..252f4d5 100644
--- a/noncore/graphics/drawpad/drawpadcanvas.cpp
+++ b/noncore/graphics/drawpad/drawpadcanvas.cpp
@@ -15,25 +15,24 @@
 
 #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 <qtextcodec.h>
 #include <qtextstream.h>
 #include <qxml.h>
 
 #include <zlib.h>
 
 class DrawPadCanvasXmlHandler: public QXmlDefaultHandler
 {
 public:
     DrawPadCanvasXmlHandler();
     ~DrawPadCanvasXmlHandler();
@@ -337,48 +336,38 @@ void DrawPadCanvas::backupPage()
 
     while (m_pageBackups.count() >= (5 + 1)) {
         m_pageBackups.removeFirst();
     }
 
     m_pageBackups.append(new Page(*(m_pages.current())));
 
     emit pageBackupsChanged();
 }
 
 void DrawPadCanvas::deleteAll()
 {
-    QMessageBox messageBox(tr("Delete All"), tr("Do you want to delete\nall the pages?"),
-                           QMessageBox::Information, QMessageBox::Yes,
-                           QMessageBox::No | QMessageBox::Escape | QMessageBox::Default,
-                           QMessageBox::NoButton, this);
-
-    messageBox.setButtonText(QMessageBox::Yes, tr("Yes"));
-    messageBox.setButtonText(QMessageBox::No, tr("No"));
-
-    if (messageBox.exec() == QMessageBox::Yes) {
         m_pages.clear();
 
         m_pages.append(new Page(contentsRect().size()));
         m_pages.current()->fill(Qt::white);
 
         m_pageBackups.clear();
         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::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 Page(newPageDialog.selectedWidth(),
                                                   newPageDialog.selectedHeight()));
         m_pages.current()->fill(newPageDialog.selectedColor());
@@ -387,67 +376,47 @@ void DrawPadCanvas::newPage()
         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::clearPage()
 {
-    QMessageBox messageBox(tr("Clear Page"), tr("Do you want to clear\nthe current page?"),
-                           QMessageBox::Information, QMessageBox::Yes,
-                           QMessageBox::No | QMessageBox::Escape | QMessageBox::Default,
-                           QMessageBox::NoButton, this);
-
-    messageBox.setButtonText(QMessageBox::Yes, tr("Yes"));
-    messageBox.setButtonText(QMessageBox::No, tr("No"));
-
-    if (messageBox.exec() == QMessageBox::Yes) {
         m_pages.current()->fill(Qt::white);
 
         viewport()->update();
     }
-}
 
 void DrawPadCanvas::deletePage()
 {
-   QMessageBox messageBox(tr("Delete Page"), tr("Do you want to delete\nthe current page?"),
-                           QMessageBox::Information, QMessageBox::Yes,
-                           QMessageBox::No | QMessageBox::Escape | QMessageBox::Default,
-                           QMessageBox::NoButton, this);
-
-    messageBox.setButtonText(QMessageBox::Yes, tr("Yes"));
-    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 Page(contentsRect().size()));
             m_pages.current()->fill(Qt::white);
         }
 
         m_pageBackups.clear();
         m_pageBackups.append(new Page(*(m_pages.current())));
 
         resizeContents(m_pages.current()->width(), m_pages.current()->height());
         viewport()->update();
 
         emit pagesChanged();
         emit pageBackupsChanged();
     }
-}
 
 bool DrawPadCanvas::undoEnabled()
 {
     return (m_pageBackups.current() != m_pageBackups.getFirst());
 }
 
 bool DrawPadCanvas::redoEnabled()
 {
     return (m_pageBackups.current() != m_pageBackups.getLast());
 }
 
 bool DrawPadCanvas::goPreviousPageEnabled()