diff options
| author | hjk <hjk@qt.io> | 2019-05-10 13:18:37 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-05-13 11:33:33 +0000 |
| commit | 8b532c2cc54f1562ff6bb9057636d360a302cadc (patch) | |
| tree | f00894f5e48f88326a78a591e205c0e2efe0d351 /src/plugins/coreplugin | |
| parent | dd304fc824de7c04d4b6bccb2a1a7c87e8880b90 (diff) | |
| download | qt-creator-8b532c2cc54f1562ff6bb9057636d360a302cadc.tar.gz | |
Utils: Replace FileName::FileName(QFileInfo) by a named constructor
More consistent with the fromString case and avoiding false
conversions QString -> QFileInfo -> FileName in case the
inheritance of QString suddenly disappears.
Change-Id: Ib14646ab1a660fd45dd1ea6862a0b5faa52ad0e3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/coreplugin')
| -rw-r--r-- | src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/coreplugin/locator/basefilefilter.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp index 7392eb5905..8d1447b07b 100644 --- a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp +++ b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp @@ -283,7 +283,7 @@ int ReadOnlyFilesDialog::exec() result = static_cast<ReadOnlyResult>(buttongroup.group->checkedId()); switch (result) { case RO_MakeWritable: - if (!Utils::FileUtils::makeWritable(Utils::FileName(QFileInfo(buttongroup.fileName)))) { + if (!Utils::FileUtils::makeWritable(Utils::FileName::fromFileInfo(buttongroup.fileName))) { failedToMakeWritable << buttongroup.fileName; continue; } @@ -403,7 +403,7 @@ void ReadOnlyFilesDialogPrivate::initDialog(const QStringList &fileNames) auto item = new QTreeWidgetItem(ui.treeWidget); item->setText(FileName, visibleName); item->setIcon(FileName, FileIconProvider::icon(fileName)); - item->setText(Folder, Utils::FileUtils::shortNativePath(Utils::FileName(QFileInfo(directory)))); + item->setText(Folder, Utils::FileUtils::shortNativePath(Utils::FileName::fromFileInfo(directory))); auto radioButtonGroup = new QButtonGroup; // Add a button for opening the file with a version control system diff --git a/src/plugins/coreplugin/locator/basefilefilter.cpp b/src/plugins/coreplugin/locator/basefilefilter.cpp index 220f6ff782..d64a2e5d2f 100644 --- a/src/plugins/coreplugin/locator/basefilefilter.cpp +++ b/src/plugins/coreplugin/locator/basefilefilter.cpp @@ -153,7 +153,7 @@ QList<LocatorFilterEntry> BaseFileFilter::matchesFor(QFutureInterface<LocatorFil QFileInfo fi(path); LocatorFilterEntry filterEntry(this, fi.fileName(), QString(path + fp.postfix)); filterEntry.fileName = path; - filterEntry.extraInfo = FileUtils::shortNativePath(FileName(fi)); + filterEntry.extraInfo = FileUtils::shortNativePath(FileName::fromFileInfo(fi)); const int matchLevel = matchLevelFor(match, matchText); if (hasPathSeparator) { |