+ Changed StorageKit namespace to BPrivate::Storage
+ Changed Sniffer namespace to BPrivate::Storage::Sniffer git-svn-id: file:///srv/svn/repos/haiku/trunk/current@714 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -87,11 +87,11 @@ private:
|
||||
|
||||
private:
|
||||
virtual void close_fd();
|
||||
StorageKit::FileDescriptor get_fd() const;
|
||||
BPrivate::Storage::FileDescriptor get_fd() const;
|
||||
|
||||
private:
|
||||
uint32 _reservedData[7];
|
||||
StorageKit::FileDescriptor fDirFd;
|
||||
BPrivate::Storage::FileDescriptor fDirFd;
|
||||
|
||||
friend class BEntry;
|
||||
};
|
||||
@@ -107,3 +107,5 @@ status_t create_directory(const char *path, mode_t mode);
|
||||
#endif
|
||||
|
||||
#endif // _DIRECTORY_H
|
||||
|
||||
|
||||
|
||||
@@ -90,11 +90,11 @@ private:
|
||||
/*! BEntry implementation of BStatable::set_stat() */
|
||||
virtual status_t set_stat(struct stat &st, uint32 what);
|
||||
|
||||
status_t set(StorageKit::FileDescriptor dir, const char *path,
|
||||
status_t set(BPrivate::Storage::FileDescriptor dir, const char *path,
|
||||
bool traverse);
|
||||
|
||||
/*! File descriptor for the entry's parent directory. */
|
||||
StorageKit::FileDescriptor fDirFd;
|
||||
BPrivate::Storage::FileDescriptor fDirFd;
|
||||
|
||||
/*! Leaf name of the entry. */
|
||||
char *fName;
|
||||
@@ -118,3 +118,7 @@ bool operator<(const entry_ref &a, const entry_ref &b);
|
||||
#endif
|
||||
|
||||
#endif // _ENTRY_H
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -58,3 +58,5 @@ private:
|
||||
#endif
|
||||
|
||||
#endif // _ENTRY_LIST_H
|
||||
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ private:
|
||||
uint32 _reservedData[8];
|
||||
|
||||
private:
|
||||
StorageKit::FileDescriptor get_fd() const;
|
||||
BPrivate::Storage::FileDescriptor get_fd() const;
|
||||
|
||||
private:
|
||||
//! The file's open mode.
|
||||
@@ -83,3 +83,5 @@ private:
|
||||
#endif
|
||||
|
||||
#endif // _FILE_H
|
||||
|
||||
|
||||
|
||||
@@ -133,3 +133,5 @@ status_t find_directory(directory_which which, BPath *path,
|
||||
#endif
|
||||
|
||||
#endif // _FIND_DIRECTORY_H
|
||||
|
||||
|
||||
|
||||
@@ -43,3 +43,5 @@ enum icon_size {
|
||||
#endif
|
||||
|
||||
#endif // _MIME_H
|
||||
|
||||
|
||||
|
||||
@@ -191,3 +191,5 @@ private:
|
||||
|
||||
|
||||
#endif // _MIME_TYPE_H
|
||||
|
||||
|
||||
|
||||
@@ -115,14 +115,14 @@ private:
|
||||
uint32 rudeData[4];
|
||||
|
||||
private:
|
||||
status_t set_fd(StorageKit::FileDescriptor fd);
|
||||
status_t set_fd(BPrivate::Storage::FileDescriptor fd);
|
||||
virtual void close_fd();
|
||||
void set_status(status_t newStatus);
|
||||
|
||||
virtual status_t set_stat(struct stat &st, uint32 what);
|
||||
|
||||
StorageKit::FileDescriptor fFd;
|
||||
StorageKit::FileDescriptor fAttrFd;
|
||||
BPrivate::Storage::FileDescriptor fFd;
|
||||
BPrivate::Storage::FileDescriptor fAttrFd;
|
||||
status_t fCStatus;
|
||||
|
||||
status_t InitAttrDir();
|
||||
@@ -135,3 +135,5 @@ private:
|
||||
#endif
|
||||
|
||||
#endif // _NODE_H
|
||||
|
||||
|
||||
|
||||
@@ -87,3 +87,5 @@ private:
|
||||
#endif // USE_OPENBEOS_NAMESPACE
|
||||
|
||||
#endif // _NODE_INFO_H
|
||||
|
||||
|
||||
|
||||
@@ -98,3 +98,5 @@ private:
|
||||
#endif
|
||||
|
||||
#endif // _PATH_H
|
||||
|
||||
|
||||
|
||||
@@ -20,10 +20,12 @@
|
||||
class BVolume;
|
||||
struct entry_ref;
|
||||
|
||||
namespace StorageKit {
|
||||
class QueryNode;
|
||||
class QueryStack;
|
||||
class QueryTree;
|
||||
namespace BPrivate {
|
||||
namespace Storage {
|
||||
class QueryNode;
|
||||
class QueryStack;
|
||||
class QueryTree;
|
||||
};
|
||||
};
|
||||
|
||||
typedef enum {
|
||||
@@ -97,7 +99,7 @@ public:
|
||||
|
||||
private:
|
||||
bool _HasFetched() const;
|
||||
status_t _PushNode(StorageKit::QueryNode *node, bool deleteOnError);
|
||||
status_t _PushNode(BPrivate::Storage::QueryNode *node, bool deleteOnError);
|
||||
status_t _SetPredicate(const char *expression);
|
||||
status_t _EvaluateStack();
|
||||
|
||||
@@ -111,13 +113,15 @@ private:
|
||||
|
||||
private:
|
||||
int32 _reservedData[4]; // FBC
|
||||
StorageKit::QueryStack *fStack;
|
||||
BPrivate::Storage::QueryStack *fStack;
|
||||
char *fPredicate;
|
||||
dev_t fDevice;
|
||||
bool fLive;
|
||||
port_id fPort;
|
||||
long fToken;
|
||||
StorageKit::FileDescriptor fQueryFd;
|
||||
BPrivate::Storage::FileDescriptor fQueryFd;
|
||||
};
|
||||
|
||||
#endif // _QUERY_H
|
||||
|
||||
|
||||
|
||||
@@ -88,3 +88,5 @@ private:
|
||||
};
|
||||
|
||||
#endif // _RESOURCE_STRINGS_H
|
||||
|
||||
|
||||
|
||||
@@ -16,9 +16,11 @@
|
||||
namespace OpenBeOS {
|
||||
#endif
|
||||
|
||||
namespace StorageKit {
|
||||
class ResourcesContainer;
|
||||
class ResourceFile;
|
||||
namespace BPrivate {
|
||||
namespace Storage {
|
||||
class ResourcesContainer;
|
||||
class ResourceFile;
|
||||
};
|
||||
};
|
||||
|
||||
/*!
|
||||
@@ -99,8 +101,8 @@ private:
|
||||
|
||||
private:
|
||||
BFile fFile;
|
||||
StorageKit::ResourcesContainer *fContainer;
|
||||
StorageKit::ResourceFile *fResourceFile;
|
||||
BPrivate::Storage::ResourcesContainer *fContainer;
|
||||
BPrivate::Storage::ResourceFile *fResourceFile;
|
||||
bool fReadOnly;
|
||||
bool _pad[3];
|
||||
uint32 _reserved[3]; // FBC
|
||||
@@ -112,3 +114,5 @@ private:
|
||||
#endif
|
||||
|
||||
#endif // _RESOURCES_H
|
||||
|
||||
|
||||
|
||||
@@ -81,3 +81,5 @@ public:
|
||||
#endif // USE_OPENBEOS_NAMESPACE
|
||||
|
||||
#endif // _STATABLE_H
|
||||
|
||||
|
||||
|
||||
@@ -10,8 +10,12 @@
|
||||
#ifndef _DEF_STORAGE_PRIVATE_H
|
||||
#define _DEF_STORAGE_PRIVATE_H
|
||||
|
||||
namespace StorageKit {
|
||||
typedef int FileDescriptor;
|
||||
namespace BPrivate {
|
||||
namespace Storage {
|
||||
typedef int FileDescriptor;
|
||||
};
|
||||
};
|
||||
|
||||
#endif // _DEF_STORAGE_PRIVATE_H
|
||||
|
||||
|
||||
|
||||
@@ -54,3 +54,5 @@ enum node_flavor {
|
||||
|
||||
|
||||
#endif // _DEF_STORAGE_H
|
||||
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ public:
|
||||
|
||||
// WORKAROUND
|
||||
// SetTo() methods: Part of a work around until someone has an idea how to
|
||||
// get StorageKit::read_link(FileDescriptor,...) to work.
|
||||
// get BPrivate::Storage::read_link(FileDescriptor,...) to work.
|
||||
status_t SetTo(const entry_ref *ref);
|
||||
status_t SetTo(const BEntry *entry);
|
||||
status_t SetTo(const char *path);
|
||||
@@ -57,7 +57,7 @@ public:
|
||||
|
||||
// WORKAROUND
|
||||
// operator=(): Part of a work around until someone has an idea how to
|
||||
// get StorageKit::read_link(FileDescriptor,...) to work.
|
||||
// get BPrivate::Storage::read_link(FileDescriptor,...) to work.
|
||||
BSymLink &operator=(const BSymLink &link);
|
||||
|
||||
private:
|
||||
@@ -70,13 +70,13 @@ private:
|
||||
|
||||
// WORKAROUND
|
||||
// fSecretEntry: Part of a work around until someone has an idea how to
|
||||
// get StorageKit::read_link(FileDescriptor,...) to work.
|
||||
// get BPrivate::Storage::read_link(FileDescriptor,...) to work.
|
||||
// uint32 _reservedData[4];
|
||||
uint32 _reservedData[3];
|
||||
BEntry *fSecretEntry;
|
||||
|
||||
private:
|
||||
StorageKit::FileDescriptor get_fd() const;
|
||||
BPrivate::Storage::FileDescriptor get_fd() const;
|
||||
};
|
||||
|
||||
#ifdef USE_OPENBEOS_NAMESPACE
|
||||
@@ -84,3 +84,5 @@ private:
|
||||
#endif
|
||||
|
||||
#endif // _SYM_LINK_H
|
||||
|
||||
|
||||
|
||||
@@ -105,3 +105,5 @@ class BVolume {
|
||||
#endif
|
||||
|
||||
#endif // _VOLUME_H
|
||||
|
||||
|
||||
|
||||
@@ -62,3 +62,5 @@ class BVolumeRoster {
|
||||
#endif
|
||||
|
||||
#endif // _VOLUME_ROSTER_H
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user