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

Replace QFileInfo::fileName() with FileName::fileName()

Browse Source 
Change-Id: I4852ff215abf25649fc5eac1e922ae901839ca3d
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-01-10 23:40:32 +02:00
committed by hjk
parent 6fd0d4ed33
commit 8b5dcc13c5
77 changed files with 163 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/diffeditor/diffeditor.cpp
View File

@@ -44,6 +44,8 @@
#include <texteditor/displaysettings.h>
#include <texteditor/marginsettings.h>
#include <utils/fileutils.h>
#include <QStackedWidget>
#include <QToolButton>
#include <QSpinBox>
@@ -52,7 +54,6 @@
#include <QHBoxLayout>
#include <QToolBar>
#include <QComboBox>
#include <QFileInfo>
#include <QDir>
#include <QTextCodec>
#include <QTextBlock>
@@ -421,8 +422,8 @@ void DiffEditor::slotDiffFilesChanged(const QList<FileData> &diffFileList,
for (int i = 0; i < count; i++) {
const DiffFileInfo leftEntry = diffFileList.at(i).leftFileInfo;
const DiffFileInfo rightEntry = diffFileList.at(i).rightFileInfo;
const QString leftShortFileName = QFileInfo(leftEntry.fileName).fileName();
const QString rightShortFileName = QFileInfo(rightEntry.fileName).fileName();
const QString leftShortFileName = Utils::FileName::fromString(leftEntry.fileName).fileName();
const QString rightShortFileName = Utils::FileName::fromString(rightEntry.fileName).fileName();
QString itemText;
QString itemToolTip;
if (leftEntry.fileName == rightEntry.fileName) {