ODP changes

7 files changed, 14 insertions, 2 deletions

diff --git a/noncore/multimedia/camera/cmd/capture.cpp b/noncore/multimedia/camera/cmd/capture.cpp
index 64c223c..688622b 100644
--- a/noncore/multimedia/camera/cmd/capture.cpp
+++ b/noncore/multimedia/camera/cmd/capture.cpp
@@ -15,24 +15,26 @@
 
 #include "capture.h"
 
 #include "zcameraio.h"
 #include "imageio.h"
 #include "avi.h"
 
 #include <opie2/oapplication.h>
 #include <opie2/odebug.h>
 
 #include <qimage.h>
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 Capturer::Capturer()
          :QFrame( 0 ), height( 320 ), width( 240 ), zoom( 1 ), quality( 90 ),
          flip( "A" ), format( "JPEG" ), name( "Untitled" )
 {
 }
 
 
 Capturer::~Capturer()
 {
 }
 
 
diff --git a/noncore/multimedia/camera/gui/main.cpp b/noncore/multimedia/camera/gui/main.cpp
index f25475c..7d6b3bb 100644
--- a/noncore/multimedia/camera/gui/main.cpp
+++ b/noncore/multimedia/camera/gui/main.cpp
@@ -4,25 +4,27 @@
 ** This file is part of Opie Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
+
 #include "mainwindow.h"
 #include <opie2/oapplication.h>
 
+using namespace Opie::Core;
 int main( int argc, char **argv )
 {
     OApplication a( argc, argv, "Opie-Camera" );
     CameraMainWindow* w = new CameraMainWindow();
     a.showMainWidget( w );
     a.exec();
     delete w;
     return 0;
 }
 
diff --git a/noncore/multimedia/camera/gui/mainwindow.cpp b/noncore/multimedia/camera/gui/mainwindow.cpp
index e4e1b6c..7f2a9bd 100644
--- a/noncore/multimedia/camera/gui/mainwindow.cpp
+++ b/noncore/multimedia/camera/gui/mainwindow.cpp
@@ -19,25 +19,24 @@
 #include "imageio.h"
 #include "avi.h"
 
 /* OPIE */
 #include <opie2/ofiledialog.h>
 #include <opie2/odevice.h>
 #include <opie2/oapplication.h>
 #include <opie2/oconfig.h>
 #include <opie2/odebug.h>
 #include <qpe/global.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
-using namespace Opie;
 
 /* QT */
 #include <qapplication.h>
 #include <qaction.h>
 #include <qvbox.h>
 #include <qcombobox.h>
 #include <qcursor.h>
 #include <qdatastream.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qimage.h>
 #include <qlabel.h>
@@ -55,24 +54,28 @@ using namespace Opie;
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
 
 #define CAPTUREFILE "/tmp/capture.dat"
 #define OUTPUTFILE  "/tmp/output.avi"
 
 #define OUTPUT_TO_CUSTOM 250
 #define OUTPUT_TO_DOCFOLDER 251
 
+
+using namespace Opie::Ui;
+using namespace Opie::Core;
+
 CameraMainWindow::CameraMainWindow( QWidget * parent, const char * name, WFlags f )
            :QMainWindow( parent, name, f ),
            _rotation( 270 ), // FIXME: get this from current settings (ODevice?)
            _capturing( false ),
            _pics( 1 ), _videos( 1 )
 {
     #ifdef QT_NO_DEBUG
     if ( !ZCameraIO::instance()->isOpen() )
     {
         QVBox* v = new QVBox( this );
         v->setMargin( 10 );
         QLabel* l1 = new QLabel( v );
diff --git a/noncore/multimedia/camera/lib/imageio.cpp b/noncore/multimedia/camera/lib/imageio.cpp
index ed0d39f..7d20848 100644
--- a/noncore/multimedia/camera/lib/imageio.cpp
+++ b/noncore/multimedia/camera/lib/imageio.cpp
@@ -9,24 +9,25 @@
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "imageio.h"
 
 #include <opie2/odebug.h>
 #include <qimage.h>
 
+using namespace Opie::Core;
 
 void bufferToImage( int _width, int _height, unsigned char* bp, QImage* image )
 {
     unsigned char* p;
 
     image->create( _width, _height, 16 );
     for ( int i = 0; i < _height; ++i )
     {
         p = image->scanLine( i );
         for ( int j = 0; j < _width; j++ )
         {
             *p = *bp;
diff --git a/noncore/multimedia/camera/lib/zcameraio.cpp b/noncore/multimedia/camera/lib/zcameraio.cpp
index d59cbbb..c4be42f 100644
--- a/noncore/multimedia/camera/lib/zcameraio.cpp
+++ b/noncore/multimedia/camera/lib/zcameraio.cpp
@@ -21,24 +21,26 @@
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>
 
 #include <qimage.h>
 #include <qdatetime.h>
 
 #include <opie2/odebug.h>
 
 #define SHARPZDC "/dev/sharp_zdc"
 
+using namespace Opie::Core;
+
 ZCameraIO* ZCameraIO::_instance = 0;
 
 ZCameraIO* ZCameraIO::instance()
 {
     if ( !ZCameraIO::_instance )
     {
         odebug << "Creating ZCameraIO::_instance" << oendl;
         ZCameraIO::_instance = new ZCameraIO();
     }
     return ZCameraIO::_instance;
 }
 
diff --git a/noncore/multimedia/opierec/helpwindow.cpp b/noncore/multimedia/opierec/helpwindow.cpp
index a3b29fa..6aebaa1 100644
--- a/noncore/multimedia/opierec/helpwindow.cpp
+++ b/noncore/multimedia/opierec/helpwindow.cpp
@@ -2,25 +2,25 @@
 ** $Id$
 **
 ** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of an example program for Qt.  This example
 ** program may be used, distributed and modified without limitation.
 **
 *****************************************************************************/
 
 #include "helpwindow.h"
 #include <qlayout.h>
 
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qpe/resource.h>
 
 #include <qaction.h>
 #include <qmenubar.h>
 
 #include <ctype.h>
 
 HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* parent, const char *name )
     : QMainWindow( parent, name, WDestructiveClose ), pathCombo( 0 ), selectedURL()
 {
     QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 2);
diff --git a/noncore/multimedia/opierec/main.cpp b/noncore/multimedia/opierec/main.cpp
index bb51446..a435d8e 100644
--- a/noncore/multimedia/opierec/main.cpp
+++ b/noncore/multimedia/opierec/main.cpp
@@ -1,13 +1,14 @@
 /***************************************************************************
+
  main.cpp  -  main routine
  ***************************************************************************/
 //// main.cpp
 ////  copyright 2001, 2002, by L. J. Potter <ljp@llornkcor.com>
 /***************************************************************************
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 #include "qtrec.h"
 
@@ -15,17 +16,18 @@
 int main(int argc, char* argv[]) {
     QPEApplication a(argc, argv);
     QtRec qtrec;
     a.showMainWidget( &qtrec);
  return a.exec();
 }
 
 
 #else
 
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<QtRec> )
 
 #endif