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

Removed unecessary method/cleanup header

Browse source
This commit is contained in:
Atlante45 2015-01-12 14:53:31 -08:00
parent e62fbe2557
commit 7bf57b3cca
2 changed files with 14 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
interface/src/Menu.cpp
View file

@ -54,13 +54,14 @@
#include "ui/AddressBarDialog.h" #include "ui/AddressBarDialog.h"
#include "ui/AnimationsDialog.h" #include "ui/AnimationsDialog.h"
#include "ui/AttachmentsDialog.h" #include "ui/AttachmentsDialog.h"
#include "ui/BandwidthDialog" #include "ui/BandwidthDialog.h"
#include "ui/DataWebDialog" #include "ui/CachesSizeDialog.h"
#include "ui/HMDToolsDialog" #include "ui/DataWebDialog.h"
#include "ui/LodToolsDialog" #include "ui/HMDToolsDialog.h"
#include "ui/LodToolsDialog.h"
#include "ui/LoginDialog.h" #include "ui/LoginDialog.h"
#include "ui/OctreeStatsDialog" #include "ui/OctreeStatsDialog.h"
#include "ui/PreferencesDialog" #include "ui/PreferencesDialog.h"
#include "ui/InfoView.h" #include "ui/InfoView.h"
#include "ui/MetavoxelEditor.h" #include "ui/MetavoxelEditor.h"
#include "ui/MetavoxelNetworkSimulator.h" #include "ui/MetavoxelNetworkSimulator.h"
@ -122,13 +123,7 @@ Menu::Menu() :
_lastAvatarDetailDrop(usecTimestampNow()), _lastAvatarDetailDrop(usecTimestampNow()),
_fpsAverage(FIVE_SECONDS_OF_FRAMES), _fpsAverage(FIVE_SECONDS_OF_FRAMES),
_fastFPSAverage(ONE_SECOND_OF_FRAMES), _fastFPSAverage(ONE_SECOND_OF_FRAMES),
_loginAction(NULL),
_newLocationDialog(NULL),
_userLocationsDialog(NULL),
_hasLoginDialogDisplayed(false), _hasLoginDialogDisplayed(false),
_snapshotsLocation(),
_scriptsLocation(),
_walletPrivateKey(),
_shouldRenderTableNeedsRebuilding(true) _shouldRenderTableNeedsRebuilding(true)
{ {
Application *appInstance = Application::getInstance(); Application *appInstance = Application::getInstance();
@ -1145,7 +1140,7 @@ void Menu::bandwidthDetails() {
if (! _bandwidthDialog) { if (! _bandwidthDialog) {
_bandwidthDialog = new BandwidthDialog(DependencyManager::get<GLCanvas>().data(), _bandwidthDialog = new BandwidthDialog(DependencyManager::get<GLCanvas>().data(),
Application::getInstance()->getBandwidthMeter()); Application::getInstance()->getBandwidthMeter());
connect(_bandwidthDialog, SIGNAL(closed()), SLOT(bandwidthDetailsClosed())); connect(_bandwidthDialog, SIGNAL(closed()), _bandwidthDialog, SLOT(deleteLater()));
_bandwidthDialog->show(); _bandwidthDialog->show();
@ -1249,7 +1244,7 @@ void Menu::octreeStatsDetails() {
if (!_octreeStatsDialog) { if (!_octreeStatsDialog) {
_octreeStatsDialog = new OctreeStatsDialog(DependencyManager::get<GLCanvas>().data(), _octreeStatsDialog = new OctreeStatsDialog(DependencyManager::get<GLCanvas>().data(),
Application::getInstance()->getOcteeSceneStats()); Application::getInstance()->getOcteeSceneStats());
connect(_octreeStatsDialog, SIGNAL(closed()), SLOT(octreeStatsDetailsClosed())); connect(_octreeStatsDialog, SIGNAL(closed()), _octreeStatsDialog, SLOT(deleteLater()));
_octreeStatsDialog->show(); _octreeStatsDialog->show();
if (_hmdToolsDialog) { if (_hmdToolsDialog) {
_hmdToolsDialog->watchWindow(_octreeStatsDialog->windowHandle()); _hmdToolsDialog->watchWindow(_octreeStatsDialog->windowHandle());
@ -1425,7 +1420,7 @@ bool Menu::shouldRenderMesh(float largestDimension, float distanceToCamera) {
void Menu::lodTools() { void Menu::lodTools() {
if (!_lodToolsDialog) { if (!_lodToolsDialog) {
_lodToolsDialog = new LodToolsDialog(DependencyManager::get<GLCanvas>().data()); _lodToolsDialog = new LodToolsDialog(DependencyManager::get<GLCanvas>().data());
connect(_lodToolsDialog, SIGNAL(closed()), SLOT(lodToolsClosed())); connect(_lodToolsDialog, SIGNAL(closed()), _lodToolsDialog, SLOT(deleteLater()));
_lodToolsDialog->show(); _lodToolsDialog->show();
if (_hmdToolsDialog) { if (_hmdToolsDialog) {
_hmdToolsDialog->watchWindow(_lodToolsDialog->windowHandle()); _hmdToolsDialog->watchWindow(_lodToolsDialog->windowHandle());
@ -1434,13 +1429,6 @@ void Menu::lodTools() {
_lodToolsDialog->raise(); _lodToolsDialog->raise();
} }
void Menu::lodToolsClosed() {
if (_lodToolsDialog) {
delete _lodToolsDialog;
_lodToolsDialog = NULL;
}
}
void Menu::hmdTools(bool showTools) { void Menu::hmdTools(bool showTools) {
if (showTools) { if (showTools) {
if (!_hmdToolsDialog) { if (!_hmdToolsDialog) {

10
interface/src/Menu.h
View file

@ -53,6 +53,7 @@ class QSettings;
class AddressBarDialog; class AddressBarDialog;
class AnimationsDialog; class AnimationsDialog;
class AttachmentsDialog; class AttachmentsDialog;
class CachesSizeDialog;
class BandwidthDialog; class BandwidthDialog;
class DataWebDialog; class DataWebDialog;
class HMDToolsDialog; class HMDToolsDialog;
@ -190,9 +191,6 @@ private slots:
void changePrivateKey(); void changePrivateKey();
void nameLocation(); void nameLocation();
void toggleLocationList(); void toggleLocationList();
void bandwidthDetailsClosed();
void octreeStatsDetailsClosed();
void lodToolsClosed();
void hmdToolsClosed(); void hmdToolsClosed();
void runTests(); void runTests();
void showMetavoxelEditor(); void showMetavoxelEditor();
@ -263,16 +261,15 @@ private:
float _avatarLODDistanceMultiplier; float _avatarLODDistanceMultiplier;
int _boundaryLevelAdjust; int _boundaryLevelAdjust;
int _maxOctreePacketsPerSecond; int _maxOctreePacketsPerSecond;
QString replaceLastOccurrence(QChar search, QChar replace, QString string);
quint64 _lastAdjust; quint64 _lastAdjust;
quint64 _lastAvatarDetailDrop; quint64 _lastAvatarDetailDrop;
SimpleMovingAverage _fpsAverage; SimpleMovingAverage _fpsAverage;
SimpleMovingAverage _fastFPSAverage; SimpleMovingAverage _fastFPSAverage;
QAction* _loginAction;
QPointer<AddressBarDialog> _addressBarDialog; QPointer<AddressBarDialog> _addressBarDialog;
QPointer<AnimationsDialog> _animationsDialog; QPointer<AnimationsDialog> _animationsDialog;
QPointer<AttachmentsDialog> _attachmentsDialog; QPointer<AttachmentsDialog> _attachmentsDialog;
QPointer<BandwidthDialog> _bandwidthDialog; QPointer<BandwidthDialog> _bandwidthDialog;
QPointer<CachesSizeDialog> _cachesSizeDialog;
QPointer<DataWebDialog> _newLocationDialog; QPointer<DataWebDialog> _newLocationDialog;
QPointer<DataWebDialog> _userLocationsDialog; QPointer<DataWebDialog> _userLocationsDialog;
QPointer<HMDToolsDialog> _hmdToolsDialog; QPointer<HMDToolsDialog> _hmdToolsDialog;
@ -281,7 +278,8 @@ private:
QPointer<OctreeStatsDialog> _octreeStatsDialog; QPointer<OctreeStatsDialog> _octreeStatsDialog;
QPointer<PreferencesDialog> _preferencesDialog; QPointer<PreferencesDialog> _preferencesDialog;
bool _hasLoginDialogDisplayed; bool _hasLoginDialogDisplayed;
QAction* _chatAction; QAction* _loginAction = nullptr;
QAction* _chatAction = nullptr;
QString _snapshotsLocation; QString _snapshotsLocation;
QString _scriptsLocation; QString _scriptsLocation;
QByteArray _walletPrivateKey; QByteArray _walletPrivateKey;