Commit 3201d4ad authored by Friedemann Kleint's avatar Friedemann Kleint Committed by hjk
Browse files

Rename breakpoint.cpp/h from CDB to avoid linker conflicts.

parent 87fc54fa
...@@ -49,7 +49,7 @@ HEADERS += \ ...@@ -49,7 +49,7 @@ HEADERS += \
$$PWD/debugeventcallbackbase.h \ $$PWD/debugeventcallbackbase.h \
$$PWD/symbolgroupcontext.h \ $$PWD/symbolgroupcontext.h \
$$PWD/stacktracecontext.h \ $$PWD/stacktracecontext.h \
$$PWD/breakpoint.h $$PWD/corebreakpoint.h
HEADERS += \ HEADERS += \
$$PWD/cdbengine.h \ $$PWD/cdbengine.h \
...@@ -74,7 +74,7 @@ SOURCES += \ ...@@ -74,7 +74,7 @@ SOURCES += \
# $$PWD/debugeventcallbackbase.cpp \ # $$PWD/debugeventcallbackbase.cpp \
# $$PWD/symbolgroupcontext.cpp \ # $$PWD/symbolgroupcontext.cpp \
# $$PWD/stacktracecontext.cpp \ # $$PWD/stacktracecontext.cpp \
# $$PWD/breakpoint.cpp # $$PWD/corebreakpoint.cpp
SOURCES += \ SOURCES += \
# $$PWD/cdbengine.cpp \ # $$PWD/cdbengine.cpp \
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#define CDBBREAKPOINTS_H #define CDBBREAKPOINTS_H
#include "cdbcom.h" #include "cdbcom.h"
#include "breakpoint.h" #include "corebreakpoint.h"
#include "breakhandler.h" #include "breakhandler.h"
#include <QtCore/QString> #include <QtCore/QString>
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
** **
**************************************************************************/ **************************************************************************/
#include "breakpoint.h" #include "corebreakpoint.h"
#include "coreengine.h" #include "coreengine.h"
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
......
...@@ -47,7 +47,8 @@ namespace CdbCore { ...@@ -47,7 +47,8 @@ namespace CdbCore {
* When/How many times it triggers can be influenced by * When/How many times it triggers can be influenced by
* condition/ignorecount and 'oneshot'-flag. */ * condition/ignorecount and 'oneshot'-flag. */
// FIXME: Merge with/derive from Debugger::Internal::Breakpoint // Note: File is named corebreakpoint.h/cpp to avoid conflicts with
// ../breakpoint.h/cpp.
struct BreakPoint struct BreakPoint
{ {
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "stacktracecontext.h" #include "stacktracecontext.h"
#include "symbolgroupcontext.h" #include "symbolgroupcontext.h"
#include "breakpoint.h" #include "corebreakpoint.h"
#include "coreengine.h" #include "coreengine.h"
#include <QtCore/QDir> #include <QtCore/QDir>
......
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