From e87e0a1e0b35fefe09807acc525f5e1097333b6f Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Wed, 11 Mar 2015 12:10:37 -0700
Subject: [PATCH] some cleanup of dead code related to timers

---
 assignment-client/src/Agent.cpp              | 1 -
 assignment-client/src/audio/AudioMixer.cpp   | 1 -
 interface/src/ui/BandwidthDialog.h           | 1 +
 libraries/networking/src/BandwidthRecorder.h | 1 -
 libraries/networking/src/DomainHandler.cpp   | 7 -------
 libraries/networking/src/DomainHandler.h     | 1 -
 6 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index d56db7aace..ed1f293c06 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -12,7 +12,6 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QEventLoop>
 #include <QtCore/QStandardPaths>
-#include <QtCore/QTimer>
 #include <QtNetwork/QNetworkDiskCache>
 #include <QtNetwork/QNetworkRequest>
 #include <QtNetwork/QNetworkReply>
diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index e865ab0035..dd566bc40b 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -37,7 +37,6 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonValue>
 #include <QtCore/QThread>
-#include <QtCore/QTimer>
 #include <QtNetwork/QNetworkRequest>
 #include <QtNetwork/QNetworkReply>
 
diff --git a/interface/src/ui/BandwidthDialog.h b/interface/src/ui/BandwidthDialog.h
index a504a5964f..1fc8627191 100644
--- a/interface/src/ui/BandwidthDialog.h
+++ b/interface/src/ui/BandwidthDialog.h
@@ -16,6 +16,7 @@
 #include <QLabel>
 #include <QFormLayout>
 #include <QVector>
+#include <QTimer>
 
 #include "Node.h"
 #include "BandwidthRecorder.h"
diff --git a/libraries/networking/src/BandwidthRecorder.h b/libraries/networking/src/BandwidthRecorder.h
index a7f51fbb45..c22665d2cc 100644
--- a/libraries/networking/src/BandwidthRecorder.h
+++ b/libraries/networking/src/BandwidthRecorder.h
@@ -16,7 +16,6 @@
 
 #include <QObject>
 #include <QElapsedTimer>
-#include <QTimer>
 #include "DependencyManager.h"
 #include "Node.h"
 #include "SimpleMovingAverage.h"
diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp
index fe50647c20..78ec64832b 100644
--- a/libraries/networking/src/DomainHandler.cpp
+++ b/libraries/networking/src/DomainHandler.cpp
@@ -32,7 +32,6 @@ DomainHandler::DomainHandler(QObject* parent) :
     _iceServerSockAddr(),
     _icePeer(),
     _isConnected(false),
-    _handshakeTimer(NULL),
     _settingsObject(),
     _failedSettingsRequests(0)
 {
@@ -50,12 +49,6 @@ void DomainHandler::clearConnectionInfo() {
     }
     
     setIsConnected(false);
-    
-    if (_handshakeTimer) {
-        _handshakeTimer->stop();
-        delete _handshakeTimer;
-        _handshakeTimer = NULL;
-    }
 }
 
 void DomainHandler::clearSettings() {
diff --git a/libraries/networking/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h
index 295e6eac01..0877f657e1 100644
--- a/libraries/networking/src/DomainHandler.h
+++ b/libraries/networking/src/DomainHandler.h
@@ -100,7 +100,6 @@ private:
     HifiSockAddr _iceServerSockAddr;
     NetworkPeer _icePeer;
     bool _isConnected;
-    QTimer* _handshakeTimer;
     QJsonObject _settingsObject;
     int _failedSettingsRequests;
 };