feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Move some CdbEngine member initialization

Browse Source 
More concise.

Change-Id: I28ac441cacfceef1ad5622f15fecac1d2cca9395
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2017-10-05 08:53:23 +02:00
parent 033b641373
commit d0e419e02b
2 changed files with 16 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -212,22 +212,7 @@ void addCdbOptionPages(QList<Core::IOptionsPage *> *opts)
CdbEngine::CdbEngine() : CdbEngine::CdbEngine() :
m_tokenPrefix("<token>"), m_tokenPrefix("<token>"),
m_effectiveStartMode(NoStartMode), m_extensionCommandPrefix("!" QT_CREATOR_CDB_EXT ".")
m_accessible(false),
m_specialStopMode(NoSpecialStop),
m_nextCommandToken(0),
m_currentBuiltinResponseToken(-1),
m_extensionCommandPrefix("!" QT_CREATOR_CDB_EXT "."),
m_operateByInstructionPending(true),
m_operateByInstruction(true), // Default CDB setting
m_hasDebuggee(false),
m_wow64State(wow64Uninitialized),
m_elapsedLogTime(0),
m_sourceStepInto(false),
m_watchPointX(0),
m_watchPointY(0),
m_autoBreakPointCorrection(false),
m_ignoreCdbOutput(false)
{ {
setObjectName("CdbEngine"); setObjectName("CdbEngine");

30
src/plugins/debugger/cdb/cdbengine.h
View File

@@ -224,40 +224,40 @@ private:
QProcess m_process; QProcess m_process;
QScopedPointer<Utils::ConsoleProcess> m_consoleStub; QScopedPointer<Utils::ConsoleProcess> m_consoleStub;
DebuggerStartMode m_effectiveStartMode; DebuggerStartMode m_effectiveStartMode = NoStartMode;
QByteArray m_outputBuffer; QByteArray m_outputBuffer;
//! Debugger accessible (expecting commands) //! Debugger accessible (expecting commands)
bool m_accessible; bool m_accessible = false;
SpecialStopMode m_specialStopMode; SpecialStopMode m_specialStopMode = NoSpecialStop;
ProjectExplorer::DeviceProcessSignalOperation::Ptr m_signalOperation; ProjectExplorer::DeviceProcessSignalOperation::Ptr m_signalOperation;
int m_nextCommandToken; int m_nextCommandToken = 0;
QHash<int, DebuggerCommand> m_commandForToken; QHash<int, DebuggerCommand> m_commandForToken;
QString m_currentBuiltinResponse; QString m_currentBuiltinResponse;
int m_currentBuiltinResponseToken; int m_currentBuiltinResponseToken = -1;
QMap<QString, NormalizedSourceFileName> m_normalizedFileCache; QMap<QString, NormalizedSourceFileName> m_normalizedFileCache;
const QString m_extensionCommandPrefix; //!< Library name used as prefix const QString m_extensionCommandPrefix; //!< Library name used as prefix
bool m_operateByInstructionPending; //!< Creator operate by instruction action changed. bool m_operateByInstructionPending = true; //!< Creator operate by instruction action changed.
bool m_operateByInstruction; bool m_operateByInstruction = true; // Default CDB setting.
bool m_hasDebuggee; bool m_hasDebuggee = false;
enum Wow64State { enum Wow64State {
wow64Uninitialized, wow64Uninitialized,
noWow64Stack, noWow64Stack,
wow64Stack32Bit, wow64Stack32Bit,
wow64Stack64Bit wow64Stack64Bit
} m_wow64State; } m_wow64State = wow64Uninitialized;
QTime m_logTime; QTime m_logTime;
mutable int m_elapsedLogTime; mutable int m_elapsedLogTime = 0;
QString m_extensionMessageBuffer; QString m_extensionMessageBuffer;
bool m_sourceStepInto; bool m_sourceStepInto = false;
int m_watchPointX; int m_watchPointX = 0;
int m_watchPointY; int m_watchPointY = 0;
PendingBreakPointMap m_pendingBreakpointMap; PendingBreakPointMap m_pendingBreakpointMap;
PendingBreakPointMap m_insertSubBreakpointMap; PendingBreakPointMap m_insertSubBreakpointMap;
PendingBreakPointMap m_pendingSubBreakpointMap; PendingBreakPointMap m_pendingSubBreakpointMap;
bool m_autoBreakPointCorrection; bool m_autoBreakPointCorrection = false;
QHash<QString, QString> m_fileNameModuleHash; QHash<QString, QString> m_fileNameModuleHash;
QMultiHash<QString, quint64> m_symbolAddressCache; QMultiHash<QString, quint64> m_symbolAddressCache;
bool m_ignoreCdbOutput; bool m_ignoreCdbOutput = false;
QVariantList m_customSpecialStopData; QVariantList m_customSpecialStopData;
QList<SourcePathMapping> m_sourcePathMappings; QList<SourcePathMapping> m_sourcePathMappings;
QScopedPointer<GdbMi> m_coreStopReason; QScopedPointer<GdbMi> m_coreStopReason;