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

Cleanup some headers

Browse source
This commit is contained in:
Atlante45 2015-01-12 14:09:26 -08:00
parent fd2b0edf7a
commit e62fbe2557
2 changed files with 13 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
interface/src/Menu.cpp
View file

@ -51,13 +51,20 @@
#include "scripting/LocationScriptingInterface.h" #include "scripting/LocationScriptingInterface.h"
#include "scripting/MenuScriptingInterface.h" #include "scripting/MenuScriptingInterface.h"
#include "Util.h" #include "Util.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/DataWebDialog"
#include "ui/HMDToolsDialog"
#include "ui/LodToolsDialog"
#include "ui/LoginDialog.h"
#include "ui/OctreeStatsDialog"
#include "ui/PreferencesDialog"
#include "ui/InfoView.h" #include "ui/InfoView.h"
#include "ui/MetavoxelEditor.h" #include "ui/MetavoxelEditor.h"
#include "ui/MetavoxelNetworkSimulator.h" #include "ui/MetavoxelNetworkSimulator.h"
#include "ui/ModelsBrowser.h" #include "ui/ModelsBrowser.h"
#include "ui/LoginDialog.h"
#include "ui/NodeBounds.h" #include "ui/NodeBounds.h"
Menu* Menu::_instance = NULL; Menu* Menu::_instance = NULL;
@ -613,15 +620,6 @@ Menu::Menu() :
#endif #endif
} }
Menu::~Menu() {
bandwidthDetailsClosed();
octreeStatsDetailsClosed();
if (_hmdToolsDialog) {
delete _hmdToolsDialog;
_hmdToolsDialog = NULL;
}
}
void Menu::loadSettings(QSettings* settings) { void Menu::loadSettings(QSettings* settings) {
bool lockedSettings = false; bool lockedSettings = false;
if (!settings) { if (!settings) {
@ -1247,13 +1245,6 @@ void Menu::audioMuteToggled() {
} }
} }
void Menu::bandwidthDetailsClosed() {
if (_bandwidthDialog) {
delete _bandwidthDialog;
_bandwidthDialog = NULL;
}
}
void Menu::octreeStatsDetails() { void Menu::octreeStatsDetails() {
if (!_octreeStatsDialog) { if (!_octreeStatsDialog) {
_octreeStatsDialog = new OctreeStatsDialog(DependencyManager::get<GLCanvas>().data(), _octreeStatsDialog = new OctreeStatsDialog(DependencyManager::get<GLCanvas>().data(),
@ -1267,13 +1258,6 @@ void Menu::octreeStatsDetails() {
_octreeStatsDialog->raise(); _octreeStatsDialog->raise();
} }
void Menu::octreeStatsDetailsClosed() {
if (_octreeStatsDialog) {
delete _octreeStatsDialog;
_octreeStatsDialog = NULL;
}
}
QString Menu::getLODFeedbackText() { QString Menu::getLODFeedbackText() {
// determine granularity feedback // determine granularity feedback
int boundaryLevelAdjust = getBoundaryLevelAdjust(); int boundaryLevelAdjust = getBoundaryLevelAdjust();

11
interface/src/Menu.h
View file

@ -27,12 +27,8 @@
#include "SpeechRecognizer.h" #include "SpeechRecognizer.h"
#endif #endif
#include "ui/AddressBarDialog.h"
#include "ui/ChatWindow.h" #include "ui/ChatWindow.h"
#include "ui/DataWebDialog.h"
#include "ui/JSConsole.h" #include "ui/JSConsole.h"
#include "ui/LoginDialog.h"
#include "ui/PreferencesDialog.h"
#include "ui/ScriptEditorWindow.h" #include "ui/ScriptEditorWindow.h"
const float ADJUST_LOD_DOWN_FPS = 40.0; const float ADJUST_LOD_DOWN_FPS = 40.0;
@ -54,22 +50,25 @@ const float MAXIMUM_AVATAR_LOD_DISTANCE_MULTIPLIER = 15.0f;
const QString SETTINGS_ADDRESS_KEY = "address"; const QString SETTINGS_ADDRESS_KEY = "address";
class QSettings; class QSettings;
class AddressBarDialog;
class AnimationsDialog; class AnimationsDialog;
class AttachmentsDialog; class AttachmentsDialog;
class BandwidthDialog; class BandwidthDialog;
class DataWebDialog;
class HMDToolsDialog; class HMDToolsDialog;
class LodToolsDialog; class LodToolsDialog;
class LoginDialog;
class OctreeStatsDialog;
class PreferencesDialog;
class MetavoxelEditor; class MetavoxelEditor;
class MetavoxelNetworkSimulator; class MetavoxelNetworkSimulator;
class ChatWindow; class ChatWindow;
class OctreeStatsDialog;
class MenuItemProperties; class MenuItemProperties;
class Menu : public QMenuBar { class Menu : public QMenuBar {
Q_OBJECT Q_OBJECT
public: public:
static Menu* getInstance(); static Menu* getInstance();
~Menu();
void triggerOption(const QString& menuOption); void triggerOption(const QString& menuOption);
QAction* getActionForOption(const QString& menuOption); QAction* getActionForOption(const QString& menuOption);