| -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,3 +1,3 @@ -moc -obj +*moc +*obj config.in 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,4 +1,4 @@ *.pro -moc -obj +*moc +*obj config.in 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 @@ -27,4 +27,4 @@ #include <opie2/odebug.h> +#include <opie2/oresource.h> #include <qpe/global.h> -#include <qpe/resource.h> #include <qpe/qcopenvelope_qws.h> @@ -81,3 +81,3 @@ CameraMainWindow::CameraMainWindow( QWidget * parent, const char * name, WFlags 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 ); @@ -240,3 +240,3 @@ void CameraMainWindow::systemMessage( const QCString& msg, const QByteArray& dat "This rotation is not supported.\n" - "Supported are 180° and 270°" ); + "Supported are 180 and 270" ); } @@ -335,3 +335,3 @@ void CameraMainWindow::resoMenuItemClicked( QAction* a ) "This rotation is not supported.\n" - "Supported are 180° and 270°" ); + "Supported are 180 and 270" ); } 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,4 +1,4 @@ *.pro -moc -obj +*moc +*obj config.in |