Showing the changes to interface/src/Application.cpp (1 of 8 files). Show all
Unified · Split
| @@ -152,7 +152,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 151 unmodified lines | ||
| 152 | 152 | _resetRecentMaxPacketsSoon(true), |
| 153 | 153 | _swatch(NULL), |
| 154 | 154 | _pasteMode(false), |
| 155 | − _logger(new FileLogger()), | |
| 155 | + _logger(new FileLogger(this)), | |
| 156 | 156 | _persistThread(NULL) |
| 157 | 157 | { |
| 158 | 158 | _myAvatar = _avatarManager.getMyAvatar(); |
| @@ -319,7 +319,7 @@ Application::~Application() { · 160 unmodified lines | ||
| 319 | 319 | _persistThread->deleteLater(); |
| 320 | 320 | _persistThread = NULL; |
| 321 | 321 | } |
| 322 | − | |
| 322 | + | |
| 323 | 323 | storeSizeAndPosition(); |
| 324 | 324 | saveScripts(); |
| 325 | 325 | _sharedVoxelSystem.changeTree(new VoxelTree); |
| @@ -328,9 +328,7 @@ Application::~Application() { · 2 unmodified lines | ||
| 328 | 328 | Menu::getInstance()->deleteLater(); |
| 329 | 329 | |
| 330 | 330 | _myAvatar = NULL; |
| 331 | − | |
| 332 | − delete _logger; | |
| 333 | − delete _settings; | |
| 331 | + | |
| 334 | 332 | delete _glWidget; |
| 335 | 333 | } |
| 336 | 334 | |
| @@ -4038,33 +4036,33 @@ void Application::packetSent(quint64 length) { · 3701 unmodified lines | ||
| 4038 | 4036 | _bandwidthMeter.outputStream(BandwidthMeter::VOXELS).updateValue(length); |
| 4039 | 4037 | } |
| 4040 | 4038 | |
| 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(); | |
| 4052 | 4051 | } |
| 4053 | 4052 | |
| 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(); | |
| 4064 | 4063 | } |
| 4065 | 4064 | |
| 4066 | −void Application::removeScriptName(const QString& fileNameString) | |
| 4067 | −{ | |
| 4065 | +void Application::removeScriptName(const QString& fileNameString) { | |
| 4068 | 4066 | _activeScripts.removeOne(fileNameString); |
| 4069 | 4067 | } |
| 4070 | 4068 | |
| @@ -4096,7 +4094,8 @@ void Application::loadScript(const QString& fileNameString) { · 25 unmodified lines | ||
| 4096 | 4094 | // start the script on a new thread... |
| 4097 | 4095 | bool wantMenuItems = true; // tells the ScriptEngine object to add menu items for itself |
| 4098 | 4096 | |
| 4099 | − ScriptEngine* scriptEngine = new ScriptEngine(script, wantMenuItems, fileName, Menu::getInstance(), &_controllerScriptingInterface); | |
| 4097 | + ScriptEngine* scriptEngine = new ScriptEngine(script, wantMenuItems, fileName, Menu::getInstance(), | |
| 4098 | + &_controllerScriptingInterface); | |
| 4100 | 4099 | scriptEngine->setupMenuItems(); |
| 4101 | 4100 | |
| 4102 | 4101 | // setup the packet senders and jurisdiction listeners of the script engine's scripting interfaces so |