From f69d34a72cb4ca92bfe91b3e1720de6a6bc5b350 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 25 Feb 2008 00:55:57 +0000 Subject: [PATCH] Updated headers/build/os/support/TypeConstants.h with the current 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 --- headers/build/os/support/TypeConstants.h | 175 +++++++----------- src/build/libbe/storage/AppFileInfo.cpp | 2 - src/build/libbe/storage/NodeInfo.cpp | 5 - .../libbe/storage/mime/database_support.cpp | 8 - 4 files changed, 63 insertions(+), 127 deletions(-) diff --git a/headers/build/os/support/TypeConstants.h b/headers/build/os/support/TypeConstants.h index d2f2b15b76..4df643d90b 100644 --- a/headers/build/os/support/TypeConstants.h +++ b/headers/build/os/support/TypeConstants.h @@ -1,127 +1,78 @@ -//------------------------------------------------------------------------------ -// Copyright (c) 2001-2002, OpenBeOS -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// 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 (erik@cgsoftware.com) -// Description: Constants that represent distinct data types, as used -// by BMessage et. al. -//------------------------------------------------------------------------------ - +/* + * Copyright 2005-2007, Haiku, Inc. All Rights Reserved. + * Distributed under the terms of the MIT License. + * + * Author: + * Erik Jaesler (erik@cgsoftware.com) + */ #ifndef _TYPE_CONSTANTS_H #define _TYPE_CONSTANTS_H -// Standard Includes ----------------------------------------------------------- -// System Includes ------------------------------------------------------------- #include -// Project Includes ------------------------------------------------------------ - -// Local Includes -------------------------------------------------------------- - -// Local Defines --------------------------------------------------------------- - -// Globals --------------------------------------------------------------------- - - -// Data Types ------------------------------------------------------------------ enum { - B_ANY_TYPE = 'ANYT', - B_BOOL_TYPE = 'BOOL', - B_CHAR_TYPE = 'CHAR', - B_COLOR_8_BIT_TYPE = 'CLRB', - B_DOUBLE_TYPE = 'DBLE', - B_FLOAT_TYPE = 'FLOT', - B_GRAYSCALE_8_BIT_TYPE = 'GRYB', - B_INT64_TYPE = 'LLNG', - B_INT32_TYPE = 'LONG', - B_INT16_TYPE = 'SHRT', - B_INT8_TYPE = 'BYTE', - B_MESSAGE_TYPE = 'MSGG', - B_MESSENGER_TYPE = 'MSNG', - B_MIME_TYPE = 'MIME', - B_MONOCHROME_1_BIT_TYPE = 'MNOB', - B_OBJECT_TYPE = 'OPTR', - B_OFF_T_TYPE = 'OFFT', - B_PATTERN_TYPE = 'PATN', - B_POINTER_TYPE = 'PNTR', - B_POINT_TYPE = 'BPNT', - B_RAW_TYPE = 'RAWT', - B_RECT_TYPE = 'RECT', - B_REF_TYPE = 'RREF', - B_RGB_32_BIT_TYPE = 'RGBB', - B_RGB_COLOR_TYPE = 'RGBC', - B_SIZE_T_TYPE = 'SIZT', - B_SSIZE_T_TYPE = 'SSZT', - B_STRING_TYPE = 'CSTR', - B_TIME_TYPE = 'TIME', - B_UINT64_TYPE = 'ULLG', - B_UINT32_TYPE = 'ULNG', - B_UINT16_TYPE = 'USHT', - B_UINT8_TYPE = 'UBYT', - B_VECTOR_ICON_TYPE = 'VICN', - - B_MEDIA_PARAMETER_TYPE = 'BMCT', - B_MEDIA_PARAMETER_WEB_TYPE = 'BMCW', - B_MEDIA_PARAMETER_GROUP_TYPE= 'BMCG', + B_ANY_TYPE = 'ANYT', + B_ATOM_TYPE = 'ATOM', + B_ATOMREF_TYPE = 'ATMR', + B_BOOL_TYPE = 'BOOL', + B_CHAR_TYPE = 'CHAR', + B_COLOR_8_BIT_TYPE = 'CLRB', + B_DOUBLE_TYPE = 'DBLE', + B_FLOAT_TYPE = 'FLOT', + B_GRAYSCALE_8_BIT_TYPE = 'GRYB', + B_INT16_TYPE = 'SHRT', + B_INT32_TYPE = 'LONG', + B_INT64_TYPE = 'LLNG', + B_INT8_TYPE = 'BYTE', + B_LARGE_ICON_TYPE = 'ICON', + B_MEDIA_PARAMETER_GROUP_TYPE = 'BMCG', + B_MEDIA_PARAMETER_TYPE = 'BMCT', + B_MEDIA_PARAMETER_WEB_TYPE = 'BMCW', + B_MESSAGE_TYPE = 'MSGG', + B_MESSENGER_TYPE = 'MSNG', + B_MIME_TYPE = 'MIME', + B_MINI_ICON_TYPE = 'MICN', + B_MONOCHROME_1_BIT_TYPE = 'MNOB', + B_OBJECT_TYPE = 'OPTR', + B_OFF_T_TYPE = 'OFFT', + B_PATTERN_TYPE = 'PATN', + B_POINTER_TYPE = 'PNTR', + B_POINT_TYPE = 'BPNT', + B_PROPERTY_INFO_TYPE = 'SCTD', + B_RAW_TYPE = 'RAWT', + B_RECT_TYPE = 'RECT', + B_REF_TYPE = 'RREF', + B_RGB_32_BIT_TYPE = 'RGBB', + B_RGB_COLOR_TYPE = 'RGBC', + B_SIZE_T_TYPE = 'SIZT', + B_SSIZE_T_TYPE = 'SSZT', + B_STRING_TYPE = 'CSTR', + B_TIME_TYPE = 'TIME', + 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 - 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, - // mark it as a handler of the corresponding MIME type from the list - // below. When the user clicks on a link in NetPositive that your - // application is a handler for, you will get a B_ARGV_RECEIVED message - // with the full URL as the second argument. -extern _IMPEXP_BE const char *B_URL_HTTP; // application/x-vnd.Be.URL.http -extern _IMPEXP_BE const char *B_URL_HTTPS; // application/x-vnd.Be.URL.https -extern _IMPEXP_BE const char *B_URL_FTP; // application/x-vnd.Be.URL.ftp -extern _IMPEXP_BE const char *B_URL_GOPHER; // application/x-vnd.Be.URL.gopher -extern _IMPEXP_BE const char *B_URL_MAILTO; // application/x-vnd.Be.URL.mailto -extern _IMPEXP_BE const char *B_URL_NEWS; // application/x-vnd.Be.URL.news -extern _IMPEXP_BE const char *B_URL_NNTP; // application/x-vnd.Be.URL.nntp -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' -}; - -//------------------------------------------------------------------------------ +extern const char *B_URL_HTTP; // application/x-vnd.Be.URL.http +extern const char *B_URL_HTTPS; // application/x-vnd.Be.URL.https +extern const char *B_URL_FTP; // application/x-vnd.Be.URL.ftp +extern const char *B_URL_GOPHER; // application/x-vnd.Be.URL.gopher +extern const char *B_URL_MAILTO; // application/x-vnd.Be.URL.mailto +extern const char *B_URL_NEWS; // application/x-vnd.Be.URL.news +extern const char *B_URL_NNTP; // application/x-vnd.Be.URL.nntp +extern const char *B_URL_TELNET; // application/x-vnd.Be.URL.telnet +extern const char *B_URL_RLOGIN; // application/x-vnd.Be.URL.rlogin +extern const char *B_URL_TN3270; // application/x-vnd.Be.URL.tn3270 +extern const char *B_URL_WAIS; // application/x-vnd.Be.URL.wais +extern const char *B_URL_FILE; // application/x-vnd.Be.URL.file #endif // _TYPE_CONSTANTS_H - -/* - * $Log $ - * - * $Id $ - * - */ - diff --git a/src/build/libbe/storage/AppFileInfo.cpp b/src/build/libbe/storage/AppFileInfo.cpp index 6e938b87bd..2e301359cc 100644 --- a/src/build/libbe/storage/AppFileInfo.cpp +++ b/src/build/libbe/storage/AppFileInfo.cpp @@ -46,8 +46,6 @@ static const int32 kLargeIconForTypeResourceID = 0; // type codes enum { B_APP_FLAGS_TYPE = 'APPF', - B_MINI_ICON_TYPE = 'MICN', - B_LARGE_ICON_TYPE = 'ICON', B_VERSION_INFO_TYPE = 'APPV', }; diff --git a/src/build/libbe/storage/NodeInfo.cpp b/src/build/libbe/storage/NodeInfo.cpp index 631e641229..f444f330c1 100644 --- a/src/build/libbe/storage/NodeInfo.cpp +++ b/src/build/libbe/storage/NodeInfo.cpp @@ -32,11 +32,6 @@ static const char *kNIAppHintAttribute = NI_BEOS ":PPATH"; static const char *kNIMiniIconAttribute = NI_BEOS ":M: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 /*! \brief Creates an uninitialized BNodeInfo object. diff --git a/src/build/libbe/storage/mime/database_support.cpp b/src/build/libbe/storage/mime/database_support.cpp index 220e4c38d7..9282991957 100644 --- a/src/build/libbe/storage/mime/database_support.cpp +++ b/src/build/libbe/storage/mime/database_support.cpp @@ -29,14 +29,6 @@ #define DBG(x) #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 Storage { namespace Mime {