From 9fbd5d79e4e2bf34c6f7fbb5a665d318322c6bae Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 24 Apr 2015 17:46:56 -0700
Subject: [PATCH] Removing duplicate declaration

---
 interface/src/ui/AddressBarDialog.cpp |  2 +-
 interface/src/ui/AddressBarDialog.h   |  2 +-
 interface/src/ui/LoginDialog.cpp      |  2 +-
 interface/src/ui/LoginDialog.h        |  2 +-
 libraries/ui/src/OffscreenQmlDialog.h | 28 ---------------------------
 5 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp
index 6b5c92c194..837702d253 100644
--- a/interface/src/ui/AddressBarDialog.cpp
+++ b/interface/src/ui/AddressBarDialog.cpp
@@ -15,7 +15,7 @@
 #include "DependencyManager.h"
 #include "AddressManager.h"
 
-QML_DIALOG_DEF(AddressBarDialog)
+HIFI_QML_DEF(AddressBarDialog)
 
 AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(parent) {
     auto addressManager = DependencyManager::get<AddressManager>();
diff --git a/interface/src/ui/AddressBarDialog.h b/interface/src/ui/AddressBarDialog.h
index 28056edd30..395cf3c725 100644
--- a/interface/src/ui/AddressBarDialog.h
+++ b/interface/src/ui/AddressBarDialog.h
@@ -17,7 +17,7 @@
 class AddressBarDialog : public OffscreenQmlDialog
 {
     Q_OBJECT
-    QML_DIALOG_DECL
+    HIFI_QML_DECL
 
 public:
     AddressBarDialog(QQuickItem* parent = nullptr);
diff --git a/interface/src/ui/LoginDialog.cpp b/interface/src/ui/LoginDialog.cpp
index 5726818b2d..b452f153f0 100644
--- a/interface/src/ui/LoginDialog.cpp
+++ b/interface/src/ui/LoginDialog.cpp
@@ -15,7 +15,7 @@
 #include "Menu.h"
 #include <NetworkingConstants.h>
 
-QML_DIALOG_DEF(LoginDialog)
+HIFI_QML_DEF(LoginDialog)
 
 LoginDialog::LoginDialog(QQuickItem *parent) : OffscreenQmlDialog(parent), _rootUrl(NetworkingConstants::METAVERSE_SERVER_URL.toString()) {
     connect(&AccountManager::getInstance(), &AccountManager::loginComplete,
diff --git a/interface/src/ui/LoginDialog.h b/interface/src/ui/LoginDialog.h
index b6d505943e..e9ae0a1c16 100644
--- a/interface/src/ui/LoginDialog.h
+++ b/interface/src/ui/LoginDialog.h
@@ -17,7 +17,7 @@
 class LoginDialog : public OffscreenQmlDialog
 {
     Q_OBJECT
-    QML_DIALOG_DECL
+    HIFI_QML_DECL
 
     Q_PROPERTY(QString statusText READ statusText WRITE setStatusText NOTIFY statusTextChanged)
     Q_PROPERTY(QString rootUrl READ rootUrl)
diff --git a/libraries/ui/src/OffscreenQmlDialog.h b/libraries/ui/src/OffscreenQmlDialog.h
index b97bc1914f..0ff9156f8f 100644
--- a/libraries/ui/src/OffscreenQmlDialog.h
+++ b/libraries/ui/src/OffscreenQmlDialog.h
@@ -16,34 +16,6 @@
 
 #include "OffscreenUi.h"
 
-#define QML_DIALOG_DECL \
-private: \
-    static const QString NAME; \
-    static const QUrl QML; \
-public: \
-    static void registerType(); \
-    static void show(std::function<void(QQmlContext*, QObject*)> f = [](QQmlContext*, QObject*) {}); \
-    static void toggle(std::function<void(QQmlContext*, QObject*)> f = [](QQmlContext*, QObject*) {}); \
-private:
-
-#define QML_DIALOG_DEF(x) \
-    const QUrl x::QML = QUrl(#x ".qml"); \
-    const QString x::NAME = #x; \
-    \
-    void x::registerType() { \
-        qmlRegisterType<x>("Hifi", 1, 0, NAME.toLocal8Bit().constData()); \
-    } \
-    \
-    void x::show(std::function<void(QQmlContext*, QObject*)> f) { \
-        auto offscreenUi = DependencyManager::get<OffscreenUi>(); \
-        offscreenUi->show(QML, NAME, f); \
-    } \
-    \
-    void x::toggle(std::function<void(QQmlContext*, QObject*)> f) { \
-        auto offscreenUi = DependencyManager::get<OffscreenUi>(); \
-        offscreenUi->toggle(QML, NAME, f); \
-    }
-
 class OffscreenQmlDialog : public QQuickItem
 {
     Q_OBJECT