| author | zecke <zecke> | 2004-03-13 23:00:19 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2004-03-13 23:00:19 (UTC) |
| commit | 874af2f5ce2d48a460d5d9fa1d6535b68e5966da (patch) (side-by-side diff) | |
| tree | 50c2f0dbe0b0aa4b0ef53c537d6005a4afcf210d | |
| parent | 8f5b7d0ee495901cdd9aa7901c445d82827e99b1 (diff) | |
| download | opie-874af2f5ce2d48a460d5d9fa1d6535b68e5966da.zip opie-874af2f5ce2d48a460d5d9fa1d6535b68e5966da.tar.gz opie-874af2f5ce2d48a460d5d9fa1d6535b68e5966da.tar.bz2 | |
ODP namespace adjustment
| -rw-r--r-- | noncore/graphics/drawpad/drawpad.cpp | 4 | ||||
| -rw-r--r-- | noncore/graphics/drawpad/exportdialog.cpp | 5 | ||||
| -rw-r--r-- | noncore/graphics/drawpad/importdialog.cpp | 7 | ||||
| -rw-r--r-- | noncore/graphics/drawpad/importdialog.h | 2 | ||||
| -rw-r--r-- | noncore/graphics/drawpad/main.cpp | 2 |
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> ) |