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

src/plugins/debugger/cdb/cdb.pri

@@ -49,7 +49,7 @@ HEADERS += \
     $$PWD/debugeventcallbackbase.h \
     $$PWD/symbolgroupcontext.h \
     $$PWD/stacktracecontext.h \
-    $$PWD/breakpoint.h
+    $$PWD/corebreakpoint.h
 
 HEADERS += \
     $$PWD/cdbengine.h \
@@ -74,7 +74,7 @@ SOURCES += \
 #    $$PWD/debugeventcallbackbase.cpp \
 #    $$PWD/symbolgroupcontext.cpp \
 #    $$PWD/stacktracecontext.cpp \
-#    $$PWD/breakpoint.cpp
+#    $$PWD/corebreakpoint.cpp
 
 SOURCES += \
 #    $$PWD/cdbengine.cpp \

src/plugins/debugger/cdb/cdbbreakpoint.h

@@ -31,7 +31,7 @@
 #define CDBBREAKPOINTS_H
 
 #include "cdbcom.h"
-#include "breakpoint.h"
+#include "corebreakpoint.h"
 #include "breakhandler.h"
 
 #include <QtCore/QString>

src/plugins/debugger/cdb/breakpoint.cpp → src/plugins/debugger/cdb/corebreakpoint.cpp

@@ -27,7 +27,7 @@
 **
 **************************************************************************/
 
-#include "breakpoint.h"
+#include "corebreakpoint.h"
 #include "coreengine.h"
 
 #include <utils/qtcassert.h>

src/plugins/debugger/cdb/breakpoint.h → src/plugins/debugger/cdb/corebreakpoint.h

@@ -47,7 +47,8 @@ namespace CdbCore {
  * When/How many times it triggers can be influenced by
  * 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
 {

src/plugins/debugger/cdb/stacktracecontext.cpp

@@ -29,7 +29,7 @@
 
 #include "stacktracecontext.h"
 #include "symbolgroupcontext.h"
-#include "breakpoint.h"
+#include "corebreakpoint.h"
 #include "coreengine.h"
 
 #include <QtCore/QDir>