From 7bf57b3cca68b09d75fc83d87ecb618b2241a175 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 12 Jan 2015 14:53:31 -0800
Subject: [PATCH] Removed unecessary method/cleanup header

---
 interface/src/Menu.cpp | 32 ++++++++++----------------------
 interface/src/Menu.h   | 10 ++++------
 2 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index c25ab67db5..3e4f2c212a 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -54,13 +54,14 @@
 #include "ui/AddressBarDialog.h"
 #include "ui/AnimationsDialog.h"
 #include "ui/AttachmentsDialog.h"
-#include "ui/BandwidthDialog"
-#include "ui/DataWebDialog"
-#include "ui/HMDToolsDialog"
-#include "ui/LodToolsDialog"
+#include "ui/BandwidthDialog.h"
+#include "ui/CachesSizeDialog.h"
+#include "ui/DataWebDialog.h"
+#include "ui/HMDToolsDialog.h"
+#include "ui/LodToolsDialog.h"
 #include "ui/LoginDialog.h"
-#include "ui/OctreeStatsDialog"
-#include "ui/PreferencesDialog"
+#include "ui/OctreeStatsDialog.h"
+#include "ui/PreferencesDialog.h"
 #include "ui/InfoView.h"
 #include "ui/MetavoxelEditor.h"
 #include "ui/MetavoxelNetworkSimulator.h"
@@ -122,13 +123,7 @@ Menu::Menu() :
     _lastAvatarDetailDrop(usecTimestampNow()),
     _fpsAverage(FIVE_SECONDS_OF_FRAMES),
     _fastFPSAverage(ONE_SECOND_OF_FRAMES),
-    _loginAction(NULL),
-    _newLocationDialog(NULL),
-    _userLocationsDialog(NULL),
     _hasLoginDialogDisplayed(false),
-    _snapshotsLocation(),
-    _scriptsLocation(),
-    _walletPrivateKey(),
     _shouldRenderTableNeedsRebuilding(true)
 {
     Application *appInstance = Application::getInstance();
@@ -1145,7 +1140,7 @@ void Menu::bandwidthDetails() {
     if (! _bandwidthDialog) {
         _bandwidthDialog = new BandwidthDialog(DependencyManager::get<GLCanvas>().data(),
                                                Application::getInstance()->getBandwidthMeter());
-        connect(_bandwidthDialog, SIGNAL(closed()), SLOT(bandwidthDetailsClosed()));
+        connect(_bandwidthDialog, SIGNAL(closed()), _bandwidthDialog, SLOT(deleteLater()));
 
         _bandwidthDialog->show();
         
@@ -1249,7 +1244,7 @@ void Menu::octreeStatsDetails() {
     if (!_octreeStatsDialog) {
         _octreeStatsDialog = new OctreeStatsDialog(DependencyManager::get<GLCanvas>().data(),
                                                  Application::getInstance()->getOcteeSceneStats());
-        connect(_octreeStatsDialog, SIGNAL(closed()), SLOT(octreeStatsDetailsClosed()));
+        connect(_octreeStatsDialog, SIGNAL(closed()), _octreeStatsDialog, SLOT(deleteLater()));
         _octreeStatsDialog->show();
         if (_hmdToolsDialog) {
             _hmdToolsDialog->watchWindow(_octreeStatsDialog->windowHandle());
@@ -1425,7 +1420,7 @@ bool Menu::shouldRenderMesh(float largestDimension, float distanceToCamera) {
 void Menu::lodTools() {
     if (!_lodToolsDialog) {
         _lodToolsDialog = new LodToolsDialog(DependencyManager::get<GLCanvas>().data());
-        connect(_lodToolsDialog, SIGNAL(closed()), SLOT(lodToolsClosed()));
+        connect(_lodToolsDialog, SIGNAL(closed()), _lodToolsDialog, SLOT(deleteLater()));
         _lodToolsDialog->show();
         if (_hmdToolsDialog) {
             _hmdToolsDialog->watchWindow(_lodToolsDialog->windowHandle());
@@ -1434,13 +1429,6 @@ void Menu::lodTools() {
     _lodToolsDialog->raise();
 }
 
-void Menu::lodToolsClosed() {
-    if (_lodToolsDialog) {
-        delete _lodToolsDialog;
-        _lodToolsDialog = NULL;
-    }
-}
-
 void Menu::hmdTools(bool showTools) {
     if (showTools) {
         if (!_hmdToolsDialog) {
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 2cd9c8ecf2..3bc15fd99a 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -53,6 +53,7 @@ class QSettings;
 class AddressBarDialog;
 class AnimationsDialog;
 class AttachmentsDialog;
+class CachesSizeDialog;
 class BandwidthDialog;
 class DataWebDialog;
 class HMDToolsDialog;
@@ -190,9 +191,6 @@ private slots:
     void changePrivateKey();
     void nameLocation();
     void toggleLocationList();
-    void bandwidthDetailsClosed();
-    void octreeStatsDetailsClosed();
-    void lodToolsClosed();
     void hmdToolsClosed();
     void runTests();
     void showMetavoxelEditor();
@@ -263,16 +261,15 @@ private:
     float _avatarLODDistanceMultiplier;
     int _boundaryLevelAdjust;
     int _maxOctreePacketsPerSecond;
-    QString replaceLastOccurrence(QChar search, QChar replace, QString string);
     quint64 _lastAdjust;
     quint64 _lastAvatarDetailDrop;
     SimpleMovingAverage _fpsAverage;
     SimpleMovingAverage _fastFPSAverage;
-    QAction* _loginAction;
     QPointer<AddressBarDialog> _addressBarDialog;
     QPointer<AnimationsDialog> _animationsDialog;
     QPointer<AttachmentsDialog> _attachmentsDialog;
     QPointer<BandwidthDialog> _bandwidthDialog;
+    QPointer<CachesSizeDialog> _cachesSizeDialog;
     QPointer<DataWebDialog> _newLocationDialog;
     QPointer<DataWebDialog> _userLocationsDialog;
     QPointer<HMDToolsDialog> _hmdToolsDialog;
@@ -281,7 +278,8 @@ private:
     QPointer<OctreeStatsDialog> _octreeStatsDialog;
     QPointer<PreferencesDialog> _preferencesDialog;
     bool _hasLoginDialogDisplayed;
-    QAction* _chatAction;
+    QAction* _loginAction = nullptr;
+    QAction* _chatAction = nullptr;
     QString _snapshotsLocation;
     QString _scriptsLocation;
     QByteArray _walletPrivateKey;