From 40a963cf927500ab371918ba672cc1038b475ad1 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 31 Jan 2014 17:50:51 -0800
Subject: [PATCH] some application destructor cleanup

---
 interface/src/AbstractLoggerInterface.h | 1 +
 interface/src/Application.cpp           | 9 ++-------
 interface/src/FileLogger.cpp            | 5 ++++-
 interface/src/FileLogger.h              | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/interface/src/AbstractLoggerInterface.h b/interface/src/AbstractLoggerInterface.h
index d8a48fc2fd..cedab1fad2 100644
--- a/interface/src/AbstractLoggerInterface.h
+++ b/interface/src/AbstractLoggerInterface.h
@@ -17,6 +17,7 @@ class AbstractLoggerInterface : public QObject {
     Q_OBJECT
 
 public:
+    AbstractLoggerInterface(QObject* parent = NULL) : QObject(parent) {};
     inline bool extraDebugging() { return _extraDebugging; };
     inline void setExtraDebugging(bool debugging) { _extraDebugging = debugging; };
 
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 289e7e2430..d0d0fc4c40 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -154,7 +154,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
         _resetRecentMaxPacketsSoon(true),
         _swatch(NULL),
         _pasteMode(false),
-        _logger(new FileLogger()),
+        _logger(new FileLogger(this)),
         _persistThread(NULL)
 {
     _myAvatar = _avatarManager.getMyAvatar();
@@ -328,12 +328,7 @@ Application::~Application() {
 
     VoxelTreeElement::removeDeleteHook(&_voxels); // we don't need to do this processing on shutdown
     Menu::getInstance()->deleteLater();
-
-    _avatarManager.clear();
-    _myAvatar = NULL;
-
-    delete _logger;
-    delete _settings;
+    
     delete _glWidget;
 }
 
diff --git a/interface/src/FileLogger.cpp b/interface/src/FileLogger.cpp
index 3c98b285a3..81c626a46e 100644
--- a/interface/src/FileLogger.cpp
+++ b/interface/src/FileLogger.cpp
@@ -18,7 +18,10 @@ const QString FILENAME_FORMAT = "hifi-log_%1_%2.txt";
 const QString DATETIME_FORMAT = "yyyy-MM-dd_hh.mm.ss";
 const QString LOGS_DIRECTORY = "Logs";
 
-FileLogger::FileLogger() : _logData(NULL) {
+FileLogger::FileLogger(QObject* parent) :
+    AbstractLoggerInterface(parent),
+    _logData(NULL)
+{
     setExtraDebugging(false);
 
     _fileName = FileUtils::standardPath(LOGS_DIRECTORY);
diff --git a/interface/src/FileLogger.h b/interface/src/FileLogger.h
index 6a17032ae2..35cafa4db7 100644
--- a/interface/src/FileLogger.h
+++ b/interface/src/FileLogger.h
@@ -16,7 +16,7 @@ class FileLogger : public AbstractLoggerInterface {
     Q_OBJECT
 
 public:
-    FileLogger();
+    FileLogger(QObject* parent = NULL);
 
     virtual void addMessage(QString);
     virtual QStringList getLogData() { return _logData; };