Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-19 12:24:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

clean up debug prints. put filename in window title-bar when connected to a serverless domain

Browse source
This commit is contained in:
Seth Alves 2018-02-23 16:46:42 -08:00
parent 77febe0aab
commit 5632f9d8fd
6 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Application.cpp
View file

@ -3052,8 +3052,6 @@ void Application::loadServerlessDomain(QUrl domainURL) {
return;
}
qDebug() << "QQQQ loadServerlessDomain" << domainURL.toString();
clearDomainOctreeDetails();
_entityClipboard->eraseAllOctreeElements();
@ -5731,7 +5729,7 @@ void Application::updateWindowTitle() const {
QString currentPlaceName;
if (isServerlessMode()) {
currentPlaceName = "serverless"; // XXX filename?
currentPlaceName = "serverless: " + DependencyManager::get<AddressManager>()->getServerlessDomainURL().toString();
} else {
currentPlaceName = DependencyManager::get<AddressManager>()->getHost();
if (currentPlaceName.isEmpty()) {
@ -5789,7 +5787,6 @@ void Application::clearDomainAvatars() {
}
void Application::domainChanged(const QString& domainHostname) {
qDebug() << "QQQQ Application::domainChanged" << domainHostname;
clearDomainOctreeDetails();
getEntities()->getTree()->setIsServerlessMode(isServerlessMode());
updateWindowTitle();

1
interface/src/avatar/MyAvatar.cpp
View file

@ -1164,7 +1164,6 @@ void MyAvatar::loadData() {
updateAvatarEntity(entityID, properties);
}
settings.endArray();
qDebug() << "QQQQ saved " << avatarEntityCount << " avatar entities";
if (avatarEntityCount == 0) {
// HACK: manually remove empty 'avatarEntityData' else legacy data may persist in settings file
settings.remove("avatarEntityData");

2
libraries/networking/src/AddressManager.cpp
View file

@ -404,8 +404,6 @@ void AddressManager::goToAddressFromObject(const QVariantMap& dataObject, const
QString domainIDString = domainObject[DOMAIN_ID_KEY].toString();
QUuid domainID(domainIDString);
qDebug() << "QQQQ AddressManager::goToAddressFromObject";
if (domainObject.contains(DOMAIN_NETWORK_ADDRESS_KEY)) {
QString domainHostname = domainObject[DOMAIN_NETWORK_ADDRESS_KEY].toString();

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

@ -179,6 +179,8 @@ public:
const QStack<QUrl>& getBackStack() const { return _backStack; }
const QStack<QUrl>& getForwardStack() const { return _forwardStack; }
QUrl getServerlessDomainURL() { return _serverlessDomainURL; }
public slots:
/**jsdoc
* Go to a specified metaverse address.

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

@ -156,8 +156,6 @@ void DomainHandler::setSocketAndID(const QUrl& serverlessDomainURL,
_pendingDomainID = domainID;
qDebug() << "QQQQ DomainHandler::setSocketAndID " << serverlessDomainURL << hostname << port;
if (serverlessDomainURL != _serverlessDomainURL || hostname != _hostname || _sockAddr.getPort() != port) {
// re-set the domain info so that auth information is reloaded
hardReset();
@ -167,7 +165,6 @@ void DomainHandler::setSocketAndID(const QUrl& serverlessDomainURL,
if (_serverlessDomainURL != QUrl()) {
setIsConnected(true);
}
qDebug() << "QQQQ serverlessDomainChanged";
emit serverlessDomainChanged(_serverlessDomainURL);
}
@ -187,7 +184,6 @@ void DomainHandler::setSocketAndID(const QUrl& serverlessDomainURL,
UserActivityLogger::getInstance().changedDomain(_hostname);
}
qDebug() << "QQQQ hostnameChanged";
emit hostnameChanged(_hostname);
}

1
libraries/shared/src/PathUtils.cpp
View file

@ -126,7 +126,6 @@ QUrl PathUtils::expandToLocalDataAbsolutePath(const QUrl& fileUrl) {
if (path.startsWith("/~/")) {
path.replace(0, 3, getAppLocalDataPath());
url = QUrl::fromLocalFile(path);
qDebug() << "QQQQ expandToLocalDataAbsolutePath: " << fileUrl << url;
}
return url;
}