summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/drawpad/drawpad.cpp4
-rw-r--r--noncore/graphics/drawpad/exportdialog.cpp5
-rw-r--r--noncore/graphics/drawpad/importdialog.cpp7
-rw-r--r--noncore/graphics/drawpad/importdialog.h2
-rw-r--r--noncore/graphics/drawpad/main.cpp2
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
@@ -36,5 +36,5 @@
#include <qpe/applnk.h>
#include <qpe/config.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
#include <qpe/resource.h>
#include <qpe/qpeapplication.h>
@@ -49,4 +49,6 @@
#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)
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
@@ -27,4 +27,5 @@
#include <stdlib.h>
+using namespace Opie::Ui;
ExportDialog::ExportDialog(uint pageAt, uint pageCount, QWidget* parent, const char* name)
: QDialog(parent, name, true)
@@ -67,6 +68,6 @@ ExportDialog::ExportDialog(uint pageAt, uint pageCount, QWidget* parent, const c
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 );
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
@@ -22,4 +22,5 @@
#include <qpushbutton.h>
+using namespace Opie::Ui;
ImportDialog::ImportDialog(QWidget* parent, const char* name)
: QDialog(parent, name, true)
@@ -28,7 +29,7 @@ ImportDialog::ImportDialog(QWidget* parent, const char* name)
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 );
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
@@ -39,5 +39,5 @@ private slots:
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
@@ -16,3 +16,5 @@
#include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
+using namespace Opie::Core;
OPIE_EXPORT_APP( OApplicationFactory<DrawPad> )