* Cleanup.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31710 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/os/storage/Query.h

@@ -1,23 +1,19 @@
-//----------------------------------------------------------------------
-//  This software is part of the OpenBeOS distribution and is covered 
-//  by the OpenBeOS license.
-//---------------------------------------------------------------------
-/*!
-	\file Query.h
-	BQuery interface declaration.
-*/
-
+/*
+ * Copyright 2002-2009, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef _QUERY_H
 #define _QUERY_H
 
+
 #include <EntryList.h>
 #include <Messenger.h>
 #include <OS.h>
-#include <SupportDefs.h>
 
 class BVolume;
 struct entry_ref;
 
+
 namespace BPrivate {
 	namespace Storage {
 		class QueryNode;
@@ -43,81 +39,84 @@ typedef enum {
 	_B_RESERVED_OP_	= 0x100000
 } query_op;
 
+
 /*!
 	\class BQuery
 	\brief Represents a live or non-live file system query
-	
+
 	Provides an interface for creating file system queries. Implements
 	the BEntryList for iterating through the found entries.
 
 	\author <a href='mailto:[email protected]'>Ingo Weinhold</a>
-	
+
 	\version 0.0.0
 */
 class BQuery : public BEntryList {
 public:
-	BQuery();
-	virtual ~BQuery();
+							BQuery();
+	virtual					~BQuery();
 
-	status_t Clear();
+			status_t		Clear();
 
-	status_t PushAttr(const char *attrName);
-	status_t PushOp(query_op op);
+			status_t		PushAttr(const char* attrName);
+			status_t		PushOp(query_op op);
 
-	status_t PushUInt32(uint32 value);
-	status_t PushInt32(int32 value);
-	status_t PushUInt64(uint64 value);
-	status_t PushInt64(int64 value);
-	status_t PushFloat(float value);
-	status_t PushDouble(double value);
-	status_t PushString(const char *value, bool caseInsensitive = false);
-	status_t PushDate(const char *date);
+			status_t		PushUInt32(uint32 value);
+			status_t		PushInt32(int32 value);
+			status_t		PushUInt64(uint64 value);
+			status_t		PushInt64(int64 value);
+			status_t		PushFloat(float value);
+			status_t		PushDouble(double value);
+			status_t		PushString(const char* value,
+								bool caseInsensitive = false);
+			status_t		PushDate(const char* date);
 
-	status_t SetVolume(const BVolume *volume);
-	status_t SetPredicate(const char *expression);
-	status_t SetTarget(BMessenger messenger);
+			status_t		SetVolume(const BVolume* volume);
+			status_t		SetPredicate(const char* expression);
+			status_t		SetTarget(BMessenger messenger);
 
-	bool IsLive() const;
+			bool			IsLive() const;
 
-	status_t GetPredicate(char *buffer, size_t length);
-	status_t GetPredicate(BString *predicate);
-	size_t PredicateLength();
+			status_t		GetPredicate(char* buffer, size_t length);
+			status_t		GetPredicate(BString* predicate);
+			size_t			PredicateLength();
 
-	dev_t TargetDevice() const;
+			dev_t			TargetDevice() const;
 
-	status_t Fetch();
+			status_t		Fetch();
 
 	// BEntryList interface
-	virtual status_t GetNextEntry(BEntry *entry, bool traverse = false);
-	virtual status_t GetNextRef(entry_ref *ref);
-	virtual int32 GetNextDirents(struct dirent *buf, size_t length,
+	virtual	status_t		GetNextEntry(BEntry* entry, bool traverse = false);
+	virtual	status_t		GetNextRef(entry_ref* ref);
+	virtual	int32			GetNextDirents(struct dirent* buffer, size_t length,
 								 int32 count = INT_MAX);
-	virtual status_t Rewind();
-	virtual int32 CountEntries();
+	virtual	status_t		Rewind();
+	virtual	int32			CountEntries();
 
 private:
-	bool _HasFetched() const;
-	status_t _PushNode(BPrivate::Storage::QueryNode *node, bool deleteOnError);
-	status_t _SetPredicate(const char *expression);
-	status_t _EvaluateStack();
+			bool			_HasFetched() const;
+			status_t		_PushNode(BPrivate::Storage::QueryNode* node,
+								bool deleteOnError);
+			status_t		_SetPredicate(const char* expression);
+			status_t		_EvaluateStack();
 
 	// FBC
-	virtual void _QwertyQuery1();
-	virtual void _QwertyQuery2();
-	virtual void _QwertyQuery3();
-	virtual void _QwertyQuery4();
-	virtual void _QwertyQuery5();
-	virtual void _QwertyQuery6();
+	virtual	void			_QwertyQuery1();
+	virtual	void			_QwertyQuery2();
+	virtual	void			_QwertyQuery3();
+	virtual	void			_QwertyQuery4();
+	virtual	void			_QwertyQuery5();
+	virtual	void			_QwertyQuery6();
 
 private:
-	int32		_reservedData[4];	// FBC
-	BPrivate::Storage::QueryStack *fStack;
-	char		*fPredicate;
-	dev_t		fDevice;
-	bool		fLive;
-	port_id		fPort;
-	long		fToken;
-	int			fQueryFd;
+			BPrivate::Storage::QueryStack* fStack;
+			char*			fPredicate;
+			dev_t			fDevice;
+			bool			fLive;
+			port_id			fPort;
+			long			fToken;
+			int				fQueryFd;
+			int32			_reservedData[4];
 };
 
 #endif	// _QUERY_H