Move B_MIME_STRING_TYPE to <TypeConstants.h>
This commit is contained in:
parent
901749cff2
commit
3e29244600
@ -1,4 +1,4 @@
|
||||
/*
|
||||
/*
|
||||
* Copyright 2004-2006, Haiku Inc. All Rights Reserved.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
@ -31,7 +31,6 @@ status_t create_app_meta_mime(const char *path, int recursive, int synchronous,
|
||||
|
||||
status_t get_device_icon(const char *dev, void *icon, int32 size);
|
||||
|
||||
static const uint32 B_MIME_STRING_TYPE = 'MIMS';
|
||||
|
||||
enum icon_size {
|
||||
B_LARGE_ICON = 32,
|
||||
|
@ -10,10 +10,9 @@
|
||||
|
||||
#include <SupportDefs.h>
|
||||
#include <StorageDefs.h>
|
||||
#include <TypeConstants.h>
|
||||
|
||||
|
||||
static const uint32 B_MIME_STRING_TYPE = 'MIMS';
|
||||
|
||||
enum icon_size {
|
||||
B_LARGE_ICON = 32,
|
||||
B_MINI_ICON = 16
|
||||
|
@ -60,6 +60,7 @@ enum {
|
||||
B_VECTOR_ICON_TYPE = 'VICN',
|
||||
B_XATTR_TYPE = 'XATR',
|
||||
B_NETWORK_ADDRESS_TYPE = 'NWAD',
|
||||
B_MIME_STRING_TYPE = 'MIMS',
|
||||
|
||||
// deprecated, do not use
|
||||
B_ASCII_TYPE = 'TEXT' // use B_STRING_TYPE instead
|
||||
|
@ -111,13 +111,6 @@ union value {
|
||||
};
|
||||
|
||||
|
||||
// B_MIME_STRING_TYPE is defined in storage/Mime.h, but we
|
||||
// don't need the whole file here; the type can't change anyway
|
||||
#ifndef _MIME_H
|
||||
# define B_MIME_STRING_TYPE 'MIMS'
|
||||
#endif
|
||||
|
||||
|
||||
template<typename QueryPolicy>
|
||||
class Query {
|
||||
public:
|
||||
|
@ -1471,6 +1471,9 @@
|
||||
#define B_UINT8_TYPE FSSH_B_UINT8_TYPE
|
||||
#define B_VECTOR_ICON_TYPE FSSH_B_VECTOR_ICON_TYPE
|
||||
#define B_ASCII_TYPE FSSH_B_ASCII_TYPE
|
||||
#define B_XATTR_TYPE FSSH_B_XATTR_TYPE
|
||||
#define B_NETWORK_ADDRESS_TYPE FSSH_B_NETWORK_ADDRESS_TYPE
|
||||
#define B_MIME_STRING_TYPE FSSH_B_MIME_STRING_TYPE
|
||||
|
||||
//----- System-wide MIME types for handling URL's ------------------------------
|
||||
|
||||
|
@ -55,6 +55,9 @@ enum {
|
||||
FSSH_B_UINT64_TYPE = 'ULLG',
|
||||
FSSH_B_UINT8_TYPE = 'UBYT',
|
||||
FSSH_B_VECTOR_ICON_TYPE = 'VICN',
|
||||
FSSH_B_XATTR_TYPE = 'XATR',
|
||||
FSSH_B_NETWORK_ADDRESS_TYPE = 'NWAD',
|
||||
FSSH_B_MIME_STRING_TYPE = 'MIMS',
|
||||
|
||||
// deprecated, do not use
|
||||
FSSH_B_ASCII_TYPE = 'TEXT' // use B_STRING_TYPE instead
|
||||
|
@ -14,13 +14,6 @@
|
||||
#include "BPlusTree.h"
|
||||
|
||||
|
||||
// B_MIME_STRING_TYPE is defined in storage/Mime.h, but we
|
||||
// don't need the whole file here; the type can't change anyway
|
||||
#ifndef _MIME_H
|
||||
# define B_MIME_STRING_TYPE 'MIMS'
|
||||
#endif
|
||||
|
||||
|
||||
Index::Index(Volume* volume)
|
||||
:
|
||||
fVolume(volume),
|
||||
|
@ -79,11 +79,6 @@ union value {
|
||||
char String[INODE_FILE_NAME_LENGTH];
|
||||
};
|
||||
|
||||
// B_MIME_STRING_TYPE is defined in storage/Mime.h, but we
|
||||
// don't need the whole file here; the type can't change anyway
|
||||
#ifndef _MIME_H
|
||||
# define B_MIME_STRING_TYPE 'MIMS'
|
||||
#endif
|
||||
|
||||
/*! Abstract base class for the operator/equation classes.
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user