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

Utils: Make DeviceFileHooks access a bit more self-contained

Browse Source 
Change-Id: Ib13035820021e9eda0585f98885bef9cbd2317a6
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
hjk
2022-08-04 10:44:45 +02:00
parent 451d02c88d
commit 8945b3832c
4 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,6 +65,11 @@ namespace Utils {
static DeviceFileHooks s_deviceHooks; static DeviceFileHooks s_deviceHooks;
DeviceFileHooks &DeviceFileHooks::instance()
{
return s_deviceHooks;
}
static bool removeRecursivelyLocal(const FilePath &filePath, QString *error) static bool removeRecursivelyLocal(const FilePath &filePath, QString *error)
{ {
@@ -118,11 +123,6 @@ static bool removeRecursivelyLocal(const FilePath &filePath, QString *error)
return true; return true;
} }
void FilePath::setDeviceFileHooks(const DeviceFileHooks &hooks)
{
s_deviceHooks = hooks;
}
/*! /*!
If this is a directory, the function will recursively check all files and return If this is a directory, the function will recursively check all files and return
true if one of them is newer than \a timeStamp. If this is a single file, true will true if one of them is newer than \a timeStamp. If this is a single file, true will

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

@@ -47,7 +47,6 @@ class tst_fileutils; // This becomes a friend of Utils::FilePath for testing pri
namespace Utils { namespace Utils {
class DeviceFileHooks;
class Environment; class Environment;
class EnvironmentChange; class EnvironmentChange;
@@ -225,8 +224,6 @@ public:
[[nodiscard]] static QString specialPath(SpecialPathComponent component); [[nodiscard]] static QString specialPath(SpecialPathComponent component);
[[nodiscard]] static FilePath specialFilePath(SpecialPathComponent component); [[nodiscard]] static FilePath specialFilePath(SpecialPathComponent component);
static void setDeviceFileHooks(const DeviceFileHooks &hooks);
private: private:
friend class ::tst_fileutils; friend class ::tst_fileutils;
static QString calcRelativePath(const QString &absolutePath, const QString &absoluteAnchorPath); static QString calcRelativePath(const QString &absolutePath, const QString &absoluteAnchorPath);
@@ -243,9 +240,11 @@ inline size_t qHash(const Utils::FilePath &a, uint seed = 0)
return a.hash(seed); return a.hash(seed);
} }
class DeviceFileHooks class QTCREATOR_UTILS_EXPORT DeviceFileHooks
{ {
public: public:
static DeviceFileHooks &instance();
std::function<bool(const FilePath &)> isExecutableFile; std::function<bool(const FilePath &)> isExecutableFile;
std::function<bool(const FilePath &)> isReadableFile; std::function<bool(const FilePath &)> isReadableFile;
std::function<bool(const FilePath &)> isReadableDir; std::function<bool(const FilePath &)> isReadableDir;

4
src/plugins/projectexplorer/devicesupport/devicemanager.cpp
View File

@@ -425,7 +425,7 @@ DeviceManager::DeviceManager(bool isInstance) : d(std::make_unique<DeviceManager
connect(Core::ICore::instance(), &Core::ICore::saveSettingsRequested, connect(Core::ICore::instance(), &Core::ICore::saveSettingsRequested,
this, &DeviceManager::save); this, &DeviceManager::save);
DeviceFileHooks deviceHooks; DeviceFileHooks &deviceHooks = DeviceFileHooks::instance();
deviceHooks.isExecutableFile = [](const FilePath &filePath) { deviceHooks.isExecutableFile = [](const FilePath &filePath) {
auto device = DeviceManager::deviceForPath(filePath); auto device = DeviceManager::deviceForPath(filePath);
@@ -610,8 +610,6 @@ DeviceManager::DeviceManager(bool isInstance) : d(std::make_unique<DeviceManager
return device->displayName(); return device->displayName();
}; };
FilePath::setDeviceFileHooks(deviceHooks);
DeviceProcessHooks processHooks; DeviceProcessHooks processHooks;
processHooks.processImplHook = [](const FilePath &filePath) -> ProcessInterface * { processHooks.processImplHook = [](const FilePath &filePath) -> ProcessInterface * {

4
tests/auto/utils/fsengine/tst_fsengine.cpp
View File

@@ -74,7 +74,7 @@ void tst_fsengine::initTestCase()
if (!FSEngine::isAvailable()) if (!FSEngine::isAvailable())
QSKIP("Utils was built without Filesystem Engine"); QSKIP("Utils was built without Filesystem Engine");
DeviceFileHooks deviceHooks; DeviceFileHooks &deviceHooks = DeviceFileHooks::instance();
deviceHooks.fileContents = deviceHooks.fileContents =
[](const FilePath &path, qint64 maxSize, qint64 offset) -> QByteArray { [](const FilePath &path, qint64 maxSize, qint64 offset) -> QByteArray {
@@ -175,8 +175,6 @@ void tst_fsengine::initTestCase()
deviceHooks.mapToDevicePath = [](const FilePath &filePath) { return filePath.path(); }; deviceHooks.mapToDevicePath = [](const FilePath &filePath) { return filePath.path(); };
FilePath::setDeviceFileHooks(deviceHooks);
FSEngine::addDevice(FilePath::fromString("device://test")); FSEngine::addDevice(FilePath::fromString("device://test"));
tempFolder = QDir::tempPath(); tempFolder = QDir::tempPath();