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

Utils: Remove FilePath::isChildOf(QDir) overload

Browse Source 
After replacing its use in the two remaining places.

Change-Id: I6900ccdaf4ba4cf035e59b1222f06b037e7da512
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2021-09-13 13:23:19 +02:00
parent 7acb8e90f3
commit 64324db662
3 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/filepath.cpp
View File

@@ -1011,12 +1011,6 @@ bool FilePath::isChildOf(const FilePath &s) const
return m_data.at(s.m_data.size()) == QLatin1Char('/');
}
/// \overload
bool FilePath::isChildOf(const QDir &dir) const
{
return isChildOf(FilePath::fromString(dir.absolutePath()));
}
/// \returns whether FilePath startsWith \a s
bool FilePath::startsWith(const QString &s) const
{

1
src/libs/utils/filepath.h
View File

@@ -180,7 +180,6 @@ public:
[[nodiscard]] QDir toDir() const; // Avoid.
[[nodiscard]] FilePath absolutePath() const; // Avoid. Use resolvePath(...)[.parent()] with proper base.
[[nodiscard]] FilePath absoluteFilePath() const; // Avoid. Use resolvePath(...) with proper base.
[[nodiscard]] bool isChildOf(const QDir &dir) const; // Avoid. Use isChildOf(FilePath).
private:
friend class ::tst_fileutils;

6
src/plugins/resourceeditor/qrceditor/resourcefile.cpp
View File

@@ -51,10 +51,6 @@
using namespace ResourceEditor;
using namespace ResourceEditor::Internal;
/******************************************************************************
** File
*/
File::File(Prefix *prefix, const QString &_name, const QString &_alias)
: Node(this, prefix)
, name(_name)
@@ -843,7 +839,7 @@ bool ResourceModel::setData(const QModelIndex &index, const QVariant &value, int
if (newFileName.isEmpty())
return false;
if (!newFileName.isChildOf(baseDir))
if (!newFileName.isChildOf(filePath().absolutePath()))
return false;
return renameFile(file(index), newFileName.toString());