TextSnifferAddon: Move includes out of namespaces

This commit is contained in:
Ingo Weinhold
2013-11-22 23:36:06 +01:00
parent b2806f310e
commit 35c76fab52
+11 -8
View File
@@ -11,15 +11,18 @@
#include <mime/DatabaseLocation.h> #include <mime/DatabaseLocation.h>
namespace BPrivate { using BPrivate::Storage::Mime::DatabaseLocation;
namespace Storage {
namespace Mime {
static int file_ascmagic(DatabaseLocation* databaseLocation, static int file_ascmagic(DatabaseLocation* databaseLocation,
const unsigned char *buf, size_t nbytes, BMimeType* mimeType); const unsigned char *buf, size_t nbytes, BMimeType* mimeType);
namespace BPrivate {
namespace Storage {
namespace Mime {
// constructor // constructor
TextSnifferAddon::TextSnifferAddon(DatabaseLocation* databaseLocation) 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 // #pragma mark - ascmagic.c from the BSD file tool
/* /*
* The following code has been taken from version 4.17 of 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]]; out[i] = ebcdic_to_ascii[buf[i]];
} }
} }
} // namespace Mime
} // namespace Storage
} // namespace BPrivate