From 76ce34a74b3d4243d5a8d2b17c12f43e4e2422ef Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Mon, 27 Apr 2015 11:41:10 -0700 Subject: [PATCH] Scanning for code style --- interface/src/ui/MarketplaceDialog.cpp | 4 ++-- interface/src/ui/MarketplaceDialog.h | 4 ++-- libraries/ui/src/VrMenu.cpp | 2 +- tests/ui/src/main.cpp | 18 +++++++++--------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/interface/src/ui/MarketplaceDialog.cpp b/interface/src/ui/MarketplaceDialog.cpp index f37f71ef54..b9c640054c 100644 --- a/interface/src/ui/MarketplaceDialog.cpp +++ b/interface/src/ui/MarketplaceDialog.cpp @@ -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)) { diff --git a/interface/src/ui/MarketplaceDialog.h b/interface/src/ui/MarketplaceDialog.h index 241d4a7131..2440c3e07c 100644 --- a/interface/src/ui/MarketplaceDialog.h +++ b/interface/src/ui/MarketplaceDialog.h @@ -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); }; diff --git a/libraries/ui/src/VrMenu.cpp b/libraries/ui/src/VrMenu.cpp index e0fa296857..04c2cb0b30 100644 --- a/libraries/ui/src/VrMenu.cpp +++ b/libraries/ui/src/VrMenu.cpp @@ -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(); - QObject * rootMenu = offscreenUi->getRootItem()->findChild("rootMenu"); + QObject* rootMenu = offscreenUi->getRootItem()->findChild("rootMenu"); Q_ASSERT(rootMenu); static_cast(newItem)->setRootMenu(rootMenu); context->setContextProperty("rootMenu", rootMenu); diff --git a/tests/ui/src/main.cpp b/tests/ui/src/main.cpp index ae8375717e..aaca2efa2a 100644 --- a/tests/ui/src/main.cpp +++ b/tests/ui/src/main.cpp @@ -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();