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

Core: Use FileName for file path in IDocument

Browse Source 
Change-Id: I85f7398aee59d0d36f0e5c3bf88ff3c96002e394
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2014-12-21 21:54:30 +02:00
committed by Orgad Shaneh
parent 9c1b28fec2
commit c6a983d271
123 changed files with 327 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/vcsbase/vcsbaseeditor.cpp
View File

@@ -1221,7 +1221,7 @@ static QTextCodec *findProjectCodec(const QString &dir)
const ProjectList::const_iterator pcend = projects.constEnd();
for (ProjectList::const_iterator it = projects.constBegin(); it != pcend; ++it)
if (const Core::IDocument *document = (*it)->document())
if (document->filePath().startsWith(dir)) {
if (document->filePath().toString().startsWith(dir)) {
QTextCodec *codec = (*it)->editorConfiguration()->textCodec();
return codec;
}
@@ -1267,7 +1267,7 @@ int VcsBaseEditor::lineNumberOfCurrentEditor(const QString &currentFile)
return -1;
if (!currentFile.isEmpty()) {
const Core::IDocument *idocument = ed->document();
if (!idocument || idocument->filePath() != currentFile)
if (!idocument || idocument->filePath().toString() != currentFile)
return -1;
}
const BaseTextEditor *eda = qobject_cast<const BaseTextEditor *>(ed);