Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-28 03:59:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Coding standards

Browse source
This commit is contained in:
Brad Davis 2015-04-25 16:46:05 -07:00
parent 7c16fd05c1
commit 0afe8c0e32
7 changed files with 41 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/ui/src/HifiMenu.cpp
View file

@ -1,3 +1,13 @@
//
// HifiMenu.cpp
//
// Created by Bradley Austin Davis on 2015/04/21
// Copyright 2015 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include "HifiMenu.h"
#include <QtQml>

8
libraries/ui/src/HifiMenu.h
View file

@ -1,5 +1,5 @@
//
// MenuConstants.h
// HifiMenu.h
//
// Created by Bradley Austin Davis on 2015/04/21
// Copyright 2015 High Fidelity, Inc.
@ -9,8 +9,8 @@
//
#pragma once
#ifndef hifi_MenuContants_h
#define hifi_MenuConstants_h
#ifndef hifi_HifiMenu_h
#define hifi_HifiMenu_h
#include <QQuickItem>
#include <QHash>
@ -76,7 +76,7 @@ protected:
QSignalMapper _toggleMapper;
};
#endif // hifi_MenuConstants_h
#endif // hifi_HifiMenu_h

1
libraries/ui/src/MessageDialog.cpp
View file

@ -1,5 +1,4 @@
//
//
// MessageDialog.cpp
//
// Created by Bradley Austin Davis on 2015/04/14

4
libraries/ui/src/MessageDialog.h
View file

@ -98,7 +98,3 @@ private:
};
#endif // hifi_MessageDialog_h

6
libraries/ui/src/OffscreenQmlDialog.cpp
View file

@ -24,9 +24,9 @@ QString OffscreenQmlDialog::title() const {
return _title;
}
void OffscreenQmlDialog::setTitle(const QString &arg) {
if (arg != _title) {
_title = arg;
void OffscreenQmlDialog::setTitle(const QString& title) {
if (title != _title) {
_title = title;
emit titleChanged();
}
}

2
libraries/ui/src/OffscreenQmlDialog.h
View file

@ -59,7 +59,7 @@ protected:
public:
QString title() const;
void setTitle(const QString &arg);
void setTitle(const QString& title);
signals:
void accepted();

21
libraries/ui/src/OffscreenUi.cpp
View file

@ -140,13 +140,6 @@ QQuickItem* OffscreenUi::getRootItem() {
return _rootItem;
}
//QQmlContext* OffscreenUi::qmlContext() {
// if (nullptr == _rootItem) {
// return _qmlComponent->creationContext();
// }
// return QQmlEngine::contextForObject(_rootItem);
//}
void OffscreenUi::setBaseUrl(const QUrl& baseUrl) {
_qmlEngine->setBaseUrl(baseUrl);
}
@ -444,7 +437,7 @@ void OffscreenUi::messageBox(const QString& title, const QString& text,
pDialog->setIcon((MessageDialog::Icon)icon);
pDialog->setTitle(title);
pDialog->setText(text);
pDialog->setStandardButtons(MessageDialog::StandardButtons((int)buttons));
pDialog->setStandardButtons(MessageDialog::StandardButtons(static_cast<int>(buttons)));
pDialog->setResultCallback(callback);
});
pDialog->setEnabled(true);
@ -453,25 +446,29 @@ void OffscreenUi::messageBox(const QString& title, const QString& text,
void OffscreenUi::information(const QString& title, const QString& text,
ButtonCallback callback,
QMessageBox::StandardButtons buttons) {
messageBox(title, text, callback, (QMessageBox::Icon)MessageDialog::Information, buttons);
messageBox(title, text, callback,
static_cast<QMessageBox::Icon>(MessageDialog::Information), buttons);
}
void OffscreenUi::question(const QString& title, const QString& text,
ButtonCallback callback,
QMessageBox::StandardButtons buttons) {
messageBox(title, text, callback, (QMessageBox::Icon)MessageDialog::Question, buttons);
messageBox(title, text, callback,
static_cast<QMessageBox::Icon>(MessageDialog::Question), buttons);
}
void OffscreenUi::warning(const QString& title, const QString& text,
ButtonCallback callback,
QMessageBox::StandardButtons buttons) {
messageBox(title, text, callback, (QMessageBox::Icon)MessageDialog::Warning, buttons);
messageBox(title, text, callback,
static_cast<QMessageBox::Icon>(MessageDialog::Warning), buttons);
}
void OffscreenUi::critical(const QString& title, const QString& text,
ButtonCallback callback,
QMessageBox::StandardButtons buttons) {
messageBox(title, text, callback, (QMessageBox::Icon)MessageDialog::Critical, buttons);
messageBox(title, text, callback,
static_cast<QMessageBox::Icon>(MessageDialog::Critical), buttons);
}