diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2012-07-18 14:46:05 +0400 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@nokia.com> | 2012-07-18 13:19:23 +0200 |
| commit | 93353920325ad97b9c7f3728ab24ae09fb886014 (patch) | |
| tree | 9fa64332b8c32529accfc7ce468abe07ac70e785 | |
| parent | fd817c675c65da1ad92fa5d0a6bea52c51554eca (diff) | |
| download | qt-creator-93353920325ad97b9c7f3728ab24ae09fb886014.tar.gz | |
Added overload for FileName::isChildOf
Change-Id: I9c5b0e7f3eda13ef3b6903723c27267d090b9d24
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
| -rw-r--r-- | src/libs/utils/fileutils.cpp | 6 | ||||
| -rw-r--r-- | src/libs/utils/fileutils.h | 1 | ||||
| -rw-r--r-- | src/shared/qrceditor/resourcefile.cpp | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index f54920398a..17f8daa837 100644 --- a/src/libs/utils/fileutils.cpp +++ b/src/libs/utils/fileutils.cpp @@ -535,6 +535,12 @@ bool FileName::isChildOf(const FileName &s) const return at(s.size()) == QLatin1Char('/'); } +/// \overload +bool FileName::isChildOf(const QDir &dir) const +{ + return isChildOf(Utils::FileName::fromString(dir.absolutePath())); +} + /// \returns whether FileName endsWith \a s bool FileName::endsWith(const QString &s) const { diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h index e47e1c96fe..6548e8a316 100644 --- a/src/libs/utils/fileutils.h +++ b/src/libs/utils/fileutils.h @@ -162,6 +162,7 @@ public: bool operator>=(const FileName &other) const; bool isChildOf(const FileName &s) const; + bool isChildOf(const QDir &dir) const; bool endsWith(const QString &s) const; Utils::FileName relativeChildPath(const FileName &parent) const; diff --git a/src/shared/qrceditor/resourcefile.cpp b/src/shared/qrceditor/resourcefile.cpp index dc976762a1..ecea7c0e9d 100644 --- a/src/shared/qrceditor/resourcefile.cpp +++ b/src/shared/qrceditor/resourcefile.cpp @@ -820,7 +820,7 @@ bool ResourceModel::setData(const QModelIndex &index, const QVariant &value, int if (newFileName.isEmpty()) return false; - if (!newFileName.isChildOf(Utils::FileName::fromString(baseDir.absolutePath()))) + if (!newFileName.isChildOf(baseDir)) return false; return renameFile(file(index), newFileName.toString()); |