Storage Kit: Move most MIME sniffer headers into src/.

There's no reason to keep these in the private headers directory
that I can see.

headers/build/private/storage/sniffer/DisjList.h

@@ -1 +0,0 @@
-#include <../../../private/storage/sniffer/DisjList.h>

headers/build/private/storage/sniffer/Err.h

@@ -1 +0,0 @@
-#include <../../../private/storage/sniffer/Err.h>

headers/build/private/storage/sniffer/Parser.h

@@ -1 +0,0 @@
-#include <../../../private/storage/sniffer/Parser.h>

headers/build/private/storage/sniffer/Pattern.h

@@ -1 +0,0 @@
-#include <../../../private/storage/sniffer/Pattern.h>

headers/build/private/storage/sniffer/PatternList.h

@@ -1 +0,0 @@
-#include <../../../private/storage/sniffer/PatternList.h>

headers/build/private/storage/sniffer/RPattern.h

@@ -1 +0,0 @@
-#include <../../../private/storage/sniffer/RPattern.h>

headers/build/private/storage/sniffer/RPatternList.h

@@ -1 +0,0 @@
-#include <../../../private/storage/sniffer/RPatternList.h>

headers/build/private/storage/sniffer/Range.h

@@ -1 +0,0 @@
-#include <../../../private/storage/sniffer/Range.h>

headers/build/private/storage/sniffer/Rule.h

@@ -1 +0,0 @@
-#include <../../../private/storage/sniffer/Rule.h>

src/kits/storage/MimeType.cpp

@@ -14,8 +14,6 @@
 #include <Bitmap.h>
 #include <mime/database_support.h>
 #include <mime/DatabaseLocation.h>
-#include <sniffer/Rule.h>
-#include <sniffer/Parser.h>
 
 #include <RegistrarDefs.h>
 #include <RosterPrivate.h>
@@ -25,6 +23,9 @@
 #include <stdio.h>
 #include <strings.h>
 
+#include "sniffer/Rule.h"
+#include "sniffer/Parser.h"
+
 
 using namespace BPrivate;
 

src/kits/storage/mime/SnifferRules.cpp

@@ -25,12 +25,13 @@
 #include <mime/DatabaseDirectory.h>
 #include <mime/DatabaseLocation.h>
 #include <mime/MimeSniffer.h>
-#include <sniffer/Parser.h>
-#include <sniffer/Rule.h>
 #include <StorageDefs.h>
 #include <storage_support.h>
 #include <String.h>
 
+#include "../sniffer/Parser.h"
+#include "../sniffer/Rule.h"
+
 
 #define DBG(x) x
 //#define DBG(x)

src/kits/storage/sniffer/CharStream.cpp

@@ -1,6 +1,5 @@
-#include "sniffer/CharStream.h"
+#include <sniffer/CharStream.h>
-
+#include "Err.h"
-#include <sniffer/Err.h>
 
 using namespace BPrivate::Storage::Sniffer;
 

src/kits/storage/sniffer/DisjList.cpp

@@ -7,7 +7,7 @@
 	MIME sniffer Disjunction List class implementation
 */
 
-#include <sniffer/DisjList.h>
+#include "DisjList.h"
 
 using namespace BPrivate::Storage::Sniffer;
 

src/kits/storage/sniffer/Err.cpp

@@ -7,10 +7,11 @@
 	MIME sniffer Error class implementation
 */
 
-#include <sniffer/Err.h>
 #include <new>
 #include <string.h>
 
+#include "Err.h"
+
 using namespace BPrivate::Storage::Sniffer;
 
 //------------------------------------------------------------------------------

src/kits/storage/sniffer/Parser.cpp

@@ -7,13 +7,13 @@
 	MIME sniffer rule parser implementation
 */
 
-#include <sniffer/Parser.h>
+#include "Parser.h"
-#include <sniffer/Pattern.h>
+#include "Pattern.h"
-#include <sniffer/PatternList.h>
+#include "PatternList.h"
-#include <sniffer/Range.h>
+#include "Range.h"
-#include <sniffer/RPattern.h>
+#include "RPattern.h"
-#include <sniffer/RPatternList.h>
+#include "RPatternList.h"
-#include <sniffer/Rule.h>
+#include "Rule.h"
 
 #include <new>
 #include <stdio.h>

src/kits/storage/sniffer/Parser.h

@@ -11,13 +11,14 @@
 
 #include <SupportDefs.h>
 #include <sniffer/CharStream.h>
-#include <sniffer/Err.h>
-#include <sniffer/Range.h>
-#include <sniffer/Rule.h>
 #include <List.h>
 #include <string>
 #include <vector>
 
+#include "Err.h"
+#include "Range.h"
+#include "Rule.h"
+
 class BString;
 
 //! MIME Sniffer related classes

src/kits/storage/sniffer/Pattern.cpp

@@ -7,14 +7,15 @@
 	MIME sniffer pattern implementation
 */
 
-#include <sniffer/Err.h>
-#include <sniffer/Pattern.h>
 #include <DataIO.h>
 #include <stdio.h>	// for SEEK_* defines
 #include <new>
 
 #include <AutoDeleter.h>
 
+#include "Err.h"
+#include "Pattern.h"
+
 using namespace BPrivate::Storage::Sniffer;
 
 Pattern::Pattern(const std::string &string, const std::string &mask)

