9 files changed, 21 insertions, 21 deletions

diff --git a/noncore/graphics/drawpad/config.in b/noncore/graphics/drawpad/config.in
index 290a642..3ed03a4 100644
--- a/noncore/graphics/drawpad/config.in
+++ b/noncore/graphics/drawpad/config.in
@@ -1,4 +1,4 @@
   config DRAWPAD
     boolean "opie-drawpad (take simple notes or draw images)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBQTAUX
diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp
index 9f0e27f..55b23cc 100644
--- a/noncore/graphics/drawpad/drawpad.cpp
+++ b/noncore/graphics/drawpad/drawpad.cpp
@@ -30,8 +30,8 @@
 #include "texttool.h"
 #include "thumbnailview.h"
 
-#include <opie/colordialog.h>
-#include <opie/colorpopupmenu.h>
+#include <opie2/qcolordialog.h>
+#include <opie2/ocolorpopupmenu.h>
 
 #include <qpe/applnk.h>
 #include <qpe/config.h>
@@ -48,7 +48,7 @@
 #include <qtooltip.h>
 #include <qwhatsthis.h>
 
-DrawPad::DrawPad(QWidget* parent, const char* name,  WFlags fl )
+DrawPad::DrawPad(QWidget* parent, const char* name,  WFlags /*fl*/ )
     : QMainWindow(parent, name, WStyle_ContextHelp)
 {
     // init members
@@ -255,7 +255,7 @@ DrawPad::DrawPad(QWidget* parent, const char* name,  WFlags fl )
     m_pPenColorToolButton->setPixmap(Resource::loadPixmap("drawpad/pencolor"));
     QWhatsThis::add( m_pPenColorToolButton, tr( "Click here to select the color used when drawing." ) );
 
-    OColorPopupMenu* penColorPopupMenu = new OColorPopupMenu(Qt::black, m_pPenColorToolButton);
+    Opie::OColorPopupMenu* penColorPopupMenu = new Opie::OColorPopupMenu(Qt::black, m_pPenColorToolButton);
     connect(penColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this, SLOT(changePenColor(const QColor&)));
 
     QToolTip::add(m_pPenColorToolButton, tr("Pen Color"));
@@ -268,7 +268,7 @@ DrawPad::DrawPad(QWidget* parent, const char* name,  WFlags fl )
     m_pBrushColorToolButton->setPixmap(Resource::loadPixmap("drawpad/brushcolor"));
     QWhatsThis::add( m_pBrushColorToolButton, tr( "Click here to select the color used when filling in areas." ) );
 
-    OColorPopupMenu* brushColorPopupMenu = new OColorPopupMenu(Qt::white, m_pBrushColorToolButton);
+    Opie::OColorPopupMenu* brushColorPopupMenu = new Opie::OColorPopupMenu(Qt::white, m_pBrushColorToolButton);
     connect(brushColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this, SLOT(changeBrushColor(const QColor&)));
 
     QToolTip::add(m_pBrushColorToolButton, tr("Fill Color"));
diff --git a/noncore/graphics/drawpad/drawpad.h b/noncore/graphics/drawpad/drawpad.h
index 48d5225..8ba6e58 100644
--- a/noncore/graphics/drawpad/drawpad.h
+++ b/noncore/graphics/drawpad/drawpad.h
@@ -15,7 +15,6 @@
 #define DRAWPAD_H
 
 #include <qmainwindow.h>
-
 #include <qpen.h>
 
 class DrawPadCanvas;
@@ -62,7 +61,7 @@ private slots:
     void changePenWidth(int value);
     void changePenColor(const QColor& color);
     void changeBrushColor(const QColor& color);
-    
+
     void updateView();
 
     void deleteAll();
diff --git a/noncore/graphics/drawpad/drawpad.pro b/noncore/graphics/drawpad/drawpad.pro
index 30b2199..5e6ca6b 100644
--- a/noncore/graphics/drawpad/drawpad.pro
+++ b/noncore/graphics/drawpad/drawpad.pro
@@ -40,7 +40,7 @@ SOURCES		= drawpad.cpp \
 		  tool.cpp
 INCLUDEPATH	+= $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
-LIBS		+= -lqpe -lopie
+LIBS		+= -lqpe -lopiecore2 -lopieui2 -lqtaux2
 
 TARGET		= drawpad
 
diff --git a/noncore/graphics/drawpad/exportdialog.cpp b/noncore/graphics/drawpad/exportdialog.cpp
index d63f428..169acef 100644
--- a/noncore/graphics/drawpad/exportdialog.cpp
+++ b/noncore/graphics/drawpad/exportdialog.cpp
@@ -13,7 +13,7 @@
 
 #include "exportdialog.h"
 
-#include <opie/ofileselector.h>
+#include <opie2/ofileselector.h>
 
 #include <qbuttongroup.h>
 #include <qcombobox.h>
@@ -66,8 +66,8 @@ ExportDialog::ExportDialog(uint pageAt, uint pageCount, QWidget* parent, const c
     m_pFormatComboBox->insertStrList(QImageIO::outputFormats());
 
     MimeTypes types; types.insert( tr("All Images"), "image/*" );
-    OFileSelector* fileSelector = new OFileSelector(this, OFileSelector::FileSelector,
-						   OFileSelector::Normal,
+    Opie::OFileSelector* fileSelector = new Opie::OFileSelector(this, Opie::OFileSelector::FileSelector,
+						   Opie::OFileSelector::Normal,
 						   QString::null, QString::null,
 						   types );
     fileSelector->setNameVisible( false );
diff --git a/noncore/graphics/drawpad/importdialog.cpp b/noncore/graphics/drawpad/importdialog.cpp
index ce2e7ee..4fc0a0e 100644
--- a/noncore/graphics/drawpad/importdialog.cpp
+++ b/noncore/graphics/drawpad/importdialog.cpp
@@ -13,7 +13,7 @@
 
 #include "importdialog.h"
 
-#include <opie/ofileselector.h>
+#include <qpe/mimetype.h>
 
 #include <qcheckbox.h>
 #include <qimage.h>
@@ -27,9 +27,9 @@ ImportDialog::ImportDialog(QWidget* parent, const char* name)
     setCaption(tr("DrawPad - Import"));
 
     MimeTypes types; types.insert( tr("All images"),"image/*" );
-    m_pFileSelector = new OFileSelector(this,
-				        OFileSelector::FileSelector,
-					OFileSelector::Normal,
+    m_pFileSelector = new Opie::OFileSelector(this,
+				    Opie::OFileSelector::FileSelector,
+					Opie::OFileSelector::Normal,
 					QString::null,
 					QString::null, types );
     m_pFileSelector->setNameVisible( false );
diff --git a/noncore/graphics/drawpad/importdialog.h b/noncore/graphics/drawpad/importdialog.h
index ed655a5..16227d2 100644
--- a/noncore/graphics/drawpad/importdialog.h
+++ b/noncore/graphics/drawpad/importdialog.h
@@ -14,16 +14,17 @@
 #ifndef IMPORTDIALOG_H
 #define IMPORTDIALOG_H
 
+#include <opie2/ofileselector.h>
+
 #include <qdialog.h>
 
 class DocLnk;
-class OFileSelector;
 
 class QCheckBox;
 class QLabel;
 
 class ImportDialog : public QDialog
-{ 
+{
     Q_OBJECT
 
 public:
@@ -37,7 +38,7 @@ private slots:
     void preview();
 
 private:
-    OFileSelector* m_pFileSelector;
+    Opie::OFileSelector* m_pFileSelector;
     QLabel* m_pPreviewLabel;
     QCheckBox* m_pAutomaticPreviewCheckBox;
 };
diff --git a/noncore/graphics/drawpad/main.cpp b/noncore/graphics/drawpad/main.cpp
index c87cc0f..a6c666b 100644
--- a/noncore/graphics/drawpad/main.cpp
+++ b/noncore/graphics/drawpad/main.cpp
@@ -13,6 +13,6 @@
 
 #include "drawpad.h"
 
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
 OPIE_EXPORT_APP( OApplicationFactory<DrawPad> )
diff --git a/noncore/graphics/drawpad/opie-drawpad.control b/noncore/graphics/drawpad/opie-drawpad.control
index f0aa0b4..2a403f9 100644
--- a/noncore/graphics/drawpad/opie-drawpad.control
+++ b/noncore/graphics/drawpad/opie-drawpad.control
@@ -4,7 +4,7 @@ Priority: optional
 Section: opie/pim
 Maintainer: Sébastien Prud'homme <prudhomme@laposte.net>
 Architecture: arm
-Depends: task-opie-minimal, libopie1
+Depends: task-opie-minimal, libopiecore2, libopieui2, libqtaux2
 Description: A note taking program with basic draw tools
  DrawPad is an easy note taking program for Zaurus.  It can also
  be used to draw simple images. DrawPad was developed for the Opie