forked from qt-creator/qt-creator
debugger: fix spelling of synchronous
Finally.
This commit is contained in:
@@ -165,7 +165,7 @@ public:
|
|||||||
virtual void addOptionPages(QList<Core::IOptionsPage*> *) const {}
|
virtual void addOptionPages(QList<Core::IOptionsPage*> *) const {}
|
||||||
virtual unsigned debuggerCapabilities() const { return 0; }
|
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 QString qtNamespace() const { return QString(); }
|
||||||
|
|
||||||
virtual void createSnapshot() {}
|
virtual void createSnapshot() {}
|
||||||
|
|||||||
@@ -995,7 +995,7 @@ void GdbEngine::handleResultRecord(GdbResponse *response)
|
|||||||
interruptInferiorTemporarily();
|
interruptInferiorTemporarily();
|
||||||
|
|
||||||
// Continue only if there are no commands wire anymore, so this will
|
// 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.
|
// This is somewhat inefficient, as it makes the last command synchronous.
|
||||||
// An optimization would be requesting the continue immediately when the
|
// An optimization would be requesting the continue immediately when the
|
||||||
// event loop is entered, and let individual commands have a flag to suppress
|
// 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))
|
|| name != CROSS_STOP_SIGNAL))
|
||||||
initHelpers = false;
|
initHelpers = false;
|
||||||
}
|
}
|
||||||
if (isSynchroneous())
|
if (isSynchronous())
|
||||||
initHelpers = false;
|
initHelpers = false;
|
||||||
if (initHelpers) {
|
if (initHelpers) {
|
||||||
tryLoadDebuggingHelpersClassic();
|
tryLoadDebuggingHelpersClassic();
|
||||||
@@ -3243,7 +3243,7 @@ void GdbEngine::setToolTipExpression(const QPoint &mousePos,
|
|||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (isSynchroneous()) {
|
if (isSynchronous()) {
|
||||||
updateLocals(QVariant());
|
updateLocals(QVariant());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -3295,7 +3295,7 @@ bool GdbEngine::hasDebuggingHelperForType(const QString &type) const
|
|||||||
|
|
||||||
void GdbEngine::updateWatchData(const WatchData &data)
|
void GdbEngine::updateWatchData(const WatchData &data)
|
||||||
{
|
{
|
||||||
if (isSynchroneous()) {
|
if (isSynchronous()) {
|
||||||
// This should only be called for fresh expanded items, not for
|
// This should only be called for fresh expanded items, not for
|
||||||
// items that had their children retrieved earlier.
|
// items that had their children retrieved earlier.
|
||||||
//qDebug() << "\nUPDATE WATCH DATA: " << data.toString() << "\n";
|
//qDebug() << "\nUPDATE WATCH DATA: " << data.toString() << "\n";
|
||||||
@@ -3361,7 +3361,7 @@ void GdbEngine::rebuildWatchModel()
|
|||||||
{
|
{
|
||||||
static int count = 0;
|
static int count = 0;
|
||||||
++count;
|
++count;
|
||||||
if (!isSynchroneous())
|
if (!isSynchronous())
|
||||||
m_processedNames.clear();
|
m_processedNames.clear();
|
||||||
PENDING_DEBUG("REBUILDING MODEL" << count);
|
PENDING_DEBUG("REBUILDING MODEL" << count);
|
||||||
if (theDebuggerBoolSetting(LogTimeStamps))
|
if (theDebuggerBoolSetting(LogTimeStamps))
|
||||||
@@ -3515,7 +3515,7 @@ WatchData GdbEngine::localVariable(const GdbMi &item,
|
|||||||
data.setError(WatchData::msgNotInScope());
|
data.setError(WatchData::msgNotInScope());
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
if (isSynchroneous()) {
|
if (isSynchronous()) {
|
||||||
setWatchDataValue(data, item);
|
setWatchDataValue(data, item);
|
||||||
// We know that the complete list of children is
|
// We know that the complete list of children is
|
||||||
// somewhere in the response.
|
// somewhere in the response.
|
||||||
|
|||||||
@@ -290,7 +290,7 @@ private: ////////// Gdb Output, State & Capability Handling //////////
|
|||||||
StackFrame parseStackFrame(const GdbMi &mi, int level);
|
StackFrame parseStackFrame(const GdbMi &mi, int level);
|
||||||
void resetCommandQueue();
|
void resetCommandQueue();
|
||||||
|
|
||||||
bool isSynchroneous() const { return hasPython(); }
|
bool isSynchronous() const { return hasPython(); }
|
||||||
virtual bool hasPython() const;
|
virtual bool hasPython() const;
|
||||||
bool supportsThreads() const;
|
bool supportsThreads() const;
|
||||||
|
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ private:
|
|||||||
void reloadFullStack() {}
|
void reloadFullStack() {}
|
||||||
|
|
||||||
bool supportsThreads() const { return true; }
|
bool supportsThreads() const { return true; }
|
||||||
bool isSynchroneous() const { return true; }
|
bool isSynchronous() const { return true; }
|
||||||
void updateWatchData(const WatchData &data);
|
void updateWatchData(const WatchData &data);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
|
|||||||
@@ -175,9 +175,9 @@ unsigned QmlCppEngine::debuggerCapabilities() const
|
|||||||
return m_cppEngine->debuggerCapabilities();
|
return m_cppEngine->debuggerCapabilities();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool QmlCppEngine::isSynchroneous() const
|
bool QmlCppEngine::isSynchronous() const
|
||||||
{
|
{
|
||||||
return m_activeEngine->isSynchroneous();
|
return m_activeEngine->isSynchronous();
|
||||||
}
|
}
|
||||||
|
|
||||||
QString QmlCppEngine::qtNamespace() const
|
QString QmlCppEngine::qtNamespace() const
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ public:
|
|||||||
virtual void setRegisterValue(int regnr, const QString &value);
|
virtual void setRegisterValue(int regnr, const QString &value);
|
||||||
virtual unsigned debuggerCapabilities() const;
|
virtual unsigned debuggerCapabilities() const;
|
||||||
|
|
||||||
virtual bool isSynchroneous() const;
|
virtual bool isSynchronous() const;
|
||||||
virtual QString qtNamespace() const;
|
virtual QString qtNamespace() const;
|
||||||
|
|
||||||
virtual void createSnapshot();
|
virtual void createSnapshot();
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ public slots:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
// DebuggerEngine implementation
|
// DebuggerEngine implementation
|
||||||
bool isSynchroneous() const { return false; }
|
bool isSynchronous() const { return false; }
|
||||||
void executeStep();
|
void executeStep();
|
||||||
void executeStepOut();
|
void executeStepOut();
|
||||||
void executeNext();
|
void executeNext();
|
||||||
|
|||||||
@@ -1182,13 +1182,13 @@ void WatchHandler::insertData(const WatchData &data)
|
|||||||
|
|
||||||
if (data.isSomethingNeeded() && data.iname.contains('.')) {
|
if (data.isSomethingNeeded() && data.iname.contains('.')) {
|
||||||
MODEL_DEBUG("SOMETHING NEEDED: " << data.toString());
|
MODEL_DEBUG("SOMETHING NEEDED: " << data.toString());
|
||||||
if (!m_engine->isSynchroneous()) {
|
if (!m_engine->isSynchronous()) {
|
||||||
m_engine->updateWatchData(data);
|
m_engine->updateWatchData(data);
|
||||||
} else {
|
} else {
|
||||||
qDebug() << "ENDLESS LOOP: SOMETHING NEEDED: " << data.toString();
|
qDebug() << "ENDLESS LOOP: SOMETHING NEEDED: " << data.toString();
|
||||||
WatchData data1 = data;
|
WatchData data1 = data;
|
||||||
data1.setAllUnneeded();
|
data1.setAllUnneeded();
|
||||||
data1.setValue(QLatin1String("<unavailable synchroneous data>"));
|
data1.setValue(QLatin1String("<unavailable synchronous data>"));
|
||||||
data1.setHasChildren(false);
|
data1.setHasChildren(false);
|
||||||
WatchModel *model = modelForIName(data.iname);
|
WatchModel *model = modelForIName(data.iname);
|
||||||
QTC_ASSERT(model, return);
|
QTC_ASSERT(model, return);
|
||||||
@@ -1267,7 +1267,7 @@ void WatchHandler::watchExpression(const QString &exp)
|
|||||||
if (exp.isEmpty())
|
if (exp.isEmpty())
|
||||||
data.setAllUnneeded();
|
data.setAllUnneeded();
|
||||||
data.iname = watcherName(data.exp);
|
data.iname = watcherName(data.exp);
|
||||||
if (m_engine->isSynchroneous() && !m_engine->isSessionEngine())
|
if (m_engine->isSynchronous() && !m_engine->isSessionEngine())
|
||||||
m_engine->updateWatchData(data);
|
m_engine->updateWatchData(data);
|
||||||
else
|
else
|
||||||
insertData(data);
|
insertData(data);
|
||||||
|
|||||||
Reference in New Issue
Block a user