* Rewrote BeBuild.h which had "a few" consequences (got rid of all those class

definitions).
* Minor cleanup here and there.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22577 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2007-10-15 20:13:55 +00:00
parent 4f6e481644
commit f6e4cbb952
135 changed files with 844 additions and 1238 deletions
+3 -2
View File
@@ -13,12 +13,13 @@
#include <List.h>
#include <OS.h>
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:
+1
View File
@@ -15,6 +15,7 @@
#include <vector>
class BList;
class BLooper;
+2 -2
View File
@@ -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 <LinkReceiver.h>
#include <LinkSender.h>
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().
+1 -1
View File
@@ -60,7 +60,7 @@ class BTokenSpace : public BLocker {
int32 fTokenCount;
};
extern _IMPEXP_BE BTokenSpace gDefaultTokens;
extern BTokenSpace gDefaultTokens;
} // namespace BPrivate
+14 -16
View File
@@ -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
+18 -19
View File
@@ -6,20 +6,22 @@
* Marc Flerackers ([email protected])
* Stephan Aßmus <[email protected]>
*/
#ifndef _BMC_PRIVATE_H
#define _BMC_PRIVATE_H
#include <BeBuild.h>
#include <MenuBar.h>
#include <MenuItem.h>
#include <MessageFilter.h>
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
@@ -1,8 +1,12 @@
#ifndef _COLOR_CONVERSION_H_
#define _COLOR_CONVERSION_H_
#include <GraphicsDefs.h>
class BPoint;
namespace BPrivate {
status_t ConvertBits(const void *srcBits, void *dstBits, int32 srcBitsLength,
+1 -1
View File
@@ -48,7 +48,7 @@ All rights reserved.
#include <GraphicsDefs.h>
#if B_BEOS_VERSION <= B_BEOS_VERSION_MAUI
#if B_BEOS_VERSION <= B_BEOS_VERSION_5
namespace BExperimental {
+12 -9
View File
@@ -1,13 +1,13 @@
/*
* Copyright 2006, Haiku Inc.
* Distributed under the terms of the MIT License.
*
* Authors:
* Stefano Ceccherini ([email protected])
* Copyright 2006-2007, Haiku Inc.
* Distributed under the terms of the MIT License.
*
* Authors:
* Stefano Ceccherini ([email protected])
*/
#ifndef __PICTUREDATAWRITER_H
#define __PICTUREDATAWRITER_H
#ifndef _PICTURE_DATA_WRITER_H
#define _PICTURE_DATA_WRITER_H
#include <InterfaceDefs.h>
#include <Font.h>
@@ -16,6 +16,9 @@
#include <stack>
class BPositionIO;
class BRegion;
class PictureDataWriter {
public:
PictureDataWriter();
@@ -80,4 +83,4 @@ private:
std::stack<off_t> fStack;
};
#endif // __PICTUREDATAWRITER_H
#endif // _PICTURE_DATA_WRITER_H
+15 -14
View File
@@ -7,11 +7,10 @@
* Stefano Ceccherini ([email protected])
* Marcus Overhagen ([email protected])
*/
#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 <GraphicsDefs.h>
@@ -19,24 +18,26 @@
#include <Rect.h>
#include <DataIO.h>
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
+7 -27
View File
@@ -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 <InterfaceDefs.h>
#include <SupportDefs.h>
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
@@ -1,8 +1,10 @@
#ifndef _PRINTER_DRIVER_H
#define _PRINTER_DRIVER_H
#include <SupportDefs.h>
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
+2 -1
View File
@@ -11,12 +11,13 @@
#include <Handler.h>
#include <ObjectList.h>
class BDiskDevice;
class BDiskDeviceRoster;
class BLocker;
class BPartition;
class BSession;
class BDiskDeviceList : public BHandler {
public:
BDiskDeviceList(bool useOwnLocker = true);
@@ -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 <SupportDefs.h>
#include <map>
@@ -18,6 +14,8 @@
class BMessage;
class BString;
struct entry_ref;
namespace BPrivate {
namespace Storage {
+8 -10
View File
@@ -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 <SupportDefs.h>
#include <list>
#include <string>
struct entry_ref;
class BFile;
class BString;
struct entry_ref;
namespace BPrivate {
namespace Storage {
@@ -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 <StorageDefs.h>
#include <string>
class BNode;
class BMessage;
class BString;
namespace BPrivate {
namespace Storage {
+3 -6
View File
@@ -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<BString> *typeslist);
_IMPEXP_TRACKER void SpringLoadedFolderCacheDragData(const BMessage *incoming,
BMessage **, BObjectList<BString> **typeslist);
#if B_BEOS_VERSION_DANO
#undef _IMPEXP_TRACKER
#endif
} // namespace BPrivate
using namespace BPrivate;
#endif
#endif // NAV_MENU_H
+1 -1
View File
@@ -43,7 +43,7 @@ All rights reserved.
namespace BPrivate {
#if !B_BEOS_VERSION_DANO
#ifdef _IMPEXP_TRACKER
_IMPEXP_TRACKER
#endif
void InitIconPreloader();