Commit 11fc8d1b authored by Fabian Vogt's avatar Fabian Vogt

Drop KIOFuseProtocolNode and KIOFuseRootNode types

Those are just KIOFuseDirNodes with different name, no need to distinguish.
parent 4a619a02
......@@ -73,10 +73,10 @@ by either querying the typeid or doing a dynamic_cast.
During runtime, the tree can look like this:
"" (ino: 1)
KIOFuseRootNode
KIOFuseDirNode
|
| "smb"
|------> KIOFuseProtocolNode
|------> KIOFuseDirNode
| \
| \ "user@fileserver01" "a file"
| ------> KIOFuseRemoteDirNode -----> KIOFuseRemoteFileNode
......@@ -89,14 +89,14 @@ KIOFuseRootNode
| ------> KIOFuseRemoteFileNode
|
| "sftp"
------> KIOFuseProtocolNode
------> KIOFuseDirNode
\
\ "user@someserver" "a file"
------> KIOFuseRemoteDirNode -----> KIOFuseRemoteFileNode
"user:pass@someserver"
"" (ino: 2) "deleted file"
KIOFuseRootNode ----> KIOFuseRemoteFileNode
KIOFuseDirNode ----> KIOFuseRemoteFileNode
The root node with inode number 1 represents the root of the VFS.
Only files below are visible in the VFS hierarchy.
......
......@@ -44,16 +44,6 @@ public:
std::vector<fuse_ino_t> m_childrenInos;
};
class KIOFuseRootNode : public KIOFuseDirNode {
public:
using KIOFuseDirNode::KIOFuseDirNode;
};
class KIOFuseProtocolNode : public KIOFuseDirNode {
public:
using KIOFuseDirNode::KIOFuseDirNode;
};
// Used for automated testing of expiration.
// Set by KIOFuseServicePrivate::forceNodeTimeout.
extern std::chrono::steady_clock::time_point g_timeoutEpoch;
......
......@@ -142,11 +142,11 @@ KIOFuseVFS::KIOFuseVFS(QObject *parent)
fillStatForFile(attr);
attr.st_mode = S_IFDIR | 0755;
auto root = std::make_shared<KIOFuseRootNode>(KIOFuseIno::Invalid, QString(), attr);
auto root = std::make_shared<KIOFuseDirNode>(KIOFuseIno::Invalid, QString(), attr);
insertNode(root, KIOFuseIno::Root);
incrementLookupCount(root, 1); // Implicitly referenced by mounting
auto deletedRoot = std::make_shared<KIOFuseRootNode>(KIOFuseIno::Invalid, QString(), attr);
auto deletedRoot = std::make_shared<KIOFuseDirNode>(KIOFuseIno::Invalid, QString(), attr);
insertNode(deletedRoot, KIOFuseIno::DeletedRoot);
}
......@@ -1952,7 +1952,7 @@ void KIOFuseVFS::mountUrl(QUrl url, std::function<void (const std::shared_ptr<KI
fillStatForFile(attr);
attr.st_mode = S_IFDIR | 0755;
protocolNode = std::make_shared<KIOFuseProtocolNode>(KIOFuseIno::Root, url.scheme(), attr);
protocolNode = std::make_shared<KIOFuseDirNode>(KIOFuseIno::Root, url.scheme(), attr);
insertNode(protocolNode);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment