From 1f31828e08665949ff57499dfb15d34aaf2f21c3 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Sun, 18 Jan 2015 07:14:52 -0800
Subject: [PATCH] Moved last methog out of Menu

	Also did a bit of Header cleanup
---
 interface/src/Application.cpp                 | 14 +++++++-
 interface/src/Application.h                   |  2 ++
 interface/src/Bookmarks.cpp                   |  1 +
 interface/src/Menu.cpp                        | 25 +++----------
 interface/src/Menu.h                          | 35 -------------------
 interface/src/ScriptsModel.cpp                |  1 +
 interface/src/devices/Faceshift.cpp           |  1 +
 interface/src/devices/RealSense.cpp           |  2 ++
 .../scripting/WindowScriptingInterface.cpp    |  1 +
 interface/src/ui/AnimationsDialog.h           |  1 +
 interface/src/ui/DialogsManager.cpp           |  2 +-
 interface/src/ui/DialogsManager.h             | 17 +++++++++
 interface/src/ui/LodToolsDialog.cpp           |  1 +
 interface/src/ui/MetavoxelEditor.h            |  1 +
 interface/src/ui/ScriptEditorWidget.cpp       |  1 +
 interface/src/ui/Stats.cpp                    |  3 ++
 16 files changed, 51 insertions(+), 57 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 8d7c25a675..78d13e143b 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -40,6 +40,7 @@
 #include <QScreen>
 #include <QSettings>
 #include <QShortcut>
+#include <QSystemTrayIcon>
 #include <QTimer>
 #include <QUrl>
 #include <QWindow>
@@ -101,7 +102,6 @@
 #include "gpu/Batch.h"
 #include "gpu/GLBackend.h"
 
-
 #include "scripting/AccountScriptingInterface.h"
 #include "scripting/AudioDeviceScriptingInterface.h"
 #include "scripting/ClipboardScriptingInterface.h"
@@ -113,6 +113,10 @@
 #include "scripting/WindowScriptingInterface.h"
 #include "scripting/WebWindowClass.h"
 
+#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
+#include "SpeechRecognizer.h"
+#endif
+
 #include "ui/DataWebDialog.h"
 #include "ui/DialogsManager.h"
 #include "ui/InfoView.h"
@@ -727,6 +731,14 @@ void Application::runTests() {
     runTimingTests();
 }
 
+void Application::aboutApp() {
+    InfoView::forcedShow(INFO_HELP_PATH);
+}
+
+void Application::showEditEntitiesHelp() {
+    InfoView::forcedShow(INFO_EDIT_ENTITIES_PATH);
+}
+
 void Application::resetCamerasOnResizeGL(Camera& camera, int width, int height) {
     if (OculusManager::isConnected()) {
         OculusManager::configureCamera(camera, width, height);
diff --git a/interface/src/Application.h b/interface/src/Application.h
index b48d67fe12..1ff2b37657 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -371,6 +371,8 @@ public slots:
     void setVSyncEnabled();
 
     void resetSensors();
+    void aboutApp();
+    void showEditEntitiesHelp();
 
 private slots:
     void clearDomainOctreeDetails();
diff --git a/interface/src/Bookmarks.cpp b/interface/src/Bookmarks.cpp
index f8bc269635..4d484fd2cc 100644
--- a/interface/src/Bookmarks.cpp
+++ b/interface/src/Bookmarks.cpp
@@ -19,6 +19,7 @@
 #include <QStandardPaths>
 
 #include <AddressManager.h>
+#include <Application.h>
 
 #include "MainWindow.h"
 #include "Menu.h"
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 9ef736105a..07d6720916 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -51,6 +51,9 @@
 #include "Menu.h"
 #include "scripting/LocationScriptingInterface.h"
 #include "scripting/MenuScriptingInterface.h"
+#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
+#include "SpeechRecognizer.h"
+#endif
 #include "Util.h"
 #include "ui/AddressBarDialog.h"
 #include "ui/AnimationsDialog.h"
@@ -96,12 +99,7 @@ Menu::Menu() {
     QMenu* fileMenu = addMenu("File");
 
 #ifdef Q_OS_MAC
-    addActionToQMenuAndActionHash(fileMenu,
-                                  MenuOption::AboutApp,
-                                  0,
-                                  this,
-                                  SLOT(aboutApp()),
-                                  QAction::AboutRole);
+    addActionToQMenuAndActionHash(fileMenu, MenuOption::AboutApp, 0, qApp, SLOT(aboutApp()), QAction::AboutRole);
 #endif
     auto dialogsManager = DependencyManager::get<DialogsManager>();
     AccountManager& accountManager = AccountManager::getInstance();
@@ -577,7 +575,7 @@ Menu::Menu() {
 #ifndef Q_OS_MAC
     QMenu* helpMenu = addMenu("Help");
     QAction* helpAction = helpMenu->addAction(MenuOption::AboutApp);
-    connect(helpAction, SIGNAL(triggered()), this, SLOT(aboutApp()));
+    connect(helpAction, SIGNAL(triggered()), qApp, SLOT(aboutApp()));
 #endif
 }
 
@@ -1059,16 +1057,3 @@ bool Menu::menuItemExists(const QString& menu, const QString& menuitem) {
     }
     return false;
 };
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////// TODO: Move to appropriate files ////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void Menu::aboutApp() {
-    InfoView::forcedShow(INFO_HELP_PATH);
-}
-
-void Menu::showEditEntitiesHelp() {
-    InfoView::forcedShow(INFO_EDIT_ENTITIES_PATH);
-}
-
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 6eb74f2984..6a1d0399b0 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -19,36 +19,10 @@
 #include <QPointer>
 #include <QStandardPaths>
 
-#include <EventTypes.h>
 #include <MenuItemProperties.h>
 
-#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
-#include "SpeechRecognizer.h"
-#endif
-
-#include "ui/ChatWindow.h"
-#include "ui/JSConsole.h"
-#include "ui/ScriptEditorWindow.h"
-
-const QString SETTINGS_ADDRESS_KEY = "address";
 class QSettings;
 
-class AddressBarDialog;
-class AnimationsDialog;
-class AttachmentsDialog;
-class CachesSizeDialog;
-class BandwidthDialog;
-class DataWebDialog;
-class HMDToolsDialog;
-class LodToolsDialog;
-class LoginDialog;
-class OctreeStatsDialog;
-class PreferencesDialog;
-class MetavoxelEditor;
-class MetavoxelNetworkSimulator;
-class ChatWindow;
-class MenuItemProperties;
-
 class Menu : public QMenuBar {
     Q_OBJECT
 public:
@@ -123,15 +97,6 @@ private:
     
     
     QHash<QString, QAction*> _actionHash;
-    
-    
-    
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////// TODO: Move to appropriate files ////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-private slots:
-    void aboutApp();
-    void showEditEntitiesHelp();
 };
 
 namespace MenuOption {
diff --git a/interface/src/ScriptsModel.cpp b/interface/src/ScriptsModel.cpp
index 841fc30e26..cec42eef7d 100644
--- a/interface/src/ScriptsModel.cpp
+++ b/interface/src/ScriptsModel.cpp
@@ -17,6 +17,7 @@
 
 #include <NetworkAccessManager.h>
 
+#include "Application.h"
 #include "Menu.h"
 
 #include "ScriptsModel.h"
diff --git a/interface/src/devices/Faceshift.cpp b/interface/src/devices/Faceshift.cpp
index 164d6ee477..0d5eace74b 100644
--- a/interface/src/devices/Faceshift.cpp
+++ b/interface/src/devices/Faceshift.cpp
@@ -11,6 +11,7 @@
 
 #include <QTimer>
 
+#include <GLMHelpers.h>
 #include <PerfStat.h>
 #include <SharedUtil.h>
 
diff --git a/interface/src/devices/RealSense.cpp b/interface/src/devices/RealSense.cpp
index f082f96949..7d039a25d9 100644
--- a/interface/src/devices/RealSense.cpp
+++ b/interface/src/devices/RealSense.cpp
@@ -8,6 +8,8 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
+
+#include "Application.h"
 #include "RealSense.h"
 #include "MainWindow.h"
 #include "Menu.h"
diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp
index 15372dc057..cffa5f777f 100644
--- a/interface/src/scripting/WindowScriptingInterface.cpp
+++ b/interface/src/scripting/WindowScriptingInterface.cpp
@@ -15,6 +15,7 @@
 #include <QInputDialog>
 #include <QMessageBox>
 #include <QScriptValue>
+#include <QScrollArea>
 
 #include "Application.h"
 #include "MainWindow.h"
diff --git a/interface/src/ui/AnimationsDialog.h b/interface/src/ui/AnimationsDialog.h
index 9fded623ce..e0c3fb4d92 100644
--- a/interface/src/ui/AnimationsDialog.h
+++ b/interface/src/ui/AnimationsDialog.h
@@ -13,6 +13,7 @@
 #define hifi_AnimationsDialog_h
 
 #include <QDialog>
+#include <QDoubleSpinBox>
 #include <QFrame>
 
 #include "avatar/MyAvatar.h"
diff --git a/interface/src/ui/DialogsManager.cpp b/interface/src/ui/DialogsManager.cpp
index 40ebf61c64..a540b65b75 100644
--- a/interface/src/ui/DialogsManager.cpp
+++ b/interface/src/ui/DialogsManager.cpp
@@ -10,7 +10,6 @@
 //
 
 #include <AccountManager.h>
-#include <Application.h>
 #include <MainWindow.h>
 #include <PathUtils.h>
 #include <XmppClient.h>
@@ -20,6 +19,7 @@
 #include "AttachmentsDialog.h"
 #include "BandwidthDialog.h"
 #include "CachesSizeDialog.h"
+#include "ChatWindow.h"
 #include "HMDToolsDialog.h"
 #include "LodToolsDialog.h"
 #include "LoginDialog.h"
diff --git a/interface/src/ui/DialogsManager.h b/interface/src/ui/DialogsManager.h
index 8a8b1302d7..465c6829ad 100644
--- a/interface/src/ui/DialogsManager.h
+++ b/interface/src/ui/DialogsManager.h
@@ -14,10 +14,27 @@
 
 #include <QPointer>
 
+#include <Application.h>
 #include <DependencyManager.h>
 
+#include "HMDToolsDialog.h"
+
 class QAction;
 
+class AddressBarDialog;
+class AnimationsDialog;
+class AttachmentsDialog;
+class CachesSizeDialog;
+class ChatWindow;
+class BandwidthDialog;
+class LodToolsDialog;
+class LoginDialog;
+class MetavoxelEditor;
+class MetavoxelNetworkSimulator;
+class OctreeStatsDialog;
+class PreferencesDialog;
+class ScriptEditorWindow;
+
 class DialogsManager : public QObject, public Dependency {
     Q_OBJECT
     SINGLETON_DEPENDENCY
diff --git a/interface/src/ui/LodToolsDialog.cpp b/interface/src/ui/LodToolsDialog.cpp
index 1b149bf903..277d634735 100644
--- a/interface/src/ui/LodToolsDialog.cpp
+++ b/interface/src/ui/LodToolsDialog.cpp
@@ -14,6 +14,7 @@
 #include <QDialogButtonBox>
 #include <QDoubleSpinBox>
 #include <QFormLayout>
+#include <QLabel>
 #include <QPalette>
 #include <QPushButton>
 #include <QSlider>
diff --git a/interface/src/ui/MetavoxelEditor.h b/interface/src/ui/MetavoxelEditor.h
index 874989a55d..7d1deb0ce5 100644
--- a/interface/src/ui/MetavoxelEditor.h
+++ b/interface/src/ui/MetavoxelEditor.h
@@ -12,6 +12,7 @@
 #ifndef hifi_MetavoxelEditor_h
 #define hifi_MetavoxelEditor_h
 
+#include <QFormLayout>
 #include <QList>
 #include <QWidget>
 
diff --git a/interface/src/ui/ScriptEditorWidget.cpp b/interface/src/ui/ScriptEditorWidget.cpp
index 660b9009b6..37afa35d5b 100644
--- a/interface/src/ui/ScriptEditorWidget.cpp
+++ b/interface/src/ui/ScriptEditorWidget.cpp
@@ -11,6 +11,7 @@
 
 #include "ui_scriptEditorWidget.h"
 #include "ScriptEditorWidget.h"
+#include "ScriptEditorWindow.h"
 
 #include <QGridLayout>
 #include <QFileDialog>
diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp
index 9beedd4ac3..424bd4d50c 100644
--- a/interface/src/ui/Stats.cpp
+++ b/interface/src/ui/Stats.cpp
@@ -18,6 +18,9 @@
 #include <glm/gtx/quaternion.hpp>
 #include <glm/gtx/vector_angle.hpp>
 
+#include <Application.h>
+#include <GeometryCache.h>
+#include <GLCanvas.h>
 #include <LODManager.h>
 #include <PerfStat.h>