Commit d8ff1b14 authored by Ronan's avatar Ronan

feat(components): replace `broghammerus_reticulatus` variables by `camelusBactrianus`

parent c714ad8d
......@@ -34,7 +34,7 @@ using namespace std;
class AssistantModel::Handlers : public linphone::AccountCreatorListener {
public:
Handlers (AssistantModel *assistant) {
m_assistant = assistant;
mAssistant = assistant;
}
void onCreateAccount (
......@@ -43,14 +43,14 @@ public:
const string &
) override {
if (status == linphone::AccountCreatorStatusAccountCreated)
emit m_assistant->createStatusChanged("");
emit mAssistant->createStatusChanged("");
else {
if (status == linphone::AccountCreatorStatusRequestFailed)
emit m_assistant->createStatusChanged(tr("requestFailed"));
emit mAssistant->createStatusChanged(tr("requestFailed"));
else if (status == linphone::AccountCreatorStatusServerError)
emit m_assistant->createStatusChanged(tr("cannotSendSms"));
emit mAssistant->createStatusChanged(tr("cannotSendSms"));
else
emit m_assistant->createStatusChanged(tr("accountAlreadyExists"));
emit mAssistant->createStatusChanged(tr("accountAlreadyExists"));
}
}
......@@ -61,12 +61,12 @@ public:
) override {
if (status == linphone::AccountCreatorStatusAccountExist || status == linphone::AccountCreatorStatusAccountExistWithAlias) {
CoreManager::getInstance()->getCore()->addProxyConfig(creator->configure());
emit m_assistant->loginStatusChanged("");
emit mAssistant->loginStatusChanged("");
} else {
if (status == linphone::AccountCreatorStatusRequestFailed)
emit m_assistant->loginStatusChanged(tr("requestFailed"));
emit mAssistant->loginStatusChanged(tr("requestFailed"));
else
emit m_assistant->loginStatusChanged(tr("loginWithUsernameFailed"));
emit mAssistant->loginStatusChanged(tr("loginWithUsernameFailed"));
}
}
......@@ -79,12 +79,12 @@ public:
status == linphone::AccountCreatorStatusAccountActivated ||
status == linphone::AccountCreatorStatusAccountAlreadyActivated
)
emit m_assistant->activateStatusChanged("");
emit mAssistant->activateStatusChanged("");
else {
if (status == linphone::AccountCreatorStatusRequestFailed)
emit m_assistant->activateStatusChanged(tr("requestFailed"));
emit mAssistant->activateStatusChanged(tr("requestFailed"));
else
emit m_assistant->activateStatusChanged(tr("smsActivationFailed"));
emit mAssistant->activateStatusChanged(tr("smsActivationFailed"));
}
}
......@@ -96,12 +96,12 @@ public:
if (status == linphone::AccountCreatorStatusAccountActivated) {
CoreManager::getInstance()->getAccountSettingsModel()->addOrUpdateProxyConfig(creator->configure());
emit m_assistant->activateStatusChanged("");
emit mAssistant->activateStatusChanged("");
} else {
if (status == linphone::AccountCreatorStatusRequestFailed)
emit m_assistant->activateStatusChanged(tr("requestFailed"));
emit mAssistant->activateStatusChanged(tr("requestFailed"));
else
emit m_assistant->activateStatusChanged(tr("emailActivationFailed"));
emit mAssistant->activateStatusChanged(tr("emailActivationFailed"));
}
}
......@@ -142,40 +142,40 @@ public:
// ) override {}
private:
AssistantModel *m_assistant;
AssistantModel *mAssistant;
};
// -----------------------------------------------------------------------------
AssistantModel::AssistantModel (QObject *parent) : QObject(parent) {
m_handlers = make_shared<AssistantModel::Handlers>(this);
mHandlers = make_shared<AssistantModel::Handlers>(this);
shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore();
m_account_creator = core->createAccountCreator(
mAccountCreator = core->createAccountCreator(
core->getConfig()->getString("assistant", "xmlrpc_url", DEFAULT_XMLRPC_URL)
);
m_account_creator->setListener(m_handlers);
mAccountCreator->setListener(mHandlers);
}
// -----------------------------------------------------------------------------
void AssistantModel::activate () {
if (m_account_creator->getEmail().empty())
m_account_creator->activateAccount();
if (mAccountCreator->getEmail().empty())
mAccountCreator->activateAccount();
else
m_account_creator->isAccountActivated();
mAccountCreator->isAccountActivated();
}
void AssistantModel::create () {
m_account_creator->createAccount();
mAccountCreator->createAccount();
}
void AssistantModel::login () {
m_account_creator->isAccountExist();
mAccountCreator->isAccountExist();
}
void AssistantModel::reset () {
m_account_creator->reset();
mAccountCreator->reset();
emit emailChanged("", "");
emit passwordChanged("", "");
......@@ -186,14 +186,14 @@ void AssistantModel::reset () {
// -----------------------------------------------------------------------------
QString AssistantModel::getEmail () const {
return ::Utils::linphoneStringToQString(m_account_creator->getEmail());
return ::Utils::linphoneStringToQString(mAccountCreator->getEmail());
}
void AssistantModel::setEmail (const QString &email) {
shared_ptr<linphone::Config> config = CoreManager::getInstance()->getCore()->getConfig();
QString error;
switch (m_account_creator->setEmail(::Utils::qStringToLinphoneString(email))) {
switch (mAccountCreator->setEmail(::Utils::qStringToLinphoneString(email))) {
case linphone::AccountCreatorEmailStatusOk:
break;
case linphone::AccountCreatorEmailStatusMalformed:
......@@ -208,14 +208,14 @@ void AssistantModel::setEmail (const QString &email) {
}
QString AssistantModel::getPassword () const {
return ::Utils::linphoneStringToQString(m_account_creator->getPassword());
return ::Utils::linphoneStringToQString(mAccountCreator->getPassword());
}
void AssistantModel::setPassword (const QString &password) {
shared_ptr<linphone::Config> config = CoreManager::getInstance()->getCore()->getConfig();
QString error;
switch (m_account_creator->setPassword(::Utils::qStringToLinphoneString(password))) {
switch (mAccountCreator->setPassword(::Utils::qStringToLinphoneString(password))) {
case linphone::AccountCreatorPasswordStatusOk:
break;
case linphone::AccountCreatorPasswordStatusTooShort:
......@@ -238,27 +238,27 @@ void AssistantModel::setPassword (const QString &password) {
}
QString AssistantModel::getPhoneNumber () const {
return ::Utils::linphoneStringToQString(m_account_creator->getPhoneNumber());
return ::Utils::linphoneStringToQString(mAccountCreator->getPhoneNumber());
}
void AssistantModel::setPhoneNumber (const QString &phone_number) {
void AssistantModel::setPhoneNumber (const QString &phoneNumber) {
// shared_ptr<linphone::Config> config = CoreManager::getInstance()->getCore()->getConfig();
QString error;
// TODO: use the future wrapped function: `set_phone_number`.
emit phoneNumberChanged(phone_number, error);
emit phoneNumberChanged(phoneNumber, error);
}
QString AssistantModel::getUsername () const {
return ::Utils::linphoneStringToQString(m_account_creator->getUsername());
return ::Utils::linphoneStringToQString(mAccountCreator->getUsername());
}
void AssistantModel::setUsername (const QString &username) {
shared_ptr<linphone::Config> config = CoreManager::getInstance()->getCore()->getConfig();
QString error;
switch (m_account_creator->setUsername(::Utils::qStringToLinphoneString(username))) {
switch (mAccountCreator->setUsername(::Utils::qStringToLinphoneString(username))) {
case linphone::AccountCreatorUsernameStatusOk:
break;
case linphone::AccountCreatorUsernameStatusTooShort:
......
......@@ -50,7 +50,7 @@ public:
signals:
void emailChanged (const QString &email, const QString &error);
void passwordChanged (const QString &password, const QString &error);
void phoneNumberChanged (const QString &phone_number, const QString &error);
void phoneNumberChanged (const QString &phoneNumber, const QString &error);
void usernameChanged (const QString &username, const QString &error);
void activateStatusChanged (const QString &error);
......@@ -65,13 +65,13 @@ private:
void setPassword (const QString &password);
QString getPhoneNumber () const;
void setPhoneNumber (const QString &phone_number);
void setPhoneNumber (const QString &phoneNumber);
QString getUsername () const;
void setUsername (const QString &username);
std::shared_ptr<linphone::AccountCreator> m_account_creator;
std::shared_ptr<Handlers> m_handlers;
std::shared_ptr<linphone::AccountCreator> mAccountCreator;
std::shared_ptr<Handlers> mHandlers;
};
#endif // ASSISTANT_MODEL_H_
......@@ -61,14 +61,14 @@ public:
Q_ENUM(CallStatus);
CallModel (std::shared_ptr<linphone::Call> linphone_call);
CallModel (std::shared_ptr<linphone::Call> linphoneCall);
~CallModel () = default;
std::shared_ptr<linphone::Call> getLinphoneCall () const {
return m_linphone_call;
return mLinphoneCall;
}
static void setRecordFile (std::shared_ptr<linphone::CallParams> &call_params);
static void setRecordFile (std::shared_ptr<linphone::CallParams> &callParams);
Q_INVOKABLE void accept ();
Q_INVOKABLE void acceptWithVideo ();
......@@ -96,7 +96,7 @@ private:
CallStatus getStatus () const;
bool isOutgoing () const {
return m_linphone_call->getDir() == linphone::CallDirOutgoing;
return mLinphoneCall->getDir() == linphone::CallDirOutgoing;
}
int getDuration () const;
......@@ -117,11 +117,11 @@ private:
bool getRecording () const;
bool m_paused_by_remote = false;
bool m_paused_by_user = false;
bool m_recording = false;
bool mPausedByRemote = false;
bool mPausedByUser = false;
bool mRecording = false;
std::shared_ptr<linphone::Call> m_linphone_call;
std::shared_ptr<linphone::Call> mLinphoneCall;
};
#endif // CALL_MODEL_H_
......@@ -38,11 +38,11 @@ using namespace std;
inline QList<CallModel *>::iterator findCall (
QList<CallModel *> &list,
const shared_ptr<linphone::Call> &linphone_call
const shared_ptr<linphone::Call> &linphoneCall
) {
return find_if(
list.begin(), list.end(), [linphone_call](CallModel *call) {
return linphone_call == call->getLinphoneCall();
list.begin(), list.end(), [linphoneCall](CallModel *call) {
return linphoneCall == call->getLinphoneCall();
}
);
}
......@@ -50,24 +50,24 @@ inline QList<CallModel *>::iterator findCall (
// -----------------------------------------------------------------------------
CallsListModel::CallsListModel (QObject *parent) : QAbstractListModel(parent) {
m_core_handlers = CoreManager::getInstance()->getHandlers();
mCoreHandlers = CoreManager::getInstance()->getHandlers();
QObject::connect(
&(*m_core_handlers), &CoreHandlers::callStateChanged,
this, [this](const shared_ptr<linphone::Call> &linphone_call, linphone::CallState state) {
&(*mCoreHandlers), &CoreHandlers::callStateChanged,
this, [this](const shared_ptr<linphone::Call> &linphoneCall, linphone::CallState state) {
switch (state) {
case linphone::CallStateIncomingReceived:
case linphone::CallStateOutgoingInit:
addCall(linphone_call);
addCall(linphoneCall);
break;
case linphone::CallStateEnd:
case linphone::CallStateError:
removeCall(linphone_call);
removeCall(linphoneCall);
break;
case linphone::CallStateStreamsRunning: {
int index = static_cast<int>(distance(m_list.begin(), findCall(m_list, linphone_call)));
emit callRunning(index, &linphone_call->getData<CallModel>("call-model"));
int index = static_cast<int>(distance(mList.begin(), findCall(mList, linphoneCall)));
emit callRunning(index, &linphoneCall->getData<CallModel>("call-model"));
}
break;
......@@ -79,7 +79,7 @@ CallsListModel::CallsListModel (QObject *parent) : QAbstractListModel(parent) {
}
int CallsListModel::rowCount (const QModelIndex &) const {
return m_list.count();
return mList.count();
}
QHash<int, QByteArray> CallsListModel::roleNames () const {
......@@ -91,25 +91,25 @@ QHash<int, QByteArray> CallsListModel::roleNames () const {
QVariant CallsListModel::data (const QModelIndex &index, int role) const {
int row = index.row();
if (!index.isValid() || row < 0 || row >= m_list.count())
if (!index.isValid() || row < 0 || row >= mList.count())
return QVariant();
if (role == Qt::DisplayRole)
return QVariant::fromValue(m_list[row]);
return QVariant::fromValue(mList[row]);
return QVariant();
}
CallModel *CallsListModel::getCall (const shared_ptr<linphone::Call> &linphone_call) const {
auto it = findCall(*(const_cast<QList<CallModel *> *>(&m_list)), linphone_call);
return it != m_list.end() ? *it : nullptr;
CallModel *CallsListModel::getCall (const shared_ptr<linphone::Call> &linphoneCall) const {
auto it = findCall(*(const_cast<QList<CallModel *> *>(&mList)), linphoneCall);
return it != mList.end() ? *it : nullptr;
}
// -----------------------------------------------------------------------------
void CallsListModel::launchAudioCall (const QString &sip_uri) const {
void CallsListModel::launchAudioCall (const QString &sipUri) const {
shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore();
shared_ptr<linphone::Address> address = core->interpretUrl(::Utils::qStringToLinphoneString(sip_uri));
shared_ptr<linphone::Address> address = core->interpretUrl(::Utils::qStringToLinphoneString(sipUri));
if (!address)
return;
......@@ -121,9 +121,9 @@ void CallsListModel::launchAudioCall (const QString &sip_uri) const {
core->inviteAddressWithParams(address, params);
}
void CallsListModel::launchVideoCall (const QString &sip_uri) const {
void CallsListModel::launchVideoCall (const QString &sipUri) const {
shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore();
shared_ptr<linphone::Address> address = core->interpretUrl(::Utils::qStringToLinphoneString(sip_uri));
shared_ptr<linphone::Address> address = core->interpretUrl(::Utils::qStringToLinphoneString(sipUri));
if (!address)
return;
......@@ -155,13 +155,13 @@ bool CallsListModel::removeRow (int row, const QModelIndex &parent) {
bool CallsListModel::removeRows (int row, int count, const QModelIndex &parent) {
int limit = row + count - 1;
if (row < 0 || count < 0 || limit >= m_list.count())
if (row < 0 || count < 0 || limit >= mList.count())
return false;
beginRemoveRows(parent, row, limit);
for (int i = 0; i < count; ++i)
m_list.takeAt(row)->deleteLater();
mList.takeAt(row)->deleteLater();
endRemoveRows();
......@@ -170,38 +170,38 @@ bool CallsListModel::removeRows (int row, int count, const QModelIndex &parent)
// -----------------------------------------------------------------------------
void CallsListModel::addCall (const shared_ptr<linphone::Call> &linphone_call) {
if (linphone_call->getDir() == linphone::CallDirOutgoing)
void CallsListModel::addCall (const shared_ptr<linphone::Call> &linphoneCall) {
if (linphoneCall->getDir() == linphone::CallDirOutgoing)
App::getInstance()->getCallsWindow()->show();
CallModel *call = new CallModel(linphone_call);
CallModel *call = new CallModel(linphoneCall);
qInfo() << "Add call:" << call;
App::getInstance()->getEngine()->setObjectOwnership(call, QQmlEngine::CppOwnership);
linphone_call->setData("call-model", *call);
linphoneCall->setData("call-model", *call);
int row = m_list.count();
int row = mList.count();
beginInsertRows(QModelIndex(), row, row);
m_list << call;
mList << call;
endInsertRows();
}
void CallsListModel::removeCall (const shared_ptr<linphone::Call> &linphone_call) {
void CallsListModel::removeCall (const shared_ptr<linphone::Call> &linphoneCall) {
// TODO: It will be (maybe) necessary to use a single scheduled function in the future.
QTimer::singleShot(
DELAY_BEFORE_REMOVE_CALL, this, [this, linphone_call]() {
CallModel *call = &linphone_call->getData<CallModel>("call-model");
linphone_call->unsetData("call-model");
DELAY_BEFORE_REMOVE_CALL, this, [this, linphoneCall]() {
CallModel *call = &linphoneCall->getData<CallModel>("call-model");
linphoneCall->unsetData("call-model");
qInfo() << "Removing call:" << call;
int index = m_list.indexOf(call);
int index = mList.indexOf(call);
if (index == -1 || !removeRow(index))
qWarning() << "Unable to remove call:" << call;
if (m_list.empty())
if (mList.empty())
App::getInstance()->getCallsWindow()->close();
}
);
......
......@@ -43,10 +43,10 @@ public:
QHash<int, QByteArray> roleNames () const override;
QVariant data (const QModelIndex &index, int role = Qt::DisplayRole) const override;
CallModel *getCall (const std::shared_ptr<linphone::Call> &linphone_call) const;
CallModel *getCall (const std::shared_ptr<linphone::Call> &linphoneCall) const;
Q_INVOKABLE void launchAudioCall (const QString &sip_uri) const;
Q_INVOKABLE void launchVideoCall (const QString &sip_uri) const;
Q_INVOKABLE void launchAudioCall (const QString &sipUri) const;
Q_INVOKABLE void launchVideoCall (const QString &sipUri) const;
Q_INVOKABLE int getRunningCallsNumber () const;
......@@ -59,12 +59,12 @@ private:
bool removeRow (int row, const QModelIndex &parent = QModelIndex());
bool removeRows (int row, int count, const QModelIndex &parent = QModelIndex()) override;
void addCall (const std::shared_ptr<linphone::Call> &linphone_call);
void removeCall (const std::shared_ptr<linphone::Call> &linphone_call);
void addCall (const std::shared_ptr<linphone::Call> &linphoneCall);
void removeCall (const std::shared_ptr<linphone::Call> &linphoneCall);
QList<CallModel *> m_list;
QList<CallModel *> mList;
std::shared_ptr<CoreHandlers> m_core_handlers;
std::shared_ptr<CoreHandlers> mCoreHandlers;
};
#endif // CALLS_LIST_MODEL_H_
......@@ -47,24 +47,24 @@ struct ContextInfo {
// -----------------------------------------------------------------------------
CameraRenderer::CameraRenderer () {
m_context_info = new ContextInfo();
mContextInfo = new ContextInfo();
}
CameraRenderer::~CameraRenderer () {
qInfo() << QStringLiteral("Delete context info:") << m_context_info;
qInfo() << QStringLiteral("Delete context info:") << mContextInfo;
CoreManager *core = CoreManager::getInstance();
core->lockVideoRender();
if (m_is_preview)
if (mIsPreview)
CoreManager::getInstance()->getCore()->setNativePreviewWindowId(nullptr);
else if (m_linphone_call)
m_linphone_call->setNativeVideoWindowId(nullptr);
else if (mLinphoneCall)
mLinphoneCall->setNativeVideoWindowId(nullptr);
core->unlockVideoRender();
delete m_context_info;
delete mContextInfo;
}
QOpenGLFramebufferObject *CameraRenderer::createFramebufferObject (const QSize &size) {
......@@ -78,10 +78,10 @@ QOpenGLFramebufferObject *CameraRenderer::createFramebufferObject (const QSize &
// It's not the same thread as render.
core->lockVideoRender();
m_context_info->width = size.width();
m_context_info->height = size.height();
m_context_info->functions = MSFunctions::getInstance()->getFunctions();
m_update_context_info = true;
mContextInfo->width = size.width();
mContextInfo->height = size.height();
mContextInfo->functions = MSFunctions::getInstance()->getFunctions();
mUpdateContextInfo = true;
updateWindowId();
......@@ -91,7 +91,7 @@ QOpenGLFramebufferObject *CameraRenderer::createFramebufferObject (const QSize &
}
void CameraRenderer::render () {
if (!m_linphone_call)
if (!mLinphoneCall)
return;
// Draw with ms filter.
......@@ -102,48 +102,48 @@ void CameraRenderer::render () {
f->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
CoreManager *core = CoreManager::getInstance();
MSFunctions *ms_functions = MSFunctions::getInstance();
MSFunctions *msFunctions = MSFunctions::getInstance();
core->lockVideoRender();
ms_functions->bind(f);
m_linphone_call->oglRender(m_is_preview);
ms_functions->bind(nullptr);
msFunctions->bind(f);
mLinphoneCall->oglRender(mIsPreview);
msFunctions->bind(nullptr);
core->unlockVideoRender();
}
// Synchronize opengl calls with QML.
if (m_window)
m_window->resetOpenGLState();
if (mWindow)
mWindow->resetOpenGLState();
}
void CameraRenderer::synchronize (QQuickFramebufferObject *item) {
// No mutex needed here. It's a synchronized area.
m_window = item->window();
mWindow = item->window();
Camera *camera = qobject_cast<Camera *>(item);
m_linphone_call = camera->getCall()->getLinphoneCall();
m_is_preview = camera->m_is_preview;
mLinphoneCall = camera->getCall()->getLinphoneCall();
mIsPreview = camera->mIsPreview;
updateWindowId();
}
void CameraRenderer::updateWindowId () {
if (!m_update_context_info)
if (!mUpdateContextInfo)
return;
m_update_context_info = false;
mUpdateContextInfo = false;
qInfo() << "Thread" << QThread::currentThread() << QStringLiteral("Set context info (width: %1, height: %2, is_preview: %3):")
.arg(m_context_info->width).arg(m_context_info->height).arg(m_is_preview) << m_context_info;
.arg(mContextInfo->width).arg(mContextInfo->height).arg(mIsPreview) << mContextInfo;
if (m_is_preview)
CoreManager::getInstance()->getCore()->setNativePreviewWindowId(m_context_info);
else if (m_linphone_call)
m_linphone_call->setNativeVideoWindowId(m_context_info);
if (mIsPreview)
CoreManager::getInstance()->getCore()->setNativePreviewWindowId(mContextInfo);
else if (mLinphoneCall)
mLinphoneCall->setNativeVideoWindowId(mContextInfo);
}
// -----------------------------------------------------------------------------
......@@ -155,16 +155,16 @@ Camera::Camera (QQuickItem *parent) : QQuickFramebufferObject(parent) {
// The fbo content must be y-mirrored because the ms rendering is y-inverted.
setMirrorVertically(true);
m_refresh_timer = new QTimer(this);
m_refresh_timer->setInterval(1 / MAX_FPS * 1000);
mRefreshTimer = new QTimer(this);
mRefreshTimer->setInterval(1 / MAX_FPS * 1000);
QObject::connect(
m_refresh_timer, &QTimer::timeout,
mRefreshTimer, &QTimer::timeout,
this, &QQuickFramebufferObject::update,
Qt::DirectConnection
);
m_refresh_timer->start();
mRefreshTimer->start();
}
QQuickFramebufferObject::Renderer *Camera::createRenderer () const {
......@@ -178,25 +178,25 @@ void Camera::mousePressEvent (QMouseEvent *) {
// -----------------------------------------------------------------------------
CallModel *Camera::getCall () const {
return m_call;
return mCall;
}
void Camera::setCall (CallModel *call) {
if (m_call != call) {
m_call = call;
if (mCall != call) {
mCall = call;
update();
emit callChanged(m_call);
emit callChanged(mCall);
}
}
bool Camera::getIsPreview () const {
return m_is_preview;
return mIsPreview;
}
void Camera::setIsPreview (bool status) {
if (m_is_preview != status) {
m_is_preview = status;
if (mIsPreview != status) {
mIsPreview = status;
update();
emit isPreviewChanged(status);
......
......@@ -53,13 +53,13 @@ protected:
private:
void updateWindowId ();
ContextInfo *m_context_info;
bool m_update_context_info = false;
ContextInfo *mContextInfo;
bool mUpdateContextInfo = false;
bool m_is_preview = false;
std::shared_ptr<linphone::Call> m_linphone_call;
bool mIsPreview = false;
std::shared_ptr<linphone::Call> mLinphoneCall;
QQuickWindow *m_window;
QQuickWindow *mWindow;
};
// -----------------------------------------------------------------------------
......@@ -80,7 +80,7 @@ public:
signals:
void callChanged (CallModel *call);
void isPreviewChanged (bool is_preview);
void isPreviewChanged (bool isPreview);
protected:
void mousePressEvent (QMouseEvent *event) override;
......@@ -92,10 +92,10 @@ private:
bool getIsPreview () const;
void setIsPreview (bool status);
bool m_is_preview = false;
CallModel *m_call = nullptr;
bool mIsPreview = false;
CallModel *mCall = nullptr;
QTimer *m_refresh_timer;
QTimer *mRefreshTimer;
};
#endif // CAMERA_H_
......@@ -27,12 +27,12 @@
// =============================================================================