History

Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup

Andrew Meadows committed 12 years ago

Commit cb186b12 parents 32df731 0bcbe488 files · +199 −93Browse files

Showing the changes to interface/src/Application.cpp (1 of 8 files). Show all

Unified · Split

interface/src/Application.cpp+28−29
@@ -152,7 +152,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 151 unmodified lines
152152 _resetRecentMaxPacketsSoon(true),
153153 _swatch(NULL),
154154 _pasteMode(false),
155− _logger(new FileLogger()),
155+ _logger(new FileLogger(this)),
156156 _persistThread(NULL)
157157 {
158158 _myAvatar = _avatarManager.getMyAvatar();
@@ -319,7 +319,7 @@ Application::~Application() { · 160 unmodified lines
319319 _persistThread->deleteLater();
320320 _persistThread = NULL;
321321 }
322−
322+
323323 storeSizeAndPosition();
324324 saveScripts();
325325 _sharedVoxelSystem.changeTree(new VoxelTree);
@@ -328,9 +328,7 @@ Application::~Application() { · 2 unmodified lines
328328 Menu::getInstance()->deleteLater();
329329
330330 _myAvatar = NULL;
331−
332− delete _logger;
333− delete _settings;
331+
334332 delete _glWidget;
335333 }
336334
@@ -4038,33 +4036,33 @@ void Application::packetSent(quint64 length) { · 3701 unmodified lines
40384036 _bandwidthMeter.outputStream(BandwidthMeter::VOXELS).updateValue(length);
40394037 }
40404038
4041−void Application::loadScripts(){
4042− // loads all saved scripts
4043− QSettings* settings = new QSettings(this);
4044− int size = settings->beginReadArray("Settings");
4045− for(int i=0; i<size; ++i){
4046− settings->setArrayIndex(i);
4047− QString string = settings->value("script").toString();
4048− loadScript(string);
4049− }
4050− settings->endArray();
4051−
4039+void Application::loadScripts() {
4040+ // loads all saved scripts
4041+ QSettings* settings = new QSettings(this);
4042+ int size = settings->beginReadArray("Settings");
4043+
4044+ for (int i = 0; i < size; ++i){
4045+ settings->setArrayIndex(i);
4046+ QString string = settings->value("script").toString();
4047+ loadScript(string);
4048+ }
4049+
4050+ settings->endArray();
40524051 }
40534052
4054−void Application::saveScripts(){
4055− // saves all current running scripts
4056− QSettings* settings = new QSettings(this);
4057− settings->beginWriteArray("Settings");
4058− for(int i=0; i<_activeScripts.size(); ++i){
4059− settings->setArrayIndex(i);
4060− settings->setValue("script", _activeScripts.at(i));
4061− }
4062− settings->endArray();
4063−
4053+void Application::saveScripts() {
4054+ // saves all current running scripts
4055+ QSettings* settings = new QSettings(this);
4056+ settings->beginWriteArray("Settings");
4057+ for (int i = 0; i < _activeScripts.size(); ++i){
4058+ settings->setArrayIndex(i);
4059+ settings->setValue("script", _activeScripts.at(i));
4060+ }
4061+
4062+ settings->endArray();
40644063 }
40654064
4066−void Application::removeScriptName(const QString& fileNameString)
4067−{
4065+void Application::removeScriptName(const QString& fileNameString) {
40684066 _activeScripts.removeOne(fileNameString);
40694067 }
40704068
@@ -4096,7 +4094,8 @@ void Application::loadScript(const QString& fileNameString) { · 25 unmodified lines
40964094 // start the script on a new thread...
40974095 bool wantMenuItems = true; // tells the ScriptEngine object to add menu items for itself
40984096
4099− ScriptEngine* scriptEngine = new ScriptEngine(script, wantMenuItems, fileName, Menu::getInstance(), &_controllerScriptingInterface);
4097+ ScriptEngine* scriptEngine = new ScriptEngine(script, wantMenuItems, fileName, Menu::getInstance(),
4098+ &_controllerScriptingInterface);
41004099 scriptEngine->setupMenuItems();
41014100
41024101 // setup the packet senders and jurisdiction listeners of the script engine's scripting interfaces so

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t