Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 19:04:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix return-type in lambda

Browse source
This commit is contained in:
Seth Alves 2015-06-05 08:59:08 -07:00
parent 3dbf28b7b4
commit 086b9d404a
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -487,7 +487,10 @@ QUuid EntityScriptingInterface::addAction(QString actionTypeString, QUuid entity
if (actionType == ACTION_TYPE_NONE) {
return false;
}
return simulation->actionFactory(actionType, actionID, entity, arguments);
if (simulation->actionFactory(actionType, actionID, entity, arguments)) {
return true;
}
return false;
});
if (success) {
return actionID;

12
libraries/shared/src/SettingInterface.cpp
View file

@ -39,12 +39,12 @@ namespace Setting {
void init() {
// read the ApplicationInfo.ini file for Name/Version/Domain information
QSettings::setDefaultFormat(QSettings::IniFormat);
QSettings applicationInfo(PathUtils::resourcesPath() + "info/ApplicationInfo.ini", QSettings::IniFormat);
// set the associated application properties
applicationInfo.beginGroup("INFO");
QCoreApplication::setApplicationName(applicationInfo.value("name").toString());
QCoreApplication::setOrganizationName(applicationInfo.value("organizationName").toString());
QCoreApplication::setOrganizationDomain(applicationInfo.value("organizationDomain").toString());
// QSettings applicationInfo(PathUtils::resourcesPath() + "info/ApplicationInfo.ini", QSettings::IniFormat);
// // set the associated application properties
// applicationInfo.beginGroup("INFO");
// QCoreApplication::setApplicationName(applicationInfo.value("name").toString());
// QCoreApplication::setOrganizationName(applicationInfo.value("organizationName").toString());
// QCoreApplication::setOrganizationDomain(applicationInfo.value("organizationDomain").toString());
// Let's set up the settings Private instance on its own thread
QThread* thread = new QThread();