summaryrefslogtreecommitdiff
path: root/noncore/multimedia
authorzecke <zecke>2004-03-14 11:21:03 (UTC)
committer zecke <zecke>2004-03-14 11:21:03 (UTC)
commitced17a6b39a2b4e282b5912dbb58262d4ad2b6d1 (patch) (side-by-side diff)
tree171a164f98398128f906f647b47d2d4d2f2cb513 /noncore/multimedia
parent6b5ec807e25094979f5631a3a46baf7415326d8a (diff)
downloadopie-ced17a6b39a2b4e282b5912dbb58262d4ad2b6d1.zip
opie-ced17a6b39a2b4e282b5912dbb58262d4ad2b6d1.tar.gz
opie-ced17a6b39a2b4e282b5912dbb58262d4ad2b6d1.tar.bz2
Use ODP namespace
Diffstat (limited to 'noncore/multimedia') (more/less context) (show 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
@@ -33,12 +33,13 @@
#include "audiowidget.h"
#include <qpe/qpeapplication.h>
+using namespace Opie::Ui;
namespace
{
const int xo = -2; // movable x offset
const int yo = 22; // movable y 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
@@ -33,13 +33,13 @@
#ifndef AUDIO_WIDGET_H
#define AUDIO_WIDGET_H
#include <qlineedit.h>
-#include <opie/oticker.h>
+#include <opie2/oticker.h>
#include "mediawidget.h"
class QPixmap;
class AudioWidget : public MediaWidget {
@@ -80,13 +80,13 @@ private slots:
void skipBack();
void stopSkip();
private:
int skipDirection;
QString skin;
- OTicker songInfo;
+ Opie::Ui::OTicker songInfo;
QSlider slider;
QLineEdit time;
bool isStreaming : 1;
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
@@ -1,16 +1,18 @@
#include "mediaplayer.h"
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
OPIE_EXPORT_APP( OApplicationFactory<PlayListWidget> )
#if 0
+using namespace Opie::Core;
int main(int argc, char **argv) {
QPEApplication a(argc,argv);
MediaPlayerState st( 0, "mediaPlayerState" );
PlayListWidget pl( st, 0, "playList" );
pl.showMaximized();
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
@@ -30,13 +30,13 @@
Boston, MA 02111-1307, USA.
*/
#include <qtoolbar.h>
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
#include <qmessagebox.h>
#include "playlistselection.h"
#include "playlistwidget.h"
#include "mediaplayer.h"
@@ -44,12 +44,13 @@
#include "om3u.h"
#include "playlistfileview.h"
//only needed for the random play
#include <assert.h>
+using namespace Opie::Ui;
PlayListWidget::PlayListWidget(QWidget* parent, const char* name, WFlags fl )
: PlayListWidgetGui( parent, "playList" ) , currentFileListView( 0 )
{
mediaPlayerState = new MediaPlayerState(0, "mediaPlayerState" );
m_mp = new MediaPlayer(*this, *mediaPlayerState, 0, "mediaPlayer");
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
@@ -20,7 +20,9 @@
#include "showimg.h"
#include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
+using namespace Opie::Core;
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
@@ -29,22 +29,23 @@
#include <opie2/ofiledialog.h>
#include <qpe/qpeapplication.h>
#include <qpe/config.h>
#include <qpe/resource.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
#include <qaction.h>
#include <qfiledialog.h>
#include <qmenubar.h>
#include <qspinbox.h>
#include <math.h>
+using namespace Opie::Ui;
ControlsDialog::ControlsDialog(const QString &caption,QImage image,int *brightness,QWidget *parent)
: QDialog(parent,0,true)
{
setCaption(caption);
if ( parent ) {
@@ -520,13 +521,13 @@ void ImageViewer::show(const QString& fileref)
void ImageViewer::openFile() {
MimeTypes types;
QStringList image;
image << "image/*";
types.insert("Images", image);
- QString str = Opie::OFileDialog::getOpenFileName( 1,QPEApplication::documentDir(),"", types, 0 );
+ QString str = OFileDialog::getOpenFileName( 1,QPEApplication::documentDir(),"", types, 0 );
DocLnk link(str);
// if ( link.isValid() )
openFile(link);
}