slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

QtMultimedia: examples/camera coding style

Browse Source 
Also unconditionally include code for Qt >= 4.7

Change-Id: Ic8b9d009a54f9e0fe7e9477c75c125ad09a485ee
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
hjk
2012-11-20 15:20:24 +01:00
committed by The Qt Project
parent 294fa9c5df
commit 9f4d6e824c
6 changed files with 57 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
examples/camera/camera.h
View File

@@ -41,25 +41,20 @@
#ifndef CAMERA_H
#define CAMERA_H
#include <qcamera.h>
#include <qmediarecorder.h>
#include <qcameraimagecapture.h>
QT_BEGIN_NAMESPACE
namespace Ui {
class Camera;
}
class QCameraViewfinder;
QT_END_NAMESPACE
#include <QCamera>
#include <QCameraImageCapture>
#include <QMediaRecorder>
#include <QMainWindow>
#include <QDir>
QT_USE_NAMESPACE
QT_BEGIN_NAMESPACE
namespace Ui { class Camera; }
QT_END_NAMESPACE
class Camera : public QMainWindow
{
Q_OBJECT
public:
Camera(QWidget *parent = 0);
~Camera();
@@ -85,7 +80,7 @@ private slots:
void displayRecorderError();
void displayCameraError();
void updateCameraDevice(QAction*);
void updateCameraDevice(QAction *action);
void updateCameraState(QCamera::State);
void updateCaptureMode();
@@ -94,19 +89,19 @@ private slots:
void updateRecordTime();
void processCapturedImage(int requestId, const QImage& img);
void processCapturedImage(int requestId, const QImage &img);
void updateLockStatus(QCamera::LockStatus, QCamera::LockChangeReason);
void displayViewfinder();
void displayCapturedImage();
void readyForCapture(bool);
void imageSaved(int, const QString&);
void readyForCapture(bool ready);
void imageSaved(int id, const QString &fileName);
protected:
void keyPressEvent(QKeyEvent * event);
void keyReleaseEvent(QKeyEvent * event);
void closeEvent(QCloseEvent *event );
void keyPressEvent(QKeyEvent *event);
void keyReleaseEvent(QKeyEvent *event);
void closeEvent(QCloseEvent *event);
private:
Ui::Camera *ui;