5 files changed, 13 insertions, 7 deletions

diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp
index 55b23cc..3331193 100644
--- a/noncore/graphics/drawpad/drawpad.cpp
+++ b/noncore/graphics/drawpad/drawpad.cpp
@@ -34,9 +34,9 @@
 #include <opie2/ocolorpopupmenu.h>
 
 #include <qpe/applnk.h>
 #include <qpe/config.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 
 #include <qmenubar.h>
@@ -47,8 +47,10 @@
 #include <qtoolbutton.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
 
+using namespace Opie::Ui;
+using namespace Opie::Ui;
 DrawPad::DrawPad(QWidget* parent, const char* name,  WFlags /*fl*/ )
     : QMainWindow(parent, name, WStyle_ContextHelp)
 {
     // init members
diff --git a/noncore/graphics/drawpad/exportdialog.cpp b/noncore/graphics/drawpad/exportdialog.cpp
index 169acef..f053bb5 100644
--- a/noncore/graphics/drawpad/exportdialog.cpp
+++ b/noncore/graphics/drawpad/exportdialog.cpp
@@ -25,8 +25,9 @@
 #include <qspinbox.h>
 
 #include <stdlib.h>
 
+using namespace Opie::Ui;
 ExportDialog::ExportDialog(uint pageAt, uint pageCount, QWidget* parent, const char* name)
     : QDialog(parent, name, true)
 {
     setCaption(tr("DrawPad - Export"));
@@ -65,10 +66,10 @@ ExportDialog::ExportDialog(uint pageAt, uint pageCount, QWidget* parent, const c
     m_pFormatComboBox = new QComboBox(exportGroupBox);
     m_pFormatComboBox->insertStrList(QImageIO::outputFormats());
 
     MimeTypes types; types.insert( tr("All Images"), "image/*" );
-    Opie::OFileSelector* fileSelector = new Opie::OFileSelector(this, Opie::OFileSelector::FileSelector,
-                                                   Opie::OFileSelector::Normal,
+    OFileSelector* fileSelector = new OFileSelector(this, OFileSelector::FileSelector,
+                                                   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 4fc0a0e..a2f4c40 100644
--- a/noncore/graphics/drawpad/importdialog.cpp
+++ b/noncore/graphics/drawpad/importdialog.cpp
@@ -20,17 +20,18 @@
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 
+using namespace Opie::Ui;
 ImportDialog::ImportDialog(QWidget* parent, const char* name)
     : QDialog(parent, name, true)
 {
     setCaption(tr("DrawPad - Import"));
 
     MimeTypes types; types.insert( tr("All images"),"image/*" );
-    m_pFileSelector = new Opie::OFileSelector(this,
-                                    Opie::OFileSelector::FileSelector,
-                                        Opie::OFileSelector::Normal,
+    m_pFileSelector = new OFileSelector(this,
+                                        OFileSelector::FileSelector,
+                                        OFileSelector::Normal,
                                         QString::null,
                                         QString::null, types );
     m_pFileSelector->setNameVisible( false );
     connect(m_pFileSelector, SIGNAL(fileSelected(const DocLnk&)), this, SLOT(fileChanged()));
diff --git a/noncore/graphics/drawpad/importdialog.h b/noncore/graphics/drawpad/importdialog.h
index 16227d2..0e0727a 100644
--- a/noncore/graphics/drawpad/importdialog.h
+++ b/noncore/graphics/drawpad/importdialog.h
@@ -37,9 +37,9 @@ private slots:
     void fileChanged();
     void preview();
 
 private:
-    Opie::OFileSelector* m_pFileSelector;
+    Opie::Ui::OFileSelector* m_pFileSelector;
     QLabel* m_pPreviewLabel;
     QCheckBox* m_pAutomaticPreviewCheckBox;
 };
 
diff --git a/noncore/graphics/drawpad/main.cpp b/noncore/graphics/drawpad/main.cpp
index a6c666b..e48bb2e 100644
--- a/noncore/graphics/drawpad/main.cpp
+++ b/noncore/graphics/drawpad/main.cpp
@@ -14,5 +14,7 @@
 #include "drawpad.h"
 
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<DrawPad> )