Commit 53d62b0b authored by dt's avatar dt
Browse files

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

parents 540ddcd5 b68a0679
...@@ -43,4 +43,5 @@ typedef IDebugDataSpaces4 CIDebugDataSpaces; ...@@ -43,4 +43,5 @@ typedef IDebugDataSpaces4 CIDebugDataSpaces;
typedef IDebugSymbolGroup2 CIDebugSymbolGroup; typedef IDebugSymbolGroup2 CIDebugSymbolGroup;
typedef IDebugBreakpoint2 CIDebugBreakpoint; typedef IDebugBreakpoint2 CIDebugBreakpoint;
#endif // CDBCOM_H #endif // CDBCOM_H
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "watchutils.h" #include "watchutils.h"
#include "cdbcom.h" #include "cdbcom.h"
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QtCore/QMap> #include <QtCore/QMap>
...@@ -42,8 +43,7 @@ struct CdbComInterfaces; ...@@ -42,8 +43,7 @@ struct CdbComInterfaces;
class IDebuggerManagerAccessForEngines; class IDebuggerManagerAccessForEngines;
class DebuggerManager; class DebuggerManager;
/* For code clarity, all the stuff related to custom dumpers /* For code clarity, all the stuff related to custom dumpers goes here.
* goes here.
* "Custom dumper" is a library compiled against the current * "Custom dumper" is a library compiled against the current
* Qt containing functions to evaluate values of Qt classes * Qt containing functions to evaluate values of Qt classes
* (such as QString, taking pointers to their addresses). * (such as QString, taking pointers to their addresses).
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
**************************************************************************/ **************************************************************************/
#include "cdboptions.h" #include "cdboptions.h"
#include <QtCore/QSettings> #include <QtCore/QSettings>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QFileInfo> #include <QtCore/QFileInfo>
......
...@@ -73,7 +73,7 @@ public: ...@@ -73,7 +73,7 @@ public:
// Top-Level instruction offset for disassembler // Top-Level instruction offset for disassembler
ULONG64 instructionOffset() const { return m_instructionOffset; } ULONG64 instructionOffset() const { return m_instructionOffset; }
CdbStackFrameContext*frameContextAt(int index, QString *errorMessage); CdbStackFrameContext *frameContextAt(int index, QString *errorMessage);
// Format for logging // Format for logging
void format(QTextStream &str) const; void format(QTextStream &str) const;
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "cdbdebugengine_p.h" #include "cdbdebugengine_p.h"
#include "watchhandler.h" #include "watchhandler.h"
#include "watchutils.h" #include "watchutils.h"
#include <QtCore/QTextStream> #include <QtCore/QTextStream>
enum { debug = 0 }; enum { debug = 0 };
...@@ -40,7 +41,10 @@ static inline QString msgSymbolNotFound(const QString &s) ...@@ -40,7 +41,10 @@ static inline QString msgSymbolNotFound(const QString &s)
return QString::fromLatin1("The symbol '%1' could not be found.").arg(s); return QString::fromLatin1("The symbol '%1' could not be found.").arg(s);
} }
static inline bool isTopLevelSymbol(const DEBUG_SYMBOL_PARAMETERS &p) { return p.ParentSymbol == DEBUG_ANY_ID; } static inline bool isTopLevelSymbol(const DEBUG_SYMBOL_PARAMETERS &p)
{
return p.ParentSymbol == DEBUG_ANY_ID;
}
static inline void debugSymbolFlags(unsigned long f, QTextStream &str) static inline void debugSymbolFlags(unsigned long f, QTextStream &str)
{ {
......
...@@ -130,7 +130,8 @@ private: ...@@ -130,7 +130,8 @@ private:
}; };
// Helper to a sequence of WatchData into a list. // Helper to a sequence of WatchData into a list.
class WatchDataBackInserter { class WatchDataBackInserter
{
public: public:
explicit WatchDataBackInserter(QList<WatchData> &wh) : m_wh(wh) {} explicit WatchDataBackInserter(QList<WatchData> &wh) : m_wh(wh) {}
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#ifdef USE_PSAPI #ifdef USE_PSAPI
# include <psapi.h> # include <psapi.h>
#endif #endif
namespace Debugger { namespace Debugger {
namespace Internal { namespace Internal {
...@@ -75,5 +76,5 @@ QList<ProcData> winProcessList() ...@@ -75,5 +76,5 @@ QList<ProcData> winProcessList()
return rc; return rc;
} }
} } // namespace Internal
} } // namespace Debugger
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
** **
**************************************************************************/ **************************************************************************/
#ifndef _DBG_WINDUTILS_H #ifndef DEBUGGER_DBG_WINUTILS_H
#define _DBG_WINDUTILS_H #define DEBUGGER_DBG_WINUTILS_H
#include <QtCore/QList> #include <QtCore/QList>
...@@ -39,6 +39,7 @@ struct ProcData; // debuggerdialogs, used by the process listing dialogs ...@@ -39,6 +39,7 @@ struct ProcData; // debuggerdialogs, used by the process listing dialogs
QList<ProcData> winProcessList(); QList<ProcData> winProcessList();
} } // namespace Internal
} } // namespace Debugger
#endif
#endif // DEBUGGER_DBG_WINUTILS_H
...@@ -40,7 +40,7 @@ using Core::Utils::winErrorMessage; ...@@ -40,7 +40,7 @@ using Core::Utils::winErrorMessage;
// a memory mapped file // a memory mapped file
template <class Ptr> template <class Ptr>
inline Ptr *makePtr(void *base, ptrdiff_t offset) inline Ptr *makePtr(void *base, ptrdiff_t offset)
{ {
return reinterpret_cast<Ptr*>(static_cast<char*>(base) + offset); return reinterpret_cast<Ptr*>(static_cast<char*>(base) + offset);
} }
...@@ -275,5 +275,5 @@ bool getPDBFiles(const QString &peExecutableFileName, QStringList *rc, QString * ...@@ -275,5 +275,5 @@ bool getPDBFiles(const QString &peExecutableFileName, QStringList *rc, QString *
return success; return success;
} }
} } // namespace Internal
} } // namespace Debugger
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
** **
**************************************************************************/ **************************************************************************/
#ifndef PEUTILS_H #ifndef DEBUGGER_PEUTILS_H
#define PEUTILS_H #define DEBUGGER_PEUTILS_H
#include <QtCore/qnamespace.h> #include <QtCore/qnamespace.h>
...@@ -45,7 +45,7 @@ namespace Internal { ...@@ -45,7 +45,7 @@ namespace Internal {
// Return a list of Program-Database (*.pdb) files a PE executable refers to. */ // Return a list of Program-Database (*.pdb) files a PE executable refers to. */
bool getPDBFiles(const QString &peExecutableFileName, QStringList *rc, QString *errorMessage); bool getPDBFiles(const QString &peExecutableFileName, QStringList *rc, QString *errorMessage);
} } // namespace Internal
} } // namespace Debugger
#endif // PEUTILS_H #endif // DEBUGGER_PEUTILS_H
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment