From d25dd4b92033d7ee4e7640f7f8a08d98a8e24800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 12 Apr 2010 21:02:09 +0000 Subject: [PATCH] some copyright headers clean up git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36203 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/libroot/fork.h | 8 +-- headers/private/locale/DefaultCatalog.h | 8 +-- headers/private/locale/HashMapCatalog.h | 8 +-- headers/private/locale/ICUWrapper.h | 16 +++--- headers/private/locale/PlainTextCatalog.h | 8 +-- headers/private/locale/PropertyFile.h | 8 +-- headers/private/locale/UnicodeProperties.h | 8 +-- headers/private/locale/nl_types.h | 6 +-- headers/private/mail/crypt.h | 8 +-- headers/private/media/MediaMisc.h | 1 - headers/private/media/MediaRosterEx.h | 7 ++- headers/private/media/MediaSounds.h | 3 +- headers/private/media/MetaFormat.h | 8 +-- headers/private/storage/MimeTypes.h | 8 +-- headers/private/system/real_time_data.h | 6 +-- headers/private/system/syscall_process_info.h | 6 +-- headers/private/usb_vision/nt100x.h | 50 +++++++++---------- 17 files changed, 81 insertions(+), 86 deletions(-) diff --git a/headers/private/libroot/fork.h b/headers/private/libroot/fork.h index dfe92a926c..d008e8f520 100644 --- a/headers/private/libroot/fork.h +++ b/headers/private/libroot/fork.h @@ -1,9 +1,9 @@ +/* + * Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the Haiku License. + */ #ifndef __FORK_H__ #define __FORK_H__ -/* -** Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the Haiku License. -*/ #include diff --git a/headers/private/locale/DefaultCatalog.h b/headers/private/locale/DefaultCatalog.h index d12f28c3f3..80939f41ee 100644 --- a/headers/private/locale/DefaultCatalog.h +++ b/headers/private/locale/DefaultCatalog.h @@ -1,7 +1,7 @@ -/* -** Copyright 2009, Adrien Destugues, pulkomandy@gmail.com. -** Distributed under the terms of the MIT License. -*/ +/* + * Copyright 2009, Adrien Destugues, pulkomandy@gmail.com. + * Distributed under the terms of the MIT License. + */ #ifndef _DEFAULT_CATALOG_H_ #define _DEFAULT_CATALOG_H_ diff --git a/headers/private/locale/HashMapCatalog.h b/headers/private/locale/HashMapCatalog.h index 127d7451d1..930ac646ba 100644 --- a/headers/private/locale/HashMapCatalog.h +++ b/headers/private/locale/HashMapCatalog.h @@ -1,7 +1,7 @@ -/* -** Copyright 2009, Adrien Destugues, pulkomandy@gmail.com. -** Distributed under the terms of the MIT License. -*/ +/* + * Copyright 2009, Adrien Destugues, pulkomandy@gmail.com. + * Distributed under the terms of the MIT License. + */ /* * This file declares all the things we need to add to a catalog add-on to be * able to use it in the developper tools (linkcatkeys, dumpcatalog, and the diff --git a/headers/private/locale/ICUWrapper.h b/headers/private/locale/ICUWrapper.h index e5e1a6aa49..a8167ff82c 100644 --- a/headers/private/locale/ICUWrapper.h +++ b/headers/private/locale/ICUWrapper.h @@ -1,12 +1,10 @@ -/* -** Copyright 2009, Adrien Destugues, pulkomandy@gmail.com. -** Distributed under the terms of the MIT License. -*/ +/* + * Copyright 2009, Adrien Destugues, pulkomandy@gmail.com. + * Distributed under the terms of the MIT License. + */ /* This file holds various wrapper functions to interface easily between ICU * and the Be API. */ - - #ifndef __ICU_WRAPPER_H__ #define __ICU_WRAPPER_H__ @@ -24,9 +22,9 @@ class BStringByteSink : public ByteSink { { dest_->Append(data, n); } private: BString* dest_; - BStringByteSink(); - BStringByteSink(const BStringByteSink &); - BStringByteSink &operator=(const BStringByteSink &); + BStringByteSink(); + BStringByteSink(const BStringByteSink &); + BStringByteSink &operator=(const BStringByteSink &); }; diff --git a/headers/private/locale/PlainTextCatalog.h b/headers/private/locale/PlainTextCatalog.h index 86e3f7cd3a..030ee5da3c 100644 --- a/headers/private/locale/PlainTextCatalog.h +++ b/headers/private/locale/PlainTextCatalog.h @@ -1,7 +1,7 @@ -/* -** Copyright 2009, Adrien Destugues, pulkomandy@gmail.com. -** Distributed under the terms of the MIT License. -*/ +/* + * Copyright 2009, Adrien Destugues, pulkomandy@gmail.com. + * Distributed under the terms of the MIT License. + */ #ifndef _PLAINTEXT_CATALOG_H_ #define _PLAINTEXT_CATALOG_H_ diff --git a/headers/private/locale/PropertyFile.h b/headers/private/locale/PropertyFile.h index 8f0af1a304..b25623656e 100644 --- a/headers/private/locale/PropertyFile.h +++ b/headers/private/locale/PropertyFile.h @@ -1,7 +1,7 @@ -/* -** Copyright 2003, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the MIT License. -*/ +/* + * Copyright 2003, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + */ #ifndef PROPERTY_FILE_H #define PROPERTY_FILE_H diff --git a/headers/private/locale/UnicodeProperties.h b/headers/private/locale/UnicodeProperties.h index 7c68e1c324..0caec17462 100644 --- a/headers/private/locale/UnicodeProperties.h +++ b/headers/private/locale/UnicodeProperties.h @@ -1,7 +1,7 @@ -/* -** Copyright 2003, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the OpenBeOS License. -*/ +/* + * Copyright 2003, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the OpenBeOS License. + */ #ifndef _UNICODE_PROPERTIES_H_ #define _UNICODE_PROPERTIES_H_ diff --git a/headers/private/locale/nl_types.h b/headers/private/locale/nl_types.h index 35857a652f..36b65f885d 100644 --- a/headers/private/locale/nl_types.h +++ b/headers/private/locale/nl_types.h @@ -1,8 +1,8 @@ +/* + * Distributed under the terms of the OpenBeOS License. + */ #ifndef _NL_TYPES_H_ #define _NL_TYPES_H_ -/* -** Distributed under the terms of the OpenBeOS License. -*/ #define NL_SETD 0 diff --git a/headers/private/mail/crypt.h b/headers/private/mail/crypt.h index a7db5b5cf3..8cfcfc0586 100644 --- a/headers/private/mail/crypt.h +++ b/headers/private/mail/crypt.h @@ -1,9 +1,9 @@ +/* crypt - simple encryption algorithm used for passwords + * + * Copyright 2001 Dr. Zoidberg Enterprises. All rights reserved. + */ #ifndef ZOIDBERG_CRYPT_H #define ZOIDBERG_CRYPT_H -/* crypt - simple encryption algorithm used for passwords -** -** Copyright 2001 Dr. Zoidberg Enterprises. All rights reserved. -*/ #define PASSWORD_LENGTH 32 diff --git a/headers/private/media/MediaMisc.h b/headers/private/media/MediaMisc.h index b417ebf9e9..f4763757f5 100644 --- a/headers/private/media/MediaMisc.h +++ b/headers/private/media/MediaMisc.h @@ -4,7 +4,6 @@ * * This file may be used under the terms of the MIT License. */ - #ifndef _MEDIA_MISC_H_ #define _MEDIA_MISC_H_ diff --git a/headers/private/media/MediaRosterEx.h b/headers/private/media/MediaRosterEx.h index 381bfbe452..07618a94ff 100644 --- a/headers/private/media/MediaRosterEx.h +++ b/headers/private/media/MediaRosterEx.h @@ -4,7 +4,6 @@ * * This file may be used under the terms of the MIT License. */ - #ifndef _MEDIA_ROSTER_EX_H_ #define _MEDIA_ROSTER_EX_H_ @@ -39,9 +38,9 @@ public: status_t IncrementAddonFlavorInstancesCount(media_addon_id addonid, int32 flavorid); status_t DecrementAddonFlavorInstancesCount(media_addon_id addonid, int32 flavorid); status_t ReleaseNodeAll(const media_node& node); - + status_t SetNodeCreator(media_node_id node, team_id creator); - + status_t RegisterNode(BMediaNode * node, media_addon_id addonid, int32 flavorid); status_t InstantiateDormantNode(media_addon_id addonid, int32 flavorid, team_id creator, media_node *out_node); status_t GetDormantFlavorInfo(media_addon_id addonid, int32 flavorid, dormant_flavor_info *out_flavor); @@ -53,7 +52,7 @@ public: status_t GetAllInputs(BBufferConsumer *node, List *list); status_t PublishOutputs(const media_node & node, List *list); status_t PublishInputs(const media_node & node, List *list); - + BTimeSource *MakeTimeSourceObject(media_node_id timesource_id); private: diff --git a/headers/private/media/MediaSounds.h b/headers/private/media/MediaSounds.h index d4bc017389..84835e1656 100644 --- a/headers/private/media/MediaSounds.h +++ b/headers/private/media/MediaSounds.h @@ -1,8 +1,7 @@ -/* +/* * Copyright 2007, Jérôme Duval. All rights reserved. * Distributed under the terms of the MIT License. */ - #ifndef _MEDIA_SOUNDS_H #define _MEDIA_SOUNDS_H diff --git a/headers/private/media/MetaFormat.h b/headers/private/media/MetaFormat.h index 04df17c710..00acf1fb5a 100644 --- a/headers/private/media/MetaFormat.h +++ b/headers/private/media/MetaFormat.h @@ -1,7 +1,7 @@ -/* -** Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the OpenBeOS License. -*/ +/* + * Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the OpenBeOS License. + */ #ifndef META_FORMAT_H #define META_FORMAT_H diff --git a/headers/private/storage/MimeTypes.h b/headers/private/storage/MimeTypes.h index 08b21f0214..1d7259fab8 100644 --- a/headers/private/storage/MimeTypes.h +++ b/headers/private/storage/MimeTypes.h @@ -1,7 +1,7 @@ -/* -** Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the OpenBeOS License. -*/ +/* + * Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the OpenBeOS License. + */ #ifndef _MIME_TYPES_H #define _MIME_TYPES_H diff --git a/headers/private/system/real_time_data.h b/headers/private/system/real_time_data.h index 9977a2dc75..c6c9fd5017 100644 --- a/headers/private/system/real_time_data.h +++ b/headers/private/system/real_time_data.h @@ -1,7 +1,7 @@ /* -** Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the Haiku License. -*/ + * Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the Haiku License. + */ #ifndef _KERNEL_REAL_TIME_DATA_H #define _KERNEL_REAL_TIME_DATA_H diff --git a/headers/private/system/syscall_process_info.h b/headers/private/system/syscall_process_info.h index 13d3f04d09..f759be8d29 100644 --- a/headers/private/system/syscall_process_info.h +++ b/headers/private/system/syscall_process_info.h @@ -1,7 +1,7 @@ /* -** Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the Haiku License. -*/ + * Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the Haiku License. + */ #ifndef _SYSTEM_SYSCALL_PROCESS_INFO_H #define _SYSTEM_SYSCALL_PROCESS_INFO_H diff --git a/headers/private/usb_vision/nt100x.h b/headers/private/usb_vision/nt100x.h index be75c7f905..d19262b635 100644 --- a/headers/private/usb_vision/nt100x.h +++ b/headers/private/usb_vision/nt100x.h @@ -8,7 +8,7 @@ * Skeletal part of this code was inherired from original BeOS sample code, * that is distributed under the terms of the Be Sample Code License. * Look into the file "Be License" for details. - * + * * $Source: /cvsroot/sis4be/usbvision/include/nt100x.h,v $ * $Author: zharik $ * $Revision: 1.1 $ @@ -17,12 +17,12 @@ */ #ifndef _NT100X_H_ - #define _NT100X_H_ +#define _NT100X_H_ #define READ_CMD_PREFIX 0x33C2 #define WRITE_CMD_PREFIX 0x3342 -#define COMMAND_DATA_LENGTH 0x08 +#define COMMAND_DATA_LENGTH 0x08 typedef struct{ uint8 reg; uint8 data_length; @@ -52,23 +52,23 @@ typedef struct{ #define EE_DATA 0x0e /*14*/ #define EE_LSBAD 0x0f /*15*/ #define EE_CONT 0x10 /*16*/ - -/*17: 0x11*/ + +/*17: 0x11*/ /*DRAM and Memory Buffers Setup Registers*/ -#define DRM_CONT 0x12 /*18*/ -#define DRM_PRM1 0x13 /*19*/ -#define DRM_PRM2 0x14 /*20*/ -#define DRM_PRM3 0x15 /*21*/ -#define DRM_PRM4 0x16 /*22*/ -#define DRM_PRM5 0x17 /*23*/ -#define DRM_PRM6 0x18 /*24*/ -#define DRM_PRM7 0x19 /*25*/ -#define DRM_PRM8 0x1a /*26*/ +#define DRM_CONT 0x12 /*18*/ +#define DRM_PRM1 0x13 /*19*/ +#define DRM_PRM2 0x14 /*20*/ +#define DRM_PRM3 0x15 /*21*/ +#define DRM_PRM4 0x16 /*22*/ +#define DRM_PRM5 0x17 /*23*/ +#define DRM_PRM6 0x18 /*24*/ +#define DRM_PRM7 0x19 /*25*/ +#define DRM_PRM8 0x1a /*26*/ /*Video Setup and Control Registers*/ -#define VIN_REG1 0x1b /*27*/ -#define VIN_REG2 0x1c /*28*/ +#define VIN_REG1 0x1b /*27*/ +#define VIN_REG2 0x1c /*28*/ #define LXSIZE_IN 0x1d /*29*/ #define MXSIZE_IN 0x1e /*30*/ #define LYSIZE_IN 0x1f /*31*/ @@ -94,7 +94,7 @@ typedef struct{ #define AUD_PK_LEN 0x33 /*51*/ #define BLK_PK_LEN 0x34 /*52*/ -/*USB Watch­Dog Register*/ +/*USB WatchDog Register*/ #define WD_COUNT 0x35 /*53*/ /*54 0x36*/ @@ -102,14 +102,14 @@ typedef struct{ /*Compression Ratio Management Registers*/ #define PCM_THR1 0x38 /*56*/ -#define PCM_THR2 0x39 /*57*/ -#define DIST_THR_I 0x3a /*58*/ -#define DIST_THR_A 0x3b /*59*/ -#define MAX_DIST_I 0x3c /*60*/ -#define MAX_DIST_A 0x3d /*61*/ -#define VID_BUF_ 0x3e /*62*/ +#define PCM_THR2 0x39 /*57*/ +#define DIST_THR_I 0x3a /*58*/ +#define DIST_THR_A 0x3b /*59*/ +#define MAX_DIST_I 0x3c /*60*/ +#define MAX_DIST_A 0x3d /*61*/ +#define VID_BUF_ 0x3e /*62*/ #define LFP_LSB 0x3f /*63*/ #define LFP_MSB 0x40 /*64*/ -#define VID_LPF 0x41 /*65*/ +#define VID_LPF 0x41 /*65*/ -#endif //_NT100X_H_ \ No newline at end of file +#endif //_NT100X_H_