diff --git a/examples/clipboardExample.js b/examples/clipboardExample.js index 8afe5ad315..e468c7ab95 100644 --- a/examples/clipboardExample.js +++ b/examples/clipboardExample.js @@ -25,14 +25,14 @@ function printKeyEvent(eventName, event) { function keyPressEvent(event) { - var debug = true; + var debug = false; if (debug) { printKeyEvent("keyPressEvent", event); } } function keyReleaseEvent(event) { - var debug = true; + var debug = false; if (debug) { printKeyEvent("keyReleaseEvent", event); } diff --git a/interface/src/ClipboardScriptingInterface.cpp b/interface/src/ClipboardScriptingInterface.cpp index c2a1a945a1..7faedd1bce 100644 --- a/interface/src/ClipboardScriptingInterface.cpp +++ b/interface/src/ClipboardScriptingInterface.cpp @@ -50,10 +50,12 @@ void ClipboardScriptingInterface::exportVoxels(float x, float y, float z, float z / (float)TREE_SCALE, s / (float)TREE_SCALE }; + // TODO: should we be calling invokeMethod() in all these cases? Application::getInstance()->exportVoxels(sourceVoxel); } void ClipboardScriptingInterface::importVoxels() { - Application::getInstance()->importVoxels(); + QMetaObject::invokeMethod(Application::getInstance(), "importVoxels"); } + diff --git a/libraries/script-engine/src/EventTypes.cpp b/libraries/script-engine/src/EventTypes.cpp index b06e53e0dd..c8451d84a7 100644 --- a/libraries/script-engine/src/EventTypes.cpp +++ b/libraries/script-engine/src/EventTypes.cpp @@ -105,7 +105,7 @@ KeyEvent::KeyEvent(const QKeyEvent& event) { } else if (key == Qt::Key_CapsLock) { text = "CAPS LOCK"; } else if (key >= Qt::Key_A && key <= Qt::Key_Z && (isMeta || isControl || isAlt)) { - // this little bit of hacker will fix the text character keys like a-z in cases of control/alt/meta where + // this little bit of hackery will fix the text character keys like a-z in cases of control/alt/meta where // qt doesn't always give you the key characters and will sometimes give you crazy non-printable characters const int lowerCaseAdjust = 0x20; QString unicode;