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

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

@@ -75,7 +75,7 @@ private:
TextMarkRegistry *m_instance = nullptr;
TextMark::TextMark(const QString &fileName, int lineNumber, Id category, double widthFactor)
TextMark::TextMark(const FileName &fileName, int lineNumber, Id category, double widthFactor)
: m_fileName(fileName)
, m_lineNumber(lineNumber)
, m_visible(true)
@@ -95,12 +95,12 @@ TextMark::~TextMark()
m_baseTextDocument = nullptr;
}
QString TextMark::fileName() const
FileName TextMark::fileName() const
{
return m_fileName;
}
void TextMark::updateFileName(const QString &fileName)
void TextMark::updateFileName(const FileName &fileName)
{
if (fileName == m_fileName)
return;
@@ -324,8 +324,9 @@ TextMarkRegistry::TextMarkRegistry(QObject *parent)
void TextMarkRegistry::add(TextMark *mark)
{
instance()->m_marks[FileName::fromString(mark->fileName())].insert(mark);
auto document = qobject_cast<TextDocument*>(DocumentModel::documentForFilePath(mark->fileName()));
instance()->m_marks[mark->fileName()].insert(mark);
auto document = qobject_cast<TextDocument *>(
DocumentModel::documentForFilePath(mark->fileName().toString()));
if (!document)
return;
document->addMark(mark);
@@ -333,7 +334,7 @@ void TextMarkRegistry::add(TextMark *mark)
bool TextMarkRegistry::remove(TextMark *mark)
{
return instance()->m_marks[FileName::fromString(mark->fileName())].remove(mark);
return instance()->m_marks[mark->fileName()].remove(mark);
}
TextMarkRegistry *TextMarkRegistry::instance()
@@ -374,7 +375,7 @@ void TextMarkRegistry::documentRenamed(IDocument *document, const
m_marks[newFileName].unite(toBeMoved);
foreach (TextMark *mark, toBeMoved)
mark->updateFileName(newName);
mark->updateFileName(newFileName);
}
void TextMarkRegistry::allDocumentsRenamed(const QString &oldName, const QString &newName)
@@ -390,7 +391,7 @@ void TextMarkRegistry::allDocumentsRenamed(const QString &oldName, const QString
m_marks[oldFileName].clear();
foreach (TextMark *mark, oldFileNameMarks)
mark->updateFileName(newName);
mark->updateFileName(newFileName);
}
QHash<AnnotationColors::SourceColors, AnnotationColors> AnnotationColors::m_colorCache;