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

TextEditor: Some fileName -> filePath renaming

Browse Source 
Change-Id: Id0751f936666fa658226d62a1906b82e3bac1660
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2023-02-07 18:14:53 +01:00
parent a7bf65c288
commit 3f8240a7de
11 changed files with 46 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,9 +89,9 @@ public:
gbp->m_params.lineNumber = lineNumber;
}
void updateFileName(const FilePath &fileName) final
void updateFilePath(const FilePath &fileName) final
{
TextMark::updateFileName(fileName);
TextMark::updateFilePath(fileName);
QTC_ASSERT(m_bp, return);
m_bp->setFileName(fileName);
if (GlobalBreakpoint gbp = m_bp->globalBreakpoint())
@@ -158,9 +158,9 @@ public:
m_gbp->updateLineNumber(lineNumber);
}
void updateFileName(const FilePath &fileName) final
void updateFilePath(const FilePath &fileName) final
{
TextMark::updateFileName(fileName);
TextMark::updateFilePath(fileName);
QTC_ASSERT(m_gbp, return);
m_gbp->updateFileName(fileName);
}
@@ -1883,7 +1883,7 @@ void BreakpointItem::updateMarker()
{
const FilePath &file = markerFileName();
int line = markerLineNumber();
if (m_marker && (file != m_marker->fileName() || line != m_marker->lineNumber()))
if (m_marker && (file != m_marker->filePath() || line != m_marker->lineNumber()))
destroyMarker();
if (!m_marker && !file.isEmpty() && line > 0)
@@ -2308,8 +2308,8 @@ void GlobalBreakpointItem::updateMarker()
const int line = m_params.lineNumber;
if (m_marker) {
if (m_params.fileName != m_marker->fileName())
m_marker->updateFileName(m_params.fileName);
if (m_params.fileName != m_marker->filePath())
m_marker->updateFilePath(m_params.fileName);
if (line != m_marker->lineNumber())
m_marker->move(line);
} else if (!m_params.fileName.isEmpty() && line > 0) {