diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index ab30b99fb2ef027208e989e6ecd862db62938c6b..a609d936249cecf3d033021a4988cde271a46552 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -165,7 +165,7 @@ public: virtual void addOptionPages(QList<Core::IOptionsPage*> *) const {} virtual unsigned debuggerCapabilities() const { return 0; } - virtual bool isSynchroneous() const { return false; } + virtual bool isSynchronous() const { return false; } virtual QString qtNamespace() const { return QString(); } virtual void createSnapshot() {} diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index a4ea3f156dbcad96a9d3e43585b34ed3b74b1e6b..45a09f4743a79804a6daa76e130b75c74dc8fd05 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -995,7 +995,7 @@ void GdbEngine::handleResultRecord(GdbResponse *response) interruptInferiorTemporarily(); // Continue only if there are no commands wire anymore, so this will - // be fully synchroneous. + // be fully synchronous. // This is somewhat inefficient, as it makes the last command synchronous. // An optimization would be requesting the continue immediately when the // event loop is entered, and let individual commands have a flag to suppress @@ -1340,7 +1340,7 @@ void GdbEngine::handleStopResponse(const GdbMi &data) || name != CROSS_STOP_SIGNAL)) initHelpers = false; } - if (isSynchroneous()) + if (isSynchronous()) initHelpers = false; if (initHelpers) { tryLoadDebuggingHelpersClassic(); @@ -3243,7 +3243,7 @@ void GdbEngine::setToolTipExpression(const QPoint &mousePos, } */ - if (isSynchroneous()) { + if (isSynchronous()) { updateLocals(QVariant()); return; } @@ -3295,7 +3295,7 @@ bool GdbEngine::hasDebuggingHelperForType(const QString &type) const void GdbEngine::updateWatchData(const WatchData &data) { - if (isSynchroneous()) { + if (isSynchronous()) { // This should only be called for fresh expanded items, not for // items that had their children retrieved earlier. //qDebug() << "\nUPDATE WATCH DATA: " << data.toString() << "\n"; @@ -3361,7 +3361,7 @@ void GdbEngine::rebuildWatchModel() { static int count = 0; ++count; - if (!isSynchroneous()) + if (!isSynchronous()) m_processedNames.clear(); PENDING_DEBUG("REBUILDING MODEL" << count); if (theDebuggerBoolSetting(LogTimeStamps)) @@ -3515,7 +3515,7 @@ WatchData GdbEngine::localVariable(const GdbMi &item, data.setError(WatchData::msgNotInScope()); return data; } - if (isSynchroneous()) { + if (isSynchronous()) { setWatchDataValue(data, item); // We know that the complete list of children is // somewhere in the response. diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h index db257fcf78d72f8d6bb3d947ad1ad8fcf307e765..ce04dadb4496249ab76a5518c56ff3aaa3bb655c 100644 --- a/src/plugins/debugger/gdb/gdbengine.h +++ b/src/plugins/debugger/gdb/gdbengine.h @@ -290,7 +290,7 @@ private: ////////// Gdb Output, State & Capability Handling ////////// StackFrame parseStackFrame(const GdbMi &mi, int level); void resetCommandQueue(); - bool isSynchroneous() const { return hasPython(); } + bool isSynchronous() const { return hasPython(); } virtual bool hasPython() const; bool supportsThreads() const; diff --git a/src/plugins/debugger/pdb/pdbengine.h b/src/plugins/debugger/pdb/pdbengine.h index e113afb43927dd8273ca792ba7e7b7687e7197c3..bd5afb88cb5061c44ac253ed75f93aa095ffe192 100644 --- a/src/plugins/debugger/pdb/pdbengine.h +++ b/src/plugins/debugger/pdb/pdbengine.h @@ -102,7 +102,7 @@ private: void reloadFullStack() {} bool supportsThreads() const { return true; } - bool isSynchroneous() const { return true; } + bool isSynchronous() const { return true; } void updateWatchData(const WatchData &data); signals: diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index 826141799c0d90a5667d3299c87ecd735bf6bd0d..ae368f2e016faa29a50e538def6b9dda7fc459d7 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -175,9 +175,9 @@ unsigned QmlCppEngine::debuggerCapabilities() const return m_cppEngine->debuggerCapabilities(); } -bool QmlCppEngine::isSynchroneous() const +bool QmlCppEngine::isSynchronous() const { - return m_activeEngine->isSynchroneous(); + return m_activeEngine->isSynchronous(); } QString QmlCppEngine::qtNamespace() const diff --git a/src/plugins/debugger/qml/qmlcppengine.h b/src/plugins/debugger/qml/qmlcppengine.h index 1c1a8d0b383fe5421a17f01ddf5904552616e113..0fcdd3cce05a913c122d6e287b683ed3ff5e3968 100644 --- a/src/plugins/debugger/qml/qmlcppengine.h +++ b/src/plugins/debugger/qml/qmlcppengine.h @@ -45,7 +45,7 @@ public: virtual void setRegisterValue(int regnr, const QString &value); virtual unsigned debuggerCapabilities() const; - virtual bool isSynchroneous() const; + virtual bool isSynchronous() const; virtual QString qtNamespace() const; virtual void createSnapshot(); diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h index fee77d95e584d9e5d984b895d7ac8d1bb48a0098..9c02c2c4cb7e16f9ce24b84b995a7c27ddaffc88 100644 --- a/src/plugins/debugger/qml/qmlengine.h +++ b/src/plugins/debugger/qml/qmlengine.h @@ -74,7 +74,7 @@ public slots: private: // DebuggerEngine implementation - bool isSynchroneous() const { return false; } + bool isSynchronous() const { return false; } void executeStep(); void executeStepOut(); void executeNext(); diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index 1890aeba26649f16e33f6de24132c2e672c8441d..6ed126889dc3836f3f5d0d63be5cbb0b4b396efc 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -1182,13 +1182,13 @@ void WatchHandler::insertData(const WatchData &data) if (data.isSomethingNeeded() && data.iname.contains('.')) { MODEL_DEBUG("SOMETHING NEEDED: " << data.toString()); - if (!m_engine->isSynchroneous()) { + if (!m_engine->isSynchronous()) { m_engine->updateWatchData(data); } else { qDebug() << "ENDLESS LOOP: SOMETHING NEEDED: " << data.toString(); WatchData data1 = data; data1.setAllUnneeded(); - data1.setValue(QLatin1String("<unavailable synchroneous data>")); + data1.setValue(QLatin1String("<unavailable synchronous data>")); data1.setHasChildren(false); WatchModel *model = modelForIName(data.iname); QTC_ASSERT(model, return); @@ -1267,7 +1267,7 @@ void WatchHandler::watchExpression(const QString &exp) if (exp.isEmpty()) data.setAllUnneeded(); data.iname = watcherName(data.exp); - if (m_engine->isSynchroneous() && !m_engine->isSessionEngine()) + if (m_engine->isSynchronous() && !m_engine->isSessionEngine()) m_engine->updateWatchData(data); else insertData(data);