From 35c76fab52eff4d5462c94fc4811c66445e4fc9b Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Fri, 22 Nov 2013 23:35:29 +0100
Subject: [PATCH] TextSnifferAddon: Move includes out of namespaces

---
 src/kits/storage/mime/TextSnifferAddon.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/kits/storage/mime/TextSnifferAddon.cpp b/src/kits/storage/mime/TextSnifferAddon.cpp
index bf298f928e..06a0bdc5cd 100644
--- a/src/kits/storage/mime/TextSnifferAddon.cpp
+++ b/src/kits/storage/mime/TextSnifferAddon.cpp
@@ -11,15 +11,18 @@
 #include <mime/DatabaseLocation.h>
 
 
-namespace BPrivate {
-namespace Storage {
-namespace Mime {
+using BPrivate::Storage::Mime::DatabaseLocation;
 
 
 static int file_ascmagic(DatabaseLocation* databaseLocation,
 	const unsigned char *buf, size_t nbytes, BMimeType* mimeType);
 
 
+namespace BPrivate {
+namespace Storage {
+namespace Mime {
+
+
 // constructor
 TextSnifferAddon::TextSnifferAddon(DatabaseLocation* databaseLocation)
 	:
@@ -65,6 +68,11 @@ TextSnifferAddon::GuessMimeType(BFile* file, const void* buffer, int32 length,
 }
 
 
+} // namespace Mime
+} // namespace Storage
+} // namespace BPrivate
+
+
 // #pragma mark - ascmagic.c from the BSD file tool
 /*
  * The following code has been taken from version 4.17 of the BSD file tool,
@@ -708,8 +716,3 @@ from_ebcdic(const unsigned char *buf, size_t nbytes, unsigned char *out)
 		out[i] = ebcdic_to_ascii[buf[i]];
 	}
 }
-
-
-} // namespace Mime
-} // namespace Storage
-} // namespace BPrivate