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

Utils: Rename FileName to FilePath

Browse Source 
More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.

Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-05-28 13:49:26 +02:00
parent 4704f49fbb
commit 473a741c9f
688 changed files with 3487 additions and 3484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/texteditor/textmark.cpp
View File

@@ -58,7 +58,7 @@ private:
void documentRenamed(Core::IDocument *document, const QString &oldName, const QString &newName);
void allDocumentsRenamed(const QString &oldName, const QString &newName);
QHash<Utils::FileName, QSet<TextMark *> > m_marks;
QHash<Utils::FilePath, QSet<TextMark *> > m_marks;
};
class AnnotationColors
@@ -78,7 +78,7 @@ private:
TextMarkRegistry *m_instance = nullptr;
TextMark::TextMark(const FileName &fileName, int lineNumber, Id category, double widthFactor)
TextMark::TextMark(const FilePath &fileName, int lineNumber, Id category, double widthFactor)
: m_fileName(fileName)
, m_lineNumber(lineNumber)
, m_visible(true)
@@ -100,12 +100,12 @@ TextMark::~TextMark()
m_baseTextDocument = nullptr;
}
FileName TextMark::fileName() const
FilePath TextMark::fileName() const
{
return m_fileName;
}
void TextMark::updateFileName(const FileName &fileName)
void TextMark::updateFileName(const FilePath &fileName)
{
if (fileName == m_fileName)
return;
@@ -398,8 +398,8 @@ void TextMarkRegistry::documentRenamed(IDocument *document, const
auto baseTextDocument = qobject_cast<TextDocument *>(document);
if (!baseTextDocument)
return;
FileName oldFileName = FileName::fromString(oldName);
FileName newFileName = FileName::fromString(newName);
FilePath oldFileName = FilePath::fromString(oldName);
FilePath newFileName = FilePath::fromString(newName);
if (!m_marks.contains(oldFileName))
return;
@@ -416,8 +416,8 @@ void TextMarkRegistry::documentRenamed(IDocument *document, const
void TextMarkRegistry::allDocumentsRenamed(const QString &oldName, const QString &newName)
{
FileName oldFileName = FileName::fromString(oldName);
FileName newFileName = FileName::fromString(newName);
FilePath oldFileName = FilePath::fromString(oldName);
FilePath newFileName = FilePath::fromString(newName);
if (!m_marks.contains(oldFileName))
return;