From 9fb64386aafad9fd9e8f7e73a1de40f943965c1d Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 25 Jun 2014 11:44:58 -0700 Subject: [PATCH 1/2] Fix stopping scripts in the script editor --- interface/src/Application.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index d7e3b7453d..1641f0b928 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3643,8 +3643,9 @@ void Application::stopAllScripts(bool restart) { } void Application::stopScript(const QString &scriptName) { - if (_scriptEnginesHash.contains(scriptName)) { - _scriptEnginesHash.value(scriptName)->stop(); + const QString& scriptURLString = QUrl(scriptName).toString(); + if (_scriptEnginesHash.contains(scriptURLString)) { + _scriptEnginesHash.value(scriptURLString)->stop(); qDebug() << "stopping script..." << scriptName; } } From 1bc2f214a563d16fca20ac2b903514ebb471bb64 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Fri, 27 Jun 2014 22:18:38 +0200 Subject: [PATCH 2/2] Compiler warning fixes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes all warnings that I got while compiling with g++ 4.7.2: In file included from interface/src/Application.h:53:0, from interface/src/Menu.cpp:36: interface/src/Menu.h: In constructor ‘Menu::Menu()’: interface/src/Menu.h:292:13: warning: ‘Menu::_scriptsLocation’ will be initialized after [-Wreorder] interface/src/Menu.h:289:27: warning: ‘QPointer Menu::_loginDialog’ [-Wreorder] interface/src/Menu.cpp:82:1: warning: when initialized here [-Wreorder] libraries/audio/src/AudioRingBuffer.cpp: In member function ‘qint64 AudioRingBuffer::writeData(const char*, qint64)’: libraries/audio/src/AudioRingBuffer.cpp:126:75: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] libraries/audio/src/PositionalAudioRingBuffer.cpp: In member function ‘bool PositionalAudioRingBuffer::shouldBeAddedToMix()’: libraries/audio/src/PositionalAudioRingBuffer.cpp:212:37: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] interface/ui/preferencesDialog.ui: Warning: The name 'horizontalLayout_11' (QHBoxLayout) is already in use, defaulting to 'horizontalLayout_111'. interface/ui/preferencesDialog.ui: Warning: The name 'horizontalSpacer_11' (QSpacerItem) is already in use, defaulting to 'horizontalSpacer_111'. interface/src/avatar/Avatar.cpp: In member function ‘void Avatar::initializeHair()’: interface/src/avatar/Avatar.cpp:587:21: warning: name lookup of ‘link’ changed [enabled by default] interface/src/avatar/Avatar.cpp:574:18: warning: matches this ‘link’ under ISO standard rules [enabled by default] interface/src/avatar/Avatar.cpp:577:22: warning: matches this ‘link’ under old rules [enabled by default] interface/src/ui/ApplicationOverlay.cpp: In member function ‘void ApplicationOverlay::renderControllerPointers()’: interface/src/ui/ApplicationOverlay.cpp:379:59: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] In file included from interface/src/ui/RunningScriptsWidget.cpp:14:0: interface/src/ui/RunningScriptsWidget.h: In constructor ‘RunningScriptsWidget::RunningScriptsWidget(QWidget*)’: interface/src/ui/RunningScriptsWidget.h:61:18: warning: ‘RunningScriptsWidget::_scriptsModel’ will be initialized after [-Wreorder] interface/src/ui/RunningScriptsWidget.h:60:27: warning: ‘QSortFilterProxyModel RunningScriptsWidget::_proxyModel’ [-Wreorder] interface/src/ui/RunningScriptsWidget.cpp:27:1: warning: when initialized here [-Wreorder] --- interface/src/Menu.cpp | 4 ++-- interface/src/avatar/Avatar.cpp | 4 ++-- interface/src/ui/ApplicationOverlay.cpp | 2 +- interface/src/ui/RunningScriptsWidget.cpp | 4 ++-- interface/ui/preferencesDialog.ui | 4 ++-- libraries/audio/src/AudioRingBuffer.cpp | 2 +- libraries/audio/src/PositionalAudioRingBuffer.cpp | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 6269d4a8c0..9357ba2004 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -108,9 +108,9 @@ Menu::Menu() : _fastFPSAverage(ONE_SECOND_OF_FRAMES), _loginAction(NULL), _preferencesDialog(NULL), - _scriptsLocation(), _loginDialog(NULL), - _snapshotsLocation() + _snapshotsLocation(), + _scriptsLocation() { Application *appInstance = Application::getInstance(); diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index 5a294bb2a5..9b136980f4 100644 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -574,8 +574,8 @@ void Avatar::initializeHair() { for (int link = 0; link < HAIR_LINKS; link++) { int vertexIndex = strand * HAIR_LINKS + link; // Clear constraints - for (int link = 0; link < HAIR_MAX_CONSTRAINTS; link++) { - _hairConstraints[vertexIndex * HAIR_MAX_CONSTRAINTS + link] = -1; + for (int link2 = 0; link2 < HAIR_MAX_CONSTRAINTS; link2++) { + _hairConstraints[vertexIndex * HAIR_MAX_CONSTRAINTS + link2] = -1; } if (vertexIndex % HAIR_LINKS == 0) { // start of strand diff --git a/interface/src/ui/ApplicationOverlay.cpp b/interface/src/ui/ApplicationOverlay.cpp index 342a145953..77e8986297 100644 --- a/interface/src/ui/ApplicationOverlay.cpp +++ b/interface/src/ui/ApplicationOverlay.cpp @@ -376,7 +376,7 @@ void ApplicationOverlay::renderControllerPointers() { //then disable it. const int MAX_BUTTON_PRESS_TIME = 250 * MSECS_TO_USECS; - if (usecTimestampNow() - pressedTime[index] < MAX_BUTTON_PRESS_TIME) { + if (usecTimestampNow() < pressedTime[index] + MAX_BUTTON_PRESS_TIME) { _magActive[index] = !stateWhenPressed[index]; } } diff --git a/interface/src/ui/RunningScriptsWidget.cpp b/interface/src/ui/RunningScriptsWidget.cpp index 136d0a2d38..8a7ebcbfd4 100644 --- a/interface/src/ui/RunningScriptsWidget.cpp +++ b/interface/src/ui/RunningScriptsWidget.cpp @@ -28,8 +28,8 @@ RunningScriptsWidget::RunningScriptsWidget(QWidget* parent) : FramelessDialog(parent, 0, POSITION_LEFT), ui(new Ui::RunningScriptsWidget), _signalMapper(this), - _scriptsModel(this), - _proxyModel(this) { + _proxyModel(this), + _scriptsModel(this) { ui->setupUi(this); setAttribute(Qt::WA_DeleteOnClose, false); diff --git a/interface/ui/preferencesDialog.ui b/interface/ui/preferencesDialog.ui index a75c2bdec2..95678bf6f8 100644 --- a/interface/ui/preferencesDialog.ui +++ b/interface/ui/preferencesDialog.ui @@ -902,7 +902,7 @@ padding: 10px;margin-top:10px - + 0 @@ -937,7 +937,7 @@ padding: 10px;margin-top:10px - + Arial diff --git a/libraries/audio/src/AudioRingBuffer.cpp b/libraries/audio/src/AudioRingBuffer.cpp index ee4027841b..a2d3715462 100644 --- a/libraries/audio/src/AudioRingBuffer.cpp +++ b/libraries/audio/src/AudioRingBuffer.cpp @@ -121,7 +121,7 @@ qint64 AudioRingBuffer::writeData(const char* data, qint64 maxSize) { // make sure we have enough bytes left for this to be the right amount of audio // otherwise we should not copy that data, and leave the buffer pointers where they are - int samplesToCopy = std::min((quint64)(maxSize / sizeof(int16_t)), (quint64)_sampleCapacity); + quint64 samplesToCopy = std::min((quint64)(maxSize / sizeof(int16_t)), (quint64)_sampleCapacity); if (_hasStarted && samplesToCopy > _sampleCapacity - samplesAvailable()) { // this read will cross the next output, so call us starved and reset the buffer diff --git a/libraries/audio/src/PositionalAudioRingBuffer.cpp b/libraries/audio/src/PositionalAudioRingBuffer.cpp index 23e258fe87..acd688bdc0 100644 --- a/libraries/audio/src/PositionalAudioRingBuffer.cpp +++ b/libraries/audio/src/PositionalAudioRingBuffer.cpp @@ -209,7 +209,7 @@ bool PositionalAudioRingBuffer::shouldBeAddedToMix() { } return false; - } else if (samplesAvailable() < samplesPerFrame) { + } else if (samplesAvailable() < (unsigned int)samplesPerFrame) { // if the buffer doesn't have a full frame of samples to take for mixing, it is starved _isStarved = true;