diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2015-01-10 23:40:32 +0200 |
|---|---|---|
| committer | hjk <hjk@theqtcompany.com> | 2015-01-29 11:15:43 +0000 |
| commit | 8b5dcc13c539e755b67bfb6ae38553534c9b3d11 (patch) | |
| tree | 6ece649b191598e412049646832a59ae096f850c /src/plugins/diffeditor/diffeditor.cpp | |
| parent | 6fd0d4ed339fe656bc68d7b31ba9d8e63955b12a (diff) | |
| download | qt-creator-8b5dcc13c539e755b67bfb6ae38553534c9b3d11.tar.gz | |
Replace QFileInfo::fileName() with FileName::fileName()
Change-Id: I4852ff215abf25649fc5eac1e922ae901839ca3d
Reviewed-by: hjk <hjk@theqtcompany.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditor.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffeditor.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp index bb97af7581..7132c91364 100644 --- a/src/plugins/diffeditor/diffeditor.cpp +++ b/src/plugins/diffeditor/diffeditor.cpp @@ -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) { |