diff --git a/headers/os/BeBuild.h b/headers/os/BeBuild.h index e8c3eb1ec5..1f5a5edfa1 100644 --- a/headers/os/BeBuild.h +++ b/headers/os/BeBuild.h @@ -1,387 +1,26 @@ -/****************************************************************************** -/ -/ File: BeBuild.h -/ -/ Description: Import/export macros -/ -/ Copyright 1993-98, Be Incorporated -/ -*******************************************************************************/ - +/* + * Copyright 2007, Haiku, Inc. All Rights Reserved. + * Distributed under the terms of the MIT License. + */ #ifndef _BE_BUILD_H #define _BE_BUILD_H + #define B_BEOS_VERSION_4 0x0400 #define B_BEOS_VERSION_4_5 0x0450 #define B_BEOS_VERSION_5 0x0500 #define B_BEOS_VERSION B_BEOS_VERSION_5 -#define B_BEOS_VERSION_MAUI B_BEOS_VERSION_5 +#define B_BEOS_VERSION_MAUI B_BEOS_VERSION_5 -#if defined(__POWERPC__) - // the PowerPC build is using GCC now (BeOS R5 used to use the Metrowerks - // compiler), so it is not compatible to any BeOS version on that platform - // before. However, that wouldn't rule out source compatibility, which - // we do here (for now). - #define _PR2_COMPATIBLE_ 0 - #define _PR3_COMPATIBLE_ 0 - #define _R4_COMPATIBLE_ 0 - #define _R4_5_COMPATIBLE_ 0 -#elif defined(__INTEL__) - #define _PR2_COMPATIBLE_ 0 - #define _PR3_COMPATIBLE_ 0 - #define _R4_COMPATIBLE_ 1 - #define _R4_5_COMPATIBLE_ 1 -#else -# error Configure BeBuild.h for your platform -#endif - -#if __MWERKS__ -# define _UNUSED(x) -# define _PACKED -#endif +#define B_HAIKU_VERSION_1 0x0100 #if __GNUC__ -# define _UNUSED(x) x -# define _PACKED __attribute__((packed)) -#endif - -#if defined(__INTEL__) || defined(__POWERPC__) - -// This is the standard import/export definitions used for -// the ELF binary format - this should be usable by all flavors -// of OpenBeOS. - +# define _UNUSED(argument) argument +# define _PACKED __attribute__((packed)) +# define _PRINTFLIKE(_format_, _args_) \ + __attribute__((format(__printf__, _format_, _args_))) # define _EXPORT -# define _IMPORT - -# define _IMPEXP_KERNEL -# define _IMPEXP_GL -# define _IMPEXP_ROOT -# define _IMPEXP_NET -# define _IMPEXP_NETDEV -# define _IMPEXP_ATALK -# define _IMPEXP_BE -# define _IMPEXP_TRACKER -# define _IMPEXP_MAIL -# define _IMPEXP_DEVICE -# define _IMPEXP_MEDIA -# define _IMPEXP_MIDI -# define _IMPEXP_MIDI2 -# define _IMPEXP_GAME -# define _IMPEXP_GSOUND -# define _IMPEXP_TRANSLATION -# define _IMPEXP_TEXTENCODING -# define _IMPEXP_INPUT #endif - -#ifdef __cplusplus - -/* cpp kit */ - -// /* -- */ -// class _IMPEXP_ROOT bad_cast; -// class _IMPEXP_ROOT bad_typeid; -// class _IMPEXP_ROOT type_info; -// -// /* -- */ -// class _IMPEXP_ROOT exception; -// class _IMPEXP_ROOT bad_exception; -// -// /* -- */ -// class _IMPEXP_ROOT bad_alloc; -// -// /* -- */ -// class _IMPEXP_ROOT logic_error; -// class _IMPEXP_ROOT domain_error; -// class _IMPEXP_ROOT invalid_argument; -// class _IMPEXP_ROOT length_error; -// class _IMPEXP_ROOT out_of_range; -// class _IMPEXP_ROOT runtime_error; -// class _IMPEXP_ROOT range_error; -// class _IMPEXP_ROOT overflow_error; - -/* support kit */ -class _IMPEXP_BE BArchivable; -class _IMPEXP_BE BAutolock; -class _IMPEXP_BE BBlockCache; -class _IMPEXP_BE BBufferIO; -class _IMPEXP_BE BDataIO; -class _IMPEXP_BE BPositionIO; -class _IMPEXP_BE BMallocIO; -class _IMPEXP_BE BMemoryIO; -class _IMPEXP_BE BFlattenable; -class _IMPEXP_BE BList; -class _IMPEXP_BE BLocker; -class _IMPEXP_BE BStopWatch; -class _IMPEXP_BE BString; - -class _IMPEXP_BE PointerList; - -/*storage kit */ -struct _IMPEXP_BE entry_ref; -struct _IMPEXP_BE node_ref; -class _IMPEXP_BE BAppFileInfo; -class _IMPEXP_BE BDirectory; -class _IMPEXP_BE BEntry; -class _IMPEXP_BE BFile; -class _IMPEXP_BE BRefFilter; -class _IMPEXP_BE BMimeType; -class _IMPEXP_BE BNode; -class _IMPEXP_BE BNodeInfo; -class _IMPEXP_BE BPath; -class _IMPEXP_BE BQuery; -class _IMPEXP_BE BResources; -class _IMPEXP_BE BResourceStrings; -class _IMPEXP_BE BStatable; -class _IMPEXP_BE BSymLink; -class _IMPEXP_BE BVolume; -class _IMPEXP_BE BVolumeRoster; - -//class _IMPEXP_BE Partition; -//class _IMPEXP_BE Session; -//class _IMPEXP_BE Device; -//class _IMPEXP_BE DeviceList; -//class _IMPEXP_BE TNodeWalker; -//class _IMPEXP_BE TQueryWalker; -//class _IMPEXP_BE TVolWalker; - -/*app kit */ -struct _IMPEXP_BE app_info; -class _IMPEXP_BE BApplication; -class _IMPEXP_BE BClipboard; -class _IMPEXP_BE BHandler; -class _IMPEXP_BE BInvoker; -class _IMPEXP_BE BLooper; -class _IMPEXP_BE BMessage; -class _IMPEXP_BE BMessageFilter; -class _IMPEXP_BE BMessageQueue; -class _IMPEXP_BE BMessageRunner; -class _IMPEXP_BE BMessenger; -class _IMPEXP_BE BPropertyInfo; -class _IMPEXP_BE BRoster; - -class _IMPEXP_BE _BAppServerLink_; -class _IMPEXP_BE _BSession_; - -/*interface kit */ -class _IMPEXP_BE BAlert; -class _IMPEXP_BE BBitmap; -class _IMPEXP_BE BBox; -class _IMPEXP_BE BButton; -class _IMPEXP_BE BChannelControl; -class _IMPEXP_BE BChannelSlider; -class _IMPEXP_BE BCheckBox; -class _IMPEXP_BE BColorControl; -class _IMPEXP_BE BControl; -class _IMPEXP_BE BDeskbar; -class _IMPEXP_BE BDragger; -class _IMPEXP_BE BFont; -class _IMPEXP_BE BInputDevice; -class _IMPEXP_BE BListItem; -class _IMPEXP_BE BListView; -class _IMPEXP_BE BStringItem; -class _IMPEXP_BE BMenu; -class _IMPEXP_BE BMenuBar; -class _IMPEXP_BE BMenuField; -class _IMPEXP_BE BMenuItem; -class _IMPEXP_BE BOptionControl; -class _IMPEXP_BE BOptionPopUp; -class _IMPEXP_BE BOutlineListView; -class _IMPEXP_BE BPicture; -class _IMPEXP_BE BPictureButton; -class _IMPEXP_BE BPoint; -class _IMPEXP_BE BPolygon; -class _IMPEXP_BE BPopUpMenu; -class _IMPEXP_BE BPrintJob; -class _IMPEXP_BE BRadioButton; -class _IMPEXP_BE BRect; -class _IMPEXP_BE BRegion; -class _IMPEXP_BE BScreen; -class _IMPEXP_BE BScrollBar; -class _IMPEXP_BE BScrollView; -class _IMPEXP_BE BSeparatorItem; -class _IMPEXP_BE BShelf; -class _IMPEXP_BE BShape; -class _IMPEXP_BE BShapeIterator; -class _IMPEXP_BE BSlider; -class _IMPEXP_BE BStatusBar; -class _IMPEXP_BE BStringView; -class _IMPEXP_BE BTab; -class _IMPEXP_BE BTabView; -class _IMPEXP_BE BTextControl; -class _IMPEXP_BE BTextView; -class _IMPEXP_BE BView; -class _IMPEXP_BE BWindow; - -class _IMPEXP_BE _BTextInput_; -class _IMPEXP_BE _BMCMenuBar_; -class _IMPEXP_BE _BMCItem_; -class _IMPEXP_BE _BWidthBuffer_; -//class _IMPEXP_BE BPrivateScreen; - -/* net kit */ -class _IMPEXP_NET _Allocator; -class _IMPEXP_NET _Transacter; -class _IMPEXP_NET _FastIPC; - -/* netdev kit */ -class _IMPEXP_NETDEV BNetPacket; -class _IMPEXP_NETDEV BStandardPacket; -class _IMPEXP_NETDEV BTimeoutHandler; -class _IMPEXP_NETDEV BPacketHandler; -class _IMPEXP_NETDEV BNetProtocol; -class _IMPEXP_NETDEV BNetDevice; -class _IMPEXP_NETDEV BCallBackHandler; -class _IMPEXP_NETDEV BNetConfig; -class _IMPEXP_NETDEV BIpDevice; - -class _IMPEXP_NETDEV _NetBufList; -class _IMPEXP_NETDEV _BSem; - -/* atalk kit */ -class _IMPEXP_ATALK _PrinterNode; - -/* tracker kit */ -class _IMPEXP_TRACKER BFilePanel; -class _IMPEXP_TRACKER BRecentItemsList; -class _IMPEXP_TRACKER BRecentFilesList; -class _IMPEXP_TRACKER BRecentFoldersList; -class _IMPEXP_TRACKER BRecentAppsList; - -/* mail kit */ -class _IMPEXP_MAIL BMailMessage; - -/* device kit */ -class _IMPEXP_DEVICE BA2D; -class _IMPEXP_DEVICE BD2A; -class _IMPEXP_DEVICE BDigitalPort; -class _IMPEXP_DEVICE BJoystick; -class _IMPEXP_DEVICE BSerialPort; - -/* media kit */ -class _IMPEXP_MEDIA BDACRenderer; -class _IMPEXP_MEDIA BAudioFileStream; -class _IMPEXP_MEDIA BADCStream; -class _IMPEXP_MEDIA BDACStream; -class _IMPEXP_MEDIA BAbstractBufferStream; -class _IMPEXP_MEDIA BBufferStreamManager; -class _IMPEXP_MEDIA BBufferStream; -class _IMPEXP_MEDIA BSoundFile; -class _IMPEXP_MEDIA BSubscriber; - -class _IMPEXP_MEDIA BMediaRoster; -class _IMPEXP_MEDIA BMediaNode; -class _IMPEXP_MEDIA BTimeSource; -class _IMPEXP_MEDIA BBufferProducer; -class _IMPEXP_MEDIA BBufferConsumer; -class _IMPEXP_MEDIA BBuffer; -class _IMPEXP_MEDIA BBufferGroup; -class _IMPEXP_MEDIA BControllable; -class _IMPEXP_MEDIA BFileInterface; -class _IMPEXP_MEDIA BEntityInterface; -class _IMPEXP_MEDIA BMediaAddOn; -class _IMPEXP_MEDIA BMediaTheme; -class _IMPEXP_MEDIA BParameterWeb; -class _IMPEXP_MEDIA BParameterGroup; -class _IMPEXP_MEDIA BParameter; -class _IMPEXP_MEDIA BNullParameter; -class _IMPEXP_MEDIA BDiscreteParameter; -class _IMPEXP_MEDIA BContinuousParameter; -class _IMPEXP_MEDIA BMediaFiles; -class _IMPEXP_MEDIA BSound; -class _IMPEXP_MEDIA BSoundCard; -class _IMPEXP_MEDIA BSoundPlayer; -class _IMPEXP_MEDIA BMediaFormats; -class _IMPEXP_MEDIA BTimedEventQueue; -//class _IMPEXP_MEDIA BEventIterator; -class _IMPEXP_MEDIA BMediaEventLooper; -class _IMPEXP_MEDIA BMediaFile; -class _IMPEXP_MEDIA BMediaTrack; - -class _IMPEXP_MEDIA media_node; -struct _IMPEXP_MEDIA media_input; -struct _IMPEXP_MEDIA media_output; -struct _IMPEXP_MEDIA live_node_info; -struct _IMPEXP_MEDIA buffer_clone_info; -struct _IMPEXP_MEDIA media_source; -struct _IMPEXP_MEDIA media_destination; -struct _IMPEXP_MEDIA media_raw_audio_format; -struct _IMPEXP_MEDIA media_raw_video_format; -struct _IMPEXP_MEDIA media_video_display_info; -struct _IMPEXP_MEDIA flavor_info; -struct _IMPEXP_MEDIA dormant_node_info; -struct _IMPEXP_MEDIA dormant_flavor_info; -struct _IMPEXP_MEDIA media_source; -struct _IMPEXP_MEDIA media_destination; -struct _IMPEXP_MEDIA _media_format_description; -struct _IMPEXP_MEDIA media_timed_event; - -/* midi kit */ -class _IMPEXP_MIDI BMidi; -class _IMPEXP_MIDI BMidiPort; -class _IMPEXP_MIDI BMidiStore; -class _IMPEXP_MIDI BMidiSynth; -class _IMPEXP_MIDI BMidiSynthFile; -class _IMPEXP_MIDI BMidiText; -class _IMPEXP_MIDI BSamples; -class _IMPEXP_MIDI BSynth; - -class _IMPEXP_MIDI2 BMidiEndpoint; -class _IMPEXP_MIDI2 BMidiProducer; -class _IMPEXP_MIDI2 BMidiConsumer; -class _IMPEXP_MIDI2 BMidiLocalProducer; -class _IMPEXP_MIDI2 BMidiLocalConsumer; -class _IMPEXP_MIDI2 BMidiRoster; - -/* game kit */ -class _IMPEXP_GAME BWindowScreen; -class _IMPEXP_GAME BDirectWindow; - -/* gamesound kit */ -class _IMPEXP_GSOUND BGameSound; -class _IMPEXP_GSOUND BSimpleGameSound; -class _IMPEXP_GSOUND BStreamingGameSound; -class _IMPEXP_GSOUND BFileGameSound; -class _IMPEXP_GSOUND BPushGameSound; - -/* translation kit */ -class _IMPEXP_TRANSLATION BTranslatorRoster; -class _IMPEXP_TRANSLATION BTranslationUtils; -class _IMPEXP_TRANSLATION BBitmapStream; -class _IMPEXP_TRANSLATION BTranslator; -struct _IMPEXP_TRANSLATION translation_format; -struct _IMPEXP_TRANSLATION translator_info; - -/* GL */ -class _IMPEXP_GL BGLView; -class _IMPEXP_GL BGLScreen; -class _IMPEXP_GL GLUnurbs; -class _IMPEXP_GL GLUquadric; -class _IMPEXP_GL GLUtesselator; - -typedef class _IMPEXP_GL GLUnurbs GLUnurbsObj; -typedef class _IMPEXP_GL GLUquadric GLUquadricObj; -typedef class _IMPEXP_GL GLUtesselator GLUtesselatorObj; -typedef class _IMPEXP_GL GLUtesselator GLUtriangulatorObj; - -/* input_server */ -class _IMPEXP_INPUT BInputServerDevice; -class _IMPEXP_INPUT BInputServerFilter; -class _IMPEXP_INPUT BInputServerMethod; - -#else /* __cplusplus */ -/* -//typedef struct _IMPEXP_GL GLUnurbs GLUnurbs; -//typedef struct _IMPEXP_GL GLUquadric GLUquadric; -//typedef struct _IMPEXP_GL GLUtesselator GLUtesselator; - -//typedef struct _IMPEXP_GL GLUnurbs GLUnurbsObj; -//typedef struct _IMPEXP_GL GLUquadric GLUquadricObj; -//typedef struct _IMPEXP_GL GLUtesselator GLUtesselatorObj; -//typedef struct _IMPEXP_GL GLUtesselator GLUtriangulatorObj; -*/ -#endif /* __cplusplus */ - #endif /* _BE_BUILD_H */ diff --git a/headers/os/add-ons/graphics/GraphicsCard.h b/headers/os/add-ons/graphics/GraphicsCard.h index 493619ffa5..a7c585da1b 100644 --- a/headers/os/add-ons/graphics/GraphicsCard.h +++ b/headers/os/add-ons/graphics/GraphicsCard.h @@ -147,7 +147,7 @@ typedef void (*graphics_card_hook) (); extern "C" { #endif -_EXPORT int32 control_graphics_card(uint32, void*); +int32 control_graphics_card(uint32, void*); #ifdef __cplusplus } diff --git a/headers/os/add-ons/input_server/InputServerFilter.h b/headers/os/add-ons/input_server/InputServerFilter.h index 28e37f4133..306654913e 100644 --- a/headers/os/add-ons/input_server/InputServerFilter.h +++ b/headers/os/add-ons/input_server/InputServerFilter.h @@ -15,6 +15,7 @@ #include #include +class BRegion; class BInputServerFilter { public: diff --git a/headers/os/add-ons/input_server/InputServerMethod.h b/headers/os/add-ons/input_server/InputServerMethod.h index 125a13a5b6..20218f96c4 100644 --- a/headers/os/add-ons/input_server/InputServerMethod.h +++ b/headers/os/add-ons/input_server/InputServerMethod.h @@ -18,6 +18,7 @@ class _BMethodAddOn_; class AddOnManager; +class BMenu; class InputServer; class BInputServerMethod : public BInputServerFilter { diff --git a/headers/os/app/Application.h b/headers/os/app/Application.h index 51dab408e3..f53ed94153 100644 --- a/headers/os/app/Application.h +++ b/headers/os/app/Application.h @@ -1,5 +1,5 @@ /* - * Copyright 2001-2006, Haiku. + * Copyright 2001-2007, Haiku. * Distributed under the terms of the MIT License. * * Authors: @@ -20,10 +20,12 @@ class BCursor; class BList; -class BWindow; -class BResources; +class BLocker; class BMessageRunner; +class BResources; class BServer; +class BWindow; +struct app_info; namespace BPrivate { class PortLink; @@ -163,7 +165,7 @@ private: // Global Objects -extern _IMPEXP_BE BApplication* be_app; -extern _IMPEXP_BE BMessenger be_app_messenger; +extern BApplication* be_app; +extern BMessenger be_app_messenger; #endif // _APPLICATION_H diff --git a/headers/os/app/Handler.h b/headers/os/app/Handler.h index 44e6541ad0..4a5831bf26 100644 --- a/headers/os/app/Handler.h +++ b/headers/os/app/Handler.h @@ -16,6 +16,7 @@ class BLooper; class BMessageFilter; class BMessage; +class BMessenger; class BList; #define B_OBSERVE_WHAT_CHANGE "be:observe_change_what" diff --git a/headers/os/app/Roster.h b/headers/os/app/Roster.h index cbeb3a952a..6d2d20f7a9 100644 --- a/headers/os/app/Roster.h +++ b/headers/os/app/Roster.h @@ -13,6 +13,9 @@ #include #include +class BMimeType; +class BNodeInfo; + struct app_info { app_info(); diff --git a/headers/os/device/Joystick.h b/headers/os/device/Joystick.h index cf18b93c80..cf966ac43d 100644 --- a/headers/os/device/Joystick.h +++ b/headers/os/device/Joystick.h @@ -17,8 +17,10 @@ #include class BList; +class BString; +struct entry_ref; struct _extended_joystick; -class _IMPEXP_DEVICE _BJoystickTweaker; +class _BJoystickTweaker; /* -----------------------------------------------------------------------*/ class BJoystick { @@ -107,12 +109,10 @@ virtual void _ReservedJoystick3(); BList * _fDevices; _joystick_info * m_info; char * m_dev_name; -#if !_PR3_COMPATIBLE_ virtual status_t _Reserved_Joystick_4(void *, ...); virtual status_t _Reserved_Joystick_5(void *, ...); virtual status_t _Reserved_Joystick_6(void *, ...); uint32 _reserved_Joystick_[10]; -#endif }; #endif diff --git a/headers/os/game/FileGameSound.h b/headers/os/game/FileGameSound.h index f99b317d3d..2a87d4abdd 100644 --- a/headers/os/game/FileGameSound.h +++ b/headers/os/game/FileGameSound.h @@ -23,28 +23,18 @@ // Author: Christopher ML Zumwalt May (zummy@users.sf.net) // Description: BFileGameSound is a class that streams data out of a file. //------------------------------------------------------------------------------ - #ifndef _FILEGAMESOUND_H #define _FILEGAMESOUND_H -// Standard Includes ----------------------------------------------------------- -// System Includes ------------------------------------------------------------- #include -// Project Includes ------------------------------------------------------------ - -// Local Includes -------------------------------------------------------------- - -// Local Defines --------------------------------------------------------------- - -// Globals --------------------------------------------------------------------- +struct entry_ref; struct _gs_media_tracker; struct _gs_ramp; -// FileGameSound ------------------------------------------------------------- -class BFileGameSound : public BStreamingGameSound -{ + +class BFileGameSound : public BStreamingGameSound { public: BFileGameSound(const entry_ref * file, bool looping = true, @@ -74,7 +64,6 @@ public: int32 IsPaused(); private: - _gs_media_tracker * fAudioStream; bool fStopping; @@ -133,4 +122,4 @@ virtual status_t _Reserved_BFileGameSound_22(int32 arg, ...); virtual status_t _Reserved_BFileGameSound_23(int32 arg, ...); }; -#endif +#endif // _FILEGAMESOUND_H diff --git a/headers/os/interface/Deskbar.h b/headers/os/interface/Deskbar.h index 1cd2f14b79..30d4489cdc 100644 --- a/headers/os/interface/Deskbar.h +++ b/headers/os/interface/Deskbar.h @@ -1,5 +1,5 @@ /* - * Copyright 2006, Haiku, Inc. All Rights Reserved. + * Copyright 2006-2007, Haiku, Inc. All Rights Reserved. * Distributed under the terms of the MIT License. */ #ifndef _DESKBAR_H @@ -11,6 +11,7 @@ class BMessenger; class BView; +struct entry_ref; enum deskbar_location { diff --git a/headers/os/interface/Dragger.h b/headers/os/interface/Dragger.h index 52224e919a..981c278476 100644 --- a/headers/os/interface/Dragger.h +++ b/headers/os/interface/Dragger.h @@ -1,5 +1,5 @@ /* - * Copyright 2006, Haiku, Inc. All Rights Reserved. + * Copyright 2006-2007, Haiku, Inc. All Rights Reserved. * Distributed under the terms of the MIT License. */ #ifndef _DRAGGER_H @@ -12,6 +12,7 @@ class BBitmap; class BMessage; +class BPopUpMenu; class BShelf; namespace BPrivate { diff --git a/headers/os/interface/Font.h b/headers/os/interface/Font.h index 5448cd4462..6ebe42f1d2 100644 --- a/headers/os/interface/Font.h +++ b/headers/os/interface/Font.h @@ -1,5 +1,5 @@ /* - * Copyright 2005, Haiku, Inc. All Rights Reserved. + * Copyright 2005-2007, Haiku, Inc. All Rights Reserved. * Distributed under the terms of the MIT License. */ #ifndef _FONT_H_ @@ -9,6 +9,8 @@ #include #include +class BPoint; + #define B_FONT_FAMILY_LENGTH 63 #define B_FONT_STYLE_LENGTH 63 diff --git a/headers/os/interface/GraphicsDefs.h b/headers/os/interface/GraphicsDefs.h index 4b56d4aebf..20fa8977a9 100644 --- a/headers/os/interface/GraphicsDefs.h +++ b/headers/os/interface/GraphicsDefs.h @@ -65,9 +65,9 @@ operator!=(const pattern& a, const pattern& b) #endif // __cplusplus -extern _IMPEXP_BE const pattern B_SOLID_HIGH; -extern _IMPEXP_BE const pattern B_MIXED_COLORS; -extern _IMPEXP_BE const pattern B_SOLID_LOW; +extern const pattern B_SOLID_HIGH; +extern const pattern B_MIXED_COLORS; +extern const pattern B_SOLID_LOW; //------------------------------------------------------------------------------ @@ -115,15 +115,15 @@ make_color(uint8 red, uint8 green, uint8 blue, uint8 alpha = 255) //------------------------------------------------------------------------------ -extern _IMPEXP_BE const rgb_color B_TRANSPARENT_COLOR; -extern _IMPEXP_BE const uint8 B_TRANSPARENT_MAGIC_CMAP8; -extern _IMPEXP_BE const uint16 B_TRANSPARENT_MAGIC_RGBA15; -extern _IMPEXP_BE const uint16 B_TRANSPARENT_MAGIC_RGBA15_BIG; -extern _IMPEXP_BE const uint32 B_TRANSPARENT_MAGIC_RGBA32; -extern _IMPEXP_BE const uint32 B_TRANSPARENT_MAGIC_RGBA32_BIG; +extern const rgb_color B_TRANSPARENT_COLOR; +extern const uint8 B_TRANSPARENT_MAGIC_CMAP8; +extern const uint16 B_TRANSPARENT_MAGIC_RGBA15; +extern const uint16 B_TRANSPARENT_MAGIC_RGBA15_BIG; +extern const uint32 B_TRANSPARENT_MAGIC_RGBA32; +extern const uint32 B_TRANSPARENT_MAGIC_RGBA32_BIG; -extern _IMPEXP_BE const uint8 B_TRANSPARENT_8_BIT; -extern _IMPEXP_BE const rgb_color B_TRANSPARENT_32_BIT; +extern const uint8 B_TRANSPARENT_8_BIT; +extern const rgb_color B_TRANSPARENT_32_BIT; //------------------------------------------------------------------------------ @@ -160,7 +160,7 @@ typedef struct overlay_restrictions { struct screen_id { int32 id; }; -extern _IMPEXP_BE const struct screen_id B_MAIN_SCREEN_ID; +extern const struct screen_id B_MAIN_SCREEN_ID; //------------------------------------------------------------------------------ @@ -272,7 +272,7 @@ enum { B_VIEWS_SUPPORT_DRAW_BITMAP = 0x1, B_BITMAPS_SUPPORT_ATTACHED_VIEWS = 0x2 }; -_IMPEXP_BE bool bitmaps_support_space(color_space space, uint32 * support_flags); +bool bitmaps_support_space(color_space space, uint32 * support_flags); //------------------------------------------------------------------------------ // "pixel_chunk" is the native increment from one pixel starting on an integral byte @@ -281,7 +281,7 @@ _IMPEXP_BE bool bitmaps_support_space(color_space space, uint32 * support_flags) // sets pixel_chunk to 1, row_alignment to 4 and pixels_per_chunk to 8, whereas // B_RGB24 sets pixel_chunk to 3, row_alignment to 4 and pixels_per_chunk to 1. //------------------------------------------------------------------------------ -_IMPEXP_BE status_t get_pixel_size_for(color_space space, size_t * pixel_chunk, +status_t get_pixel_size_for(color_space space, size_t * pixel_chunk, size_t * row_alignment, size_t * pixels_per_chunk); diff --git a/headers/os/interface/Input.h b/headers/os/interface/Input.h index 263a94d2f0..2e320ba27e 100644 --- a/headers/os/interface/Input.h +++ b/headers/os/interface/Input.h @@ -15,6 +15,8 @@ #include #include +class BList; + enum input_method_op { B_INPUT_METHOD_STARTED = 0, @@ -47,9 +49,9 @@ enum input_device_notification { class BInputDevice; -_IMPEXP_BE BInputDevice* find_input_device(const char *name); -_IMPEXP_BE status_t get_input_devices(BList *list); -_IMPEXP_BE status_t watch_input_devices(BMessenger target, bool start); +BInputDevice* find_input_device(const char *name); +status_t get_input_devices(BList *list); +status_t watch_input_devices(BMessenger target, bool start); class BInputDevice { diff --git a/headers/os/interface/InterfaceDefs.h b/headers/os/interface/InterfaceDefs.h index 1e2a6314db..04f3d76794 100644 --- a/headers/os/interface/InterfaceDefs.h +++ b/headers/os/interface/InterfaceDefs.h @@ -251,54 +251,54 @@ enum overlay_options { /*----------------------------------------------------------------*/ -_IMPEXP_BE status_t get_deskbar_frame(BRect *frame); +status_t get_deskbar_frame(BRect *frame); -_IMPEXP_BE const color_map *system_colors(); +const color_map *system_colors(); -_IMPEXP_BE status_t set_screen_space(int32 index, uint32 res, - bool stick = true); +status_t set_screen_space(int32 index, uint32 res, + bool stick = true); -_IMPEXP_BE status_t get_scroll_bar_info(scroll_bar_info *info); -_IMPEXP_BE status_t set_scroll_bar_info(scroll_bar_info *info); +status_t get_scroll_bar_info(scroll_bar_info *info); +status_t set_scroll_bar_info(scroll_bar_info *info); -_IMPEXP_BE status_t get_mouse_type(int32 *type); -_IMPEXP_BE status_t set_mouse_type(int32 type); -_IMPEXP_BE status_t get_mouse_map(mouse_map *map); -_IMPEXP_BE status_t set_mouse_map(mouse_map *map); -_IMPEXP_BE status_t get_click_speed(bigtime_t *speed); -_IMPEXP_BE status_t set_click_speed(bigtime_t speed); -_IMPEXP_BE status_t get_mouse_speed(int32 *speed); -_IMPEXP_BE status_t set_mouse_speed(int32 speed); -_IMPEXP_BE status_t get_mouse_acceleration(int32 *speed); -_IMPEXP_BE status_t set_mouse_acceleration(int32 speed); +status_t get_mouse_type(int32 *type); +status_t set_mouse_type(int32 type); +status_t get_mouse_map(mouse_map *map); +status_t set_mouse_map(mouse_map *map); +status_t get_click_speed(bigtime_t *speed); +status_t set_click_speed(bigtime_t speed); +status_t get_mouse_speed(int32 *speed); +status_t set_mouse_speed(int32 speed); +status_t get_mouse_acceleration(int32 *speed); +status_t set_mouse_acceleration(int32 speed); -_IMPEXP_BE status_t get_key_repeat_rate(int32 *rate); -_IMPEXP_BE status_t set_key_repeat_rate(int32 rate); -_IMPEXP_BE status_t get_key_repeat_delay(bigtime_t *delay); -_IMPEXP_BE status_t set_key_repeat_delay(bigtime_t delay); +status_t get_key_repeat_rate(int32 *rate); +status_t set_key_repeat_rate(int32 rate); +status_t get_key_repeat_delay(bigtime_t *delay); +status_t set_key_repeat_delay(bigtime_t delay); -_IMPEXP_BE uint32 modifiers(); -_IMPEXP_BE status_t get_key_info(key_info *info); -_IMPEXP_BE void get_key_map(key_map **map, char **key_buffer); -_IMPEXP_BE status_t get_keyboard_id(uint16 *id); -_IMPEXP_BE void set_modifier_key(uint32 modifier, uint32 key); -_IMPEXP_BE void set_keyboard_locks(uint32 modifiers); +uint32 modifiers(); +status_t get_key_info(key_info *info); +void get_key_map(key_map **map, char **key_buffer); +status_t get_keyboard_id(uint16 *id); +void set_modifier_key(uint32 modifier, uint32 key); +void set_keyboard_locks(uint32 modifiers); -_IMPEXP_BE rgb_color keyboard_navigation_color(); +rgb_color keyboard_navigation_color(); -_IMPEXP_BE int32 count_workspaces(); -_IMPEXP_BE void set_workspace_count(int32 count); -_IMPEXP_BE int32 current_workspace(); -_IMPEXP_BE void activate_workspace(int32 workspace); +int32 count_workspaces(); +void set_workspace_count(int32 count); +int32 current_workspace(); +void activate_workspace(int32 workspace); -_IMPEXP_BE bigtime_t idle_time(); +bigtime_t idle_time(); -_IMPEXP_BE void run_select_printer_panel(); -_IMPEXP_BE void run_add_printer_panel(); -_IMPEXP_BE void run_be_about(); +void run_select_printer_panel(); +void run_add_printer_panel(); +void run_be_about(); -_IMPEXP_BE void set_focus_follows_mouse(bool follow); -_IMPEXP_BE bool focus_follows_mouse(); +void set_focus_follows_mouse(bool follow); +bool focus_follows_mouse(); enum mode_mouse { B_NORMAL_MOUSE = 0, @@ -307,8 +307,8 @@ enum mode_mouse { B_INSTANT_WARP_MOUSE = 7 }; -_IMPEXP_BE void set_mouse_mode(mode_mouse mode); -_IMPEXP_BE mode_mouse mouse_mode(); +void set_mouse_mode(mode_mouse mode); +mode_mouse mouse_mode(); enum color_which { B_PANEL_BACKGROUND_COLOR = 1, @@ -350,10 +350,10 @@ enum color_which { B_WINDOW_INACTIVE_TEXT_COLOR = 24 }; -_IMPEXP_BE rgb_color ui_color(color_which which); -_IMPEXP_BE void set_ui_color(const color_which &which, +rgb_color ui_color(color_which which); +void set_ui_color(const color_which &which, const rgb_color &color); -_IMPEXP_BE rgb_color tint_color(rgb_color color, float tint); +rgb_color tint_color(rgb_color color, float tint); extern "C" status_t _init_interface_kit_(); /* effects on standard gray level */ diff --git a/headers/os/interface/ListItem.h b/headers/os/interface/ListItem.h index 18346bd48c..1126125b19 100644 --- a/headers/os/interface/ListItem.h +++ b/headers/os/interface/ListItem.h @@ -1,5 +1,5 @@ /* - * Copyright 2006, Haiku, Inc. All Rights Reserved. + * Copyright 2006-2007, Haiku, Inc. All Rights Reserved. * Distributed under the terms of the MIT License. */ #ifndef _LIST_ITEM_H @@ -10,6 +10,7 @@ #include class BFont; +class BList; class BMessage; class BOutlineListView; class BView; diff --git a/headers/os/interface/Menu.h b/headers/os/interface/Menu.h index bca34ab445..1d97e87b8a 100644 --- a/headers/os/interface/Menu.h +++ b/headers/os/interface/Menu.h @@ -10,8 +10,9 @@ #include #include -class BMenuItem; +class BMenu; class BMenuBar; +class BMenuItem; namespace BPrivate { diff --git a/headers/os/interface/Picture.h b/headers/os/interface/Picture.h index 590d64d720..498f2bf6b1 100644 --- a/headers/os/interface/Picture.h +++ b/headers/os/interface/Picture.h @@ -33,7 +33,7 @@ #include #include - +class BDataIO; class BView; struct _BPictureExtent_; diff --git a/headers/os/interface/PrintJob.h b/headers/os/interface/PrintJob.h index 0ae3939d07..4aff3ea497 100644 --- a/headers/os/interface/PrintJob.h +++ b/headers/os/interface/PrintJob.h @@ -15,6 +15,7 @@ #include /* For convenience */ #include +class BFile; class BView; /*----------------------------------------------------------------*/ diff --git a/headers/os/interface/Screen.h b/headers/os/interface/Screen.h index f13f0a73a5..87662d9ad6 100644 --- a/headers/os/interface/Screen.h +++ b/headers/os/interface/Screen.h @@ -12,6 +12,7 @@ #include +class BBitmap; class BWindow; namespace BPrivate { diff --git a/headers/os/interface/Shape.h b/headers/os/interface/Shape.h index 553565adc2..53c4f1030c 100644 --- a/headers/os/interface/Shape.h +++ b/headers/os/interface/Shape.h @@ -1,96 +1,90 @@ /* - * Copyright 2006, Haiku, Inc. All Rights Reserved. + * Copyright 2006-2007, Haiku, Inc. All Rights Reserved. * Distributed under the terms of the MIT License. */ - #ifndef _SHAPE_H #define _SHAPE_H + #include #include +class BPoint; +class BRect; +class BShape; + namespace BPrivate { class ServerLink; class PicturePlayer; }; -/*----------------------------------------------------------------*/ -/*----- BShapeIterator class -------------------------------------*/ - class BShapeIterator { - public: BShapeIterator(); -virtual ~BShapeIterator(); + virtual ~BShapeIterator(); -virtual status_t IterateMoveTo(BPoint *point); -virtual status_t IterateLineTo(int32 lineCount, BPoint *linePts); -virtual status_t IterateBezierTo(int32 bezierCount, BPoint *bezierPts); -virtual status_t IterateClose(); + virtual status_t IterateMoveTo(BPoint *point); + virtual status_t IterateLineTo(int32 lineCount, BPoint *linePts); + virtual status_t IterateBezierTo(int32 bezierCount, BPoint *bezierPts); + virtual status_t IterateClose(); - status_t Iterate(BShape *shape); + status_t Iterate(BShape *shape); private: + virtual void _ReservedShapeIterator1(); + virtual void _ReservedShapeIterator2(); + virtual void _ReservedShapeIterator3(); + virtual void _ReservedShapeIterator4(); -virtual void _ReservedShapeIterator1(); -virtual void _ReservedShapeIterator2(); -virtual void _ReservedShapeIterator3(); -virtual void _ReservedShapeIterator4(); - - uint32 reserved[4]; + uint32 reserved[4]; }; -/*----------------------------------------------------------------*/ -/*----- BShape class ---------------------------------------------*/ class BShape : public BArchivable { - public: BShape(); BShape(const BShape ©From); BShape(BMessage *data); -virtual ~BShape(); + virtual ~BShape(); -virtual status_t Archive(BMessage *into, bool deep = true) const; -static BArchivable *Instantiate(BMessage *data); + virtual status_t Archive(BMessage *into, bool deep = true) const; + static BArchivable *Instantiate(BMessage *data); - void Clear(); - BRect Bounds() const; + void Clear(); + BRect Bounds() const; - status_t AddShape(const BShape *other); + status_t AddShape(const BShape *other); - status_t MoveTo(BPoint point); - status_t LineTo(BPoint linePoint); - status_t BezierTo(BPoint controlPoints[3]); - status_t Close(); - -/*----- Private or reserved ---------------*/ -virtual status_t Perform(perform_code d, void *arg); + status_t MoveTo(BPoint point); + status_t LineTo(BPoint linePoint); + status_t BezierTo(BPoint controlPoints[3]); + status_t Close(); private: + virtual status_t Perform(perform_code d, void *arg); -virtual void _ReservedShape1(); -virtual void _ReservedShape2(); -virtual void _ReservedShape3(); -virtual void _ReservedShape4(); + virtual void _ReservedShape1(); + virtual void _ReservedShape2(); + virtual void _ReservedShape3(); + virtual void _ReservedShape4(); - friend class BShapeIterator; - friend class BView; - friend class BFont; - friend class BPrivate::PicturePlayer; - friend class BPrivate::ServerLink; + friend class BShapeIterator; + friend class BView; + friend class BFont; + friend class BPrivate::PicturePlayer; + friend class BPrivate::ServerLink; - void GetData(int32 *opCount, int32 *ptCount, uint32 **opList, BPoint **ptList); - void SetData(int32 opCount, int32 ptCount, const uint32 *opList, const BPoint *ptList); - void InitData(); - bool AllocatePts(int32 count); - bool AllocateOps(int32 count); + void GetData(int32 *opCount, int32 *ptCount, uint32 **opList, BPoint **ptList); + void SetData(int32 opCount, int32 ptCount, const uint32 *opList, const BPoint *ptList); + void InitData(); + bool AllocatePts(int32 count); + bool AllocateOps(int32 count); - uint32 fState; - uint32 fBuildingOp; - void * fPrivateData; - uint32 reserved[4]; + uint32 fState; + uint32 fBuildingOp; + void* fPrivateData; + uint32 reserved[4]; }; -#endif +#endif // _SHAPE_H diff --git a/headers/os/interface/Shelf.h b/headers/os/interface/Shelf.h index 26263561ed..6830441d62 100644 --- a/headers/os/interface/Shelf.h +++ b/headers/os/interface/Shelf.h @@ -1,5 +1,5 @@ /* - * Copyright 2001-2006, Haiku Inc. + * Copyright 2001-2007, Haiku Inc. * Distributed under the terms of the MIT License. */ #ifndef _SHELF_H @@ -10,6 +10,7 @@ #include class BDataIO; +class BPoint; class BView; class BEntry; struct entry_ref; diff --git a/headers/os/interface/TabView.h b/headers/os/interface/TabView.h index 6c0e20f010..86fe2d528d 100644 --- a/headers/os/interface/TabView.h +++ b/headers/os/interface/TabView.h @@ -158,11 +158,7 @@ virtual BHandler *ResolveSpecifier(BMessage *message, int32 index, virtual status_t GetSupportedSuites(BMessage *message); virtual void AddTab(BView *target, BTab *tab = NULL); -#if !_PR3_COMPATIBLE_ virtual BTab *RemoveTab(int32 tabIndex); -#else -virtual BTab *RemoveTab(int32 tabIndex) const; -#endif virtual BTab *TabAt ( int32 tab_index ) const; @@ -208,6 +204,4 @@ virtual void _ReservedTabView12(); uint32 _reserved[11]; }; - #endif // _TAB_VIEW_H - diff --git a/headers/os/interface/TextView.h b/headers/os/interface/TextView.h index 3e340cc4e5..421b24d70c 100644 --- a/headers/os/interface/TextView.h +++ b/headers/os/interface/TextView.h @@ -14,6 +14,8 @@ #include #include +class BMessageRunner; + /*----------------------------------------------------------------*/ /*----- BTextView structures and definitions ---------------------*/ @@ -37,16 +39,6 @@ enum undo_state { B_UNDO_DROP }; - -#if _PR2_COMPATIBLE_ -extern "C" void _ReservedTextView2__9BTextViewFv(BTextView *object, - BMessage *drag, - BBitmap **bitmap, - BPoint *point, - BHandler **handler); -#endif - - class BBitmap; class BClipboard; class BFile; @@ -266,27 +258,16 @@ private: friend status_t _init_interface_kit_(); friend class _BTextTrackState_; -#if _PR2_COMPATIBLE_ -friend void _ReservedTextView2__9BTextViewFv(BTextView *object, - BMessage *drag, - BBitmap **bitmap, - BPoint *point, - BHandler **handler); -#endif - virtual void _ReservedTextView3(); virtual void _ReservedTextView4(); virtual void _ReservedTextView5(); virtual void _ReservedTextView6(); virtual void _ReservedTextView7(); virtual void _ReservedTextView8(); - -#if !_PR3_COMPATIBLE_ virtual void _ReservedTextView9(); virtual void _ReservedTextView10(); virtual void _ReservedTextView11(); virtual void _ReservedTextView12(); -#endif void InitObject(BRect textRect, const BFont *initialFont, @@ -423,17 +404,14 @@ static void UnlockWidthBuffer(); color_space fColorSpace; bool fResizable; BView* fContainerView; - _BUndoBuffer_* fUndo; /* was _reserved[0] */ - _BInlineInput_* fInline; /* was _reserved[1] */ - BMessageRunner * fDragRunner; /* was _reserved[2] */ - BMessageRunner * fClickRunner; /* was _reserved[3] */ + _BUndoBuffer_* fUndo; + _BInlineInput_* fInline; + BMessageRunner * fDragRunner; + BMessageRunner * fClickRunner; BPoint fWhere; - _BTextTrackState_* fTrackingMouse; /* was _reserved[6] */ - _BTextChangeResult_* fTextChange; /* was _reserved[7] */ - uint32 _reserved[1]; /* was 8 */ -#if !_PR3_COMPATIBLE_ - uint32 _more_reserved[8]; -#endif + _BTextTrackState_* fTrackingMouse; + _BTextChangeResult_* fTextChange; + uint32 _reserved[9]; static _BWidthBuffer_* sWidths; static sem_id sWidthSem; diff --git a/headers/os/interface/View.h b/headers/os/interface/View.h index 39becf87df..383c252ca4 100644 --- a/headers/os/interface/View.h +++ b/headers/os/interface/View.h @@ -422,11 +422,7 @@ public: virtual void SetFont(const BFont* font, uint32 mask = B_FONT_ALL); - #if !_PR3_COMPATIBLE_ void GetFont(BFont* font) const; - #else - void GetFont(BFont* font); - #endif void TruncateString(BString* in_out, uint32 mode, float width) const; diff --git a/headers/os/kernel/image.h b/headers/os/kernel/image.h index 638008fbad..0a8238a536 100644 --- a/headers/os/kernel/image.h +++ b/headers/os/kernel/image.h @@ -64,20 +64,20 @@ enum { // doesn't exist. }; -extern _IMPEXP_ROOT thread_id load_image(int32 argc, const char **argv, +extern thread_id load_image(int32 argc, const char **argv, const char **envp); -extern _IMPEXP_ROOT image_id load_add_on(const char *path); -extern _IMPEXP_ROOT status_t unload_add_on(image_id imageID); +extern image_id load_add_on(const char *path); +extern status_t unload_add_on(image_id imageID); /* private; use the macros, below */ -extern _IMPEXP_ROOT status_t _get_image_info (image_id imageID, - image_info *info, size_t size); -extern _IMPEXP_ROOT status_t _get_next_image_info (team_id team, int32 *cookie, - image_info *info, size_t size); +extern status_t _get_image_info (image_id imageID, + image_info *info, size_t size); +extern status_t _get_next_image_info (team_id team, int32 *cookie, + image_info *info, size_t size); /* use these */ -#define get_image_info(image, info) \ +#define get_image_info(image, info) \ _get_image_info((image), (info), sizeof(*(info))) -#define get_next_image_info(team, cookie, info) \ +#define get_next_image_info(team, cookie, info) \ _get_next_image_info((team), (cookie), (info), sizeof(*(info))) @@ -88,11 +88,11 @@ extern _IMPEXP_ROOT status_t _get_next_image_info (team_id team, int32 *cookie, #define B_SYMBOL_TYPE_TEXT 0x2 #define B_SYMBOL_TYPE_ANY 0x5 -extern _IMPEXP_ROOT status_t get_image_symbol(image_id imid, - const char *name, int32 sclass, void **ptr); -extern _IMPEXP_ROOT status_t get_nth_image_symbol(image_id imid, int32 index, - char *buf, int32 *bufsize, int32 *sclass, - void **ptr); +extern status_t get_image_symbol(image_id imid, + const char *name, int32 sclass, void **ptr); +extern status_t get_nth_image_symbol(image_id imid, int32 index, + char *buf, int32 *bufsize, int32 *sclass, + void **ptr); /*---------------------------------------------------------*/ @@ -103,7 +103,7 @@ extern _IMPEXP_ROOT status_t get_nth_image_symbol(image_id imid, int32 index, #define B_INVALIDATE_DCACHE 0x0002 #define B_INVALIDATE_ICACHE 0x0008 -extern _IMPEXP_ROOT void clear_caches(void *addr, size_t len, uint32 flags); +extern void clear_caches(void *addr, size_t len, uint32 flags); /*---------------------------------------------------------*/ diff --git a/headers/os/kernel/scheduler.h b/headers/os/kernel/scheduler.h index 0d67143b45..6e179bba42 100644 --- a/headers/os/kernel/scheduler.h +++ b/headers/os/kernel/scheduler.h @@ -41,13 +41,13 @@ enum be_task_flags { /* bitmasks for "what" */ }; #if defined(__cplusplus) extern "C" { -_IMPEXP_ROOT int32 suggest_thread_priority(uint32 task_flags = B_DEFAULT_MEDIA_PRIORITY, +int32 suggest_thread_priority(uint32 task_flags = B_DEFAULT_MEDIA_PRIORITY, int32 period = 0, bigtime_t jitter = 0, bigtime_t length = 0); -_IMPEXP_ROOT bigtime_t estimate_max_scheduling_latency(thread_id th = -1); /* default is current thread */ +bigtime_t estimate_max_scheduling_latency(thread_id th = -1); /* default is current thread */ } #else -_IMPEXP_ROOT int32 suggest_thread_priority(uint32 what, int32 period, bigtime_t jitter, bigtime_t length); -_IMPEXP_ROOT bigtime_t estimate_max_scheduling_latency(thread_id th); /* default is current thread */ +int32 suggest_thread_priority(uint32 what, int32 period, bigtime_t jitter, bigtime_t length); +bigtime_t estimate_max_scheduling_latency(thread_id th); /* default is current thread */ #endif #endif /* SCHEDULER_H */ diff --git a/headers/os/mail/E-mail.h b/headers/os/mail/E-mail.h index 006044585c..b0d9e0ad38 100644 --- a/headers/os/mail/E-mail.h +++ b/headers/os/mail/E-mail.h @@ -14,6 +14,7 @@ #include class BList; +struct entry_ref; /* -----------------------------------------------------------------------*/ /* 'E-Mail' attributes...*/ @@ -94,22 +95,22 @@ typedef struct { /* -----------------------------------------------------------------------*/ /* global functions...*/ -_IMPEXP_MAIL int32 count_pop_accounts(void); -_IMPEXP_MAIL status_t get_pop_account(mail_pop_account*, int32 index = 0); -_IMPEXP_MAIL status_t set_pop_account(mail_pop_account*, int32 index = 0, +int32 count_pop_accounts(void); +status_t get_pop_account(mail_pop_account*, int32 index = 0); +status_t set_pop_account(mail_pop_account*, int32 index = 0, bool save = true); -_IMPEXP_MAIL status_t get_smtp_host(char*); -_IMPEXP_MAIL status_t set_smtp_host(char*, bool save = true); -_IMPEXP_MAIL status_t get_mail_notification(mail_notification*); -_IMPEXP_MAIL status_t set_mail_notification(mail_notification*, bool save = true); +status_t get_smtp_host(char*); +status_t set_smtp_host(char*, bool save = true); +status_t get_mail_notification(mail_notification*); +status_t set_mail_notification(mail_notification*, bool save = true); -_IMPEXP_MAIL status_t check_for_mail(int32 *incoming_count = NULL); -_IMPEXP_MAIL status_t send_queued_mail(void); -_IMPEXP_MAIL status_t forward_mail(entry_ref*, const char* recipients, bool now = true); +status_t check_for_mail(int32 *incoming_count = NULL); +status_t send_queued_mail(void); +status_t forward_mail(entry_ref*, const char* recipients, bool now = true); -_IMPEXP_MAIL ssize_t decode_base64(char *out, char *in, off_t length, +ssize_t decode_base64(char *out, char *in, off_t length, bool replace_cr = false); -_IMPEXP_MAIL ssize_t encode_base64(char *out, char *in, off_t length); +ssize_t encode_base64(char *out, char *in, off_t length); /* -----------------------------------------------------------------------*/ diff --git a/headers/os/media/BufferConsumer.h b/headers/os/media/BufferConsumer.h index 26a99b92ae..30db885e9f 100644 --- a/headers/os/media/BufferConsumer.h +++ b/headers/os/media/BufferConsumer.h @@ -14,6 +14,10 @@ #include #include +class BBuffer; +class BBufferGroup; +class BRegion; + namespace BPrivate { namespace media { class BMediaRosterEx; }} diff --git a/headers/os/media/BufferGroup.h b/headers/os/media/BufferGroup.h index 969f1f95bb..a45a794924 100644 --- a/headers/os/media/BufferGroup.h +++ b/headers/os/media/BufferGroup.h @@ -14,6 +14,7 @@ #include +class BBuffer; struct _shared_buffer_list; class BBufferGroup diff --git a/headers/os/media/BufferProducer.h b/headers/os/media/BufferProducer.h index 172bb9f742..25a832b2e5 100644 --- a/headers/os/media/BufferProducer.h +++ b/headers/os/media/BufferProducer.h @@ -14,6 +14,10 @@ #include #include +class BBuffer; +class BBufferGroup; +class BRegion; + namespace BPrivate { namespace media { class BMediaRosterEx; }} diff --git a/headers/os/media/FileInterface.h b/headers/os/media/FileInterface.h index aacba0099d..6a6bfe2db4 100644 --- a/headers/os/media/FileInterface.h +++ b/headers/os/media/FileInterface.h @@ -15,6 +15,8 @@ #include #include +struct entry_ref; + class BFileInterface : public virtual BMediaNode diff --git a/headers/os/media/MediaAddOn.h b/headers/os/media/MediaAddOn.h index 10d6118ae9..6d14a0c624 100644 --- a/headers/os/media/MediaAddOn.h +++ b/headers/os/media/MediaAddOn.h @@ -17,6 +17,9 @@ #include #include +class BMediaNode; +class BMimeType; +struct entry_ref; struct dormant_node_info { dormant_node_info(); diff --git a/headers/os/media/MediaDefs.h b/headers/os/media/MediaDefs.h index 3d06386b78..9b815ce32a 100644 --- a/headers/os/media/MediaDefs.h +++ b/headers/os/media/MediaDefs.h @@ -21,6 +21,7 @@ #include #endif +struct media_node; #define B_MEDIA_NAME_LENGTH 64 @@ -208,15 +209,15 @@ private: uint32 _reserved_media_source_[2]; }; -_IMPEXP_MEDIA bool operator==(const media_destination & a, const media_destination & b); -_IMPEXP_MEDIA bool operator!=(const media_destination & a, const media_destination & b); -_IMPEXP_MEDIA bool operator<(const media_destination & a, const media_destination & b); -_IMPEXP_MEDIA bool operator==(const media_source & a, const media_source & b); -_IMPEXP_MEDIA bool operator!=(const media_source & a, const media_source & b); -_IMPEXP_MEDIA bool operator<(const media_source & a, const media_source & b); -_IMPEXP_MEDIA bool operator==(const media_node & a, const media_node & b); -_IMPEXP_MEDIA bool operator!=(const media_node & a, const media_node & b); -_IMPEXP_MEDIA bool operator<(const media_node & a, const media_node & b); +bool operator==(const media_destination & a, const media_destination & b); +bool operator!=(const media_destination & a, const media_destination & b); +bool operator<(const media_destination & a, const media_destination & b); +bool operator==(const media_source & a, const media_source & b); +bool operator!=(const media_source & a, const media_source & b); +bool operator<(const media_source & a, const media_source & b); +bool operator==(const media_node & a, const media_node & b); +bool operator!=(const media_node & a, const media_node & b); +bool operator<(const media_node & a, const media_node & b); @@ -518,21 +519,21 @@ struct media_format { /* no more than 192 bytes */ media_format & operator=(const media_format & clone); }; -_IMPEXP_MEDIA bool operator==(const media_raw_audio_format & a, const media_raw_audio_format & b); -_IMPEXP_MEDIA bool operator==(const media_multi_audio_info & a, const media_multi_audio_info & b); -_IMPEXP_MEDIA bool operator==(const media_multi_audio_format & a, const media_multi_audio_format & b); -_IMPEXP_MEDIA bool operator==(const media_encoded_audio_format & a, const media_encoded_audio_format & b); -_IMPEXP_MEDIA bool operator==(const media_video_display_info & a, const media_video_display_info & b); -_IMPEXP_MEDIA bool operator==(const media_raw_video_format & a, const media_raw_video_format & b); -_IMPEXP_MEDIA bool operator==(const media_encoded_video_format & a, const media_encoded_video_format & b); -_IMPEXP_MEDIA bool operator==(const media_multistream_format::vid_info & a, const media_multistream_format::vid_info & b); -_IMPEXP_MEDIA bool operator==(const media_multistream_format::avi_info & a, const media_multistream_format::avi_info & b); -_IMPEXP_MEDIA bool operator==(const media_multistream_format & a, const media_multistream_format & b); -_IMPEXP_MEDIA bool operator==(const media_format & a, const media_format & b); +bool operator==(const media_raw_audio_format & a, const media_raw_audio_format & b); +bool operator==(const media_multi_audio_info & a, const media_multi_audio_info & b); +bool operator==(const media_multi_audio_format & a, const media_multi_audio_format & b); +bool operator==(const media_encoded_audio_format & a, const media_encoded_audio_format & b); +bool operator==(const media_video_display_info & a, const media_video_display_info & b); +bool operator==(const media_raw_video_format & a, const media_raw_video_format & b); +bool operator==(const media_encoded_video_format & a, const media_encoded_video_format & b); +bool operator==(const media_multistream_format::vid_info & a, const media_multistream_format::vid_info & b); +bool operator==(const media_multistream_format::avi_info & a, const media_multistream_format::avi_info & b); +bool operator==(const media_multistream_format & a, const media_multistream_format & b); +bool operator==(const media_format & a, const media_format & b); /* return true if a and b are compatible (accounting for wildcards) */ -_IMPEXP_MEDIA bool format_is_compatible(const media_format & a, const media_format & b); /* a is the format you want to feed to something accepting b */ -_IMPEXP_MEDIA bool string_for_format(const media_format & f, char * buf, size_t size); +bool format_is_compatible(const media_format & a, const media_format & b); /* a is the format you want to feed to something accepting b */ +bool string_for_format(const media_format & f, char * buf, size_t size); struct media_seek_tag { char data[16]; @@ -587,8 +588,8 @@ struct media_file_format_id { dev_t device; uint32 internal_id; }; -_IMPEXP_MEDIA bool operator==(const media_file_format_id & a, const media_file_format_id & b); -_IMPEXP_MEDIA bool operator<(const media_file_format_id & a, const media_file_format_id & b); +bool operator==(const media_file_format_id & a, const media_file_format_id & b); +bool operator<(const media_file_format_id & a, const media_file_format_id & b); typedef enum { B_ANY_FORMAT_FAMILY = 0, @@ -644,7 +645,7 @@ status_t get_next_file_format(int32 *cookie, media_file_format *mfi); /* In your thread, read_port() into this struct, and call HandleMessage() on it. */ const size_t B_MEDIA_MESSAGE_SIZE = 16384; -_IMPEXP_MEDIA extern const char * B_MEDIA_SERVER_SIGNATURE; +extern const char * B_MEDIA_SERVER_SIGNATURE; class media_node; /* found in MediaNode.h */ struct media_input; diff --git a/headers/os/media/MediaFile.h b/headers/os/media/MediaFile.h index e0ef377409..58d4d41e4a 100644 --- a/headers/os/media/MediaFile.h +++ b/headers/os/media/MediaFile.h @@ -13,7 +13,7 @@ namespace BPrivate { namespace media { class MediaExtractor; } - class _IMPEXP_MEDIA MediaWriter; + class MediaWriter; class _AddonManager; } diff --git a/headers/os/media/MediaFormats.h b/headers/os/media/MediaFormats.h index 40c0bda16a..2c8960a19d 100644 --- a/headers/os/media/MediaFormats.h +++ b/headers/os/media/MediaFormats.h @@ -203,11 +203,11 @@ class BMediaFormats { uint32 _reserved[30]; }; -_IMPEXP_MEDIA bool operator==(const media_format_description & a, const media_format_description & b); -_IMPEXP_MEDIA bool operator<(const media_format_description & a, const media_format_description & b); +bool operator==(const media_format_description & a, const media_format_description & b); +bool operator<(const media_format_description & a, const media_format_description & b); -_IMPEXP_MEDIA bool operator==(const GUID & a, const GUID & b); -_IMPEXP_MEDIA bool operator<(const GUID & a, const GUID & b); +bool operator==(const GUID & a, const GUID & b); +bool operator<(const GUID & a, const GUID & b); #endif /* __cplusplus */ diff --git a/headers/os/media/MediaNode.h b/headers/os/media/MediaNode.h index bbd812627e..e3e70af953 100644 --- a/headers/os/media/MediaNode.h +++ b/headers/os/media/MediaNode.h @@ -19,8 +19,11 @@ #include +class BBufferConsumer; +class BControllable; +class BFileInterface; class BMediaAddOn; - +class BTimeSource; class media_node { diff --git a/headers/os/media/MediaRoster.h b/headers/os/media/MediaRoster.h index afe3004b29..9d550da601 100644 --- a/headers/os/media/MediaRoster.h +++ b/headers/os/media/MediaRoster.h @@ -15,9 +15,13 @@ #include #include -class BMimeType; -struct dormant_flavor_info; +class BBufferGroup; class BMediaAddOn; +class BMimeType; +class BParameterWeb; +class BString; +struct dormant_flavor_info; +struct entry_ref; namespace BPrivate { namespace media { class DefaultDeleter; diff --git a/headers/os/media/MediaTheme.h b/headers/os/media/MediaTheme.h index fc72056744..f7f51cdf35 100644 --- a/headers/os/media/MediaTheme.h +++ b/headers/os/media/MediaTheme.h @@ -9,7 +9,12 @@ #include #include +class BBitmap; +class BControl; +class BParameter; class BParameterWeb; +class BRect; +class BView; class BMediaTheme { diff --git a/headers/os/media/ParameterWeb.h b/headers/os/media/ParameterWeb.h index 93276244cd..737a4e107d 100644 --- a/headers/os/media/ParameterWeb.h +++ b/headers/os/media/ParameterWeb.h @@ -16,17 +16,10 @@ #if !defined(_CONTROL_WEB_H) #define _CONTROL_WEB_H -#include #include +#include #include - -#if !defined(_PR3_COMPATIBLE_) -enum { - B_MEDIA_PARAMETER_TYPE = 'BMCT', - B_MEDIA_PARAMETER_WEB_TYPE = 'BMCW', - B_MEDIA_PARAMETER_GROUP_TYPE= 'BMCG' -}; -#endif +#include // It is highly unfortunate that a linker bug forces these symbols out @@ -34,50 +27,50 @@ enum { /* These are control KINDs */ /* kind used when you don't know or care */ -extern _IMPEXP_MEDIA const char * const B_GENERIC; +extern const char * const B_GENERIC; /* kinds used for sliders */ -extern _IMPEXP_MEDIA const char * const B_MASTER_GAIN; /* Main Volume */ -extern _IMPEXP_MEDIA const char * const B_GAIN; -extern _IMPEXP_MEDIA const char * const B_BALANCE; -extern _IMPEXP_MEDIA const char * const B_FREQUENCY; /* like a radio tuner */ -extern _IMPEXP_MEDIA const char * const B_LEVEL; /* like for effects */ -extern _IMPEXP_MEDIA const char * const B_SHUTTLE_SPEED; /* Play, SloMo, Scan 1.0 == regular */ -extern _IMPEXP_MEDIA const char * const B_CROSSFADE; /* 0 == first input, +100 == second input */ -extern _IMPEXP_MEDIA const char * const B_EQUALIZATION; /* depth (dB) */ +extern const char * const B_MASTER_GAIN; /* Main Volume */ +extern const char * const B_GAIN; +extern const char * const B_BALANCE; +extern const char * const B_FREQUENCY; /* like a radio tuner */ +extern const char * const B_LEVEL; /* like for effects */ +extern const char * const B_SHUTTLE_SPEED; /* Play, SloMo, Scan 1.0 == regular */ +extern const char * const B_CROSSFADE; /* 0 == first input, +100 == second input */ +extern const char * const B_EQUALIZATION; /* depth (dB) */ /* kinds used for compressors */ -extern _IMPEXP_MEDIA const char * const B_COMPRESSION; /* 0% == no compression, 99% == 100:1 compression */ -extern _IMPEXP_MEDIA const char * const B_QUALITY; /* 0% == full compression, 100% == no compression */ -extern _IMPEXP_MEDIA const char * const B_BITRATE; /* in bits/second */ -extern _IMPEXP_MEDIA const char * const B_GOP_SIZE; /* Group Of Pictures. a k a "Keyframe every N frames" */ +extern const char * const B_COMPRESSION; /* 0% == no compression, 99% == 100:1 compression */ +extern const char * const B_QUALITY; /* 0% == full compression, 100% == no compression */ +extern const char * const B_BITRATE; /* in bits/second */ +extern const char * const B_GOP_SIZE; /* Group Of Pictures. a k a "Keyframe every N frames" */ /* kinds used for selectors */ -extern _IMPEXP_MEDIA const char * const B_MUTE; /* 0 == thru, 1 == mute */ -extern _IMPEXP_MEDIA const char * const B_ENABLE; /* 0 == disable, 1 == enable */ -extern _IMPEXP_MEDIA const char * const B_INPUT_MUX; /* "value" 1-N == input selected */ -extern _IMPEXP_MEDIA const char * const B_OUTPUT_MUX; /* "value" 1-N == output selected */ -extern _IMPEXP_MEDIA const char * const B_TUNER_CHANNEL; /* like cable TV */ -extern _IMPEXP_MEDIA const char * const B_TRACK; /* like a CD player; "value" should be 1-N */ -extern _IMPEXP_MEDIA const char * const B_RECSTATE; /* like mutitrack tape deck, 0 == silent, 1 == play, 2 == record */ -extern _IMPEXP_MEDIA const char * const B_SHUTTLE_MODE; /* -1 == backwards, 0 == stop, 1 == play, 2 == pause/cue */ -extern _IMPEXP_MEDIA const char * const B_RESOLUTION; -extern _IMPEXP_MEDIA const char * const B_COLOR_SPACE; /* "value" should be color_space */ -extern _IMPEXP_MEDIA const char * const B_FRAME_RATE; -extern _IMPEXP_MEDIA const char * const B_VIDEO_FORMAT; /* 1 == NTSC-M, 2 == NTSC-J, 3 == PAL-BDGHI, 4 == PAL-M, 5 == PAL-N, 6 == SECAM, 7 == MPEG-1, 8 == MPEG-2 */ +extern const char * const B_MUTE; /* 0 == thru, 1 == mute */ +extern const char * const B_ENABLE; /* 0 == disable, 1 == enable */ +extern const char * const B_INPUT_MUX; /* "value" 1-N == input selected */ +extern const char * const B_OUTPUT_MUX; /* "value" 1-N == output selected */ +extern const char * const B_TUNER_CHANNEL; /* like cable TV */ +extern const char * const B_TRACK; /* like a CD player; "value" should be 1-N */ +extern const char * const B_RECSTATE; /* like mutitrack tape deck, 0 == silent, 1 == play, 2 == record */ +extern const char * const B_SHUTTLE_MODE; /* -1 == backwards, 0 == stop, 1 == play, 2 == pause/cue */ +extern const char * const B_RESOLUTION; +extern const char * const B_COLOR_SPACE; /* "value" should be color_space */ +extern const char * const B_FRAME_RATE; +extern const char * const B_VIDEO_FORMAT; /* 1 == NTSC-M, 2 == NTSC-J, 3 == PAL-BDGHI, 4 == PAL-M, 5 == PAL-N, 6 == SECAM, 7 == MPEG-1, 8 == MPEG-2 */ /* kinds used for junctions */ // the prefix of "WEB" is to avoid collission with an enum in Defs.h -extern _IMPEXP_MEDIA const char * const B_WEB_PHYSICAL_INPUT; /* a jack on the back of the card */ -extern _IMPEXP_MEDIA const char * const B_WEB_PHYSICAL_OUTPUT; -extern _IMPEXP_MEDIA const char * const B_WEB_ADC_CONVERTER; /* from analog to digital signals */ -extern _IMPEXP_MEDIA const char * const B_WEB_DAC_CONVERTER; /* from digital to analog signals */ -extern _IMPEXP_MEDIA const char * const B_WEB_LOGICAL_INPUT; /* an "input" that may not be physical */ -extern _IMPEXP_MEDIA const char * const B_WEB_LOGICAL_OUTPUT; -extern _IMPEXP_MEDIA const char * const B_WEB_LOGICAL_BUS; /* a logical connection point that is neither input nor output; auxilliary bus */ -extern _IMPEXP_MEDIA const char * const B_WEB_BUFFER_INPUT; /* an input that corresponds to a media_input */ -extern _IMPEXP_MEDIA const char * const B_WEB_BUFFER_OUTPUT; +extern const char * const B_WEB_PHYSICAL_INPUT; /* a jack on the back of the card */ +extern const char * const B_WEB_PHYSICAL_OUTPUT; +extern const char * const B_WEB_ADC_CONVERTER; /* from analog to digital signals */ +extern const char * const B_WEB_DAC_CONVERTER; /* from digital to analog signals */ +extern const char * const B_WEB_LOGICAL_INPUT; /* an "input" that may not be physical */ +extern const char * const B_WEB_LOGICAL_OUTPUT; +extern const char * const B_WEB_LOGICAL_BUS; /* a logical connection point that is neither input nor output; auxilliary bus */ +extern const char * const B_WEB_BUFFER_INPUT; /* an input that corresponds to a media_input */ +extern const char * const B_WEB_BUFFER_OUTPUT; // a simple transport control is a discrete parameter with five values (states): // rewinding, stopped, playing, paused, and fast-forwarding -extern _IMPEXP_MEDIA const char * const B_SIMPLE_TRANSPORT; +extern const char * const B_SIMPLE_TRANSPORT; class BList; class BParameterGroup; diff --git a/headers/os/media/PlaySound.h b/headers/os/media/PlaySound.h index 7ee6bad966..2d820f363c 100644 --- a/headers/os/media/PlaySound.h +++ b/headers/os/media/PlaySound.h @@ -18,17 +18,14 @@ typedef sem_id sound_handle; -_IMPEXP_MEDIA sound_handle play_sound(const entry_ref *soundRef, bool mix, bool queue, bool background ); -_IMPEXP_MEDIA status_t stop_sound(sound_handle handle); -_IMPEXP_MEDIA status_t wait_for_sound(sound_handle handle); #endif /* #ifndef _PLAY_SOUND_H*/ diff --git a/headers/os/media/RealtimeAlloc.h b/headers/os/media/RealtimeAlloc.h index c39ba79f1e..09f6038149 100644 --- a/headers/os/media/RealtimeAlloc.h +++ b/headers/os/media/RealtimeAlloc.h @@ -28,20 +28,20 @@ typedef struct rtm_pool rtm_pool; /* If out_pool is NULL, the default pool will be created if it isn't already. */ /* If the default pool is already created, it will return EALREADY. */ #if defined(__cplusplus) -_IMPEXP_MEDIA status_t rtm_create_pool(rtm_pool ** out_pool, size_t total_size, const char * name=NULL); +status_t rtm_create_pool(rtm_pool ** out_pool, size_t total_size, const char * name=NULL); #else -_IMPEXP_MEDIA status_t rtm_create_pool(rtm_pool ** out_pool, size_t total_size, const char * name); +status_t rtm_create_pool(rtm_pool ** out_pool, size_t total_size, const char * name); #endif -_IMPEXP_MEDIA status_t rtm_delete_pool(rtm_pool * pool); +status_t rtm_delete_pool(rtm_pool * pool); /* If NULL is passed for pool, the default pool is used (if created). */ -_IMPEXP_MEDIA void * rtm_alloc(rtm_pool * pool, size_t size); -_IMPEXP_MEDIA status_t rtm_free(void * data); -_IMPEXP_MEDIA status_t rtm_realloc(void ** data, size_t new_size); -_IMPEXP_MEDIA status_t rtm_size_for(void * data); -_IMPEXP_MEDIA status_t rtm_phys_size_for(void * data); +void * rtm_alloc(rtm_pool * pool, size_t size); +status_t rtm_free(void * data); +status_t rtm_realloc(void ** data, size_t new_size); +status_t rtm_size_for(void * data); +status_t rtm_phys_size_for(void * data); /* Return the default pool, or NULL if not yet initialized */ -_IMPEXP_MEDIA rtm_pool * rtm_default_pool(); +rtm_pool * rtm_default_pool(); #if defined(__cplusplus) } diff --git a/headers/os/media/Sound.h b/headers/os/media/Sound.h index 1a81204b7f..6e8acf033a 100644 --- a/headers/os/media/Sound.h +++ b/headers/os/media/Sound.h @@ -6,7 +6,9 @@ #include +class BMediaFile; class BSoundFile; +struct entry_ref; namespace BPrivate { class BTrackReader; diff --git a/headers/os/media/SoundPlayer.h b/headers/os/media/SoundPlayer.h index efa6c1d0fd..a2e37b04c4 100644 --- a/headers/os/media/SoundPlayer.h +++ b/headers/os/media/SoundPlayer.h @@ -11,6 +11,8 @@ #include +class BContinuousParameter; +class BParameterWeb; class BSound; class _SoundPlayNode; diff --git a/headers/os/media/TimeCode.h b/headers/os/media/TimeCode.h index 16eae0be74..d00d1bb300 100644 --- a/headers/os/media/TimeCode.h +++ b/headers/os/media/TimeCode.h @@ -36,12 +36,12 @@ struct timecode_info { char format[32]; /* for sprintf(fmt, h, m, s, f) */ char _reserved_[64]; }; -_IMPEXP_MEDIA status_t us_to_timecode(bigtime_t micros, int * hours, int * minutes, int * seconds, int * frames, const timecode_info * code = NULL); -_IMPEXP_MEDIA status_t timecode_to_us(int hours, int minutes, int seconds, int frames, bigtime_t * micros, const timecode_info * code = NULL); -_IMPEXP_MEDIA status_t frames_to_timecode(int32 l_frames, int * hours, int * minutes, int * seconds, int * frames, const timecode_info * code = NULL); -_IMPEXP_MEDIA status_t timecode_to_frames(int hours, int minutes, int seconds, int frames, int32 * l_frames, const timecode_info * code = NULL); -_IMPEXP_MEDIA status_t get_timecode_description(timecode_type type, timecode_info * out_timecode); -_IMPEXP_MEDIA status_t count_timecodes(); +status_t us_to_timecode(bigtime_t micros, int * hours, int * minutes, int * seconds, int * frames, const timecode_info * code = NULL); +status_t timecode_to_us(int hours, int minutes, int seconds, int frames, bigtime_t * micros, const timecode_info * code = NULL); +status_t frames_to_timecode(int32 l_frames, int * hours, int * minutes, int * seconds, int * frames, const timecode_info * code = NULL); +status_t timecode_to_frames(int hours, int minutes, int seconds, int frames, int32 * l_frames, const timecode_info * code = NULL); +status_t get_timecode_description(timecode_type type, timecode_info * out_timecode); +status_t count_timecodes(); /* we may want a set_default_timecode, too -- but that's bad from a thread standpoint */ diff --git a/headers/os/media/TimedEventQueue.h b/headers/os/media/TimedEventQueue.h index 582cb7e019..ff1adab229 100644 --- a/headers/os/media/TimedEventQueue.h +++ b/headers/os/media/TimedEventQueue.h @@ -44,10 +44,10 @@ struct media_timed_event { uint32 _reserved_media_timed_event_[8]; }; -_IMPEXP_MEDIA bool operator==(const media_timed_event & a, const media_timed_event & b); -_IMPEXP_MEDIA bool operator!=(const media_timed_event & a, const media_timed_event & b); -_IMPEXP_MEDIA bool operator<(const media_timed_event & a, const media_timed_event & b); -_IMPEXP_MEDIA bool operator>(const media_timed_event & a, const media_timed_event &b); +bool operator==(const media_timed_event & a, const media_timed_event & b); +bool operator!=(const media_timed_event & a, const media_timed_event & b); +bool operator<(const media_timed_event & a, const media_timed_event & b); +bool operator>(const media_timed_event & a, const media_timed_event &b); class BTimedEventQueue { diff --git a/headers/os/midi/Synth.h b/headers/os/midi/Synth.h index 7d0c1bd65b..4fbf49b384 100644 --- a/headers/os/midi/Synth.h +++ b/headers/os/midi/Synth.h @@ -104,6 +104,6 @@ private: uint32 _reserved[10]; }; -extern _IMPEXP_MIDI BSynth* be_synth; +extern BSynth* be_synth; #endif // _SYNTH_H diff --git a/headers/os/net/net_settings.h b/headers/os/net/net_settings.h index 0e2d3529e9..32a3f63169 100644 --- a/headers/os/net/net_settings.h +++ b/headers/os/net/net_settings.h @@ -46,11 +46,11 @@ typedef struct _net_settings { /* * For finding and setting network preferences */ -extern _IMPEXP_NET +extern char *find_net_setting(net_settings *ncw, const char *heading, const char *name, char *value, unsigned nbytes); -extern _IMPEXP_NET +extern status_t set_net_setting(net_settings *ncw, const char *heading, const char *name, const char *value); diff --git a/headers/os/storage/Node.h b/headers/os/storage/Node.h index f6a663e1d1..e7467af732 100644 --- a/headers/os/storage/Node.h +++ b/headers/os/storage/Node.h @@ -9,6 +9,9 @@ #include class BDirectory; +class BString; +struct entry_ref; + //! Reference structure to a particular vnode on a particular device /*! node_ref - A node reference. diff --git a/headers/os/storage/SymLink.h b/headers/os/storage/SymLink.h index 6d00925982..3ba659e3ba 100644 --- a/headers/os/storage/SymLink.h +++ b/headers/os/storage/SymLink.h @@ -1,23 +1,17 @@ -//---------------------------------------------------------------------- -// This software is part of the OpenBeOS distribution and is covered -// by the OpenBeOS license. -// -// File Name: SymLink.h -//--------------------------------------------------------------------- -/*! - \file SymLink.h - BSymLink interface declaration. -*/ - +/* + * Copyright 2002-2007, Haiku, Inc. All Rights Reserved. + * Distributed under the terms of the MIT License. + */ #ifndef _SYM_LINK_H #define _SYM_LINK_H + #include #include -#ifdef USE_OPENBEOS_NAMESPACE -namespace OpenBeOS { -#endif +class BDirectory; +class BPath; + /*! \class BSymLink @@ -61,8 +55,4 @@ private: int get_fd() const; }; -#ifdef USE_OPENBEOS_NAMESPACE -}; // namespace OpenBeOS -#endif - #endif // _SYM_LINK_H diff --git a/headers/os/support/Debug.h b/headers/os/support/Debug.h index c13b4b8c45..d9192a9426 100644 --- a/headers/os/support/Debug.h +++ b/headers/os/support/Debug.h @@ -18,20 +18,20 @@ #ifdef __cplusplus extern "C" { #endif - extern _IMPEXP_ROOT bool _rtDebugFlag; + extern bool _rtDebugFlag; - _IMPEXP_ROOT bool _debugFlag(void); - _IMPEXP_ROOT bool _setDebugFlag(bool); + bool _debugFlag(void); + bool _setDebugFlag(bool); #if __GNUC__ - int _debugPrintf(const char *, ...) __attribute__ ((format (__printf__, 1, 2))); - int _sPrintf(const char *, ...) __attribute__ ((format (__printf__, 1, 2))); + int _debugPrintf(const char *, ...) _PRINTFLIKE(1, 2); + int _sPrintf(const char *, ...) _PRINTFLIKE(1, 2); #else int _debugPrintf(const char *, ...); int _sPrintf(const char *, ...); #endif - _IMPEXP_ROOT int _xdebugPrintf(const char *, ...); - _IMPEXP_ROOT int _debuggerAssert(const char *, int, char *); + int _xdebugPrintf(const char *, ...); + int _debuggerAssert(const char *, int, char *); #ifdef __cplusplus } #endif diff --git a/headers/os/support/TypeConstants.h b/headers/os/support/TypeConstants.h index 0cab670883..4df643d90b 100644 --- a/headers/os/support/TypeConstants.h +++ b/headers/os/support/TypeConstants.h @@ -1,5 +1,5 @@ /* - * Copyright 2005, Haiku, Inc. All Rights Reserved. + * Copyright 2005-2007, Haiku, Inc. All Rights Reserved. * Distributed under the terms of the MIT License. * * Author: @@ -60,19 +60,19 @@ enum { 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 -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 +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 diff --git a/headers/os/translation/TranslationUtils.h b/headers/os/translation/TranslationUtils.h index 8c9652e8f7..40bfdce6a9 100644 --- a/headers/os/translation/TranslationUtils.h +++ b/headers/os/translation/TranslationUtils.h @@ -10,9 +10,13 @@ #include class BBitmap; -class BTranslatorRoster; -class BPositionIO; +class BFile; class BMenu; +class BMessage; +class BPositionIO; +class BTextView; +class BTranslatorRoster; +struct entry_ref; class BTranslationUtils { diff --git a/headers/os/translation/Translator.h b/headers/os/translation/Translator.h index 3b7f700f0a..86345e6947 100644 --- a/headers/os/translation/Translator.h +++ b/headers/os/translation/Translator.h @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006, Haiku, Inc. All Rights Reserved. + * Copyright 2002-2007, Haiku, Inc. All Rights Reserved. * Distributed under the terms of the MIT License. */ #ifndef _TRANSLATOR_H @@ -69,7 +69,7 @@ class BTranslator : public BArchivable { // API. You will be called for values of n starting at 0 and increasing; // return 0 when you can't make another kind of translator (i.e. for n=1 // if you only implement one subclass of BTranslator). Ignore flags for now. -extern "C" _EXPORT BTranslator *make_nth_translator(int32 n, image_id you, +extern "C" BTranslator *make_nth_translator(int32 n, image_id you, uint32 flags, ...); #endif /* _TRANSLATOR_H */ diff --git a/headers/os/translation/TranslatorAddOn.h b/headers/os/translation/TranslatorAddOn.h index 551df235bc..5c336be982 100644 --- a/headers/os/translation/TranslatorAddOn.h +++ b/headers/os/translation/TranslatorAddOn.h @@ -15,9 +15,10 @@ #ifndef _TRANSLATOR_ADD_ON_H #define _TRANSLATOR_ADD_ON_H + #include - +class BMessage; class BView; class BRect; class BPositionIO; diff --git a/headers/os/translation/TranslatorFormats.h b/headers/os/translation/TranslatorFormats.h index 93b6e4d187..912f40982a 100644 --- a/headers/os/translation/TranslatorFormats.h +++ b/headers/os/translation/TranslatorFormats.h @@ -21,18 +21,18 @@ /* extensions used in the extension BMessage. Use of these */ /* is described in the documentation. */ -_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_HEADER_ONLY[]; -_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_DATA_ONLY[]; -_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_COMMENT[]; -_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_TIME[]; -_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_FRAME[]; -_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_BITMAP_RECT[]; -_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_BITMAP_COLOR_SPACE[]; -_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_BITMAP_PALETTE[]; -_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_SOUND_CHANNEL[]; -_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_SOUND_MONO[]; -_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_SOUND_MARKER[]; -_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_SOUND_LOOP[]; +extern char B_TRANSLATOR_EXT_HEADER_ONLY[]; +extern char B_TRANSLATOR_EXT_DATA_ONLY[]; +extern char B_TRANSLATOR_EXT_COMMENT[]; +extern char B_TRANSLATOR_EXT_TIME[]; +extern char B_TRANSLATOR_EXT_FRAME[]; +extern char B_TRANSLATOR_EXT_BITMAP_RECT[]; +extern char B_TRANSLATOR_EXT_BITMAP_COLOR_SPACE[]; +extern char B_TRANSLATOR_EXT_BITMAP_PALETTE[]; +extern char B_TRANSLATOR_EXT_SOUND_CHANNEL[]; +extern char B_TRANSLATOR_EXT_SOUND_MONO[]; +extern char B_TRANSLATOR_EXT_SOUND_MARKER[]; +extern char B_TRANSLATOR_EXT_SOUND_LOOP[]; #if defined(_DATATYPES_COMPATIBLE_) #define kCommentExtension "/comment" diff --git a/headers/os/translation/TranslatorRoster.h b/headers/os/translation/TranslatorRoster.h index f8f0932c6b..fcda94163c 100644 --- a/headers/os/translation/TranslatorRoster.h +++ b/headers/os/translation/TranslatorRoster.h @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006, Haiku, Inc. All Rights Reserved. + * Copyright 2002-2007, Haiku, Inc. All Rights Reserved. * Distributed under the terms of the MIT License. */ #ifndef _TRANSLATOR_ROSTER_H @@ -12,10 +12,14 @@ struct translation_format; class BBitmap; -class BView; +class BMessage; +class BMessenger; class BPositionIO; class BQuery; -class BMessage; +class BRect; +class BTranslator; +class BView; +struct entry_ref; class BTranslatorRoster : public BArchivable { diff --git a/headers/private/app/AreaLink.h b/headers/private/app/AreaLink.h index 50281ead2f..ec7114ba5e 100644 --- a/headers/private/app/AreaLink.h +++ b/headers/private/app/AreaLink.h @@ -13,12 +13,13 @@ #include #include +class AreaLinkHeader; +class BPoint; + #define MAX_ATTACHMENT_SIZE 65535 // in bytes #define SIZE_SIZE 2 // size of the size records in an AreaLink area -class AreaLinkHeader; - class AreaLink { public: diff --git a/headers/private/app/LooperList.h b/headers/private/app/LooperList.h index 9e926b6edf..0410ae3070 100644 --- a/headers/private/app/LooperList.h +++ b/headers/private/app/LooperList.h @@ -15,6 +15,7 @@ #include +class BList; class BLooper; diff --git a/headers/private/app/ServerLink.h b/headers/private/app/ServerLink.h index f564bf255c..aabc843b5b 100644 --- a/headers/private/app/ServerLink.h +++ b/headers/private/app/ServerLink.h @@ -1,5 +1,5 @@ /* - * Copyright 2001-2006, Haiku. + * Copyright 2001-2007, Haiku. * Distributed under the terms of the MIT License. * * Authors: @@ -15,9 +15,9 @@ #include #include +class BShape; class BString; - /* * Error checking rules: (for if you don't want to check every return code) * - Calling EndMessage() is optional, implied by Flush() or StartMessage(). diff --git a/headers/private/app/TokenSpace.h b/headers/private/app/TokenSpace.h index ec725d9821..c90709d586 100644 --- a/headers/private/app/TokenSpace.h +++ b/headers/private/app/TokenSpace.h @@ -60,7 +60,7 @@ class BTokenSpace : public BLocker { int32 fTokenCount; }; -extern _IMPEXP_BE BTokenSpace gDefaultTokens; +extern BTokenSpace gDefaultTokens; } // namespace BPrivate diff --git a/headers/private/graphics/common/edid_raw.h b/headers/private/graphics/common/edid_raw.h index b9e9709b11..5473d2341a 100644 --- a/headers/private/graphics/common/edid_raw.h +++ b/headers/private/graphics/common/edid_raw.h @@ -1,22 +1,21 @@ /* - Copyright (c) 2003, Thomas Kurschel - - - Part of DDC driver - - Raw EDID data block. - - Raw data are packed in a really weird way. Never even - think about using it directly, instead translate it via decode_edidpixel_clock - first. I did my best to make the code endian-independant, but - I cannot guarantee that I haven't missed something. -*/ - + * Copyright 2003, Thomas Kurschel. All Rights Reserved. + * Distributed under the terms of the MIT License. + */ #ifndef _EDID_RAW_H #define _EDID_RAW_H + #include "bendian_bitfield.h" + +/*! Raw EDID data block. + + Raw data are packed in a really weird way. Never even + think about using it directly, instead translate it via decode_edid() + first. +*/ + #define EDID1_NUM_DETAILED_MONITOR_DESC 4 #define EDID1_NUM_STD_TIMING 8 #define EDID1_NUM_EXTRA_STD_TIMING 6 @@ -249,7 +248,6 @@ typedef union _PACKED { edid1_monitor_range monitor_range; edid1_whitepoint_raw whitepoint; edid1_std_timing_raw std_timing[EDID1_NUM_EXTRA_STD_TIMING]; - } data; } extra; } edid1_detailed_monitor_raw; @@ -266,11 +264,11 @@ typedef struct _PACKED { edid1_established_timing established_timing; // 3 bytes edid1_std_timing_raw std_timing[EDID1_NUM_STD_TIMING]; // 8 a 2 bytes -> 16 bytes - + // since EDID version 1.2 edid1_detailed_monitor_raw detailed_monitor[EDID1_NUM_DETAILED_MONITOR_DESC]; // 4 a 18 bytes -> 72 bytes - + uint8 num_sections; // 1 byte uint8 check_sum; // 1 byte } edid1_raw; // total: 128 bytes diff --git a/headers/private/interface/BMCPrivate.h b/headers/private/interface/BMCPrivate.h index 82097168d1..b3ec5d87c9 100644 --- a/headers/private/interface/BMCPrivate.h +++ b/headers/private/interface/BMCPrivate.h @@ -6,20 +6,22 @@ * Marc Flerackers (mflerackers@androme.be) * Stephan Aßmus */ - - #ifndef _BMC_PRIVATE_H #define _BMC_PRIVATE_H + #include #include #include #include +class BMessageRunner; + + class _BMCFilter_ : public BMessageFilter { public: _BMCFilter_(BMenuField *menuField, uint32 what); - ~_BMCFilter_(); + virtual ~_BMCFilter_(); filter_result Filter(BMessage *message, BHandler **handler); private: @@ -28,37 +30,34 @@ private: }; -//------------------------------------------------------------------------------ class _BMCMenuBar_ : public BMenuBar { - public: _BMCMenuBar_(BRect frame, bool fixed_size, BMenuField *menuField); _BMCMenuBar_(BMessage *data); -virtual ~_BMCMenuBar_(); + virtual ~_BMCMenuBar_(); -static BArchivable *Instantiate(BMessage *data); + static BArchivable *Instantiate(BMessage *data); -virtual void AttachedToWindow(); -virtual void Draw(BRect updateRect); -virtual void FrameResized(float width, float height); -virtual void MessageReceived(BMessage* msg); -virtual void MakeFocus(bool focused = true); + virtual void AttachedToWindow(); + virtual void Draw(BRect updateRect); + virtual void FrameResized(float width, float height); + virtual void MessageReceived(BMessage* msg); + virtual void MakeFocus(bool focused = true); - void TogglePopUpMarker(bool show) { fShowPopUpMarker = show; } - bool IsPopUpMarkerShown() const { return fShowPopUpMarker; } + void TogglePopUpMarker(bool show) { fShowPopUpMarker = show; } + bool IsPopUpMarkerShown() const { return fShowPopUpMarker; } -virtual BSize MaxSize(); + virtual BSize MaxSize(); private: - _BMCMenuBar_&operator=(const _BMCMenuBar_ &); - + _BMCMenuBar_&operator=(const _BMCMenuBar_ &); + BMenuField *fMenuField; bool fFixedSize; - BMessageRunner *fRunner; + BMessageRunner *fRunner; bool fShowPopUpMarker; float fPreviousWidth; }; -//------------------------------------------------------------------------------ #endif // _BMC_PRIVATE_H diff --git a/headers/private/interface/ColorConversion.h b/headers/private/interface/ColorConversion.h index fb9356a38f..e1108a93a8 100644 --- a/headers/private/interface/ColorConversion.h +++ b/headers/private/interface/ColorConversion.h @@ -1,8 +1,12 @@ #ifndef _COLOR_CONVERSION_H_ #define _COLOR_CONVERSION_H_ + #include +class BPoint; + + namespace BPrivate { status_t ConvertBits(const void *srcBits, void *dstBits, int32 srcBitsLength, diff --git a/headers/private/interface/ColorTools.h b/headers/private/interface/ColorTools.h index ff5186a377..279a7d203b 100644 --- a/headers/private/interface/ColorTools.h +++ b/headers/private/interface/ColorTools.h @@ -48,7 +48,7 @@ All rights reserved. #include -#if B_BEOS_VERSION <= B_BEOS_VERSION_MAUI +#if B_BEOS_VERSION <= B_BEOS_VERSION_5 namespace BExperimental { diff --git a/headers/private/interface/PictureDataWriter.h b/headers/private/interface/PictureDataWriter.h index 9ee519d6bc..18c01d0e7c 100644 --- a/headers/private/interface/PictureDataWriter.h +++ b/headers/private/interface/PictureDataWriter.h @@ -1,13 +1,13 @@ /* - * Copyright 2006, Haiku Inc. - * Distributed under the terms of the MIT License. - * - * Authors: - * Stefano Ceccherini (burton666@libero.it) + * Copyright 2006-2007, Haiku Inc. + * Distributed under the terms of the MIT License. + * + * Authors: + * Stefano Ceccherini (burton666@libero.it) */ - -#ifndef __PICTUREDATAWRITER_H -#define __PICTUREDATAWRITER_H +#ifndef _PICTURE_DATA_WRITER_H +#define _PICTURE_DATA_WRITER_H + #include #include @@ -16,6 +16,9 @@ #include class BPositionIO; +class BRegion; + + class PictureDataWriter { public: PictureDataWriter(); @@ -80,4 +83,4 @@ private: std::stack fStack; }; -#endif // __PICTUREDATAWRITER_H +#endif // _PICTURE_DATA_WRITER_H diff --git a/headers/private/interface/PicturePlayer.h b/headers/private/interface/PicturePlayer.h index 42929b151d..1a74b5cefe 100644 --- a/headers/private/interface/PicturePlayer.h +++ b/headers/private/interface/PicturePlayer.h @@ -7,11 +7,10 @@ * Stefano Ceccherini (stefano.ceccherini@gmail.com) * Marcus Overhagen (marcus@overhagen.de) */ +#ifndef _PICTURE_PLAYER_H +#define _PICTURE_PLAYER_H -/** PicturePlayer is used to play picture data. */ - -#ifndef _PICTUREPLAYER_H -#define _PICTUREPLAYER_H +/*! PicturePlayer is used to play picture data. */ #include @@ -19,24 +18,26 @@ #include #include +class BList; + namespace BPrivate { class PicturePlayer { public: - PicturePlayer(); - PicturePlayer(const void *data, size_t size, BList *pictures); -virtual ~PicturePlayer(); + PicturePlayer(); + PicturePlayer(const void *data, size_t size, BList *pictures); + virtual ~PicturePlayer(); - status_t Play(void **callBackTable, int32 tableEntries, - void *userData); + status_t Play(void **callBackTable, int32 tableEntries, + void *userData); private: - const void *fData; - size_t fSize; - BList *fPictures; + const void* fData; + size_t fSize; + BList* fPictures; }; -}; // namespace BPrivate +} // namespace BPrivate -#endif // _PICTUREPLAYER_H +#endif // _PICTURE_PLAYER_H diff --git a/headers/private/interface/input_globals.h b/headers/private/interface/input_globals.h index d94093e25a..bc4f1b55d7 100644 --- a/headers/private/interface/input_globals.h +++ b/headers/private/interface/input_globals.h @@ -1,38 +1,18 @@ -//------------------------------------------------------------------------------ -// Copyright (c) 2004, Haiku -// -// 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: input_globals.h -// Author: -// Description: -//------------------------------------------------------------------------------ - +/* + * Copyright 2004-2007, Haiku, Inc. All Rights Reserved. + * Distributed under the terms of the MIT License. + */ #ifndef __INPUT_GLOBALS_H #define __INPUT_GLOBALS_H + #include #include +class BMessage; + status_t _control_input_server_(BMessage *command, BMessage *reply); status_t _restore_key_map_(); void _get_key_map(key_map **map, char **key_buffer, ssize_t *key_buffer_size); #endif // __INPUT_GLOBALS_H - diff --git a/headers/private/print/libprint/PrinterDriver.h b/headers/private/print/libprint/PrinterDriver.h index 7e5c3eaed9..4987ce712b 100644 --- a/headers/private/print/libprint/PrinterDriver.h +++ b/headers/private/print/libprint/PrinterDriver.h @@ -1,8 +1,10 @@ #ifndef _PRINTER_DRIVER_H #define _PRINTER_DRIVER_H + #include - + + class BFile; class BMessage; class BNode; @@ -50,6 +52,6 @@ private: GraphicsDriver* fGraphicsDriver; }; -_IMPEXP_BE PrinterDriver* instantiate_printer_driver(BNode* printerFolder = NULL); +PrinterDriver* instantiate_printer_driver(BNode* printerFolder = NULL); -#endif +#endif // _PRINTER_DRIVER_H diff --git a/headers/private/storage/DiskDeviceList.h b/headers/private/storage/DiskDeviceList.h index d5b3362eb3..31e298146b 100644 --- a/headers/private/storage/DiskDeviceList.h +++ b/headers/private/storage/DiskDeviceList.h @@ -11,12 +11,13 @@ #include #include - class BDiskDevice; class BDiskDeviceRoster; +class BLocker; class BPartition; class BSession; + class BDiskDeviceList : public BHandler { public: BDiskDeviceList(bool useOwnLocker = true); diff --git a/headers/private/storage/mime/AssociatedTypes.h b/headers/private/storage/mime/AssociatedTypes.h index cb6cd7baf5..41370ed340 100644 --- a/headers/private/storage/mime/AssociatedTypes.h +++ b/headers/private/storage/mime/AssociatedTypes.h @@ -1,15 +1,11 @@ -//---------------------------------------------------------------------- -// This software is part of the OpenBeOS distribution and is covered -// by the OpenBeOS license. -//--------------------------------------------------------------------- -/*! - \file AssociatedTypes.h - AssociatedTypes class declarations -*/ - +/* + * Copyright 2002-2007, Haiku, Inc. All Rights Reserved. + * Distributed under the terms of the MIT License. + */ #ifndef _MIME_ASSOCIATED_TYPES_H #define _MIME_ASSOCIATED_TYPES_H + #include #include @@ -18,6 +14,8 @@ class BMessage; class BString; +struct entry_ref; + namespace BPrivate { namespace Storage { diff --git a/headers/private/storage/mime/SnifferRules.h b/headers/private/storage/mime/SnifferRules.h index eb18f4212a..e45cea09d9 100644 --- a/headers/private/storage/mime/SnifferRules.h +++ b/headers/private/storage/mime/SnifferRules.h @@ -1,22 +1,20 @@ -//---------------------------------------------------------------------- -// This software is part of the OpenBeOS distribution and is covered -// by the OpenBeOS license. -//--------------------------------------------------------------------- -/*! - \file SnifferRules.h - SnifferRules class declarations -*/ - +/* + * Copyright 2002-2007, Haiku, Inc. All Rights Reserved. + * Distributed under the terms of the MIT License. + */ #ifndef _MIME_SNIFFER_RULES_H #define _MIME_SNIFFER_RULES_H + #include #include #include -struct entry_ref; +class BFile; class BString; +struct entry_ref; + namespace BPrivate { namespace Storage { diff --git a/headers/private/storage/mime/database_support.h b/headers/private/storage/mime/database_support.h index 3b81f93477..60e6c6c802 100644 --- a/headers/private/storage/mime/database_support.h +++ b/headers/private/storage/mime/database_support.h @@ -1,21 +1,19 @@ -//---------------------------------------------------------------------- -// This software is part of the OpenBeOS distribution and is covered -// by the OpenBeOS license. -//--------------------------------------------------------------------- -/*! - \file database_support.h - Private mime database function and constant declarations -*/ - +/* + * Copyright 2002-2007, Haiku, Inc. All Rights Reserved. + * Distributed under the terms of the MIT License. + */ #ifndef _MIME_DATABASE_SUPPORT_H #define _MIME_DATABASE_SUPPORT_H + #include #include class BNode; class BMessage; +class BString; + namespace BPrivate { namespace Storage { diff --git a/headers/private/tracker/NavMenu.h b/headers/private/tracker/NavMenu.h index adf9fd375a..310c1a7f05 100644 --- a/headers/private/tracker/NavMenu.h +++ b/headers/private/tracker/NavMenu.h @@ -148,8 +148,8 @@ class BNavMenu : public BSlowMenu { // Spring Loaded Folder convenience routines // used in both Tracker and Deskbar -#if B_BEOS_VERSION_DANO -#define _IMPEXP_TRACKER +#ifndef _IMPEXP_TRACKER +# define _IMPEXP_TRACKER #endif _IMPEXP_TRACKER bool SpringLoadedFolderCompareMessages(const BMessage *incoming, const BMessage *dragmessage); @@ -159,12 +159,9 @@ _IMPEXP_TRACKER void SpringLoadedFolderAddUniqueTypeToList(entry_ref *ref, BObjectList *typeslist); _IMPEXP_TRACKER void SpringLoadedFolderCacheDragData(const BMessage *incoming, BMessage **, BObjectList **typeslist); -#if B_BEOS_VERSION_DANO -#undef _IMPEXP_TRACKER -#endif } // namespace BPrivate using namespace BPrivate; -#endif +#endif // NAV_MENU_H diff --git a/headers/private/tracker/tracker_private.h b/headers/private/tracker/tracker_private.h index 41e63fa9d3..9edcbbbea3 100644 --- a/headers/private/tracker/tracker_private.h +++ b/headers/private/tracker/tracker_private.h @@ -43,7 +43,7 @@ All rights reserved. namespace BPrivate { -#if !B_BEOS_VERSION_DANO +#ifdef _IMPEXP_TRACKER _IMPEXP_TRACKER #endif void InitIconPreloader(); diff --git a/src/add-ons/accelerants/common/create_display_modes.cpp b/src/add-ons/accelerants/common/create_display_modes.cpp index 5d0bdfc1c2..bb91d1af7b 100644 --- a/src/add-ons/accelerants/common/create_display_modes.cpp +++ b/src/add-ons/accelerants/common/create_display_modes.cpp @@ -204,6 +204,7 @@ ModeList::AddModes(edid1_info* info) if (info->detailed_monitor[i].monitor_desc_type != EDID1_IS_DETAILED_TIMING) continue; + // TODO: handle sync and flags correctly! const edid1_detailed_timing& timing = info->detailed_monitor[i].data.detailed_timing; display_mode mode; mode.timing.pixel_clock = timing.pixel_clock * 10; diff --git a/src/add-ons/media/media-add-ons/dvb/DVBMediaNode.h b/src/add-ons/media/media-add-ons/dvb/DVBMediaNode.h index 743cae8316..6b2d027854 100644 --- a/src/add-ons/media/media-add-ons/dvb/DVBMediaNode.h +++ b/src/add-ons/media/media-add-ons/dvb/DVBMediaNode.h @@ -21,11 +21,11 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. */ - #ifndef __DVB_MEDIA_NODE_H #define __DVB_MEDIA_NODE_H -#include + +#include #include #include #include @@ -39,14 +39,13 @@ #include "StringList.h" class BDiscreteParameter; +class BParameterGroup; class PacketQueue; class DVBCard; -class DVBMediaNode : - public virtual BBufferProducer, - public virtual BControllable, - public virtual BMediaEventLooper -{ + +class DVBMediaNode : public virtual BBufferProducer, + public virtual BControllable, public virtual BMediaEventLooper { public: DVBMediaNode(BMediaAddOn *addon, const char *name, int32 internal_id, DVBCard *card); @@ -287,4 +286,4 @@ private: int fRawAudioFile; }; -#endif +#endif // __DVB_MEDIA_NODE_H diff --git a/src/add-ons/media/media-add-ons/mixer/MixerSettings.h b/src/add-ons/media/media-add-ons/mixer/MixerSettings.h index dead7a3a0b..1b9ff7df20 100644 --- a/src/add-ons/media/media-add-ons/mixer/MixerSettings.h +++ b/src/add-ons/media/media-add-ons/mixer/MixerSettings.h @@ -5,16 +5,18 @@ #ifndef _MIXER_SETTINGS_H #define _MIXER_SETTINGS_H + #include #include +class BLocker; class MixerInput; class MixerOutput; + #define MAX_INPUT_SETTINGS 50 -class MixerSettings -{ +class MixerSettings { public: MixerSettings(); ~MixerSettings(); @@ -63,7 +65,7 @@ class MixerSettings static int32 _save_thread_(void *arg); void SaveThread(); - + BLocker *fLocker; BPath *fSettingsFile; volatile bool fSettingsDirty; @@ -72,8 +74,7 @@ class MixerSettings volatile sem_id fSaveThreadWaitSem; volatile bool fSaveThreadRunning; - struct settings - { + struct settings { bool AttenuateOutput; bool NonLinearGainSlider; bool UseBalanceControl; @@ -91,4 +92,4 @@ class MixerSettings BMessage fInputSetting[MAX_INPUT_SETTINGS]; }; -#endif +#endif // _MIXER_SETTINGS_H diff --git a/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.h b/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.h index be08bd8b08..f4a88b8751 100644 --- a/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.h +++ b/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.h @@ -1,20 +1,30 @@ #ifndef _CAM_DEVICE_H #define _CAM_DEVICE_H + #include #include #ifdef __HAIKU__ -# include -# include +# include +# include #else -# include -# include +# include +# include #endif #include #include #include #include +class BBitmap; +class BBuffer; +class BDataIO; +class CamRoster; +class CamDeviceAddon; +class CamSensor; +class CamDeframer; +class WebCamMediaAddOn; + typedef struct { usb_support_descriptor desc; @@ -22,17 +32,8 @@ typedef struct { const char *product; } usb_named_support_descriptor; -class CamRoster; -class CamDeviceAddon; -class CamSensor; -class CamDeframer; -class WebCamMediaAddOn; -class BBitmap; -class BBuffer; - // This class represents each webcam -class CamDevice -{ +class CamDevice { public: CamDevice(CamDeviceAddon &_addon, BUSBDevice* _device); virtual ~CamDevice(); @@ -109,7 +110,7 @@ class CamDevice const BUSBEndpoint* fBulkIn; private: -friend class CamDeviceAddon; + friend class CamDeviceAddon; CamDeviceAddon& fCamDeviceAddon; BUSBDevice* fDevice; int fSupportedDeviceIndex; @@ -124,8 +125,7 @@ friend class CamDeviceAddon; // the addon itself, that instanciate -class CamDeviceAddon -{ +class CamDeviceAddon { public: CamDeviceAddon(WebCamMediaAddOn* webcam); virtual ~CamDeviceAddon(); @@ -135,7 +135,8 @@ class CamDeviceAddon virtual CamDevice* Instantiate(CamRoster &roster, BUSBDevice *from); void SetSupportedDevices(const usb_named_support_descriptor *devs); - const usb_named_support_descriptor* SupportedDevices() const { return fSupportedDevices; }; + const usb_named_support_descriptor* SupportedDevices() const + { return fSupportedDevices; }; WebCamMediaAddOn* WebCamAddOn() const { return fWebCamAddOn; }; private: @@ -148,8 +149,8 @@ class CamDeviceAddon get_webcam_addon_##modname // external addons -- UNIMPLEMENTED -extern "C" status_t get_webcam_addon(WebCamMediaAddOn* webcam, CamDeviceAddon **addon); +extern "C" status_t get_webcam_addon(WebCamMediaAddOn* webcam, + CamDeviceAddon **addon); #define B_WEBCAM_ADDON_INSTANTIATION_FUNC_NAME "get_webcam_addon" - #endif // _CAM_DEVICE_H diff --git a/src/add-ons/media/plugins/avi_reader/libOpenDML/FallbackIndex.h b/src/add-ons/media/plugins/avi_reader/libOpenDML/FallbackIndex.h index 89ef8d7e9a..40b02a82d4 100644 --- a/src/add-ons/media/plugins/avi_reader/libOpenDML/FallbackIndex.h +++ b/src/add-ons/media/plugins/avi_reader/libOpenDML/FallbackIndex.h @@ -25,18 +25,21 @@ #ifndef _FALLBACK_INDEX_H #define _FALLBACK_INDEX_H + #include "Index.h" -class FallbackIndex : public Index -{ + +class FallbackIndex : public Index { public: - FallbackIndex(BPositionIO *source, OpenDMLParser *parser); - ~FallbackIndex(); + FallbackIndex(BPositionIO *source, OpenDMLParser *parser); + ~FallbackIndex(); - status_t Init(); + status_t Init(); - status_t GetNextChunkInfo(int stream_index, int64 *start, uint32 *size, bool *keyframe); - status_t Seek(int stream_index, uint32 seekTo, int64 *frame, bigtime_t *time); + status_t GetNextChunkInfo(int stream_index, int64 *start, + uint32 *size, bool *keyframe); + status_t Seek(int stream_index, uint32 seekTo, int64 *frame, + bigtime_t *time); }; -#endif +#endif // _FALLBACK_INDEX_H diff --git a/src/add-ons/media/plugins/avi_reader/libOpenDML/Index.h b/src/add-ons/media/plugins/avi_reader/libOpenDML/Index.h index 673cb6a4d4..2fb25faeb1 100644 --- a/src/add-ons/media/plugins/avi_reader/libOpenDML/Index.h +++ b/src/add-ons/media/plugins/avi_reader/libOpenDML/Index.h @@ -25,22 +25,28 @@ #ifndef _INDEX_H #define _INDEX_H + +#include + +class BPositionIO; class OpenDMLParser; -class Index -{ + +class Index { public: Index(BPositionIO *source, OpenDMLParser *parser); virtual ~Index(); virtual status_t Init() = 0; - virtual status_t GetNextChunkInfo(int stream_index, int64 *start, uint32 *size, bool *keyframe) = 0; - virtual status_t Seek(int stream_index, uint32 seekTo, int64 *frame, bigtime_t *time) = 0; + virtual status_t GetNextChunkInfo(int stream_index, int64 *start, + uint32 *size, bool *keyframe) = 0; + virtual status_t Seek(int stream_index, uint32 seekTo, int64 *frame, + bigtime_t *time) = 0; protected: BPositionIO * fSource; OpenDMLParser * fParser; }; -#endif +#endif // _INDEX_H diff --git a/src/add-ons/media/plugins/ogg/OggReaderPlugin.h b/src/add-ons/media/plugins/ogg/OggReaderPlugin.h index 9773c20a0a..af7a777803 100644 --- a/src/add-ons/media/plugins/ogg/OggReaderPlugin.h +++ b/src/add-ons/media/plugins/ogg/OggReaderPlugin.h @@ -3,9 +3,12 @@ #include "ReaderPlugin.h" #include "ogg/ogg.h" + #include #include +class BFile; + namespace BPrivate { namespace media { class OggTrack; @@ -13,8 +16,7 @@ class OggTrack; typedef std::map serialno_OggTrack_map; typedef std::vector serialno_vector; -class OggReader : public Reader -{ +class OggReader : public Reader { public: OggReader(); ~OggReader(); @@ -59,8 +61,7 @@ public: }; }; -class OggReaderPlugin : public ReaderPlugin -{ +class OggReaderPlugin : public ReaderPlugin { public: Reader *NewReader(); }; @@ -69,4 +70,4 @@ public: using namespace BPrivate::media; -#endif +#endif // _OGG_READER_PLUGIN_H diff --git a/src/apps/codycam/SettingsHandler.h b/src/apps/codycam/SettingsHandler.h index 8c38202c62..7a3f7df7d7 100644 --- a/src/apps/codycam/SettingsHandler.h +++ b/src/apps/codycam/SettingsHandler.h @@ -9,6 +9,7 @@ class BFile; class BDirectory; +class BRect; class Settings; diff --git a/src/apps/cortex/DiagramView/DiagramItem.h b/src/apps/cortex/DiagramView/DiagramItem.h index d9d126f9fe..a039a75eb7 100644 --- a/src/apps/cortex/DiagramView/DiagramItem.h +++ b/src/apps/cortex/DiagramView/DiagramItem.h @@ -19,6 +19,7 @@ #include #include +class BMessage; class BView; #include "cortex_defs.h" diff --git a/src/apps/cortex/InfoView/DormantNodeInfoView.h b/src/apps/cortex/InfoView/DormantNodeInfoView.h index e1de3c502c..a0c0556264 100644 --- a/src/apps/cortex/InfoView/DormantNodeInfoView.h +++ b/src/apps/cortex/InfoView/DormantNodeInfoView.h @@ -16,6 +16,10 @@ #include "InfoView.h" #include "cortex_defs.h" + + +struct dormant_node_info; + __BEGIN_CORTEX_NAMESPACE class NodeRef; diff --git a/src/apps/cortex/InfoView/InfoWindowManager.h b/src/apps/cortex/InfoView/InfoWindowManager.h index 4c1c787e65..581610ca7a 100644 --- a/src/apps/cortex/InfoView/InfoWindowManager.h +++ b/src/apps/cortex/InfoView/InfoWindowManager.h @@ -13,15 +13,20 @@ #ifndef __InfoWindowManager_H__ #define __InfoWindowManager_H__ -// Application Kit #include -// Interface Kit #include class BList; class BWindow; #include "cortex_defs.h" + +struct dormant_node_info; +struct media_destination; +struct media_input; +struct media_output; +struct media_source; + __BEGIN_CORTEX_NAMESPACE class Connection; diff --git a/src/apps/cortex/ParameterView/ParameterWindow.h b/src/apps/cortex/ParameterView/ParameterWindow.h index aa77da24e9..2d57b360d6 100644 --- a/src/apps/cortex/ParameterView/ParameterWindow.h +++ b/src/apps/cortex/ParameterView/ParameterWindow.h @@ -26,6 +26,7 @@ // Media Kit #include +class BMediaTheme; class BMessenger; #include "cortex_defs.h" diff --git a/src/apps/cortex/Persistence/ExportContext.h b/src/apps/cortex/Persistence/ExportContext.h index 3b0c33ea9b..98dc6a6b19 100644 --- a/src/apps/cortex/Persistence/ExportContext.h +++ b/src/apps/cortex/Persistence/ExportContext.h @@ -20,49 +20,43 @@ #include "cortex_defs.h" __BEGIN_CORTEX_NAMESPACE +class BDataIO; class IPersistent; class ExportContext; // writeAttr() helper -inline BString& _pad_with_spaces( - BString& out, - const char* text, - ExportContext& context, - uint16 column); - +inline BString& _pad_with_spaces(BString& out, const char* text, + ExportContext& context, uint16 column); + class ExportContext { -public: // *** ctor/dtor - virtual ~ExportContext(); +public: ExportContext(); - ExportContext( - BDataIO* _stream); - -public: // *** public members + ExportContext(BDataIO* stream); + virtual ~ExportContext(); // the output stream - BDataIO* stream; - + BDataIO* stream; + // the element stack struct element_entry { element_entry() : hasAttributes(false), hasContent(false) {} - - BString name; - bool hasAttributes; - bool hasContent; + + BString name; + bool hasAttributes; + bool hasContent; }; - typedef std::list element_list; - element_list m_elementStack; - + typedef std::list element_list; + element_list m_elementStack; + public: // *** XML formatting helpers // writes a start tag. should be called from // IPersistent::xmlExportBegin() // (or xmlExportContent(), if you're writing nested elements) - void beginElement( - const char* name); + void beginElement(const char* name); // writes an end tag corresponding to the current element. // should only be called from IPersistent::xmlExportEnd() or diff --git a/src/apps/cortex/RouteApp/RouteWindow.h b/src/apps/cortex/RouteApp/RouteWindow.h index c7116f696f..5b09b7457f 100644 --- a/src/apps/cortex/RouteApp/RouteWindow.h +++ b/src/apps/cortex/RouteApp/RouteWindow.h @@ -21,6 +21,9 @@ #include "IStateArchivable.h" #include "cortex_defs.h" + +class BMenu; + __BEGIN_CORTEX_NAMESPACE class MediaRoutingView; diff --git a/src/apps/cortex/TransportView/TransportView.h b/src/apps/cortex/TransportView/TransportView.h index 68a7d19632..393858bb69 100644 --- a/src/apps/cortex/TransportView/TransportView.h +++ b/src/apps/cortex/TransportView/TransportView.h @@ -15,6 +15,7 @@ #include class BButton; +class BInvoker; class BStringView; class BTextControl; class BMenuField; diff --git a/src/apps/cortex/support/MediaIcon.h b/src/apps/cortex/support/MediaIcon.h index caaba54431..8779980168 100644 --- a/src/apps/cortex/support/MediaIcon.h +++ b/src/apps/cortex/support/MediaIcon.h @@ -28,6 +28,7 @@ #include class BRegion; +struct dormant_flavor_info; #include "cortex_defs.h" __BEGIN_CORTEX_NAMESPACE diff --git a/src/apps/diskprobe/DataEditor.h b/src/apps/diskprobe/DataEditor.h index 3f57010643..1d0ef7c9c6 100644 --- a/src/apps/diskprobe/DataEditor.h +++ b/src/apps/diskprobe/DataEditor.h @@ -1,5 +1,5 @@ /* - * Copyright 2004-2006, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Copyright 2004-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved. * Distributed under the terms of the MIT License. */ #ifndef DATA_EDITOR_H @@ -13,6 +13,7 @@ class BHandler; class BLooper; +class BMessage; class BMessenger; class DataChange; diff --git a/src/apps/installer/FSUtils.cpp b/src/apps/installer/FSUtils.cpp index 5686509ccd..69c7ec9e37 100644 --- a/src/apps/installer/FSUtils.cpp +++ b/src/apps/installer/FSUtils.cpp @@ -2876,11 +2876,7 @@ _TrackerLaunchAppWithDocuments(const entry_ref *appRef, const BMessage *refs, bo } extern "C" char** environ; -extern "C" -#if !B_BEOS_VERSION_DANO -_IMPEXP_ROOT -#endif -status_t _kload_image_etc_(int argc, char **argv, char **envp, +extern "C" status_t _kload_image_etc_(int argc, char **argv, char **envp, char *buf, int bufsize); @@ -3103,9 +3099,6 @@ LaunchBrokenLink(const char *signature, const BMessage *refs) // external launch calls; need to be robust, work if Tracker is not running -#if !B_BEOS_VERSION_DANO -_IMPEXP_TRACKER -#endif status_t FSLaunchItem(const entry_ref *application, const BMessage *refsReceived, bool async, bool openWithOK) @@ -3114,9 +3107,6 @@ FSLaunchItem(const entry_ref *application, const BMessage *refsReceived, } -#if !B_BEOS_VERSION_DANO -_IMPEXP_TRACKER -#endif status_t FSOpenWith(BMessage *listOfRefs) { diff --git a/src/apps/installer/FSUtils.h b/src/apps/installer/FSUtils.h index d93d4f6464..f5a88f24ea 100644 --- a/src/apps/installer/FSUtils.h +++ b/src/apps/installer/FSUtils.h @@ -145,26 +145,23 @@ TrackerCopyLoopControl::TrackerCopyLoopControl(thread_id thread) #define B_DESKTOP_DIR_NAME "Desktop" -#if B_BEOS_VERSION_DANO -#define _IMPEXP_TRACKER -#endif -_IMPEXP_TRACKER status_t FSCopyAttributesAndStats(BNode *, BNode *); +status_t FSCopyAttributesAndStats(BNode *, BNode *); -_IMPEXP_TRACKER status_t FSCopyFile(BEntry* srcFile, StatStruct *srcStat, BDirectory* destDir, +status_t FSCopyFile(BEntry* srcFile, StatStruct *srcStat, BDirectory* destDir, CopyLoopControl *loopControl, BPoint *loc, bool makeOriginalName, Undo &undo); -_IMPEXP_TRACKER status_t FSCopyFolder(BEntry *srcEntry, BDirectory *destDir, CopyLoopControl *loopControl, +status_t FSCopyFolder(BEntry *srcEntry, BDirectory *destDir, CopyLoopControl *loopControl, BPoint *loc, bool makeOriginalName, Undo &undo); -_IMPEXP_TRACKER void FSDuplicate(BObjectList *srcList, BList *pointList); -_IMPEXP_TRACKER void FSMoveToFolder(BObjectList *srcList, BEntry *, uint32 moveMode, +void FSDuplicate(BObjectList *srcList, BList *pointList); +void FSMoveToFolder(BObjectList *srcList, BEntry *, uint32 moveMode, BList *pointList = NULL); -_IMPEXP_TRACKER void FSMakeOriginalName(char *name, BDirectory *destDir, const char *suffix); -_IMPEXP_TRACKER bool FSIsTrashDir(const BEntry *); -_IMPEXP_TRACKER bool FSIsPrintersDir(const BEntry *); -_IMPEXP_TRACKER bool FSIsDeskDir(const BEntry *); -_IMPEXP_TRACKER bool FSIsSystemDir(const BEntry *); -_IMPEXP_TRACKER bool FSIsBeOSDir(const BEntry *); -_IMPEXP_TRACKER bool FSIsHomeDir(const BEntry *); -_IMPEXP_TRACKER void FSMoveToTrash(BObjectList *srcList, BList *pointList = NULL, +void FSMakeOriginalName(char *name, BDirectory *destDir, const char *suffix); +bool FSIsTrashDir(const BEntry *); +bool FSIsPrintersDir(const BEntry *); +bool FSIsDeskDir(const BEntry *); +bool FSIsSystemDir(const BEntry *); +bool FSIsBeOSDir(const BEntry *); +bool FSIsHomeDir(const BEntry *); +void FSMoveToTrash(BObjectList *srcList, BList *pointList = NULL, bool async = true); // Deprecated @@ -172,23 +169,23 @@ void FSDeleteRefList(BObjectList *, bool, bool confirm = true); void FSDelete(entry_ref *, bool, bool confirm = true); void FSRestoreRefList(BObjectList *list, bool async); -_IMPEXP_TRACKER status_t FSLaunchItem(const entry_ref *application, const BMessage *refsReceived, +status_t FSLaunchItem(const entry_ref *application, const BMessage *refsReceived, bool async, bool openWithOK); // Preferred way of launching; only pass an actual application in , not // a document; to open documents with the preferred app, pase 0 in and // stuff all the document refs into // Consider having silent mode that does not show alerts, just returns error code -_IMPEXP_TRACKER status_t FSOpenWith(BMessage *listOfRefs); +status_t FSOpenWith(BMessage *listOfRefs); // runs the Open With window; pas a list of refs -_IMPEXP_TRACKER void FSEmptyTrash(); -_IMPEXP_TRACKER status_t FSCreateNewFolderIn(const node_ref *destDir, entry_ref *newRef, +void FSEmptyTrash(); +status_t FSCreateNewFolderIn(const node_ref *destDir, entry_ref *newRef, node_ref *new_node); -_IMPEXP_TRACKER void FSCreateTrashDirs(); -_IMPEXP_TRACKER status_t FSGetTrashDir(BDirectory *trashDir, dev_t volume); -_IMPEXP_TRACKER status_t FSGetDeskDir(BDirectory *deskDir, dev_t volume); -_IMPEXP_TRACKER status_t FSRecursiveCalcSize(BInfoWindow *, BDirectory *, +void FSCreateTrashDirs(); +status_t FSGetTrashDir(BDirectory *trashDir, dev_t volume); +status_t FSGetDeskDir(BDirectory *deskDir, dev_t volume); +status_t FSRecursiveCalcSize(BInfoWindow *, BDirectory *, off_t *runningSize, int32 *fileCount, int32 *dirCount); bool FSInTrashDir(const entry_ref *); @@ -236,12 +233,12 @@ bool ConfirmChangeIfWellKnownDirectory(const BEntry *entry, const char *action, bool dontAsk = false, int32 *confirmedAlready = NULL); // Deprecated calls use newer calls above instead -_IMPEXP_TRACKER void FSLaunchItem(const entry_ref *, BMessage * = NULL, int32 workspace = -1); -_IMPEXP_TRACKER status_t FSLaunchItem(const entry_ref *, BMessage *, +void FSLaunchItem(const entry_ref *, BMessage * = NULL, int32 workspace = -1); +status_t FSLaunchItem(const entry_ref *, BMessage *, int32 workspace, bool asynch); -_IMPEXP_TRACKER void FSOpenWithDocuments(const entry_ref *executableToLaunch, +void FSOpenWithDocuments(const entry_ref *executableToLaunch, BMessage *documentEntryRefs); -_IMPEXP_TRACKER status_t FSLaunchUsing(const entry_ref *ref, BMessage *listOfRefs); +status_t FSLaunchUsing(const entry_ref *ref, BMessage *listOfRefs); // some extra directory_which values diff --git a/src/apps/mail/ComboBox.h b/src/apps/mail/ComboBox.h index 5cfe67d1fd..0ed4b1c734 100644 --- a/src/apps/mail/ComboBox.h +++ b/src/apps/mail/ComboBox.h @@ -46,10 +46,11 @@ All rights reserved. #include class BButton; +class BComboBox; class BList; class BTextControl; +class BTextView; class BWindow; -class BComboBox; struct text_run_array; typedef const char* (*text_input_filter_hook)(const char* inText, int32& length, diff --git a/src/apps/mail/Header.h b/src/apps/mail/Header.h index b46e58de5d..7d3830ae1c 100644 --- a/src/apps/mail/Header.h +++ b/src/apps/mail/Header.h @@ -78,12 +78,13 @@ All rights reserved. #define BCC_FIELD_WIDTH 197 #define BCC_FIELD_HEIGHT 16 -class TTextControl; class BFile; class BMenuField; class BMenuItem; -class BPopupMenu; +class BPopUpMenu; +class BStringView; class QPopupMenu; +class TTextControl; class THeaderView : public BBox { diff --git a/src/apps/mail/MailSupport.h b/src/apps/mail/MailSupport.h index f7ce12b2b4..8516463a5d 100644 --- a/src/apps/mail/MailSupport.h +++ b/src/apps/mail/MailSupport.h @@ -60,6 +60,7 @@ enum WINDOW_TYPES { class BFile; +class BMenu; class Words; diff --git a/src/apps/mail/MailWindow.h b/src/apps/mail/MailWindow.h index 8b15da3b0c..d8f4abd816 100644 --- a/src/apps/mail/MailWindow.h +++ b/src/apps/mail/MailWindow.h @@ -57,6 +57,7 @@ class BEmailMessage; class BFile; class BFilePanel; class BMailMessage; +class BMenu; class BMenuBar; class BMenuItem; class BmapButton; diff --git a/src/apps/mail/Prefs.h b/src/apps/mail/Prefs.h index a5abb9024a..553c46615d 100644 --- a/src/apps/mail/Prefs.h +++ b/src/apps/mail/Prefs.h @@ -31,19 +31,19 @@ of Be Incorporated in the United States and other countries. Other brand product names are registered trademarks or trademarks of their respective holders. All rights reserved. */ - -//-------------------------------------------------------------------- -// -// Prefs.h -// -//-------------------------------------------------------------------- - #ifndef _PREFS_H #define _PREFS_H + #include #include +class BButton; +class BMenu; +class BPopUpMenu; +class BTextControl; + + #define ACCOUNT_USE_DEFAULT 0 #define ACCOUNT_FROM_MAIL 1 @@ -53,8 +53,7 @@ All rights reserved. #define SIG_NONE MDR_DIALECT_CHOICE ("None", "無し") #define SIG_RANDOM MDR_DIALECT_CHOICE ("Random", "自動選択") -struct EncodingItem -{ +struct EncodingItem { char *name; uint32 flavor; }; @@ -62,10 +61,6 @@ struct EncodingItem extern const EncodingItem kEncodings[]; -class Button; - -//==================================================================== - class TPrefsWindow : public BWindow { public: TPrefsWindow(BRect rect, BFont *font, int32 *level, bool *warp, diff --git a/src/apps/mail/QueryMenu.h b/src/apps/mail/QueryMenu.h index dc7bf067c2..b7ef62c93d 100644 --- a/src/apps/mail/QueryMenu.h +++ b/src/apps/mail/QueryMenu.h @@ -31,10 +31,10 @@ of Be Incorporated in the United States and other countries. Other brand product names are registered trademarks or trademarks of their respective holders. All rights reserved. */ - #ifndef _QUERY_MENU #define _QUERY_MENU + #include #include @@ -44,6 +44,7 @@ class BLooper; class BQuery; class BVolume; class QHandler; +struct entry_ref; using std::vector; diff --git a/src/apps/mail/Status.h b/src/apps/mail/Status.h index 0cd378cb86..67c5a75f80 100644 --- a/src/apps/mail/Status.h +++ b/src/apps/mail/Status.h @@ -38,6 +38,8 @@ All rights reserved. #include #include +class BTextControl; + #define INDEX_STATUS "_status" diff --git a/src/apps/people/PeopleApp.h b/src/apps/people/PeopleApp.h index 19d95b0ecf..cf1f677e54 100644 --- a/src/apps/people/PeopleApp.h +++ b/src/apps/people/PeopleApp.h @@ -16,6 +16,8 @@ #include +class BFile; + #define B_PERSON_MIMETYPE "application/x-person" #define APP_SIG "application/x-vnd.Be-PEPL" diff --git a/src/apps/showimage/ResizerWindow.h b/src/apps/showimage/ResizerWindow.h index 43aace2ebe..32104c904c 100644 --- a/src/apps/showimage/ResizerWindow.h +++ b/src/apps/showimage/ResizerWindow.h @@ -10,26 +10,25 @@ * Michael Pfeiffer * Ryan Leavengood */ -#ifndef _resizer_window_h -#define _resizer_window_h +#ifndef _RESIZER_WINDOW_H +#define _RESIZER_WINDOW_H #include #include - -class BTextControl; class BCheckBox; +class BControl; +class BTextControl; -class ResizerWindow : public BWindow -{ +class ResizerWindow : public BWindow { public: ResizerWindow(BMessenger target, int32 width, int32 height ); - + virtual void MessageReceived(BMessage* msg); virtual bool QuitRequested(); - + virtual ~ResizerWindow(); // the public message command constants ('what') @@ -39,6 +38,7 @@ class ResizerWindow : public BWindow kUpdateMsg, // provides the new size of the image in two "int32" fields "width" and "height" }; + private: enum { kResolutionMsg = 'Rszr', @@ -46,11 +46,12 @@ class ResizerWindow : public BWindow kHeightModifiedMsg, kApplyMsg, }; - - void AddControl(BView* parent, BControl* control, float column2, BRect& rect); + + void AddControl(BView* parent, BControl* control, float column2, + BRect& rect); void AddSeparatorLine(BView* parent, BRect& rect); void LeftAlign(BControl* control); - + BTextControl* fWidth; BTextControl* fHeight; BCheckBox* fAspectRatio; @@ -62,4 +63,4 @@ class ResizerWindow : public BWindow BMessenger fTarget; }; -#endif +#endif // _RESIZER_WINDOW_H diff --git a/src/apps/stylededit/StyledEditView.h b/src/apps/stylededit/StyledEditView.h index 9daa97757f..a809fac147 100644 --- a/src/apps/stylededit/StyledEditView.h +++ b/src/apps/stylededit/StyledEditView.h @@ -14,10 +14,10 @@ #include #include - class BFile; class BHandler; class BMessenger; +class BPositionIO; class StyledEditView : public BTextView { @@ -33,8 +33,8 @@ class StyledEditView : public BTextView { const text_run_array *runs = NULL); void Reset(); - status_t GetStyledText(BPositionIO * stream); - status_t WriteStyledEditFile(BFile * file); + status_t GetStyledText(BPositionIO* stream); + status_t WriteStyledEditFile(BFile* file); void SetEncoding(uint32 encoding); uint32 GetEncoding() const; diff --git a/src/apps/sudoku/SudokuView.h b/src/apps/sudoku/SudokuView.h index 4ccb7d1afe..d0ea9659a6 100644 --- a/src/apps/sudoku/SudokuView.h +++ b/src/apps/sudoku/SudokuView.h @@ -9,6 +9,7 @@ #include class SudokuField; +struct entry_ref; enum { diff --git a/src/apps/tv/Controller.h b/src/apps/tv/Controller.h index 97d31fbbcd..aa3013e31a 100644 --- a/src/apps/tv/Controller.h +++ b/src/apps/tv/Controller.h @@ -21,19 +21,20 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. */ - #ifndef __CONTROLLER_H #define __CONTROLLER_H + #include #include #include +class BDiscreteParameter; +class BParameterWeb; class VideoView; class VideoNode; -class Controller -{ +class Controller { public: Controller(); virtual ~Controller(); @@ -71,5 +72,4 @@ private: media_output fOutput; }; - -#endif +#endif // __CONTROLLER_H diff --git a/src/apps/tv/VideoNode.h b/src/apps/tv/VideoNode.h index e79804cbc8..0922040a41 100644 --- a/src/apps/tv/VideoNode.h +++ b/src/apps/tv/VideoNode.h @@ -21,17 +21,18 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. */ - #ifndef __VIDEO_NODE_H_ #define __VIDEO_NODE_H_ + #include #include +class BLocker; class VideoView; -class VideoNode : public BMediaEventLooper, public BBufferConsumer -{ + +class VideoNode : public BMediaEventLooper, public BBufferConsumer { public: VideoNode(const char *name, VideoView *view); ~VideoNode(); @@ -53,45 +54,30 @@ protected: status_t GetNextInput(int32 *cookie, media_input *out_input); void DisposeInputCookie(int32 cookie); - status_t HandleMessage( - int32 message, - const void *data, - size_t size); + status_t HandleMessage(int32 message, const void *data, size_t size); - void HandleEvent( - const media_timed_event *event, - bigtime_t lateness, - bool realTimeEvent); + void HandleEvent(const media_timed_event *event, + bigtime_t lateness, bool realTimeEvent); - status_t AcceptFormat( - const media_destination &dst, - media_format *format); + status_t AcceptFormat(const media_destination &dst, + media_format *format); - void ProducerDataStatus( - const media_destination &dst, - int32 status, - bigtime_t at_media_time); + void ProducerDataStatus(const media_destination &dst, + int32 status, bigtime_t at_media_time); - status_t GetLatencyFor( - const media_destination &dst, - bigtime_t *out_latency, - media_node_id *out_id); + status_t GetLatencyFor(const media_destination &dst, + bigtime_t *out_latency, media_node_id *out_id); - status_t Connected( - const media_source &src, - const media_destination &dst, - const media_format &format, - media_input *out_input); + status_t Connected(const media_source &src, + const media_destination &dst, + const media_format &format, media_input *out_input); - void Disconnected( - const media_source &src, - const media_destination &dst); + void Disconnected(const media_source &src, + const media_destination &dst); - status_t FormatChanged( - const media_source &src, - const media_destination &dst, - int32 from_change_count, - const media_format &format); + status_t FormatChanged(const media_source &src, + const media_destination &dst, int32 from_change_count, + const media_format &format); protected: void HandleBuffer(BBuffer *buffer); @@ -108,4 +94,4 @@ protected: BLocker * fBitmapLocker; }; -#endif +#endif // __VIDEO_NODE_H_ diff --git a/src/apps/tv/VideoView.h b/src/apps/tv/VideoView.h index 08ca33485c..28b4dcb7c7 100644 --- a/src/apps/tv/VideoView.h +++ b/src/apps/tv/VideoView.h @@ -21,23 +21,25 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. */ - #ifndef __VIDEO_VIEW_H #define __VIDEO_VIEW_H + #include +class BMessageRunner; class VideoNode; -class VideoView : public BView -{ + +class VideoView : public BView { public: - VideoView(BRect frame, const char *name, uint32 resizeMask, uint32 flags); + VideoView(BRect frame, const char *name, uint32 resizeMask, + uint32 flags); ~VideoView(); - + void RemoveVideoDisplay(); void RemoveOverlay(); - + VideoNode * Node(); bool IsOverlaySupported(); @@ -47,18 +49,17 @@ public: void OverlayScreenshotPrepare(); void OverlayScreenshotCleanup(); - + void DrawFrame(); private: void AttachedToWindow(); void MessageReceived(BMessage *msg); void Draw(BRect updateRect); - - void DrawTestImage(); + void DrawTestImage(); void CheckActivity(); - + private: VideoNode * fVideoNode; bool fVideoActive; @@ -68,4 +69,4 @@ private: bigtime_t fLastFrame; }; -#endif +#endif // __VIDEO_VIEW_H diff --git a/src/bin/setdecor.cpp b/src/bin/setdecor.cpp index ca8dcf013c..9bc80e03ab 100644 --- a/src/bin/setdecor.cpp +++ b/src/bin/setdecor.cpp @@ -1,16 +1,17 @@ /* * Copyright 2007, François Revol, revol@free.fr. - * * Distributed under the terms of the MIT license. */ #include + #include #include #include -// this isn't public yet ? +class BBitmap; + namespace BPrivate { int32 count_decorators(void); int32 get_decorator(void); diff --git a/src/kits/interface/InterfaceDefs.cpp b/src/kits/interface/InterfaceDefs.cpp index 5db78fba29..178e0f51eb 100644 --- a/src/kits/interface/InterfaceDefs.cpp +++ b/src/kits/interface/InterfaceDefs.cpp @@ -191,14 +191,14 @@ get_mode_parameter(uint32 mode, int32& width, int32& height, uint32& colorSpace) } -_IMPEXP_BE const color_map * +const color_map * system_colors() { return BScreen(B_MAIN_SCREEN_ID).ColorMap(); } -_IMPEXP_BE status_t +status_t set_screen_space(int32 index, uint32 space, bool stick) { int32 width; @@ -225,7 +225,7 @@ set_screen_space(int32 index, uint32 space, bool stick) } -_IMPEXP_BE status_t +status_t get_scroll_bar_info(scroll_bar_info *info) { if (info == NULL) @@ -245,7 +245,7 @@ get_scroll_bar_info(scroll_bar_info *info) } -_IMPEXP_BE status_t +status_t set_scroll_bar_info(scroll_bar_info *info) { if (info == NULL) @@ -265,7 +265,7 @@ set_scroll_bar_info(scroll_bar_info *info) } -_IMPEXP_BE status_t +status_t get_mouse_type(int32 *type) { BMessage command(IS_GET_MOUSE_TYPE); @@ -280,7 +280,7 @@ get_mouse_type(int32 *type) } -_IMPEXP_BE status_t +status_t set_mouse_type(int32 type) { BMessage command(IS_SET_MOUSE_TYPE); @@ -291,7 +291,7 @@ set_mouse_type(int32 type) } -_IMPEXP_BE status_t +status_t get_mouse_map(mouse_map *map) { BMessage command(IS_GET_MOUSE_MAP); @@ -310,7 +310,7 @@ get_mouse_map(mouse_map *map) } -_IMPEXP_BE status_t +status_t set_mouse_map(mouse_map *map) { BMessage command(IS_SET_MOUSE_MAP); @@ -321,7 +321,7 @@ set_mouse_map(mouse_map *map) } -_IMPEXP_BE status_t +status_t get_click_speed(bigtime_t *speed) { BMessage command(IS_GET_CLICK_SPEED); @@ -336,7 +336,7 @@ get_click_speed(bigtime_t *speed) } -_IMPEXP_BE status_t +status_t set_click_speed(bigtime_t speed) { BMessage command(IS_SET_CLICK_SPEED); @@ -346,7 +346,7 @@ set_click_speed(bigtime_t speed) } -_IMPEXP_BE status_t +status_t get_mouse_speed(int32 *speed) { BMessage command(IS_GET_MOUSE_SPEED); @@ -361,7 +361,7 @@ get_mouse_speed(int32 *speed) } -_IMPEXP_BE status_t +status_t set_mouse_speed(int32 speed) { BMessage command(IS_SET_MOUSE_SPEED); @@ -371,7 +371,7 @@ set_mouse_speed(int32 speed) } -_IMPEXP_BE status_t +status_t get_mouse_acceleration(int32 *speed) { BMessage command(IS_GET_MOUSE_ACCELERATION); @@ -386,7 +386,7 @@ get_mouse_acceleration(int32 *speed) } -_IMPEXP_BE status_t +status_t set_mouse_acceleration(int32 speed) { BMessage command(IS_SET_MOUSE_ACCELERATION); @@ -396,7 +396,7 @@ set_mouse_acceleration(int32 speed) } -_IMPEXP_BE status_t +status_t get_key_repeat_rate(int32 *rate) { BMessage command(IS_GET_KEY_REPEAT_RATE); @@ -411,7 +411,7 @@ get_key_repeat_rate(int32 *rate) } -_IMPEXP_BE status_t +status_t set_key_repeat_rate(int32 rate) { BMessage command(IS_SET_KEY_REPEAT_RATE); @@ -421,7 +421,7 @@ set_key_repeat_rate(int32 rate) } -_IMPEXP_BE status_t +status_t get_key_repeat_delay(bigtime_t *delay) { BMessage command(IS_GET_KEY_REPEAT_DELAY); @@ -436,7 +436,7 @@ get_key_repeat_delay(bigtime_t *delay) } -_IMPEXP_BE status_t +status_t set_key_repeat_delay(bigtime_t delay) { BMessage command(IS_SET_KEY_REPEAT_DELAY); @@ -446,7 +446,7 @@ set_key_repeat_delay(bigtime_t delay) } -_IMPEXP_BE uint32 +uint32 modifiers() { BMessage command(IS_GET_MODIFIERS); @@ -465,7 +465,7 @@ modifiers() } -_IMPEXP_BE status_t +status_t get_key_info(key_info *info) { BMessage command(IS_GET_KEY_INFO); @@ -487,14 +487,14 @@ get_key_info(key_info *info) } -_IMPEXP_BE void +void get_key_map(key_map **map, char **key_buffer) { _get_key_map(map, key_buffer, NULL); } -_IMPEXP_BE void +void _get_key_map(key_map **map, char **key_buffer, ssize_t *key_buffer_size) { BMessage command(IS_GET_KEY_MAP); @@ -523,7 +523,7 @@ _get_key_map(key_map **map, char **key_buffer, ssize_t *key_buffer_size) } -_IMPEXP_BE status_t +status_t get_keyboard_id(uint16 *id) { BMessage command(IS_GET_KEYBOARD_ID); @@ -539,7 +539,7 @@ get_keyboard_id(uint16 *id) } -_IMPEXP_BE void +void set_modifier_key(uint32 modifier, uint32 key) { BMessage command(IS_SET_MODIFIER_KEY); @@ -551,7 +551,7 @@ set_modifier_key(uint32 modifier, uint32 key) } -_IMPEXP_BE void +void set_keyboard_locks(uint32 modifiers) { BMessage command(IS_SET_KEYBOARD_LOCKS); @@ -562,7 +562,7 @@ set_keyboard_locks(uint32 modifiers) } -_IMPEXP_BE status_t +status_t _restore_key_map_() { BMessage message(IS_RESTORE_KEY_MAP); @@ -572,7 +572,7 @@ _restore_key_map_() } -_IMPEXP_BE rgb_color +rgb_color keyboard_navigation_color() { // Queries the app_server @@ -580,7 +580,7 @@ keyboard_navigation_color() } -_IMPEXP_BE int32 +int32 count_workspaces() { int32 count = 1; @@ -596,7 +596,7 @@ count_workspaces() } -_IMPEXP_BE void +void set_workspace_count(int32 count) { BPrivate::AppServerLink link; @@ -606,7 +606,7 @@ set_workspace_count(int32 count) } -_IMPEXP_BE int32 +int32 current_workspace() { int32 index = 0; @@ -622,7 +622,7 @@ current_workspace() } -_IMPEXP_BE void +void activate_workspace(int32 workspace) { BPrivate::AppServerLink link; @@ -632,7 +632,7 @@ activate_workspace(int32 workspace) } -_IMPEXP_BE bigtime_t +bigtime_t idle_time() { bigtime_t idletime = 0; @@ -648,7 +648,7 @@ idle_time() } -_IMPEXP_BE void +void run_select_printer_panel() { if (be_roster == NULL) @@ -659,7 +659,7 @@ run_select_printer_panel() } -_IMPEXP_BE void +void run_add_printer_panel() { // Launches the Printer prefs app via the Roster and asks it to @@ -671,7 +671,7 @@ run_add_printer_panel() } -_IMPEXP_BE void +void run_be_about() { if (be_roster != NULL) @@ -679,7 +679,7 @@ run_be_about() } -_IMPEXP_BE void +void set_focus_follows_mouse(bool follow) { // obviously deprecated API @@ -687,14 +687,14 @@ set_focus_follows_mouse(bool follow) } -_IMPEXP_BE bool +bool focus_follows_mouse() { return mouse_mode() != B_NORMAL_MOUSE; } -_IMPEXP_BE void +void set_mouse_mode(mode_mouse mode) { BPrivate::AppServerLink link; @@ -704,7 +704,7 @@ set_mouse_mode(mode_mouse mode) } -_IMPEXP_BE mode_mouse +mode_mouse mouse_mode() { // Gets the focus-follows-mouse style, such as normal, B_WARP_MOUSE, etc. @@ -721,7 +721,7 @@ mouse_mode() } -_IMPEXP_BE rgb_color +rgb_color ui_color(color_which which) { int32 index = color_which_to_index(which); @@ -739,7 +739,7 @@ ui_color(color_which which) } -_IMPEXP_BE void +void set_ui_color(const color_which &which, const rgb_color &color) { int32 index = color_which_to_index(which); @@ -756,7 +756,7 @@ set_ui_color(const color_which &which, const rgb_color &color) } -_IMPEXP_BE rgb_color +rgb_color tint_color(rgb_color color, float tint) { rgb_color result; diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp index d06b5a1263..9a1a4d80fc 100644 --- a/src/kits/interface/View.cpp +++ b/src/kits/interface/View.cpp @@ -2179,13 +2179,8 @@ BView::SetFont(const BFont* font, uint32 mask) } -#if !_PR3_COMPATIBLE_ void BView::GetFont(BFont *font) const -#else -void -BView:GetFont(BFont *font) -#endif { *font = fState->font; } diff --git a/src/kits/media/TimeSourceObjectManager.h b/src/kits/media/TimeSourceObjectManager.h index 6d73d28bff..9528f271de 100644 --- a/src/kits/media/TimeSourceObjectManager.h +++ b/src/kits/media/TimeSourceObjectManager.h @@ -1,18 +1,20 @@ -/*********************************************************************** +/* * Copyright (c) 2002 Marcus Overhagen. All Rights Reserved. * This file may be used under the terms of the MIT License. - * - ***********************************************************************/ + */ #ifndef _TIME_SOURCE_OBJECT_MANAGER_H_ #define _TIME_SOURCE_OBJECT_MANAGER_H_ + #include "TMap.h" +class BLocker; + + namespace BPrivate { namespace media { -class TimeSourceObjectManager -{ +class TimeSourceObjectManager { public: TimeSourceObjectManager(); ~TimeSourceObjectManager(); @@ -21,13 +23,13 @@ public: void ObjectDeleted(BTimeSource *timesource); private: - Map *fMap; + Map *fMap; BLocker *fLock; }; -}; // namespace media -}; // namespace BPrivate +} // namespace media +} // namespace BPrivate extern BPrivate::media::TimeSourceObjectManager *_TimeSourceObjectManager; -#endif +#endif // _TIME_SOURCE_OBJECT_MANAGER_H_ diff --git a/src/kits/textencoding/character_sets.cpp b/src/kits/textencoding/character_sets.cpp index 8949219cb7..0a732b1d41 100644 --- a/src/kits/textencoding/character_sets.cpp +++ b/src/kits/textencoding/character_sets.cpp @@ -165,7 +165,7 @@ static const char * unicode2aliases[] = { // IANA aliases "csUnicode", // java aliases - "UTF-16BE", "X-UTF-16BE", "UnicodeBigUnmarked", + "UTF-16BE", "UTF_16BE", "X-UTF-16BE", "UnicodeBigUnmarked", NULL }; static const BCharacterSet unicode2(16,1000,"Unicode (UCS-2)","ISO-10646-UCS-2",NULL,unicode2aliases); diff --git a/src/kits/tracker/Bitmaps.h b/src/kits/tracker/Bitmaps.h index 05203dc287..4e9275d75a 100644 --- a/src/kits/tracker/Bitmaps.h +++ b/src/kits/tracker/Bitmaps.h @@ -147,7 +147,7 @@ private: extern -#if !B_BEOS_VERSION_DANO +#ifdef _IMPEXP_TRACKER _IMPEXP_TRACKER #endif BImageResources* GetTrackerResources(); @@ -156,4 +156,4 @@ BImageResources* GetTrackerResources(); using namespace BPrivate; -#endif +#endif // __BITS__ diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp index b5f2654121..e550d97a5d 100644 --- a/src/kits/tracker/ContainerWindow.cpp +++ b/src/kits/tracker/ContainerWindow.cpp @@ -88,10 +88,10 @@ All rights reserved. const uint32 kRedo = 'REDO'; - // this is the same as B_REDO in Dano/Zeta/OpenBeOS + // this is the same as B_REDO in Dano/Zeta/Haiku -#if !B_BEOS_VERSION_DANO +#ifdef _IMPEXP_BE _IMPEXP_BE #endif void do_minimize_team(BRect zoomRect, team_id team, bool zoom); diff --git a/src/kits/tracker/FBCPadding.cpp b/src/kits/tracker/FBCPadding.cpp index 34ebf1e0ae..fcc2a3c45a 100644 --- a/src/kits/tracker/FBCPadding.cpp +++ b/src/kits/tracker/FBCPadding.cpp @@ -80,8 +80,6 @@ void BRecentAppsList::_r38() {} void BRecentAppsList::_r39() {} void BRecentAppsList::_r310() {} -#if !_PR3_COMPATIBLE_ - void BFilePanel::_ReservedFilePanel1() {} void BFilePanel::_ReservedFilePanel2() {} void BFilePanel::_ReservedFilePanel3() {} @@ -91,8 +89,6 @@ void BFilePanel::_ReservedFilePanel6() {} void BFilePanel::_ReservedFilePanel7() {} void BFilePanel::_ReservedFilePanel8() {} -#endif - // deprecated cruft #if __GNUC__ && __GNUC__ < 3 || __MWERKS__ diff --git a/src/kits/tracker/FSUtils.h b/src/kits/tracker/FSUtils.h index acb4288e9d..c904f5f057 100644 --- a/src/kits/tracker/FSUtils.h +++ b/src/kits/tracker/FSUtils.h @@ -145,7 +145,7 @@ TrackerCopyLoopControl::TrackerCopyLoopControl(thread_id thread) #define B_DESKTOP_DIR_NAME "Desktop" -#if B_BEOS_VERSION_DANO +#ifndef _IMPEXP_TRACKER #define _IMPEXP_TRACKER #endif _IMPEXP_TRACKER status_t FSCopyAttributesAndStats(BNode *, BNode *); diff --git a/src/kits/tracker/FilePanel.cpp b/src/kits/tracker/FilePanel.cpp index e0d07d555a..7b53e90e1f 100644 --- a/src/kits/tracker/FilePanel.cpp +++ b/src/kits/tracker/FilePanel.cpp @@ -44,8 +44,10 @@ All rights reserved. // prototypes for some private kernel calls that will some day be public -#if B_BEOS_VERSION_DANO +#ifndef _IMPEXP_ROOT # define _IMPEXP_ROOT +#endif +#ifndef _IMPEXP_TRACKER # define _IMPEXP_TRACKER #endif extern "C" _IMPEXP_ROOT int _kset_fd_limit_(int num); @@ -54,11 +56,6 @@ extern "C" _IMPEXP_ROOT int _kset_fd_limit_(int num); extern _IMPEXP_TRACKER void run_open_panel(); extern _IMPEXP_TRACKER void run_save_panel(); -#if B_BEOS_VERSION_DANO -# undef _IMPEXP_ROOT -# undef _IMPEXP_TRACKER -#endif - void run_open_panel() diff --git a/src/kits/tracker/FindPanel.h b/src/kits/tracker/FindPanel.h index 97c487784b..fe52ef489b 100644 --- a/src/kits/tracker/FindPanel.h +++ b/src/kits/tracker/FindPanel.h @@ -70,7 +70,7 @@ const uint32 kByForumlaItem = 'Fbyq'; const uint32 kAddItem = 'Fadd'; const uint32 kRemoveItem = 'Frem'; -#if !B_BEOS_VERSION_DANO +#ifdef _IMPEXP_TRACKER _IMPEXP_TRACKER #endif BMenu *TrackerBuildRecentFindItemsMenu(const char *); diff --git a/src/kits/tracker/Model.cpp b/src/kits/tracker/Model.cpp index c57edabfce..bebfb86582 100644 --- a/src/kits/tracker/Model.cpp +++ b/src/kits/tracker/Model.cpp @@ -77,7 +77,7 @@ BObjectList *readOnlyOpenModelList = NULL; namespace BPrivate { extern -#if !B_BEOS_VERSION_DANO +#ifdef _IMPEXP_BE _IMPEXP_BE #endif bool CheckNodeIconHintPrivate(const BNode *, bool); diff --git a/src/kits/tracker/Tracker.cpp b/src/kits/tracker/Tracker.cpp index a032bbf770..7b9cdb8dc5 100644 --- a/src/kits/tracker/Tracker.cpp +++ b/src/kits/tracker/Tracker.cpp @@ -87,14 +87,11 @@ All rights reserved. #include "AboutBox.cpp" // prototypes for some private kernel calls that will some day be public -#if B_BEOS_VERSION_DANO -#define _IMPEXP_ROOT +#ifndef _IMPEXP_ROOT +# define _IMPEXP_ROOT #endif extern "C" _IMPEXP_ROOT int _kset_fd_limit_(int num); extern "C" _IMPEXP_ROOT int _kset_mon_limit_(int num); -#if B_BEOS_VERSION_DANO -#undef _IMPEXP_ROOT -#endif // from priv_syscalls.h const int32 DEFAULT_MON_NUM = 4096; diff --git a/src/kits/tracker/Utilities.cpp b/src/kits/tracker/Utilities.cpp index 9b94ab872d..c49266c50d 100644 --- a/src/kits/tracker/Utilities.cpp +++ b/src/kits/tracker/Utilities.cpp @@ -66,14 +66,11 @@ All rights reserved. #include -#if B_BEOS_VERSION_DANO +#ifndef _IMPEXP_BE # define _IMPEXP_BE #endif extern _IMPEXP_BE const uint32 LARGE_ICON_TYPE; extern _IMPEXP_BE const uint32 MINI_ICON_TYPE; -#if B_BEOS_VERSION_DANO -# undef _IMPEXP_BE -#endif FILE *logFile = NULL; diff --git a/src/preferences/datatranslations/DataTranslationsWindow.h b/src/preferences/datatranslations/DataTranslationsWindow.h index 3df6532b09..8668c61a03 100644 --- a/src/preferences/datatranslations/DataTranslationsWindow.h +++ b/src/preferences/datatranslations/DataTranslationsWindow.h @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006, Haiku, Inc. + * Copyright 2002-2007, Haiku, Inc. * Distributed under the terms of the MIT license. * * Authors: @@ -16,6 +16,7 @@ #include class BBox; +class BStringView; class BView; class IconView; diff --git a/src/preferences/mail/ConfigViews.h b/src/preferences/mail/ConfigViews.h index 1f3edb75f3..9f2f2ff2cc 100644 --- a/src/preferences/mail/ConfigViews.h +++ b/src/preferences/mail/ConfigViews.h @@ -1,26 +1,27 @@ +/* ConfigViews - config views for the account, protocols, and filters + * + * Copyright 2001 Dr. Zoidberg Enterprises. All rights reserved. + */ #ifndef CONFIG_VIEWS_H #define CONFIG_VIEWS_H -/* ConfigViews - config views for the account, protocols, and filters -** -** Copyright 2001 Dr. Zoidberg Enterprises. All rights reserved. -*/ -#include -#include +#include +#include class BTextControl; class BListView; +class BMailChain; class BMenuField; class BButton; - -class BMailChain; +struct entry_ref; class Account; +class ProtocolsConfigView; +class FiltersConfigView; -class AccountConfigView : public BBox -{ +class AccountConfigView : public BBox { public: AccountConfigView(BRect rect,Account *account); @@ -36,16 +37,10 @@ class AccountConfigView : public BBox Account *fAccount; }; - -//-------------------------------------------------------------------------------- - -class ProtocolsConfigView; -class FiltersConfigView; - -class FilterConfigView : public BBox -{ +class FilterConfigView : public BBox { public: - FilterConfigView(BMailChain *chain,int32 index,BMessage *msg,entry_ref *ref); + FilterConfigView(BMailChain *chain, int32 index, BMessage *msg, + entry_ref *ref); ~FilterConfigView(); status_t InitCheck(); @@ -56,7 +51,7 @@ class FilterConfigView : public BBox protected: friend class FiltersConfigView; - void Load(BMessage *msg,entry_ref *ref); + void Load(BMessage *msg, entry_ref *ref); void Remove(bool deleteMessage = true); BView *fConfigView; @@ -68,14 +63,10 @@ class FilterConfigView : public BBox image_id fImage; }; - -//-------------------------------------------------------------------------------- - - -class ProtocolsConfigView : public FilterConfigView -{ +class ProtocolsConfigView : public FilterConfigView { public: - ProtocolsConfigView(BMailChain *chain, int32 index, BMessage *msg, entry_ref *ref); + ProtocolsConfigView(BMailChain *chain, int32 index, BMessage *msg, + entry_ref *ref); void AttachedToWindow(); void MessageReceived(BMessage *msg); @@ -84,12 +75,7 @@ class ProtocolsConfigView : public FilterConfigView BMenuField *fProtocolsMenuField; }; - -//-------------------------------------------------------------------------------- - - -class FiltersConfigView : public BBox -{ +class FiltersConfigView : public BBox { public: FiltersConfigView(BRect rect,Account *account); ~FiltersConfigView(); diff --git a/src/preferences/mouse/MouseSettings.h b/src/preferences/mouse/MouseSettings.h index a03b09ed04..07075bf22c 100644 --- a/src/preferences/mouse/MouseSettings.h +++ b/src/preferences/mouse/MouseSettings.h @@ -1,26 +1,22 @@ -// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ -// -// Copyright (c) 2003, OpenBeOS -// -// This software is part of the OpenBeOS distribution and is covered -// by the OpenBeOS license. -// -// -// File: MouseSettings.h -// Authors: Jérôme Duval, -// Andrew McCall (mccall@digitalparadise.co.uk) -// Axel Dörfler (axeld@pinc-software.de) -// Description: Mouse Preferences -// Created: December 10, 2003 -// -// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ +/* + * Copyright 2003-2007, Haiku Inc. All Rights Reserved. + * Distributed under the terms of the MIT License. + * + * Authors: + * Jérôme Duval + * Andrew McCall (mccall@digitalparadise.co.uk) + * Axel Dörfler (axeld@pinc-software.de) + */ +#ifndef MOUSE_SETTINGS_H +#define MOUSE_SETTINGS_H -#ifndef MOUSE_SETTINGS_H_ -#define MOUSE_SETTINGS_H_ + +#include "kb_mouse_settings.h" #include #include -#include "kb_mouse_settings.h" + +class BPath; class MouseSettings { @@ -66,4 +62,4 @@ class MouseSettings { BPoint fWindowPosition; }; -#endif +#endif // MOUSE_SETTINGS_H diff --git a/src/preferences/network/EthernetSettingsView.h b/src/preferences/network/EthernetSettingsView.h index 93105ca817..4d58483dec 100644 --- a/src/preferences/network/EthernetSettingsView.h +++ b/src/preferences/network/EthernetSettingsView.h @@ -4,21 +4,24 @@ * * Author: * Andre Alves Garzia, andre@andregarzia.com - * With code from: - * Axel Dorfler + * Axel Dörfler * Hugo Santos */ #ifndef ETHERNET_SETTINGS_VIEW_H #define ETHERNET_SETTINGS_VIEW_H + #include "settings.h" + #include #include class BButton; class BMenuField; +class BPath; class BTextControl; + static const uint32 kMsgApply = 'aply'; static const uint32 kMsgRevert = 'rvrt'; static const uint32 kMsgClose = 'clse'; diff --git a/src/preferences/print/PrintersWindow.h b/src/preferences/print/PrintersWindow.h index b439a8e568..ca2195f072 100644 --- a/src/preferences/print/PrintersWindow.h +++ b/src/preferences/print/PrintersWindow.h @@ -5,7 +5,7 @@ // where noted, are licensed under the MIT License, and have been written // and are: // -// Copyright (c) 2001-2003 OpenBeOS Project +// Copyright (c) 2001-2007 Haiku Project // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the "Software"), @@ -25,10 +25,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. /*****************************************************************************/ +#ifndef PRINTERS_WINDOW_H +#define PRINTERS_WINDOW_H -#ifndef PRINTERSWINDOW_H -#define PRINTERSWINDOW_H +#include + +class BBox; class PrintersWindow; class PrinterListView; class JobListView; @@ -36,11 +39,8 @@ class Job; class SpoolFolder; class PrinterItem; -#include -class PrintersWindow : public BWindow -{ - typedef BWindow Inherited; +class PrintersWindow : public BWindow { public: PrintersWindow(BRect frame); @@ -56,6 +56,8 @@ private: bool IsSelected(PrinterItem* printer); void UpdatePrinterButtons(); void UpdateJobButtons(); + + typedef BWindow Inherited; PrinterListView* fPrinterListView; BButton* fMakeDefault; @@ -72,4 +74,4 @@ private: bool fAddingPrinter; }; -#endif +#endif // PRINTERS_WINDOW_H diff --git a/src/servers/app/FontManager.h b/src/servers/app/FontManager.h index 1cd34d7487..22dad4d3b0 100644 --- a/src/servers/app/FontManager.h +++ b/src/servers/app/FontManager.h @@ -18,7 +18,9 @@ #include #include FT_FREETYPE_H +class BEntry; class BPath; +struct node_ref; class FontFamily; class FontStyle; diff --git a/src/servers/app/ProfileMessageSupport.cpp b/src/servers/app/ProfileMessageSupport.cpp index a18d7914df..66d46b068d 100644 --- a/src/servers/app/ProfileMessageSupport.cpp +++ b/src/servers/app/ProfileMessageSupport.cpp @@ -138,6 +138,7 @@ string_for_message_code(uint32 code, BString& string) case AS_GET_RETRACE_SEMAPHORE: string = "AS_GET_RETRACE_SEMAPHORE"; break; case AS_GET_ACCELERANT_INFO: string = "AS_GET_ACCELERANT_INFO"; break; + case AS_GET_MONITOR_INFO: string = "AS_GET_MONITOR_INFO"; break; case AS_GET_FRAME_BUFFER_CONFIG: string = "AS_GET_FRAME_BUFFER_CONFIG"; break; case AS_SET_DPMS: string = "AS_SET_DPMS"; break; diff --git a/src/servers/app/ServerScreen.h b/src/servers/app/ServerScreen.h index 2dfc916019..66f4ab659c 100644 --- a/src/servers/app/ServerScreen.h +++ b/src/servers/app/ServerScreen.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2006, Haiku, Inc. + * Copyright (c) 2001-2007, Haiku, Inc. * Distributed under the terms of the MIT license. * * Authors: @@ -29,6 +29,7 @@ class Screen { void Shutdown(); int32 ID() const { return fID; } + status_t GetMonitorInfo(monitor_info& info); status_t SetMode(const display_mode& mode, bool makeDefault); status_t SetMode(uint16 width, uint16 height, diff --git a/src/servers/app/ViewLayer.h b/src/servers/app/ViewLayer.h index 8d465d4870..9c7698962f 100644 --- a/src/servers/app/ViewLayer.h +++ b/src/servers/app/ViewLayer.h @@ -20,6 +20,7 @@ #include class BList; +class BMessage; namespace BPrivate { class PortLink; diff --git a/src/servers/app/drawing/PatternHandler.h b/src/servers/app/drawing/PatternHandler.h index d07fc47c3e..55bf1348f1 100644 --- a/src/servers/app/drawing/PatternHandler.h +++ b/src/servers/app/drawing/PatternHandler.h @@ -5,14 +5,18 @@ * Author: DarkWyrm * Stephan Aßmus */ - #ifndef PATTERNHANDLER_H #define PATTERNHANDLER_H + #include #include + #include +class BPoint; + + class Pattern { public: diff --git a/src/servers/app/drawing/drawing_support.h b/src/servers/app/drawing/drawing_support.h index ca0764097d..ecbfdb3f3b 100644 --- a/src/servers/app/drawing/drawing_support.h +++ b/src/servers/app/drawing/drawing_support.h @@ -1,15 +1,19 @@ -//------------------------------------------------------------------------------ -// Copyright 2005, Haiku, Inc. All rights reserved. -// Distributed under the terms of the MIT License. -// -// Author: Stephan Aßmus, -//------------------------------------------------------------------------------ - +/* + * Copyright 2005-2007, Haiku. + * Distributed under the terms of the MIT License. + * + * Authors: + * Stephan Aßmus + */ #ifndef SUPPORT_H #define SUPPORT_H + #include +class BRect; + + // gfxcpy static inline void gfxcpy(uint8* dst, const uint8* src, int32 numBytes) diff --git a/src/servers/registrar/RecentApps.h b/src/servers/registrar/RecentApps.h index b1e3df9dec..d63924c4c2 100644 --- a/src/servers/registrar/RecentApps.h +++ b/src/servers/registrar/RecentApps.h @@ -36,10 +36,11 @@ #include #include +class BMessage; class TRoster; - struct entry_ref; + class RecentApps { public: RecentApps(); diff --git a/src/servers/registrar/RecentEntries.h b/src/servers/registrar/RecentEntries.h index 34f5a21825..b7ad973a73 100644 --- a/src/servers/registrar/RecentEntries.h +++ b/src/servers/registrar/RecentEntries.h @@ -37,6 +37,7 @@ #include #include +class BMessage; class TRoster; struct recent_entry {