Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 15:53:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tabs -> spaces, remove raw ptr, remove unnecessary spec diff

Browse source
This commit is contained in:
Ryan Jones 2016-12-05 12:57:21 -08:00
parent 39e1a3fb44
commit 094857949d
7 changed files with 30 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/ui/TestingDialog.cpp
View file

@ -15,12 +15,12 @@
#include "Application.h" #include "Application.h"
TestingDialog::TestingDialog(QWidget* parent) : TestingDialog::TestingDialog(QWidget* parent) :
QDialog(parent, Qt::Window | Qt::WindowCloseButtonHint | Qt::WindowStaysOnTopHint) QDialog(parent, Qt::Window | Qt::WindowCloseButtonHint | Qt::WindowStaysOnTopHint),
_console(new JSConsole(this))
{ {
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
setWindowTitle(windowLabel); setWindowTitle(windowLabel);
_console = new JSConsole(this);
_console->setFixedHeight(TESTING_CONSOLE_HEIGHT); _console->setFixedHeight(TESTING_CONSOLE_HEIGHT);
auto _engines = DependencyManager::get<ScriptEngines>(); auto _engines = DependencyManager::get<ScriptEngines>();
@ -29,11 +29,7 @@ TestingDialog::TestingDialog(QWidget* parent) :
connect(_engine, &ScriptEngine::finished, this, &TestingDialog::onTestingFinished); connect(_engine, &ScriptEngine::finished, this, &TestingDialog::onTestingFinished);
} }
TestingDialog::~TestingDialog() {
delete _console;
}
void TestingDialog::onTestingFinished(const QString& scriptPath) { void TestingDialog::onTestingFinished(const QString& scriptPath) {
_engine = NULL; _engine = nullptr;
_console->setScriptEngine(NULL); _console->setScriptEngine(nullptr);
} }

3
interface/src/ui/TestingDialog.h
View file

@ -24,12 +24,11 @@ class TestingDialog : public QDialog {
Q_OBJECT Q_OBJECT
public: public:
TestingDialog(QWidget* parent); TestingDialog(QWidget* parent);
~TestingDialog();
void onTestingFinished(const QString& scriptPath); void onTestingFinished(const QString& scriptPath);
private: private:
JSConsole* _console; std::unique_ptr<JSConsole> _console;
ScriptEngine* _engine; ScriptEngine* _engine;
}; };

1
scripts/developer/tests/unit_tests/avatarUnitTests.js
View file

@ -14,7 +14,6 @@ describe("MyAvatar", function () {
// wait until we are finished loading // wait until we are finished loading
var id = Script.setInterval(function () { var id = Script.setInterval(function () {
print(MyAvatar.jointNames.length);
if (MyAvatar.jointNames.length == 72) { if (MyAvatar.jointNames.length == 72) {
// assume we are finished loading. // assume we are finished loading.
Script.clearInterval(id); Script.clearInterval(id);