4 files changed, 10 insertions, 10 deletions

diff --git a/noncore/multimedia/camera/cmd/.cvsignore b/noncore/multimedia/camera/cmd/.cvsignore
index 737c5b2..e5aacf6 100644
--- a/noncore/multimedia/camera/cmd/.cvsignore
+++ b/noncore/multimedia/camera/cmd/.cvsignore
@@ -1,5 +1,5 @@
-moc
-obj
+*moc
+*obj
 config.in
 Makefile
 
diff --git a/noncore/multimedia/camera/gui/.cvsignore b/noncore/multimedia/camera/gui/.cvsignore
index 2a3a7a8..8e95df7 100644
--- a/noncore/multimedia/camera/gui/.cvsignore
+++ b/noncore/multimedia/camera/gui/.cvsignore
@@ -1,6 +1,6 @@
 *.pro
-moc
-obj
+*moc
+*obj
 config.in
 Makefile
 
diff --git a/noncore/multimedia/camera/gui/mainwindow.cpp b/noncore/multimedia/camera/gui/mainwindow.cpp
index bde448d..b2fcc6c 100644
--- a/noncore/multimedia/camera/gui/mainwindow.cpp
+++ b/noncore/multimedia/camera/gui/mainwindow.cpp
@@ -22,14 +22,14 @@
 /* OPIE */
 #include <opie2/ofiledialog.h>
 #include <opie2/odevice.h>
 #include <opie2/oapplication.h>
 #include <opie2/oconfig.h>
 #include <opie2/odebug.h>
+#include <opie2/oresource.h>
 #include <qpe/global.h>
-#include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
 /* QT */
 #include <qapplication.h>
 #include <qaction.h>
 #include <qvbox.h>
@@ -76,13 +76,13 @@ CameraMainWindow::CameraMainWindow( QWidget * parent, const char * name, WFlags
     #ifdef QT_NO_DEBUG
     if ( !ZCameraIO::instance()->isOpen() )
     {
         QVBox* v = new QVBox( this );
         v->setMargin( 10 );
         QLabel* l1 = new QLabel( v );
-        l1->setPixmap( Resource::loadPixmap( "camera/error" ) );
+        l1->setPixmap( Opie::Core::OResource::loadPixmap( "camera/error", Opie::Core::OResource::SmallIcon ) );
         QLabel* l2 = new QLabel( v );
         l2->setText( "<b>Sorry. could not detect your camera :-(</b><p>"
         "* Is the sharpzdc_cs module loaded ?<br>"
         "* Is /dev/sharpzdc read/writable ?<p>" );
         connect( new QPushButton( "Exit", v ), SIGNAL( clicked() ), this, SLOT( close() ) );
         setCentralWidget( v );
@@ -235,13 +235,13 @@ void CameraMainWindow::systemMessage( const QCString& msg, const QByteArray& dat
         switch ( _newrotation )
         {
             case 270: preview->resize( QSize( 240, 288 ) ); break;
             case 180: preview->resize( QSize( 320, 208 ) ); break;
             default: QMessageBox::warning( this, "opie-camera",
                 "This rotation is not supported.\n"
-                "Supported are 180° and 270°" );
+                "Supported are 180 and 270" );
         }
 
         if ( _newrotation != _rotation )
         {
             int tmp = captureX;
             captureX = captureY;
@@ -330,13 +330,13 @@ void CameraMainWindow::resoMenuItemClicked( QAction* a )
         case 180:
             captureX = a->text().left(3).toInt();
             captureY = a->text().right(3).toInt();
             break;
         default: QMessageBox::warning( this, "opie-camera",
             "This rotation is not supported.\n"
-            "Supported are 180° and 270°" );
+            "Supported are 180 and 270" );
     }
     odebug << "Capture Resolution now: " << captureX << ", " << captureY << oendl;
     updateCaption();
 }
 
 
diff --git a/noncore/multimedia/camera/lib/.cvsignore b/noncore/multimedia/camera/lib/.cvsignore
index 2a3a7a8..8e95df7 100644
--- a/noncore/multimedia/camera/lib/.cvsignore
+++ b/noncore/multimedia/camera/lib/.cvsignore
@@ -1,6 +1,6 @@
 *.pro
-moc
-obj
+*moc
+*obj
 config.in
 Makefile