3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-26 10:35:27 +02:00

remove comment, styling cleanup

This commit is contained in:
Stephen Birarda 2015-06-26 11:41:34 -07:00
parent c6df573933
commit 522b715628
4 changed files with 12 additions and 7 deletions

View file

@ -17,8 +17,9 @@
#include <avatar/AvatarManager.h>
#include <gpu/GLBackend.h>
#include <CursorManager.h>
#include <Tooltip.h>
#include "CursorManager.h"
#include "HyperLinkTooltip.h"
#include "Application.h"

View file

@ -59,7 +59,7 @@ private:
void x::load(std::function<void(QQmlContext*, QObject*)> f) { \
auto offscreenUi = DependencyManager::get<OffscreenUi>(); \
offscreenUi->load(QML, f); \
}
}
#define HIFI_QML_DEF_LAMBDA(x, f) \
const QUrl x::QML = QUrl(#x ".qml"); \
@ -79,7 +79,7 @@ private:
void x::load() { \
auto offscreenUi = DependencyManager::get<OffscreenUi>(); \
offscreenUi->load(QML, f); \
}
}
class OffscreenUi : public OffscreenQmlSurface, public Dependency {
Q_OBJECT
@ -97,7 +97,7 @@ public:
static void messageBox(const QString& title, const QString& text,
ButtonCallback f,
QMessageBox::Icon icon,
QMessageBox::Icon icon,
QMessageBox::StandardButtons buttons);
static void information(const QString& title, const QString& text,

View file

@ -1,5 +1,6 @@
//
// Tooltip.cpp
// libraries/ui/src
//
// Created by Bradley Austin Davis on 2015/04/14
// Copyright 2015 High Fidelity, Inc.
@ -8,14 +9,17 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include "Tooltip.h"
#include <QUuid>
#include <QtCore/QUuid>
HIFI_QML_DEF(Tooltip)
Tooltip::Tooltip(QQuickItem* parent) : QQuickItem(parent) {
}
Tooltip::~Tooltip() {
}
const QString& Tooltip::getTitle() const {
@ -47,7 +51,6 @@ void Tooltip::setVisible(bool visible) {
QString Tooltip::showTip(const QString& title, const QString& description) {
const QString newTipId = QUuid().createUuid().toString();
qDebug() << "THE NEW TIP ID IS" << newTipId;
Tooltip::show([&](QQmlContext*, QObject* object) {
object->setObjectName(newTipId);
object->setProperty("title", title);

View file

@ -1,5 +1,6 @@
//
// Tooltip.h
// libraries/ui/src
//
// Created by Bradley Austin Davis on 2015/04/14
// Copyright 2015 High Fidelity, Inc.