Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 03:53:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

more cleanup work

Browse source
This commit is contained in:
Brad Hefta-Gaub 2015-11-17 11:06:27 -08:00
parent 034debc483
commit 60ae1259fa
4 changed files with 1 additions and 29 deletions

21
libraries/networking/src/MessagesClient.cpp
View file

@ -14,18 +14,11 @@
#include <cstdint>
#include <QtCore/QBuffer>
#include <QtCore/QStandardPaths>
#include <QtCore/QThread>
#include <QtNetwork/QNetworkDiskCache>
#include "AssetRequest.h"
#include "AssetUpload.h"
#include "AssetUtils.h"
#include "NetworkAccessManager.h"
#include "NetworkLogging.h"
#include "NodeList.h"
#include "PacketReceiver.h"
#include "ResourceCache.h"
MessagesClient::MessagesClient() {
@ -45,20 +38,6 @@ void MessagesClient::init() {
if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "init", Qt::BlockingQueuedConnection);
}
// Setup disk cache if not already
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
if (!networkAccessManager.cache()) {
QString cachePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
cachePath = !cachePath.isEmpty() ? cachePath : "interfaceCache";
QNetworkDiskCache* cache = new QNetworkDiskCache();
cache->setMaximumCacheSize(MAXIMUM_CACHE_SIZE);
cache->setCacheDirectory(cachePath);
networkAccessManager.setCache(cache);
qCDebug(asset_client) << "MessagesClient disk cache setup at" << cachePath
<< "(size:" << MAXIMUM_CACHE_SIZE / BYTES_PER_GIGABYTES << "GB)";
}
}
bool haveMessagesMixer() {

2
libraries/networking/src/MessagesClient.h
View file

@ -35,8 +35,6 @@ public:
private slots:
void handleMessagesPacket(QSharedPointer<NLPacketList> packetList, SharedNodePointer senderNode);
void handleNodeKilled(SharedNodePointer node);
private:
};
#endif

4
libraries/networking/src/PacketReceiver.cpp
View file

@ -95,8 +95,6 @@ void PacketReceiver::registerDirectListenerForTypes(PacketTypeList types,
}
bool PacketReceiver::registerMessageListener(PacketType type, QObject* listener, const char* slot) {
qCDebug(networking) << "PacketReceiver::registerMessageListener() packet list type" << type;
Q_ASSERT_X(listener, "PacketReceiver::registerMessageListener", "No object to register");
Q_ASSERT_X(slot, "PacketReceiver::registerMessageListener", "No slot to register");
@ -117,7 +115,7 @@ bool PacketReceiver::registerMessageListener(PacketType type, QObject* listener,
return true;
} else {
qCDebug(networking) << "NOT Registering a packet listener for packet list type" << type;
qCWarning(networking) << "FAILED to Register a packet listener for packet list type" << type;
return false;
}
}

3
libraries/networking/src/ThreadedAssignment.cpp
View file

@ -124,12 +124,9 @@ void ThreadedAssignment::stopSendingStats() {
}
void ThreadedAssignment::checkInWithDomainServerOrExit() {
qDebug() << "ThreadedAssignment::checkInWithDomainServerOrExit()....";
if (DependencyManager::get<NodeList>()->getNumNoReplyDomainCheckIns() == MAX_SILENT_DOMAIN_SERVER_CHECK_INS) {
qDebug() << "ThreadedAssignment::checkInWithDomainServerOrExit().... getNumNoReplyDomainCheckIns() == MAX_SILENT_DOMAIN_SERVER_CHECK_INS";
setFinished(true);
} else {
qDebug() << "ThreadedAssignment::checkInWithDomainServerOrExit().... calling DependencyManager::get<NodeList>()->sendDomainServerCheckIn()";
DependencyManager::get<NodeList>()->sendDomainServerCheckIn();
}
}