src/kits/storage/sniffer/Pattern.h

@@ -11,7 +11,7 @@
 
 #include <SupportDefs.h>
 #include <string>
-#include <sniffer/Range.h>
+#include "Range.h"
 
 class BPositionIO;
 

src/kits/storage/sniffer/PatternList.cpp

@@ -7,12 +7,13 @@
 	MIME sniffer pattern list implementation
 */
 
-#include <sniffer/Err.h>
-#include <sniffer/Pattern.h>
-#include <sniffer/PatternList.h>
 #include <DataIO.h>
 #include <stdio.h>
 
+#include "Err.h"
+#include "Pattern.h"
+#include "PatternList.h"
+
 using namespace BPrivate::Storage::Sniffer;
 
 PatternList::PatternList(Range range)

src/kits/storage/sniffer/PatternList.h

@@ -9,10 +9,11 @@
 #ifndef _SNIFFER_PATTERN_LIST_H
 #define _SNIFFER_PATTERN_LIST_H
 
-#include <sniffer/DisjList.h>
-#include <sniffer/Range.h>
 #include <vector>
 
+#include "DisjList.h"
+#include "Range.h"
+
 class BPositionIO;
 
 namespace BPrivate {

src/kits/storage/sniffer/RPattern.cpp

@@ -7,12 +7,13 @@
 	MIME sniffer rpattern implementation
 */
 
-#include <sniffer/Err.h>
-#include <sniffer/Pattern.h>
-#include <sniffer/Range.h>
-#include <sniffer/RPattern.h>
 #include <DataIO.h>
 
+#include "Err.h"
+#include "Pattern.h"
+#include "Range.h"
+#include "RPattern.h"
+
 using namespace BPrivate::Storage::Sniffer;
 
 RPattern::RPattern(Range range, Pattern *pattern)

src/kits/storage/sniffer/RPattern.h

@@ -9,7 +9,7 @@
 #ifndef _SNIFFER_R_PATTERN_H
 #define _SNIFFER_R_PATTERN_H
 
-#include <sniffer/Range.h>
+#include "Range.h"
 
 class BPositionIO;
 

src/kits/storage/sniffer/RPatternList.cpp

@@ -7,12 +7,13 @@
 	MIME sniffer rpattern list implementation
 */
 
-#include <sniffer/Err.h>
-#include <sniffer/RPattern.h>
-#include <sniffer/RPatternList.h>
 #include <DataIO.h>
 #include <stdio.h>
 
+#include "Err.h"
+#include "RPattern.h"
+#include "RPatternList.h"
+
 using namespace BPrivate::Storage::Sniffer;
 
 RPatternList::RPatternList()

src/kits/storage/sniffer/RPatternList.h

@@ -9,9 +9,10 @@
 #ifndef _SNIFFER_R_PATTERN_LIST_H
 #define _SNIFFER_R_PATTERN_LIST_H
 
-#include <sniffer/DisjList.h>
 #include <vector>
 
+#include "DisjList.h"
+
 class BPositionIO;
 
 namespace BPrivate {

src/kits/storage/sniffer/Range.cpp

@@ -7,11 +7,12 @@
 	MIME sniffer range implementation
 */
 
-#include <sniffer/Err.h>
-#include <sniffer/Range.h>
-#include <sniffer/Parser.h>
 #include <stdio.h>
 
+#include "Err.h"
+#include "Range.h"
+#include "Parser.h"
+
 using namespace BPrivate::Storage::Sniffer;
 
 Range::Range(int32 start, int32 end)

src/kits/storage/sniffer/Rule.cpp

@@ -7,12 +7,13 @@
 	MIME sniffer rule implementation
 */
 
-#include <sniffer/Err.h>
-#include <sniffer/DisjList.h>
-#include <sniffer/Rule.h>
 #include <DataIO.h>
 #include <stdio.h>
 
+#include "Err.h"
+#include "DisjList.h"
+#include "Rule.h"
+
 using namespace BPrivate::Storage::Sniffer;
 
 /*! \brief Creates an unitialized Sniffer::Rule object. To initialize it, you

src/servers/registrar/RosterSettingsCharStream.cpp

@@ -9,7 +9,6 @@
 
 #include "RosterSettingsCharStream.h"
 
-#include <sniffer/Err.h>
 #include <StorageDefs.h>
 
 #include <stdio.h>

src/tests/kits/storage/Jamfile

@@ -3,6 +3,7 @@ SubDir HAIKU_TOP src tests kits storage ;
 AddSubDirSupportedPlatforms libbe_test ;
 
 UsePrivateHeaders storage ;
+SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits storage ] ;
 
 UnitTestLib libstoragetest.so
 	: StorageKitTestAddon.cpp

src/tests/kits/storage/MimeSnifferTest.cpp

@@ -5,16 +5,17 @@
 #include <cppunit/Test.h>
 #include <cppunit/TestSuite.h>
 #include <cppunit/TestCaller.h>
-#include <sniffer/Rule.h>
-#include <sniffer/Parser.h>
 #include <DataIO.h>
 #include <Mime.h>
 #include <String.h>		// BString
 #include <TestUtils.h>
 
 #include <stdio.h>
-
 #include <iostream>
+
+#include "sniffer/Rule.h"
+#include "sniffer/Parser.h"
+
 using std::cout;
 using std::endl;