Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-26 20:55:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Scanning for code style

Browse source
This commit is contained in:
Brad Davis 2015-04-27 11:41:10 -07:00
parent d55d467d3f
commit 76ce34a74b
4 changed files with 14 additions and 14 deletions
interface/src/ui
MarketplaceDialog.cppMarketplaceDialog.h
libraries/ui/src
VrMenu.cpp
tests/ui/src
main.cpp

4
interface/src/ui/MarketplaceDialog.cpp
View file

@ -15,10 +15,10 @@
HIFI_QML_DEF(MarketplaceDialog)
MarketplaceDialog::MarketplaceDialog(QQuickItem *parent) : OffscreenQmlDialog(parent) {
MarketplaceDialog::MarketplaceDialog(QQuickItem* parent) : OffscreenQmlDialog(parent) {
}
bool MarketplaceDialog::navigationRequested(const QString & url) {
bool MarketplaceDialog::navigationRequested(const QString& url) {
qDebug() << url;
if (Application::getInstance()->canAcceptURL(url)) {
if (Application::getInstance()->acceptURL(url)) {

4
interface/src/ui/MarketplaceDialog.h
View file

@ -20,9 +20,9 @@ class MarketplaceDialog : public OffscreenQmlDialog
HIFI_QML_DECL
public:
MarketplaceDialog(QQuickItem *parent = 0);
MarketplaceDialog(QQuickItem* parent = nullptr);
Q_INVOKABLE bool navigationRequested(const QString & url);
Q_INVOKABLE bool navigationRequested(const QString& url);
};

2
libraries/ui/src/VrMenu.cpp
View file

@ -50,7 +50,7 @@ const int MenuUserData::USER_DATA_ID = QObject::registerUserData();
HIFI_QML_DEF_LAMBDA(VrMenu, [&](QQmlContext* context, QObject* newItem) {
auto offscreenUi = DependencyManager::get<OffscreenUi>();
QObject * rootMenu = offscreenUi->getRootItem()->findChild<QObject*>("rootMenu");
QObject* rootMenu = offscreenUi->getRootItem()->findChild<QObject*>("rootMenu");
Q_ASSERT(rootMenu);
static_cast<VrMenu*>(newItem)->setRootMenu(rootMenu);
context->setContextProperty("rootMenu", rootMenu);

18
tests/ui/src/main.cpp
View file

@ -234,12 +234,12 @@ public:
};
public:
MenuConstants(QObject * parent = nullptr) : QObject(parent) {
MenuConstants(QObject* parent = nullptr) : QObject(parent) {
}
};
const QString & getQmlDir() {
const QString& getQmlDir() {
static QString dir;
if (dir.isEmpty()) {
QDir path(__FILE__);
@ -250,7 +250,7 @@ const QString & getQmlDir() {
return dir;
}
const QString & getTestQmlDir() {
const QString& getTestQmlDir() {
static QString dir;
if (dir.isEmpty()) {
QDir path(__FILE__);
@ -265,7 +265,7 @@ const QString & getTestQmlDir() {
class QTestWindow : public QWindow, private QOpenGLFunctions {
Q_OBJECT
QOpenGLContext * _context{ nullptr };
QOpenGLContext* _context{ nullptr };
QSize _size;
bool _altPressed{ false };
RateCounter fps;
@ -273,7 +273,7 @@ class QTestWindow : public QWindow, private QOpenGLFunctions {
int testQmlTexture{ 0 };
public:
QObject * rootMenu;
QObject* rootMenu;
QTestWindow() {
_timer.setInterval(1);
@ -304,7 +304,7 @@ public:
initializeOpenGLFunctions();
{
QOpenGLDebugLogger *logger = new QOpenGLDebugLogger(this);
QOpenGLDebugLogger* logger = new QOpenGLDebugLogger(this);
logger->initialize(); // initializes in the current context, i.e. ctx
logger->enableMessages();
connect(logger, &QOpenGLDebugLogger::messageLogged, this, [&](const QOpenGLDebugMessage & debugMessage) {
@ -396,12 +396,12 @@ private:
protected:
void resizeEvent(QResizeEvent * ev) override {
void resizeEvent(QResizeEvent* ev) override {
resizeWindow(ev->size());
}
void keyPressEvent(QKeyEvent *event) {
void keyPressEvent(QKeyEvent* event) {
_altPressed = Qt::Key_Alt == event->key();
switch (event->key()) {
case Qt::Key_L:
@ -432,7 +432,7 @@ protected:
}
}
void moveEvent(QMoveEvent *event) {
void moveEvent(QMoveEvent* event) {
static qreal oldPixelRatio = 0.0;
if (devicePixelRatio() != oldPixelRatio) {
oldPixelRatio = devicePixelRatio();