DrawPad: libopie -> libopie2

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
@@ -3,2 +3,2 @@
     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
@@ -32,4 +32,4 @@
 
-#include <opie/colordialog.h>
-#include <opie/colorpopupmenu.h>
+#include <opie2/qcolordialog.h>
+#include <opie2/ocolorpopupmenu.h>
 
@@ -50,3 +50,3 @@
 
-DrawPad::DrawPad(QWidget* parent, const char* name,  WFlags fl )
+DrawPad::DrawPad(QWidget* parent, const char* name,  WFlags /*fl*/ )
     : QMainWindow(parent, name, WStyle_ContextHelp)
@@ -257,3 +257,3 @@ DrawPad::DrawPad(QWidget* parent, const char* name,  WFlags fl )
 
-    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&)));
@@ -270,3 +270,3 @@ DrawPad::DrawPad(QWidget* parent, const char* name,  WFlags fl )
 
-    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&)));
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
@@ -17,3 +17,2 @@
 #include <qmainwindow.h>
-
 #include <qpen.h>
@@ -64,3 +63,3 @@ private slots:
     void changeBrushColor(const QColor& color);
-    
+
     void updateView();
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
@@ -42,3 +42,3 @@ INCLUDEPATH	+= $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
-LIBS		+= -lqpe -lopie
+LIBS		+= -lqpe -lopiecore2 -lopieui2 -lqtaux2
 
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
@@ -15,3 +15,3 @@
 
-#include <opie/ofileselector.h>
+#include <opie2/ofileselector.h>
 
@@ -68,4 +68,4 @@ ExportDialog::ExportDialog(uint pageAt, uint pageCount, QWidget* parent, const c
     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,
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
@@ -15,3 +15,3 @@
 
-#include <opie/ofileselector.h>
+#include <qpe/mimetype.h>
 
@@ -29,5 +29,5 @@ ImportDialog::ImportDialog(QWidget* parent, const char* name)
     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,
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
@@ -16,2 +16,4 @@
 
+#include <opie2/ofileselector.h>
+
 #include <qdialog.h>
@@ -19,3 +21,2 @@
 class DocLnk;
-class OFileSelector;
 
@@ -25,3 +26,3 @@ class QLabel;
 class ImportDialog : public QDialog
-{ 
+{
     Q_OBJECT
@@ -39,3 +40,3 @@ private slots:
 private:
-    OFileSelector* m_pFileSelector;
+    Opie::OFileSelector* m_pFileSelector;
     QLabel* m_pPreviewLabel;
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
@@ -15,3 +15,3 @@
 
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
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
@@ -6,3 +6,3 @@ 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