some cleanup of dead code related to timers

This commit is contained in:
ZappoMan 2015-03-11 12:10:37 -07:00
parent 48aca5c46f
commit e87e0a1e0b
6 changed files with 1 additions and 11 deletions

View file

@ -12,7 +12,6 @@
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <QtCore/QEventLoop> #include <QtCore/QEventLoop>
#include <QtCore/QStandardPaths> #include <QtCore/QStandardPaths>
#include <QtCore/QTimer>
#include <QtNetwork/QNetworkDiskCache> #include <QtNetwork/QNetworkDiskCache>
#include <QtNetwork/QNetworkRequest> #include <QtNetwork/QNetworkRequest>
#include <QtNetwork/QNetworkReply> #include <QtNetwork/QNetworkReply>

View file

@ -37,7 +37,6 @@
#include <QtCore/QJsonObject> #include <QtCore/QJsonObject>
#include <QtCore/QJsonValue> #include <QtCore/QJsonValue>
#include <QtCore/QThread> #include <QtCore/QThread>
#include <QtCore/QTimer>
#include <QtNetwork/QNetworkRequest> #include <QtNetwork/QNetworkRequest>
#include <QtNetwork/QNetworkReply> #include <QtNetwork/QNetworkReply>

View file

@ -16,6 +16,7 @@
#include <QLabel> #include <QLabel>
#include <QFormLayout> #include <QFormLayout>
#include <QVector> #include <QVector>
#include <QTimer>
#include "Node.h" #include "Node.h"
#include "BandwidthRecorder.h" #include "BandwidthRecorder.h"

View file

@ -16,7 +16,6 @@
#include <QObject> #include <QObject>
#include <QElapsedTimer> #include <QElapsedTimer>
#include <QTimer>
#include "DependencyManager.h" #include "DependencyManager.h"
#include "Node.h" #include "Node.h"
#include "SimpleMovingAverage.h" #include "SimpleMovingAverage.h"

View file

@ -32,7 +32,6 @@ DomainHandler::DomainHandler(QObject* parent) :
_iceServerSockAddr(), _iceServerSockAddr(),
_icePeer(), _icePeer(),
_isConnected(false), _isConnected(false),
_handshakeTimer(NULL),
_settingsObject(), _settingsObject(),
_failedSettingsRequests(0) _failedSettingsRequests(0)
{ {
@ -50,12 +49,6 @@ void DomainHandler::clearConnectionInfo() {
} }
setIsConnected(false); setIsConnected(false);
if (_handshakeTimer) {
_handshakeTimer->stop();
delete _handshakeTimer;
_handshakeTimer = NULL;
}
} }
void DomainHandler::clearSettings() { void DomainHandler::clearSettings() {

View file

@ -100,7 +100,6 @@ private:
HifiSockAddr _iceServerSockAddr; HifiSockAddr _iceServerSockAddr;
NetworkPeer _icePeer; NetworkPeer _icePeer;
bool _isConnected; bool _isConnected;
QTimer* _handshakeTimer;
QJsonObject _settingsObject; QJsonObject _settingsObject;
int _failedSettingsRequests; int _failedSettingsRequests;
}; };