Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 11:44:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

spacing cleanup in Application and ScriptEngine

Browse source
This commit is contained in:
Stephen Birarda 2014-01-31 17:38:53 -08:00
parent b99a5fd0a4
commit d65a3ee174
3 changed files with 30 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
interface/src/Application.cpp
View file

@ -321,7 +321,7 @@ Application::~Application() {
_persistThread->deleteLater(); _persistThread->deleteLater();
_persistThread = NULL; _persistThread = NULL;
} }
storeSizeAndPosition(); storeSizeAndPosition();
saveScripts(); saveScripts();
_sharedVoxelSystem.changeTree(new VoxelTree); _sharedVoxelSystem.changeTree(new VoxelTree);
@ -4186,33 +4186,33 @@ void Application::packetSent(quint64 length) {
_bandwidthMeter.outputStream(BandwidthMeter::VOXELS).updateValue(length); _bandwidthMeter.outputStream(BandwidthMeter::VOXELS).updateValue(length);
} }
void Application::loadScripts(){ void Application::loadScripts() {
// loads all saved scripts // loads all saved scripts
QSettings* settings = new QSettings(this); QSettings* settings = new QSettings(this);
int size = settings->beginReadArray("Settings"); int size = settings->beginReadArray("Settings");
for(int i=0; i<size; ++i){
settings->setArrayIndex(i); for (int i = 0; i < size; ++i){
QString string = settings->value("script").toString(); settings->setArrayIndex(i);
loadScript(string); QString string = settings->value("script").toString();
} loadScript(string);
settings->endArray(); }
settings->endArray();
} }
void Application::saveScripts(){ void Application::saveScripts() {
// saves all current running scripts // saves all current running scripts
QSettings* settings = new QSettings(this); QSettings* settings = new QSettings(this);
settings->beginWriteArray("Settings"); settings->beginWriteArray("Settings");
for(int i=0; i<_activeScripts.size(); ++i){ for (int i = 0; i < _activeScripts.size(); ++i){
settings->setArrayIndex(i); settings->setArrayIndex(i);
settings->setValue("script", _activeScripts.at(i)); settings->setValue("script", _activeScripts.at(i));
} }
settings->endArray();
settings->endArray();
} }
void Application::removeScriptName(const QString& fileNameString) void Application::removeScriptName(const QString& fileNameString) {
{
_activeScripts.removeOne(fileNameString); _activeScripts.removeOne(fileNameString);
} }
@ -4244,7 +4244,8 @@ void Application::loadScript(const QString& fileNameString) {
// start the script on a new thread... // start the script on a new thread...
bool wantMenuItems = true; // tells the ScriptEngine object to add menu items for itself bool wantMenuItems = true; // tells the ScriptEngine object to add menu items for itself
ScriptEngine* scriptEngine = new ScriptEngine(script, wantMenuItems, fileName, Menu::getInstance(), &_controllerScriptingInterface); ScriptEngine* scriptEngine = new ScriptEngine(script, wantMenuItems, fileName, Menu::getInstance(),
&_controllerScriptingInterface);
scriptEngine->setupMenuItems(); scriptEngine->setupMenuItems();
// setup the packet senders and jurisdiction listeners of the script engine's scripting interfaces so // setup the packet senders and jurisdiction listeners of the script engine's scripting interfaces so

3
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -40,7 +40,8 @@ static QScriptValue soundConstructor(QScriptContext* context, QScriptEngine* eng
} }
ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, const QString& fileNameString, AbstractMenuInterface* menu, ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, const QString& fileNameString,
AbstractMenuInterface* menu,
AbstractControllerScriptingInterface* controllerScriptingInterface) : AbstractControllerScriptingInterface* controllerScriptingInterface) :
_isAvatar(false), _isAvatar(false),
_dataServerScriptingInterface(), _dataServerScriptingInterface(),

4
libraries/script-engine/src/ScriptEngine.h
View file

@ -33,8 +33,8 @@ class ScriptEngine : public QObject {
Q_OBJECT Q_OBJECT
public: public:
ScriptEngine(const QString& scriptContents = NO_SCRIPT, bool wantMenuItems = false, ScriptEngine(const QString& scriptContents = NO_SCRIPT, bool wantMenuItems = false,
const QString& scriptMenuName = QString(""), AbstractMenuInterface* menu = NULL, const QString& scriptMenuName = QString(""), AbstractMenuInterface* menu = NULL,
AbstractControllerScriptingInterface* controllerScriptingInterface = NULL); AbstractControllerScriptingInterface* controllerScriptingInterface = NULL);
~ScriptEngine(); ~ScriptEngine();