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

22
examples/camera/imagesettings.h
View File

@@ -41,31 +41,29 @@
#ifndef IMAGESETTINGS_H
#define IMAGESETTINGS_H
#include <QtWidgets/QDialog>
#include <qmediaencodersettings.h>
#include <QDialog>
#include <QAudioEncoderSettings>
#include <QVideoEncoderSettings>
QT_BEGIN_NAMESPACE
class QComboBox;
namespace Ui {
class ImageSettingsUi;
}
class QCameraImageCapture;
namespace Ui { class ImageSettingsUi; }
QT_END_NAMESPACE
QT_USE_NAMESPACE
class ImageSettings : public QDialog {
class ImageSettings : public QDialog
{
Q_OBJECT
public:
ImageSettings(QCameraImageCapture *imageCapture, QWidget *parent = 0);
~ImageSettings();
QAudioEncoderSettings audioSettings() const;
void setAudioSettings(const QAudioEncoderSettings&);
void setAudioSettings(const QAudioEncoderSettings &settings);
QImageEncoderSettings imageSettings() const;
void setImageSettings(const QImageEncoderSettings&);
void setImageSettings(const QImageEncoderSettings &settings);
QString format() const;
void setFormat(const QString &format);
@@ -74,7 +72,7 @@ protected:
void changeEvent(QEvent *e);
private:
QVariant boxValue(const QComboBox*) const;
QVariant boxValue(const QComboBox *box) const;
void selectComboBoxItem(QComboBox *box, const QVariant &value);
Ui::ImageSettingsUi *ui;