| author | drw <drw> | 2005-05-24 21:07:23 (UTC) |
|---|---|---|
| committer | drw <drw> | 2005-05-24 21:07:23 (UTC) |
| commit | 7b809e61a3ec2afe898dd9d721efb981abffb0ca (patch) (side-by-side diff) | |
| tree | 780a542f961fb3b7e743b3c9593b1839f0e6ddb7 | |
| parent | 82a7658f6ff0c82cdba2088b70bd2a05aeb85fd6 (diff) | |
| download | opie-7b809e61a3ec2afe898dd9d721efb981abffb0ca.zip opie-7b809e61a3ec2afe898dd9d721efb981abffb0ca.tar.gz opie-7b809e61a3ec2afe898dd9d721efb981abffb0ca.tar.bz2 | |
Resource -> OResource and .cvsignore updates
| -rw-r--r-- | noncore/multimedia/camera/cmd/.cvsignore | 4 | ||||
| -rw-r--r-- | noncore/multimedia/camera/gui/.cvsignore | 4 | ||||
| -rw-r--r-- | noncore/multimedia/camera/gui/mainwindow.cpp | 8 | ||||
| -rw-r--r-- | noncore/multimedia/camera/lib/.cvsignore | 4 |
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,4 +1,4 @@ -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,5 +1,5 @@ *.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 @@ -26,6 +26,6 @@ #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> @@ -80,5 +80,5 @@ CameraMainWindow::CameraMainWindow( QWidget * parent, const char * name, WFlags 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>" @@ -239,5 +239,5 @@ void CameraMainWindow::systemMessage( const QCString& msg, const QByteArray& dat default: QMessageBox::warning( this, "opie-camera", "This rotation is not supported.\n" - "Supported are 180° and 270°" ); + "Supported are 180 and 270" ); } @@ -334,5 +334,5 @@ void CameraMainWindow::resoMenuItemClicked( QAction* a ) 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; 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,5 +1,5 @@ *.pro -moc -obj +*moc +*obj config.in Makefile |