author | zecke <zecke> | 2004-03-14 11:21:03 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 11:21:03 (UTC) |
commit | ced17a6b39a2b4e282b5912dbb58262d4ad2b6d1 (patch) (unidiff) | |
tree | 171a164f98398128f906f647b47d2d4d2f2cb513 /noncore | |
parent | 6b5ec807e25094979f5631a3a46baf7415326d8a (diff) | |
download | opie-ced17a6b39a2b4e282b5912dbb58262d4ad2b6d1.zip opie-ced17a6b39a2b4e282b5912dbb58262d4ad2b6d1.tar.gz opie-ced17a6b39a2b4e282b5912dbb58262d4ad2b6d1.tar.bz2 |
Use ODP namespace
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/main.cpp | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 3 | ||||
-rw-r--r-- | noncore/multimedia/showimg/main.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/showimg/showimg.cpp | 5 |
6 files changed, 13 insertions, 6 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 452117c..28a42eb 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -37,4 +37,5 @@ | |||
37 | #include <qpe/qpeapplication.h> | 37 | #include <qpe/qpeapplication.h> |
38 | 38 | ||
39 | using namespace Opie::Ui; | ||
39 | namespace | 40 | namespace |
40 | { | 41 | { |
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index b436239..aea4146 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h | |||
@@ -37,5 +37,5 @@ | |||
37 | #include <qlineedit.h> | 37 | #include <qlineedit.h> |
38 | 38 | ||
39 | #include <opie/oticker.h> | 39 | #include <opie2/oticker.h> |
40 | 40 | ||
41 | #include "mediawidget.h" | 41 | #include "mediawidget.h" |
@@ -84,5 +84,5 @@ private: | |||
84 | QString skin; | 84 | QString skin; |
85 | 85 | ||
86 | OTicker songInfo; | 86 | Opie::Ui::OTicker songInfo; |
87 | QSlider slider; | 87 | QSlider slider; |
88 | QLineEdit time; | 88 | QLineEdit time; |
diff --git a/noncore/multimedia/opieplayer2/main.cpp b/noncore/multimedia/opieplayer2/main.cpp index 00f72d1..6283ae3 100644 --- a/noncore/multimedia/opieplayer2/main.cpp +++ b/noncore/multimedia/opieplayer2/main.cpp | |||
@@ -4,9 +4,11 @@ | |||
4 | 4 | ||
5 | 5 | ||
6 | #include <opie/oapplicationfactory.h> | 6 | #include <opie2/oapplicationfactory.h> |
7 | 7 | ||
8 | using namespace Opie::Core; | ||
8 | OPIE_EXPORT_APP( OApplicationFactory<PlayListWidget> ) | 9 | OPIE_EXPORT_APP( OApplicationFactory<PlayListWidget> ) |
9 | 10 | ||
10 | #if 0 | 11 | #if 0 |
12 | using namespace Opie::Core; | ||
11 | int main(int argc, char **argv) { | 13 | int main(int argc, char **argv) { |
12 | QPEApplication a(argc,argv); | 14 | QPEApplication a(argc,argv); |
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 84aba55..1a5e474 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -34,5 +34,5 @@ | |||
34 | #include <qtoolbar.h> | 34 | #include <qtoolbar.h> |
35 | 35 | ||
36 | #include <opie/ofiledialog.h> | 36 | #include <opie2/ofiledialog.h> |
37 | 37 | ||
38 | #include <qmessagebox.h> | 38 | #include <qmessagebox.h> |
@@ -48,4 +48,5 @@ | |||
48 | #include <assert.h> | 48 | #include <assert.h> |
49 | 49 | ||
50 | using namespace Opie::Ui; | ||
50 | PlayListWidget::PlayListWidget(QWidget* parent, const char* name, WFlags fl ) | 51 | PlayListWidget::PlayListWidget(QWidget* parent, const char* name, WFlags fl ) |
51 | : PlayListWidgetGui( parent, "playList" ) , currentFileListView( 0 ) | 52 | : PlayListWidgetGui( parent, "playList" ) , currentFileListView( 0 ) |
diff --git a/noncore/multimedia/showimg/main.cpp b/noncore/multimedia/showimg/main.cpp index b61cffb..b7ea071 100644 --- a/noncore/multimedia/showimg/main.cpp +++ b/noncore/multimedia/showimg/main.cpp | |||
@@ -24,3 +24,5 @@ | |||
24 | #include <opie2/oapplicationfactory.h> | 24 | #include <opie2/oapplicationfactory.h> |
25 | 25 | ||
26 | using namespace Opie::Core; | ||
27 | using namespace Opie::Core; | ||
26 | OPIE_EXPORT_APP( OApplicationFactory<ImageViewer> ) | 28 | OPIE_EXPORT_APP( OApplicationFactory<ImageViewer> ) |
diff --git a/noncore/multimedia/showimg/showimg.cpp b/noncore/multimedia/showimg/showimg.cpp index 6c0c4db..696a57b 100644 --- a/noncore/multimedia/showimg/showimg.cpp +++ b/noncore/multimedia/showimg/showimg.cpp | |||
@@ -33,5 +33,5 @@ | |||
33 | #include <qpe/config.h> | 33 | #include <qpe/config.h> |
34 | #include <qpe/resource.h> | 34 | #include <qpe/resource.h> |
35 | #include <qpe/qpetoolbar.h> | 35 | #include <qtoolbar.h> |
36 | 36 | ||
37 | #include <qaction.h> | 37 | #include <qaction.h> |
@@ -43,4 +43,5 @@ | |||
43 | 43 | ||
44 | 44 | ||
45 | using namespace Opie::Ui; | ||
45 | ControlsDialog::ControlsDialog(const QString &caption,QImage image,int *brightness,QWidget *parent) | 46 | ControlsDialog::ControlsDialog(const QString &caption,QImage image,int *brightness,QWidget *parent) |
46 | : QDialog(parent,0,true) | 47 | : QDialog(parent,0,true) |
@@ -524,5 +525,5 @@ void ImageViewer::openFile() { | |||
524 | types.insert("Images", image); | 525 | types.insert("Images", image); |
525 | 526 | ||
526 | QString str = Opie::OFileDialog::getOpenFileName( 1,QPEApplication::documentDir(),"", types, 0 ); | 527 | QString str = OFileDialog::getOpenFileName( 1,QPEApplication::documentDir(),"", types, 0 ); |
527 | DocLnk link(str); | 528 | DocLnk link(str); |
528 | // if ( link.isValid() ) | 529 | // if ( link.isValid() ) |