i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated headers/build/os/support/TypeConstants.h with the current

Browse Source 
headers/os version and removed the now duplicate icon type constant
definitions from several sources.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24106 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2008-02-25 00:55:57 +00:00
parent a68292dd29
commit f69d34a72c
4 changed files with 63 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/build/os/support/TypeConstants.h
+63 -112
View File
@@ -1,127 +1,78 @@
//------------------------------------------------------------------------------ /*
// Copyright (c) 2001-2002, OpenBeOS * Copyright 2005-2007, Haiku, Inc. All Rights Reserved.
// * Distributed under the terms of the MIT License.
// Permission is hereby granted, free of charge, to any person obtaining a *
// copy of this software and associated documentation files (the "Software"), * Author:
// to deal in the Software without restriction, including without limitation * Erik Jaesler ([email protected])
// the rights to use, copy, modify, merge, publish, distribute, sublicense, */
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
// File Name: TypeConstants.h
// Author: Erik Jaesler ([email protected])
// Description: Constants that represent distinct data types, as used
// by BMessage et. al.
//------------------------------------------------------------------------------
#ifndef _TYPE_CONSTANTS_H #ifndef _TYPE_CONSTANTS_H
#define _TYPE_CONSTANTS_H #define _TYPE_CONSTANTS_H
// Standard Includes -----------------------------------------------------------
// System Includes -------------------------------------------------------------
#include <BeBuild.h> #include <BeBuild.h>
// Project Includes ------------------------------------------------------------
// Local Includes --------------------------------------------------------------
// Local Defines ---------------------------------------------------------------
// Globals ---------------------------------------------------------------------
// Data Types ------------------------------------------------------------------
enum { enum {
B_ANY_TYPE = 'ANYT', B_ANY_TYPE = 'ANYT',
B_BOOL_TYPE = 'BOOL', B_ATOM_TYPE = 'ATOM',
B_CHAR_TYPE = 'CHAR', B_ATOMREF_TYPE = 'ATMR',
B_COLOR_8_BIT_TYPE = 'CLRB', B_BOOL_TYPE = 'BOOL',
B_DOUBLE_TYPE = 'DBLE', B_CHAR_TYPE = 'CHAR',
B_FLOAT_TYPE = 'FLOT', B_COLOR_8_BIT_TYPE = 'CLRB',
B_GRAYSCALE_8_BIT_TYPE = 'GRYB', B_DOUBLE_TYPE = 'DBLE',
B_INT64_TYPE = 'LLNG', B_FLOAT_TYPE = 'FLOT',
B_INT32_TYPE = 'LONG', B_GRAYSCALE_8_BIT_TYPE = 'GRYB',
B_INT16_TYPE = 'SHRT', B_INT16_TYPE = 'SHRT',
B_INT8_TYPE = 'BYTE', B_INT32_TYPE = 'LONG',
B_MESSAGE_TYPE = 'MSGG', B_INT64_TYPE = 'LLNG',
B_MESSENGER_TYPE = 'MSNG', B_INT8_TYPE = 'BYTE',
B_MIME_TYPE = 'MIME', B_LARGE_ICON_TYPE = 'ICON',
B_MONOCHROME_1_BIT_TYPE = 'MNOB', B_MEDIA_PARAMETER_GROUP_TYPE = 'BMCG',
B_OBJECT_TYPE = 'OPTR', B_MEDIA_PARAMETER_TYPE = 'BMCT',
B_OFF_T_TYPE = 'OFFT', B_MEDIA_PARAMETER_WEB_TYPE = 'BMCW',
B_PATTERN_TYPE = 'PATN', B_MESSAGE_TYPE = 'MSGG',
B_POINTER_TYPE = 'PNTR', B_MESSENGER_TYPE = 'MSNG',
B_POINT_TYPE = 'BPNT', B_MIME_TYPE = 'MIME',
B_RAW_TYPE = 'RAWT', B_MINI_ICON_TYPE = 'MICN',
B_RECT_TYPE = 'RECT', B_MONOCHROME_1_BIT_TYPE = 'MNOB',
B_REF_TYPE = 'RREF', B_OBJECT_TYPE = 'OPTR',
B_RGB_32_BIT_TYPE = 'RGBB', B_OFF_T_TYPE = 'OFFT',
B_RGB_COLOR_TYPE = 'RGBC', B_PATTERN_TYPE = 'PATN',
B_SIZE_T_TYPE = 'SIZT', B_POINTER_TYPE = 'PNTR',
B_SSIZE_T_TYPE = 'SSZT', B_POINT_TYPE = 'BPNT',
B_STRING_TYPE = 'CSTR', B_PROPERTY_INFO_TYPE = 'SCTD',
B_TIME_TYPE = 'TIME', B_RAW_TYPE = 'RAWT',
B_UINT64_TYPE = 'ULLG', B_RECT_TYPE = 'RECT',
B_UINT32_TYPE = 'ULNG', B_REF_TYPE = 'RREF',
B_UINT16_TYPE = 'USHT', B_RGB_32_BIT_TYPE = 'RGBB',
B_UINT8_TYPE = 'UBYT', B_RGB_COLOR_TYPE = 'RGBC',
B_VECTOR_ICON_TYPE = 'VICN', B_SIZE_T_TYPE = 'SIZT',
B_SSIZE_T_TYPE = 'SSZT',
B_MEDIA_PARAMETER_TYPE = 'BMCT', B_STRING_TYPE = 'CSTR',
B_MEDIA_PARAMETER_WEB_TYPE = 'BMCW', B_TIME_TYPE = 'TIME',
B_MEDIA_PARAMETER_GROUP_TYPE= 'BMCG', B_UINT16_TYPE = 'USHT',
B_UINT32_TYPE = 'ULNG',
B_UINT64_TYPE = 'ULLG',
B_UINT8_TYPE = 'UBYT',
B_VECTOR_ICON_TYPE = 'VICN',
// deprecated, do not use // deprecated, do not use
B_ASCII_TYPE = 'TEXT' // use B_STRING_TYPE instead B_ASCII_TYPE = 'TEXT' // use B_STRING_TYPE instead
}; };
//----- System-wide MIME types for handling URL's ------------------------------ // System-wide MIME types for handling URL's
// To register your application as a handler for a specific URL type, extern const char *B_URL_HTTP; // application/x-vnd.Be.URL.http
// mark it as a handler of the corresponding MIME type from the list extern const char *B_URL_HTTPS; // application/x-vnd.Be.URL.https
// below. When the user clicks on a link in NetPositive that your extern const char *B_URL_FTP; // application/x-vnd.Be.URL.ftp
// application is a handler for, you will get a B_ARGV_RECEIVED message extern const char *B_URL_GOPHER; // application/x-vnd.Be.URL.gopher
// with the full URL as the second argument. extern const char *B_URL_MAILTO; // application/x-vnd.Be.URL.mailto
extern _IMPEXP_BE const char *B_URL_HTTP; // application/x-vnd.Be.URL.http extern const char *B_URL_NEWS; // application/x-vnd.Be.URL.news
extern _IMPEXP_BE const char *B_URL_HTTPS; // application/x-vnd.Be.URL.https extern const char *B_URL_NNTP; // application/x-vnd.Be.URL.nntp
extern _IMPEXP_BE const char *B_URL_FTP; // application/x-vnd.Be.URL.ftp extern const char *B_URL_TELNET; // application/x-vnd.Be.URL.telnet
extern _IMPEXP_BE const char *B_URL_GOPHER; // application/x-vnd.Be.URL.gopher extern const char *B_URL_RLOGIN; // application/x-vnd.Be.URL.rlogin
extern _IMPEXP_BE const char *B_URL_MAILTO; // application/x-vnd.Be.URL.mailto extern const char *B_URL_TN3270; // application/x-vnd.Be.URL.tn3270
extern _IMPEXP_BE const char *B_URL_NEWS; // application/x-vnd.Be.URL.news extern const char *B_URL_WAIS; // application/x-vnd.Be.URL.wais
extern _IMPEXP_BE const char *B_URL_NNTP; // application/x-vnd.Be.URL.nntp extern const char *B_URL_FILE; // application/x-vnd.Be.URL.file
extern _IMPEXP_BE const char *B_URL_TELNET; // application/x-vnd.Be.URL.telnet
extern _IMPEXP_BE const char *B_URL_RLOGIN; // application/x-vnd.Be.URL.rlogin
extern _IMPEXP_BE const char *B_URL_TN3270; // application/x-vnd.Be.URL.tn3270
extern _IMPEXP_BE const char *B_URL_WAIS; // application/x-vnd.Be.URL.wais
extern _IMPEXP_BE const char *B_URL_FILE; // application/x-vnd.Be.URL.file
//----- Obsolete; do not use ---------------------------------------------------
enum {
_DEPRECATED_TYPE_1_ = 'PATH'
};
//------------------------------------------------------------------------------
#endif // _TYPE_CONSTANTS_H #endif // _TYPE_CONSTANTS_H
/*
* $Log $
*
* $Id $
*
*/
src/build/libbe/storage/AppFileInfo.cpp
-2
View File
@@ -46,8 +46,6 @@ static const int32 kLargeIconForTypeResourceID = 0;
// type codes // type codes
enum { enum {
B_APP_FLAGS_TYPE = 'APPF', B_APP_FLAGS_TYPE = 'APPF',
B_MINI_ICON_TYPE = 'MICN',
B_LARGE_ICON_TYPE = 'ICON',
B_VERSION_INFO_TYPE = 'APPV', B_VERSION_INFO_TYPE = 'APPV',
}; };
src/build/libbe/storage/NodeInfo.cpp
-5
View File
@@ -32,11 +32,6 @@ static const char *kNIAppHintAttribute = NI_BEOS ":PPATH";
static const char *kNIMiniIconAttribute = NI_BEOS ":M:STD_ICON"; static const char *kNIMiniIconAttribute = NI_BEOS ":M:STD_ICON";
static const char *kNILargeIconAttribute = NI_BEOS ":L:STD_ICON"; static const char *kNILargeIconAttribute = NI_BEOS ":L:STD_ICON";
// icon types
enum {
B_MINI_ICON_TYPE = 'MICN',
B_LARGE_ICON_TYPE = 'ICON',
};
// constructor // constructor
/*! \brief Creates an uninitialized BNodeInfo object. /*! \brief Creates an uninitialized BNodeInfo object.
src/build/libbe/storage/mime/database_support.cpp
-8
View File
@@ -29,14 +29,6 @@
#define DBG(x) #define DBG(x)
#define OUT printf #define OUT printf
#ifndef HAIKU_HOST_PLATFORM_HAIKU
// icon types (which really ought to be publicly or semi-publicly declared somewhere...)
enum {
B_MINI_ICON_TYPE = 'MICN',
B_LARGE_ICON_TYPE = 'ICON',
};
#endif
namespace BPrivate { namespace BPrivate {
namespace Storage { namespace Storage {
namespace Mime { namespace Mime {