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

Use FileName in TextMark

Browse Source 
Change-Id: I3666d95dc8ef3b7da099d6d30f5cb4678a349493
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2018-05-02 15:02:00 +02:00
parent 8559df7bc9
commit 45f8d221bf
23 changed files with 84 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/breakhandler.cpp
View File

@@ -159,7 +159,7 @@ private:
class BreakpointMarker : public TextEditor::TextMark
{
public:
BreakpointMarker(BreakpointItem *b, const QString &fileName, int lineNumber)
BreakpointMarker(BreakpointItem *b, const FileName &fileName, int lineNumber)
: TextMark(fileName, lineNumber, Constants::TEXT_MARK_CATEGORY_BREAKPOINT), m_bp(b)
{
setColor(Theme::Debugger_Breakpoint_TextMarkColor);
@@ -180,10 +180,10 @@ public:
m_bp->updateLineNumberFromMarker(lineNumber);
}
void updateFileName(const QString &fileName)
void updateFileName(const FileName &fileName)
{
TextMark::updateFileName(fileName);
m_bp->updateFileNameFromMarker(fileName);
m_bp->updateFileNameFromMarker(fileName.toString());
}
bool isDraggable() const { return true; }
@@ -2256,7 +2256,7 @@ void BreakpointItem::updateMarkerIcon()
void BreakpointItem::updateMarker()
{
QString file = markerFileName();
FileName file = FileName::fromString(markerFileName());
int line = markerLineNumber();
if (m_marker && (file != m_marker->fileName() || line != m_marker->lineNumber()))
destroyMarker();