summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp1
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h4
-rw-r--r--noncore/multimedia/opieplayer2/main.cpp4
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp3
-rw-r--r--noncore/multimedia/showimg/main.cpp2
-rw-r--r--noncore/multimedia/showimg/showimg.cpp5
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
@@ -35,8 +35,9 @@
35#include "audiowidget.h" 35#include "audiowidget.h"
36 36
37#include <qpe/qpeapplication.h> 37#include <qpe/qpeapplication.h>
38 38
39using namespace Opie::Ui;
39namespace 40namespace
40{ 41{
41 42
42const int xo = -2; // movable x offset 43const int xo = -2; // movable x offset
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
@@ -35,9 +35,9 @@
35#define AUDIO_WIDGET_H 35#define AUDIO_WIDGET_H
36 36
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"
42 42
43class QPixmap; 43class QPixmap;
@@ -82,9 +82,9 @@ private slots:
82private: 82private:
83 int skipDirection; 83 int skipDirection;
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;
89 bool isStreaming : 1; 89 bool isStreaming : 1;
90 bool audioSliderBeingMoved : 1; 90 bool audioSliderBeingMoved : 1;
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
@@ -2,13 +2,15 @@
2#include "mediaplayer.h" 2#include "mediaplayer.h"
3 3
4 4
5 5
6#include <opie/oapplicationfactory.h> 6#include <opie2/oapplicationfactory.h>
7 7
8using namespace Opie::Core;
8OPIE_EXPORT_APP( OApplicationFactory<PlayListWidget> ) 9OPIE_EXPORT_APP( OApplicationFactory<PlayListWidget> )
9 10
10#if 0 11#if 0
12using namespace Opie::Core;
11int main(int argc, char **argv) { 13int main(int argc, char **argv) {
12 QPEApplication a(argc,argv); 14 QPEApplication a(argc,argv);
13 15
14 MediaPlayerState st( 0, "mediaPlayerState" ); 16 MediaPlayerState st( 0, "mediaPlayerState" );
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
@@ -32,9 +32,9 @@
32*/ 32*/
33 33
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>
39 39
40#include "playlistselection.h" 40#include "playlistselection.h"
@@ -46,8 +46,9 @@
46 46
47//only needed for the random play 47//only needed for the random play
48#include <assert.h> 48#include <assert.h>
49 49
50using namespace Opie::Ui;
50PlayListWidget::PlayListWidget(QWidget* parent, const char* name, WFlags fl ) 51PlayListWidget::PlayListWidget(QWidget* parent, const char* name, WFlags fl )
51 : PlayListWidgetGui( parent, "playList" ) , currentFileListView( 0 ) 52 : PlayListWidgetGui( parent, "playList" ) , currentFileListView( 0 )
52{ 53{
53 mediaPlayerState = new MediaPlayerState(0, "mediaPlayerState" ); 54 mediaPlayerState = new MediaPlayerState(0, "mediaPlayerState" );
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
@@ -22,5 +22,7 @@
22 22
23 23
24#include <opie2/oapplicationfactory.h> 24#include <opie2/oapplicationfactory.h>
25 25
26using namespace Opie::Core;
27using namespace Opie::Core;
26OPIE_EXPORT_APP( OApplicationFactory<ImageViewer> ) 28OPIE_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
@@ -31,9 +31,9 @@
31 31
32#include <qpe/qpeapplication.h> 32#include <qpe/qpeapplication.h>
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>
38#include <qfiledialog.h> 38#include <qfiledialog.h>
39#include <qmenubar.h> 39#include <qmenubar.h>
@@ -41,8 +41,9 @@
41 41
42#include <math.h> 42#include <math.h>
43 43
44 44
45using namespace Opie::Ui;
45ControlsDialog::ControlsDialog(const QString &caption,QImage image,int *brightness,QWidget *parent) 46ControlsDialog::ControlsDialog(const QString &caption,QImage image,int *brightness,QWidget *parent)
46 : QDialog(parent,0,true) 47 : QDialog(parent,0,true)
47{ 48{
48 setCaption(caption); 49 setCaption(caption);
@@ -522,9 +523,9 @@ void ImageViewer::openFile() {
522 QStringList image; 523 QStringList image;
523 image << "image/*"; 524 image << "image/*";
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() )
529 openFile(link); 530 openFile(link);
530 531