[haiku-commits] haiku: hrev45833 - headers/os/interface src/kits/interface docs/user/interface
- From: jscipione@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 9 Jul 2013 01:39:28 +0200 (CEST)
hrev45833 adds 2 changesets to branch 'master'
old head: 5d4ef3e4174f96710c24760e31b3c4d756fcfaf7
new head: 080bf8fe19351c11230363077b3b6e1a00192c58
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=080bf8f+%5E5d4ef3e
----------------------------------------------------------------------------
e724b26: Remove enum elaborated type specifier
...from orientation params. Elaborated type specifiers are not needed
for C++ code and removing them makes doxygen happy. Verified working
on both gcc2h and gcc4h builds.
080bf8f: Fix rest of warnings, doxygen now runs cleanly.
The BTextView::SetText() methods were included twice, update the first and
remove the second.
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
34 files changed, 166 insertions(+), 212 deletions(-)
docs/user/interface/GroupLayout.dox | 6 +--
docs/user/interface/Layout.dox | 4 +-
docs/user/interface/LayoutBuilder.Group.dox | 12 ++---
docs/user/interface/LayoutBuilder.dox | 11 +++--
docs/user/interface/ListItem.dox | 2 +-
docs/user/interface/ListView.dox | 19 +++-----
docs/user/interface/TextView.dox | 30 +++----------
docs/user/interface/TwoDimensionalLayout.dox | 8 ++--
docs/user/interface/_layout_intro.dox | 2 +-
headers/os/interface/ChannelSlider.h | 6 +--
headers/os/interface/ControlLook.h | 47 ++++++++------------
headers/os/interface/GridLayout.h | 2 +-
headers/os/interface/GroupLayout.h | 8 ++--
headers/os/interface/GroupLayoutBuilder.h | 4 +-
headers/os/interface/GroupView.h | 4 +-
headers/os/interface/LayoutBuilder.h | 56 ++++++++++++------------
headers/os/interface/ScrollBar.h | 4 +-
headers/os/interface/SeparatorView.h | 18 +++-----
headers/os/interface/SplitLayoutBuilder.h | 2 +-
headers/os/interface/SplitView.h | 9 ++--
headers/os/interface/TwoDimensionalLayout.h | 6 +--
src/kits/interface/ChannelSlider.cpp | 6 +--
src/kits/interface/ControlLook.cpp | 38 ++++++++--------
src/kits/interface/GridLayout.cpp | 2 +-
src/kits/interface/GroupLayout.cpp | 8 ++--
src/kits/interface/GroupLayoutBuilder.cpp | 6 +--
src/kits/interface/GroupView.cpp | 6 +--
src/kits/interface/ScrollBar.cpp | 2 +-
src/kits/interface/SeparatorView.cpp | 15 +++----
src/kits/interface/SplitLayout.cpp | 5 +--
src/kits/interface/SplitLayout.h | 4 +-
src/kits/interface/SplitLayoutBuilder.cpp | 2 +-
src/kits/interface/SplitView.cpp | 8 ++--
src/kits/interface/TwoDimensionalLayout.cpp | 16 +++----
############################################################################
Commit: e724b26f23ad0df100a47f8d913bcdb3d54267df
URL: http://cgit.haiku-os.org/haiku/commit/?id=e724b26
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Mon Jul 8 22:27:55 2013 UTC
Remove enum elaborated type specifier
...from orientation params. Elaborated type specifiers are not needed
for C++ code and removing them makes doxygen happy. Verified working
on both gcc2h and gcc4h builds.
----------------------------------------------------------------------------
diff --git a/docs/user/interface/GroupLayout.dox
b/docs/user/interface/GroupLayout.dox
index 75a9ab4..70e2095 100644
--- a/docs/user/interface/GroupLayout.dox
+++ b/docs/user/interface/GroupLayout.dox
@@ -52,10 +52,10 @@
/*!
- \fn BGroupLayout::BGroupLayout(enum orientation orientation, float
spacing)
+ \fn BGroupLayout::BGroupLayout(orientation orientation, float spacing)
\brief Creates a new BGroupLayout.
- \param orientation The #orientation of this BGroupLayout.
+ \param orientation The orientation of this BGroupLayout.
\param spacing The spacing between BLayoutItems in this BGroupLayout.
*/
@@ -95,7 +95,7 @@
/*!
- \fn void BGroupLayout::SetOrientation(enum orientation orientation)
+ \fn void BGroupLayout::SetOrientation(orientation orientation)
\brief Set the #orientation of this BGroupLayout.
\param orientation The new #orientation of this BGroupLayout.
*/
diff --git a/docs/user/interface/LayoutBuilder.Group.dox
b/docs/user/interface/LayoutBuilder.Group.dox
index 719e4dd..810fa0d 100644
--- a/docs/user/interface/LayoutBuilder.Group.dox
+++ b/docs/user/interface/LayoutBuilder.Group.dox
@@ -64,8 +64,7 @@
/*!
\fn BLayoutBuilder::Group<ParentBuilder>::Group(BWindow *window,
- enum orientation orientation=B_HORIZONTAL,
- float spacing=B_USE_DEFAULT_SPACING)
+ orientation orientation, float spacing)
\brief Creates a new BGroupLayout, and attaches it to a BWindow.
\note The top BView* in \a window has its ViewColor set to
@@ -98,8 +97,7 @@
/*!
\fn BLayoutBuilder::Group<ParentBuilder>::Group(
- enum orientation orientation=B_HORIZONTAL,
- float spacing=B_USE_DEFAULT_SPACING)
+ orientation orientation, float spacing)
\brief Creates a new BGroupView and targets it.
Methods called on this builder will be directed to the new BGroupView's
@@ -178,8 +176,7 @@
/*!
\fn GroupBuilder BLayoutBuilder::Group<ParentBuilder>::AddGroup(
- enum orientation orientation, float
spacing=B_USE_DEFAULT_SPACING,
- float weight=1.0f)
+ orientation orientation, float spacing, float weight)
\brief Construct and add a viewless BGroupLayout, then return a
GroupBuilder
representing the newly added layout.
@@ -264,8 +261,7 @@
/*!
\fn SplitBuilder BLayoutBuilder::Group<ParentBuilder>::AddSplit(
- enum orientation orientation, float
spacing=B_USE_DEFAULT_SPACING,
- float weight=1.0f)
+ orientation orientation, float spacing, float weight)
\brief Create and add a new BSplitView with a weight of \c weight, then
return a SplitBuilder representing the new BSplitView.
diff --git a/docs/user/interface/LayoutBuilder.dox
b/docs/user/interface/LayoutBuilder.dox
index 957300d..acaaa50 100644
--- a/docs/user/interface/LayoutBuilder.dox
+++ b/docs/user/interface/LayoutBuilder.dox
@@ -147,7 +147,7 @@ public:
= B_ALIGN_HORIZONTAL_UNSET,
int32
columnCount = 1, int32 rowCount = 1);
- inline GroupBuilder AddGroup(enum orientation orientation,
+ inline GroupBuilder AddGroup(orientation orientation,
float
spacing, int32 column, int32 row,
int32
columnCount = 1, int32 rowCount = 1);
inline GroupBuilder AddGroup(BGroupView* groupView, int32
column,
@@ -168,7 +168,7 @@ public:
int32
column, int32 row,
int32
columnCount = 1, int32 rowCount = 1);
- inline SplitBuilder AddSplit(enum orientation orientation,
+ inline SplitBuilder AddSplit(orientation orientation,
float
spacing, int32 column, int32 row,
int32
columnCount = 1, int32 rowCount = 1);
inline SplitBuilder AddSplit(BSplitView* splitView, int32
column,
@@ -197,8 +197,7 @@ public:
typedef Split<ThisBuilder> SplitBuilder;
public:
- inline Split(enum orientation
orientation
-
= B_HORIZONTAL,
+ inline Split(orientation
orientation = B_HORIZONTAL,
float
spacing = 0.0f);
inline Split(BSplitView* view);
@@ -211,7 +210,7 @@ public:
inline ThisBuilder& Add(BLayoutItem* item);
inline ThisBuilder& Add(BLayoutItem* item, float weight);
- inline GroupBuilder AddGroup(enum orientation orientation,
+ inline GroupBuilder AddGroup(orientation orientation,
float
spacing = 0.0f, float weight = 1.0f);
inline GroupBuilder AddGroup(BGroupView* groupView,
float
weight = 1.0f);
@@ -226,7 +225,7 @@ public:
inline GridBuilder AddGrid(BGridLayout* gridLayout,
float
weight = 1.0f);
- inline SplitBuilder AddSplit(enum orientation orientation,
+ inline SplitBuilder AddSplit(orientation orientation,
float
spacing = 0.0f, float weight = 1.0f);
inline SplitBuilder AddSplit(BSplitView* splitView,
float
weight = 1.0f);
diff --git a/docs/user/interface/TwoDimensionalLayout.dox
b/docs/user/interface/TwoDimensionalLayout.dox
index 2acd2b8..4e81da2 100644
--- a/docs/user/interface/TwoDimensionalLayout.dox
+++ b/docs/user/interface/TwoDimensionalLayout.dox
@@ -56,7 +56,7 @@
/*!
\fn void BTwoDimensionalLayout::AlignLayoutWith(
- BTwoDimensionalLayout* other, enum orientation orientation)
+ BTwoDimensionalLayout* other, orientation orientation)
\brief Align the BLayoutItem's in the specified \a orientation
within
two or more BTwoDimensionalLayout's.
@@ -114,7 +114,7 @@
/*!
- \fn void BTwoDimensionalLayout::PrepareItems(enum orientation
orientation)
+ \fn void BTwoDimensionalLayout::PrepareItems(orientation orientation)
\brief Prepare the BLayoutItem in this BTwoDimensionalLayout subclass
for layout within a certain \a orientation.
@@ -158,8 +158,8 @@
/*!
- \fn void BTwoDimensionalLayout::GetColumnRowConstraints(enum
orientation
- orientation, int32 index, ColumnRowConstraints* constraints)
+ \fn void BTwoDimensionalLayout::GetColumnRowConstraints(
+ orientation orientation, int32 index, ColumnRowConstraints*
constraints)
\brief Fill in the ColumnRowConstraints for a certain column or row in
the BTwoDimensionalLayout.
diff --git a/docs/user/interface/_layout_intro.dox
b/docs/user/interface/_layout_intro.dox
index 44bb175..802a77a 100644
--- a/docs/user/interface/_layout_intro.dox
+++ b/docs/user/interface/_layout_intro.dox
@@ -40,7 +40,7 @@
So, let's review the BGroupLayout constructor:
\code
-BGroupLayout(enum orientation orientation, float spacing =
B_USE_DEFAULT_SPACING)
+BGroupLayout(orientation orientation, float spacing = B_USE_DEFAULT_SPACING)
\endcode
Because we only have one item in this layout, \c orientation and \c
spacing
diff --git a/headers/os/interface/ChannelSlider.h
b/headers/os/interface/ChannelSlider.h
index b628801..8c3961b 100644
--- a/headers/os/interface/ChannelSlider.h
+++ b/headers/os/interface/ChannelSlider.h
@@ -19,14 +19,14 @@ public:
uint32
flags = B_WILL_DRAW);
BChannelSlider(BRect area, const char* name,
const
char* label, BMessage* message,
- enum
orientation orientation,
+
orientation orientation,
int32
channels = 1,
uint32
resizeMode
= B_FOLLOW_LEFT | B_FOLLOW_TOP,
uint32
flags = B_WILL_DRAW);
BChannelSlider(const char* name,
const
char* label, BMessage* message,
- enum
orientation orientation,
+
orientation orientation,
int32
channels = 1,
uint32
flags = B_WILL_DRAW);
BChannelSlider(BMessage* archive);
@@ -67,7 +67,7 @@ public:
virtual void SetEnabled(bool on);
virtual orientation Orientation() const;
- void SetOrientation(enum
orientation orientation);
+ void
SetOrientation(orientation orientation);
virtual int32 MaxChannelCount() const;
virtual bool SupportsIndividualLimits()
const;
diff --git a/headers/os/interface/ControlLook.h
b/headers/os/interface/ControlLook.h
index 1e1a5ca..48fee2b 100644
--- a/headers/os/interface/ControlLook.h
+++ b/headers/os/interface/ControlLook.h
@@ -119,16 +119,14 @@ public:
const
rgb_color& base,
uint32
flags = 0,
uint32
borders = B_ALL_BORDERS,
- enum
orientation orientation
-
= B_HORIZONTAL);
+
orientation orientation = B_HORIZONTAL);
/*virtual*/ void DrawButtonBackground(BView*
view, BRect& rect,
const
BRect& updateRect,
float
radius,
const
rgb_color& base,
uint32
flags = 0,
uint32
borders = B_ALL_BORDERS,
- enum
orientation orientation
-
= B_HORIZONTAL);
+
orientation orientation = B_HORIZONTAL);
/*virtual*/ void DrawButtonBackground(BView*
view, BRect& rect,
const
BRect& updateRect,
float
leftTopRadius,
@@ -138,8 +136,7 @@ public:
const
rgb_color& base,
uint32
flags = 0,
uint32
borders = B_ALL_BORDERS,
- enum
orientation orientation
-
= B_HORIZONTAL);
+
orientation orientation = B_HORIZONTAL);
virtual void DrawMenuBarBackground(BView*
view, BRect& rect,
const
BRect& updateRect,
@@ -222,11 +219,11 @@ public:
BRect&
rect1, BRect& rect2,
const
BRect& updateRect,
const
rgb_color& base, uint32 flags,
- enum
orientation orientation);
+
orientation orientation);
virtual void DrawScrollBarBackground(BView*
view,
BRect&
rect, const BRect& updateRect,
const
rgb_color& base, uint32 flags,
- enum
orientation orientation);
+
orientation orientation);
/*virtual*/ void DrawScrollViewFrame(BView* view,
BRect&
rect, const BRect& updateRect,
@@ -251,32 +248,32 @@ public:
rgb_color leftFillColor,
rgb_color rightFillColor,
float
sliderScale, uint32 flags,
- enum
orientation orientation);
+
orientation orientation);
virtual void DrawSliderBar(BView* view,
BRect rect,
const
BRect& updateRect,
const
rgb_color& base, rgb_color fillColor,
- uint32
flags, enum orientation orientation);
+ uint32
flags, orientation orientation);
virtual void DrawSliderThumb(BView* view,
BRect& rect,
const
BRect& updateRect,
const
rgb_color& base, uint32 flags,
- enum
orientation orientation);
+
orientation orientation);
/*virtual*/ void DrawSliderTriangle(BView* view,
BRect& rect,
const
BRect& updateRect,
const
rgb_color& base, uint32 flags,
- enum
orientation orientation);
+
orientation orientation);
virtual void DrawSliderTriangle(BView* view,
BRect& rect,
const
BRect& updateRect,
const
rgb_color& base,
const
rgb_color& fill, uint32 flags,
- enum
orientation orientation);
+
orientation orientation);
virtual void DrawSliderHashMarks(BView*
view, BRect& rect,
const
BRect& updateRect,
const
rgb_color& base, int32 count,
hash_mark_location location,
- uint32
flags, enum orientation orientation);
+ uint32
flags, orientation orientation);
virtual void DrawActiveTab(BView* view,
BRect& rect,
const
BRect& updateRect,
@@ -291,7 +288,7 @@ public:
/*virtual*/ void DrawSplitter(BView* view,
BRect& rect,
const
BRect& updateRect,
const
rgb_color& base,
- enum
orientation orientation,
+
orientation orientation,
uint32
flags = 0,
uint32
borders = B_ALL_BORDERS);
@@ -381,8 +378,7 @@ protected:
const
rgb_color& base,
uint32
flags = 0,
uint32
borders = B_ALL_BORDERS,
- enum
orientation orientation
-
= B_HORIZONTAL);
+
orientation orientation = B_HORIZONTAL);
void
_DrawMenuFieldBackgroundOutside(BView* view,
BRect&
rect, const BRect& updateRect,
@@ -503,7 +499,7 @@ protected:
const
rgb_color& fillShadowColor,
float
leftInset, float topInset,
float
rightInset, float bottomInset,
- enum
orientation orientation);
+
orientation orientation);
// Border color methods
rgb_color _EdgeLightColor(const
rgb_color& base,
@@ -530,33 +526,28 @@ protected:
void _FillGradient(BView*
view, const BRect& rect,
const
rgb_color& base, float topTint,
float
bottomTint,
- enum
orientation orientation
-
= B_HORIZONTAL);
+
orientation orientation = B_HORIZONTAL);
void
_FillGlossyGradient(BView* view,
const
BRect& rect, const rgb_color& base,
float
topTint, float middle1Tint,
float
middle2Tint, float bottomTint,
- enum
orientation orientation
-
= B_HORIZONTAL);
+
orientation orientation = B_HORIZONTAL);
void
_MakeGradient(BGradientLinear& gradient,
const
BRect& rect, const rgb_color& base,
float
topTint, float bottomTint,
- enum
orientation orientation
-
= B_HORIZONTAL) const;
+
orientation orientation = B_HORIZONTAL) const;
void
_MakeGlossyGradient(BGradientLinear& gradient,
const
BRect& rect, const rgb_color& base,
float
topTint, float middle1Tint,
float
middle2Tint, float bottomTint,
- enum
orientation orientation
-
= B_HORIZONTAL) const;
+
orientation orientation = B_HORIZONTAL) const;
void
_MakeButtonGradient(BGradientLinear& gradient,
BRect&
rect, const rgb_color& base,
- uint32
flags, enum orientation orientation
-
= B_HORIZONTAL) const;
+ uint32
flags, orientation orientation = B_HORIZONTAL) const;
bool
_RadioButtonAndCheckBoxMarkColor(
const
rgb_color& base, rgb_color& color,
diff --git a/headers/os/interface/GridLayout.h
b/headers/os/interface/GridLayout.h
index ab97397..fe13f07 100644
--- a/headers/os/interface/GridLayout.h
+++ b/headers/os/interface/GridLayout.h
@@ -80,7 +80,7 @@ protected:
virtual int32 InternalCountColumns();
virtual int32 InternalCountRows();
virtual void GetColumnRowConstraints(
- enum
orientation orientation,
+
orientation orientation,
int32
index,
ColumnRowConstraints* constraints);
virtual void GetItemDimensions(BLayoutItem*
item,
diff --git a/headers/os/interface/GroupLayout.h
b/headers/os/interface/GroupLayout.h
index 75fbaa3..d706b66 100644
--- a/headers/os/interface/GroupLayout.h
+++ b/headers/os/interface/GroupLayout.h
@@ -9,7 +9,7 @@
class BGroupLayout : public BTwoDimensionalLayout {
public:
-
BGroupLayout(enum orientation orientation,
+
BGroupLayout(orientation orientation,
float
spacing = B_USE_DEFAULT_SPACING);
BGroupLayout(BMessage* from);
virtual ~BGroupLayout();
@@ -18,7 +18,7 @@ public:
void SetSpacing(float
spacing);
orientation Orientation() const;
- void SetOrientation(enum
orientation orientation);
+ void
SetOrientation(orientation orientation);
float ItemWeight(int32 index)
const;
void SetItemWeight(int32
index, float weight);
@@ -51,12 +51,12 @@ protected:
virtual bool ItemAdded(BLayoutItem* item,
int32 atIndex);
virtual void ItemRemoved(BLayoutItem* item,
int32 fromIndex);
- virtual void PrepareItems(enum orientation
orientation);
+ virtual void PrepareItems(orientation
orientation);
virtual int32 InternalCountColumns();
virtual int32 InternalCountRows();
virtual void GetColumnRowConstraints(
- enum
orientation orientation,
+
orientation orientation,
int32
index,
ColumnRowConstraints* constraints);
virtual void GetItemDimensions(BLayoutItem*
item,
diff --git a/headers/os/interface/GroupLayoutBuilder.h
b/headers/os/interface/GroupLayoutBuilder.h
index 843a008..2e86d31 100644
--- a/headers/os/interface/GroupLayoutBuilder.h
+++ b/headers/os/interface/GroupLayoutBuilder.h
@@ -12,7 +12,7 @@
class BGroupLayoutBuilder {
public:
BGroupLayoutBuilder(
- enum
orientation orientation = B_HORIZONTAL,
+
orientation orientation = B_HORIZONTAL,
float
spacing = B_USE_DEFAULT_SPACING);
BGroupLayoutBuilder(BGroupLayout* layout);
BGroupLayoutBuilder(BGroupView* view);
@@ -28,7 +28,7 @@ public:
BGroupLayoutBuilder& Add(BLayoutItem* item);
BGroupLayoutBuilder& Add(BLayoutItem* item, float
weight);
- BGroupLayoutBuilder& AddGroup(enum orientation
orientation,
+ BGroupLayoutBuilder& AddGroup(orientation orientation,
float
spacing = B_USE_DEFAULT_SPACING,
float
weight = 1.0f);
BGroupLayoutBuilder& End();
diff --git a/headers/os/interface/GroupView.h b/headers/os/interface/GroupView.h
index b161405..ca8ef54 100644
--- a/headers/os/interface/GroupView.h
+++ b/headers/os/interface/GroupView.h
@@ -13,10 +13,10 @@
class BGroupView : public BView {
public:
BGroupView(
- enum
orientation orientation = B_HORIZONTAL,
+
orientation orientation = B_HORIZONTAL,
float
spacing = B_USE_DEFAULT_SPACING);
BGroupView(const char* name,
- enum
orientation orientation = B_HORIZONTAL,
+
orientation orientation = B_HORIZONTAL,
float
spacing = B_USE_DEFAULT_SPACING);
BGroupView(BMessage* from);
virtual ~BGroupView();
diff --git a/headers/os/interface/LayoutBuilder.h
b/headers/os/interface/LayoutBuilder.h
index 61bb7be..1de6120 100644
--- a/headers/os/interface/LayoutBuilder.h
+++ b/headers/os/interface/LayoutBuilder.h
@@ -55,14 +55,13 @@ public:
typedef Split<ThisBuilder> SplitBuilder;
public:
- inline Group(enum orientation
orientation
-
= B_HORIZONTAL,
+ inline Group(orientation
orientation = B_HORIZONTAL,
float
spacing = B_USE_DEFAULT_SPACING);
inline Group(BWindow* window,
- enum
orientation orientation = B_HORIZONTAL,
+
orientation orientation = B_HORIZONTAL,
float
spacing = B_USE_DEFAULT_SPACING);
inline Group(BView* view,
- enum
orientation orientation = B_HORIZONTAL,
+
orientation orientation = B_HORIZONTAL,
float
spacing = B_USE_DEFAULT_SPACING);
inline Group(BGroupLayout*
layout);
inline Group(BGroupView* view);
@@ -77,7 +76,7 @@ public:
inline ThisBuilder& Add(BLayoutItem* item);
inline ThisBuilder& Add(BLayoutItem* item, float weight);
- inline GroupBuilder AddGroup(enum orientation orientation,
+ inline GroupBuilder AddGroup(orientation orientation,
float
spacing = B_USE_DEFAULT_SPACING,
float
weight = 1.0f);
inline GroupBuilder AddGroup(BGroupView* groupView,
@@ -94,7 +93,7 @@ public:
inline GridBuilder AddGrid(BGridView* gridView,
float
weight = 1.0f);
- inline SplitBuilder AddSplit(enum orientation orientation,
+ inline SplitBuilder AddSplit(orientation orientation,
float
spacing = B_USE_DEFAULT_SPACING,
float
weight = 1.0f);
inline SplitBuilder AddSplit(BSplitView* splitView,
@@ -165,7 +164,7 @@ public:
int32
textColumnCount = 1,
int32
rowCount = 1);
- inline GroupBuilder AddGroup(enum orientation orientation,
+ inline GroupBuilder AddGroup(orientation orientation,
float
spacing, int32 column, int32 row,
int32
columnCount = 1, int32 rowCount = 1);
inline GroupBuilder AddGroup(BGroupView* groupView, int32
column,
@@ -186,7 +185,7 @@ public:
int32
column, int32 row,
int32
columnCount = 1, int32 rowCount = 1);
- inline SplitBuilder AddSplit(enum orientation orientation,
+ inline SplitBuilder AddSplit(orientation orientation,
float
spacing, int32 column, int32 row,
int32
columnCount = 1, int32 rowCount = 1);
inline SplitBuilder AddSplit(BSplitView* splitView, int32
column,
@@ -225,8 +224,7 @@ public:
typedef Split<ThisBuilder> SplitBuilder;
public:
- inline Split(enum orientation
orientation
-
= B_HORIZONTAL,
+ inline Split(orientation
orientation = B_HORIZONTAL,
float
spacing = B_USE_DEFAULT_SPACING);
inline Split(BSplitView* view);
@@ -239,7 +237,7 @@ public:
inline ThisBuilder& Add(BLayoutItem* item);
inline ThisBuilder& Add(BLayoutItem* item, float weight);
- inline GroupBuilder AddGroup(enum orientation orientation,
+ inline GroupBuilder AddGroup(orientation orientation,
float
spacing = B_USE_DEFAULT_SPACING,
float
weight = 1.0f);
inline GroupBuilder AddGroup(BGroupView* groupView,
@@ -256,7 +254,7 @@ public:
inline GridBuilder AddGrid(BGridLayout* gridLayout,
float
weight = 1.0f);
- inline SplitBuilder AddSplit(enum orientation orientation,
+ inline SplitBuilder AddSplit(orientation orientation,
float
spacing = B_USE_DEFAULT_SPACING,
float
weight = 1.0f);
inline SplitBuilder AddSplit(BSplitView* splitView,
@@ -358,7 +356,7 @@ Base<ParentBuilder>::End()
template<typename ParentBuilder>
-Group<ParentBuilder>::Group(enum orientation orientation, float spacing)
+Group<ParentBuilder>::Group(orientation orientation, float spacing)
:
fLayout((new BGroupView(orientation, spacing))->GroupLayout())
{
@@ -366,8 +364,8 @@ Group<ParentBuilder>::Group(enum orientation orientation,
float spacing)
template<typename ParentBuilder>
-Group<ParentBuilder>::Group(BWindow* window, enum orientation orientation,
- float spacing)
+Group<ParentBuilder>::Group(BWindow* window, orientation orientation,
+ float spacing)
:
fLayout(new BGroupLayout(orientation, spacing))
{
@@ -379,8 +377,8 @@ Group<ParentBuilder>::Group(BWindow* window, enum
orientation orientation,
template<typename ParentBuilder>
-Group<ParentBuilder>::Group(BView* view, enum orientation orientation,
- float spacing)
+Group<ParentBuilder>::Group(BView* view, orientation orientation,
+ float spacing)
:
fLayout(new BGroupLayout(orientation, spacing))
{
@@ -478,8 +476,8 @@ Group<ParentBuilder>::Add(BLayoutItem* item, float weight)
template<typename ParentBuilder>
typename Group<ParentBuilder>::GroupBuilder
-Group<ParentBuilder>::AddGroup(enum orientation orientation, float spacing,
- float weight)
+Group<ParentBuilder>::AddGroup(orientation orientation, float spacing,
+ float weight)
{
GroupBuilder builder(new BGroupLayout(orientation, spacing));
builder.SetParent(this);
@@ -546,8 +544,8 @@ Group<ParentBuilder>::AddGrid(BGridView* gridView, float
weight)
template<typename ParentBuilder>
typename Group<ParentBuilder>::SplitBuilder
-Group<ParentBuilder>::AddSplit(enum orientation orientation, float spacing,
- float weight)
+Group<ParentBuilder>::AddSplit(orientation orientation, float spacing,
+ float weight)
{
SplitBuilder builder(orientation, spacing);
builder.SetParent(this);
@@ -800,8 +798,8 @@ Grid<ParentBuilder>::AddTextControl(BTextControl*
textControl, int32 column,
template<typename ParentBuilder>
typename Grid<ParentBuilder>::GroupBuilder
-Grid<ParentBuilder>::AddGroup(enum orientation orientation, float spacing,
- int32 column, int32 row, int32 columnCount, int32 rowCount)
+Grid<ParentBuilder>::AddGroup(orientation orientation, float spacing,
+ int32 column, int32 row, int32 columnCount, int32 rowCount)
{
GroupBuilder builder(new BGroupLayout(orientation, spacing));
builder.SetParent(this);
@@ -860,7 +858,7 @@ Grid<ParentBuilder>::AddGrid(BGridView* gridView, int32
column, int32 row,
template<typename ParentBuilder>
typename Grid<ParentBuilder>::SplitBuilder
-Grid<ParentBuilder>::AddSplit(enum orientation orientation, float spacing,
+Grid<ParentBuilder>::AddSplit(orientation orientation, float spacing,
int32 column, int32 row, int32 columnCount, int32 rowCount)
{
SplitBuilder builder(orientation, spacing);
@@ -986,7 +984,7 @@ Grid<ParentBuilder>::operator BGridLayout*()
template<typename ParentBuilder>
-Split<ParentBuilder>::Split(enum orientation orientation, float spacing)
+Split<ParentBuilder>::Split(orientation orientation, float spacing)
:
fView(new BSplitView(orientation, spacing))
{
@@ -1065,8 +1063,8 @@ Split<ParentBuilder>::Add(BLayoutItem* item, float weight)
template<typename ParentBuilder>
typename Split<ParentBuilder>::GroupBuilder
-Split<ParentBuilder>::AddGroup(enum orientation orientation, float spacing,
- float weight)
+Split<ParentBuilder>::AddGroup(orientation orientation, float spacing,
+ float weight)
{
GroupBuilder builder(new BGroupLayout(orientation, spacing));
builder.SetParent(this);
@@ -1133,8 +1131,8 @@ Split<ParentBuilder>::AddGrid(BGridLayout* layout, float
weight)
template<typename ParentBuilder>
typename Split<ParentBuilder>::SplitBuilder
-Split<ParentBuilder>::AddSplit(enum orientation orientation, float spacing,
- float weight)
+Split<ParentBuilder>::AddSplit(orientation orientation, float spacing,
+ float weight)
{
SplitBuilder builder(orientation, spacing);
builder.SetParent(this);
diff --git a/headers/os/interface/ScrollBar.h b/headers/os/interface/ScrollBar.h
index c70acbe..fb4f3ec 100644
--- a/headers/os/interface/ScrollBar.h
+++ b/headers/os/interface/ScrollBar.h
@@ -26,7 +26,7 @@ public:
orientation direction);
BScrollBar(const char* name, BView* target,
float
min, float max,
- enum
orientation orientation);
+
orientation orientation);
BScrollBar(BMessage* archive);
virtual ~BScrollBar();
static BArchivable* Instantiate(BMessage* archive);
@@ -48,7 +48,7 @@ public:
void SetTarget(BView
*target);
void SetTarget(const char*
targetName);
BView* Target() const;
- void SetOrientation(enum
orientation orientation);
+ void
SetOrientation(orientation orientation);
orientation Orientation() const;
// TODO: Make this a virtual method, it should be one,
diff --git a/headers/os/interface/SeparatorView.h
b/headers/os/interface/SeparatorView.h
index 86fb3bb..4bed93c 100644
--- a/headers/os/interface/SeparatorView.h
+++ b/headers/os/interface/SeparatorView.h
@@ -13,34 +13,30 @@
class BSeparatorView : public BView {
public:
-
BSeparatorView(enum orientation orientation,
+
BSeparatorView(orientation orientation,
border_style border = B_PLAIN_BORDER);
BSeparatorView(const char* name,
const
char* label,
- enum
orientation orientation
-
= B_HORIZONTAL,
+
orientation orientation = B_HORIZONTAL,
border_style border = B_FANCY_BORDER,
const
BAlignment& alignment
= BAlignment(B_ALIGN_HORIZONTAL_CENTER,
B_ALIGN_VERTICAL_CENTER));
BSeparatorView(const char* name,
BView*
labelView,
- enum
orientation orientation
-
= B_HORIZONTAL,
+
orientation orientation = B_HORIZONTAL,
border_style border = B_FANCY_BORDER,
const
BAlignment& alignment
= BAlignment(B_ALIGN_HORIZONTAL_CENTER,
B_ALIGN_VERTICAL_CENTER));
BSeparatorView(const char* label = NULL,
- enum
orientation orientation
-
= B_HORIZONTAL,
+
orientation orientation = B_HORIZONTAL,
border_style border = B_FANCY_BORDER,
const
BAlignment& alignment
= BAlignment(B_ALIGN_HORIZONTAL_CENTER,
B_ALIGN_VERTICAL_CENTER));
BSeparatorView(BView* labelView,
- enum
orientation orientation
-
= B_HORIZONTAL,
+
orientation orientation = B_HORIZONTAL,
border_style border = B_FANCY_BORDER,
const
BAlignment& alignment
= BAlignment(B_ALIGN_HORIZONTAL_CENTER,
@@ -61,7 +57,7 @@ public:
virtual BSize MaxSize();
virtual BSize PreferredSize();
- void SetOrientation(enum
orientation orientation);
+ void
SetOrientation(orientation orientation);
void SetAlignment(const
BAlignment& aligment);
void
SetBorderStyle(border_style border);
@@ -88,7 +84,7 @@ private:
private:
void _Init(const char*
label, BView* labelView,
- enum
orientation orientation,
+
orientation orientation,
BAlignment alignment, border_style border);
float _BorderSize() const;
diff --git a/headers/os/interface/SplitLayoutBuilder.h
b/headers/os/interface/SplitLayoutBuilder.h
index a10f1d6..9b4566d 100644
--- a/headers/os/interface/SplitLayoutBuilder.h
+++ b/headers/os/interface/SplitLayoutBuilder.h
@@ -10,7 +10,7 @@
class BSplitLayoutBuilder {
public:
BSplitLayoutBuilder(
- enum
orientation orientation = B_HORIZONTAL,
+
orientation orientation = B_HORIZONTAL,
float
spacing = B_USE_DEFAULT_SPACING);
BSplitLayoutBuilder(BSplitView* view);
diff --git a/headers/os/interface/SplitView.h b/headers/os/interface/SplitView.h
index a6fd491..c4d3dd5 100644
--- a/headers/os/interface/SplitView.h
+++ b/headers/os/interface/SplitView.h
@@ -13,8 +13,7 @@ class BSplitLayout;
class BSplitView : public BView {
public:
BSplitView(
- enum
orientation orientation
-
= B_HORIZONTAL,
+
orientation orientation = B_HORIZONTAL,
float
spacing = B_USE_DEFAULT_SPACING);
BSplitView(BMessage* from);
virtual ~BSplitView();
@@ -30,7 +29,7 @@ public:
void SetSpacing(float
spacing);
orientation Orientation() const;
- void SetOrientation(enum
orientation orientation);
+ void
SetOrientation(orientation orientation);
float SplitterSize() const;
void SetSplitterSize(float
size);
@@ -86,7 +85,7 @@ protected:
virtual void DrawSplitter(BRect frame,
const
BRect& updateRect,
- enum
orientation orientation,
+
orientation orientation,
bool
pressed);
private:
@@ -109,7 +108,7 @@ private:
static void _DrawDefaultSplitter(BView*
view, BRect frame,
const
BRect& updateRect,
- enum
orientation orientation,
+
orientation orientation,
bool
pressed);
private:
diff --git a/headers/os/interface/TwoDimensionalLayout.h
b/headers/os/interface/TwoDimensionalLayout.h
index 02543c1..291b691 100644
--- a/headers/os/interface/TwoDimensionalLayout.h
+++ b/headers/os/interface/TwoDimensionalLayout.h
@@ -25,7 +25,7 @@ public:
float*
bottom) const;
void
AlignLayoutWith(BTwoDimensionalLayout* other,
- enum
orientation orientation);
+
orientation orientation);
virtual BSize BaseMinSize();
virtual BSize BaseMaxSize();
@@ -72,14 +72,14 @@ protected:
float*
preferredHeight);
BSize SubtractInsets(BSize
size);
- virtual void PrepareItems(enum orientation
orientation);
+ virtual void PrepareItems(orientation
orientation);
virtual bool HasMultiColumnItems();
virtual bool HasMultiRowItems();
virtual int32 InternalCountColumns() = 0;
virtual int32 InternalCountRows() = 0;
virtual void GetColumnRowConstraints(
- enum
orientation orientation,
+
orientation orientation,
int32
index,
ColumnRowConstraints* constraints) = 0;
virtual void GetItemDimensions(BLayoutItem*
item,
diff --git a/src/kits/interface/ChannelSlider.cpp
b/src/kits/interface/ChannelSlider.cpp
index 02e90a9..607ce55 100644
--- a/src/kits/interface/ChannelSlider.cpp
+++ b/src/kits/interface/ChannelSlider.cpp
@@ -83,7 +83,7 @@ BChannelSlider::BChannelSlider(BRect area, const char* name,
const char* label,
BChannelSlider::BChannelSlider(BRect area, const char* name, const char* label,
- BMessage* model, enum orientation orientation, int32 channels,
+ BMessage* model, orientation orientation, int32 channels,
uint32 resizeMode, uint32 flags)
: BChannelControl(area, name, label, model, channels, resizeMode, flags)
@@ -94,7 +94,7 @@ BChannelSlider::BChannelSlider(BRect area, const char* name,
const char* label,
BChannelSlider::BChannelSlider(const char* name, const char* label,
- BMessage* model, enum orientation orientation, int32 channels,
+ BMessage* model, orientation orientation, int32 channels,
uint32 flags)
: BChannelControl(name, label, model, channels, flags)
@@ -502,7 +502,7 @@ BChannelSlider::Orientation() const
void
-BChannelSlider::SetOrientation(enum orientation orientation)
+BChannelSlider::SetOrientation(orientation orientation)
{
bool isVertical = orientation == B_VERTICAL;
if (isVertical != fIsVertical) {
diff --git a/src/kits/interface/ControlLook.cpp
b/src/kits/interface/ControlLook.cpp
index ccb87cb..acb95ed 100644
--- a/src/kits/interface/ControlLook.cpp
+++ b/src/kits/interface/ControlLook.cpp
@@ -143,7 +143,7 @@ BControlLook::DrawButtonFrame(BView* view, BRect& rect,
void
BControlLook::DrawButtonBackground(BView* view, BRect& rect,
const BRect& updateRect, const rgb_color& base, uint32 flags,
- uint32 borders, enum orientation orientation)
+ uint32 borders, orientation orientation)
{
_DrawButtonBackground(view, rect, updateRect, 0.0f, 0.0f, 0.0f, 0.0f,
base, flags, borders, orientation);
@@ -153,7 +153,7 @@ BControlLook::DrawButtonBackground(BView* view, BRect& rect,
void
BControlLook::DrawButtonBackground(BView* view, BRect& rect,
const BRect& updateRect, float radius, const rgb_color& base, uint32
flags,
- uint32 borders, enum orientation orientation)
+ uint32 borders, orientation orientation)
{
_DrawButtonBackground(view, rect, updateRect, radius, radius, radius,
radius, base, flags, borders, orientation);
@@ -164,7 +164,7 @@ void
BControlLook::DrawButtonBackground(BView* view, BRect& rect,
const BRect& updateRect, float leftTopRadius, float rightTopRadius,
float leftBottomRadius, float rightBottomRadius, const rgb_color& base,
- uint32 flags, uint32 borders, enum orientation orientation)
+ uint32 flags, uint32 borders, orientation orientation)
{
_DrawButtonBackground(view, rect, updateRect, leftTopRadius,
rightTopRadius, leftBottomRadius, rightBottomRadius, base,
flags,
@@ -553,7 +553,7 @@ BControlLook::DrawRadioButton(BView* view, BRect& rect,
const BRect& updateRect,
void
BControlLook::DrawScrollBarBackground(BView* view, BRect& rect1, BRect& rect2,
const BRect& updateRect, const rgb_color& base, uint32 flags,
- enum orientation orientation)
+ orientation orientation)
{
DrawScrollBarBackground(view, rect1, updateRect, base, flags,
orientation);
DrawScrollBarBackground(view, rect2, updateRect, base, flags,
orientation);
@@ -563,7 +563,7 @@ BControlLook::DrawScrollBarBackground(BView* view, BRect&
rect1, BRect& rect2,
void
BControlLook::DrawScrollBarBackground(BView* view, BRect& rect,
const BRect& updateRect, const rgb_color& base, uint32 flags,
- enum orientation orientation)
+ orientation orientation)
{
if (!rect.IsValid() || !rect.Intersects(updateRect))
return;
@@ -818,7 +818,7 @@ BControlLook::SliderBarColor(const rgb_color& base)
void
BControlLook::DrawSliderBar(BView* view, BRect rect, const BRect& updateRect,
const rgb_color& base, rgb_color leftFillColor, rgb_color
rightFillColor,
- float sliderScale, uint32 flags, enum orientation orientation)
+ float sliderScale, uint32 flags, orientation orientation)
{
if (!rect.IsValid() || !rect.Intersects(updateRect))
return;
@@ -875,7 +875,7 @@ BControlLook::DrawSliderBar(BView* view, BRect rect, const
BRect& updateRect,
void
BControlLook::DrawSliderBar(BView* view, BRect rect, const BRect& updateRect,
const rgb_color& base, rgb_color fillColor, uint32 flags,
- enum orientation orientation)
+ orientation orientation)
{
if (!rect.IsValid() || !rect.Intersects(updateRect))
return;
@@ -1021,7 +1021,7 @@ BControlLook::DrawSliderBar(BView* view, BRect rect,
const BRect& updateRect,
void
BControlLook::DrawSliderThumb(BView* view, BRect& rect, const BRect&
updateRect,
- const rgb_color& base, uint32 flags, enum orientation orientation)
+ const rgb_color& base, uint32 flags, orientation orientation)
{
if (!rect.IsValid() || !rect.Intersects(updateRect))
return;
@@ -1106,7 +1106,7 @@ BControlLook::DrawSliderThumb(BView* view, BRect& rect,
const BRect& updateRect,
void
BControlLook::DrawSliderTriangle(BView* view, BRect& rect,
const BRect& updateRect, const rgb_color& base, uint32 flags,
- enum orientation orientation)
+ orientation orientation)
{
DrawSliderTriangle(view, rect, updateRect, base, base, flags,
orientation);
}
@@ -1115,7 +1115,7 @@ BControlLook::DrawSliderTriangle(BView* view, BRect& rect,
void
BControlLook::DrawSliderTriangle(BView* view, BRect& rect,
const BRect& updateRect, const rgb_color& base, const rgb_color& fill,
- uint32 flags, enum orientation orientation)
+ uint32 flags, orientation orientation)
{
if (!rect.IsValid() || !rect.Intersects(updateRect))
return;
@@ -1234,7 +1234,7 @@ BControlLook::DrawSliderTriangle(BView* view, BRect& rect,
void
BControlLook::DrawSliderHashMarks(BView* view, BRect& rect,
const BRect& updateRect, const rgb_color& base, int32 count,
- hash_mark_location location, uint32 flags, enum orientation orientation)
+ hash_mark_location location, uint32 flags, orientation orientation)
{
if (!rect.IsValid() || !rect.Intersects(updateRect))
return;
@@ -1482,7 +1482,7 @@ BControlLook::DrawInactiveTab(BView* view, BRect& rect,
const BRect& updateRect,
void
BControlLook::DrawSplitter(BView* view, BRect& rect, const BRect& updateRect,
- const rgb_color& base, enum orientation orientation, uint32 flags,
+ const rgb_color& base, orientation orientation, uint32 flags,
uint32 borders)
{
if (!rect.IsValid() || !rect.Intersects(updateRect))
@@ -2180,7 +2180,7 @@ void
BControlLook::_DrawButtonBackground(BView* view, BRect& rect,
const BRect& updateRect, float leftTopRadius, float rightTopRadius,
float leftBottomRadius, float rightBottomRadius, const rgb_color& base,
- uint32 flags, uint32 borders, enum orientation orientation)
+ uint32 flags, uint32 borders, orientation orientation)
{
if (!rect.IsValid() || !rect.Intersects(updateRect))
return;
@@ -2886,7 +2886,7 @@ BControlLook::_DrawRoundBarCorner(BView* view, BRect&
rect,
const rgb_color& frameLightColor, const rgb_color& frameShadowColor,
const rgb_color& fillLightColor, const rgb_color& fillShadowColor,
float leftInset, float topInset, float rightInset, float bottomInset,
- enum orientation orientation)
+ orientation orientation)
{
if (!rect.IsValid() || !rect.Intersects(updateRect))
return;
@@ -3102,7 +3102,7 @@ BControlLook::_BevelShadowColor(const rgb_color& base,
uint32 flags)
void
BControlLook::_FillGradient(BView* view, const BRect& rect,
const rgb_color& base, float topTint, float bottomTint,
- enum orientation orientation)
+ orientation orientation)
{
BGradientLinear gradient;
_MakeGradient(gradient, rect, base, topTint, bottomTint, orientation);
@@ -3113,7 +3113,7 @@ BControlLook::_FillGradient(BView* view, const BRect&
rect,
void
BControlLook::_FillGlossyGradient(BView* view, const BRect& rect,
const rgb_color& base, float topTint, float middle1Tint,
- float middle2Tint, float bottomTint, enum orientation orientation)
+ float middle2Tint, float bottomTint, orientation orientation)
{
BGradientLinear gradient;
_MakeGlossyGradient(gradient, rect, base, topTint, middle1Tint,
@@ -3125,7 +3125,7 @@ BControlLook::_FillGlossyGradient(BView* view, const
BRect& rect,
void
BControlLook::_MakeGradient(BGradientLinear& gradient, const BRect& rect,
const rgb_color& base, float topTint, float bottomTint,
- enum orientation orientation) const
+ orientation orientation) const
{
gradient.AddColor(tint_color(base, topTint), 0);
gradient.AddColor(tint_color(base, bottomTint), 255);
@@ -3141,7 +3141,7 @@ void
BControlLook::_MakeGlossyGradient(BGradientLinear& gradient, const BRect& rect,
const rgb_color& base, float topTint, float middle1Tint,
float middle2Tint, float bottomTint,
- enum orientation orientation) const
+ orientation orientation) const
{
gradient.AddColor(tint_color(base, topTint), 0);
gradient.AddColor(tint_color(base, middle1Tint), 132);
@@ -3157,7 +3157,7 @@ BControlLook::_MakeGlossyGradient(BGradientLinear&
gradient, const BRect& rect,
void
BControlLook::_MakeButtonGradient(BGradientLinear& gradient, BRect& rect,
- const rgb_color& base, uint32 flags, enum orientation orientation) const
+ const rgb_color& base, uint32 flags, orientation orientation) const
{
float topTint = 0.49;
float middleTint1 = 0.62;
diff --git a/src/kits/interface/GridLayout.cpp
b/src/kits/interface/GridLayout.cpp
index 785835c..03577d6 100644
--- a/src/kits/interface/GridLayout.cpp
+++ b/src/kits/interface/GridLayout.cpp
@@ -665,7 +665,7 @@ BGridLayout::InternalCountRows()
void
-BGridLayout::GetColumnRowConstraints(enum orientation orientation, int32 index,
+BGridLayout::GetColumnRowConstraints(orientation orientation, int32 index,
ColumnRowConstraints* constraints)
{
if (orientation == B_HORIZONTAL) {
diff --git a/src/kits/interface/GroupLayout.cpp
b/src/kits/interface/GroupLayout.cpp
index 8c18843..c300152 100644
--- a/src/kits/interface/GroupLayout.cpp
+++ b/src/kits/interface/GroupLayout.cpp
@@ -33,7 +33,7 @@ struct BGroupLayout::ItemLayoutData {
};
-BGroupLayout::BGroupLayout(enum orientation orientation, float spacing)
+BGroupLayout::BGroupLayout(orientation orientation, float spacing)
:
BTwoDimensionalLayout(),
fOrientation(orientation)
@@ -85,7 +85,7 @@ BGroupLayout::Orientation() const
void
-BGroupLayout::SetOrientation(enum orientation orientation)
+BGroupLayout::SetOrientation(orientation orientation)
{
if (orientation != fOrientation) {
fOrientation = orientation;
@@ -262,7 +262,7 @@ BGroupLayout::ItemRemoved(BLayoutItem* item, int32
fromIndex)
void
-BGroupLayout::PrepareItems(enum orientation orientation)
+BGroupLayout::PrepareItems(orientation orientation)
{
// filter the visible items
fVisibleItems.MakeEmpty();
@@ -290,7 +290,7 @@ BGroupLayout::InternalCountRows()
void
-BGroupLayout::GetColumnRowConstraints(enum orientation orientation, int32
index,
+BGroupLayout::GetColumnRowConstraints(orientation orientation, int32 index,
ColumnRowConstraints* constraints)
{
if (index >= 0 && index < fVisibleItems.CountItems()) {
diff --git a/src/kits/interface/GroupLayoutBuilder.cpp
b/src/kits/interface/GroupLayoutBuilder.cpp
index 442b43f..91231f3 100644
--- a/src/kits/interface/GroupLayoutBuilder.cpp
+++ b/src/kits/interface/GroupLayoutBuilder.cpp
@@ -14,7 +14,7 @@ using std::nothrow;
// constructor
-BGroupLayoutBuilder::BGroupLayoutBuilder(enum orientation orientation,
+BGroupLayoutBuilder::BGroupLayoutBuilder(orientation orientation,
float spacing)
: fRootLayout((new BGroupView(orientation, spacing))->GroupLayout())
{
@@ -118,8 +118,8 @@ BGroupLayoutBuilder::Add(BLayoutItem* item, float weight)
// AddGroup
BGroupLayoutBuilder&
-BGroupLayoutBuilder::AddGroup(enum orientation orientation,
- float spacing, float weight)
+BGroupLayoutBuilder::AddGroup(orientation orientation, float spacing,
+ float weight)
{
if (BGroupLayout* layout = TopLayout()) {
BGroupView* group = new(nothrow) BGroupView(orientation,
spacing);
diff --git a/src/kits/interface/GroupView.cpp b/src/kits/interface/GroupView.cpp
index efb71fe..39a534e 100644
--- a/src/kits/interface/GroupView.cpp
+++ b/src/kits/interface/GroupView.cpp
@@ -8,7 +8,7 @@
#include <GroupView.h>
-BGroupView::BGroupView(enum orientation orientation, float spacing)
+BGroupView::BGroupView(orientation orientation, float spacing)
:
BView(NULL, 0, new BGroupLayout(orientation, spacing))
{
@@ -16,8 +16,8 @@ BGroupView::BGroupView(enum orientation orientation, float
spacing)
}
-BGroupView::BGroupView(const char* name, enum orientation orientation,
- float spacing)
+BGroupView::BGroupView(const char* name, orientation orientation,
+ float spacing)
:
BView(name, 0, new BGroupLayout(orientation, spacing))
{
diff --git a/src/kits/interface/ScrollBar.cpp b/src/kits/interface/ScrollBar.cpp
index faafab4..d15e0fe 100644
--- a/src/kits/interface/ScrollBar.cpp
+++ b/src/kits/interface/ScrollBar.cpp
@@ -595,7 +595,7 @@ BScrollBar::Target() const
void
-BScrollBar::SetOrientation(enum orientation orientation)
+BScrollBar::SetOrientation(orientation orientation)
{
if (fOrientation == orientation)
return;
diff --git a/src/kits/interface/SeparatorView.cpp
b/src/kits/interface/SeparatorView.cpp
index a464f58..2c24a6a 100644
--- a/src/kits/interface/SeparatorView.cpp
+++ b/src/kits/interface/SeparatorView.cpp
@@ -24,8 +24,7 @@ static const float kMinBorderLength = 5.0f;
// TODO: More testing, especially archiving.
-BSeparatorView::BSeparatorView(enum orientation orientation,
- border_style border)
+BSeparatorView::BSeparatorView(orientation orientation, border_style border)
:
BView(NULL, B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE)
{
@@ -35,7 +34,7 @@ BSeparatorView::BSeparatorView(enum orientation orientation,
BSeparatorView::BSeparatorView(const char* name, const char* label,
- enum orientation orientation, border_style border,
+ orientation orientation, border_style border,
const BAlignment& alignment)
:
BView(name, B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE)
@@ -45,7 +44,7 @@ BSeparatorView::BSeparatorView(const char* name, const char*
label,
BSeparatorView::BSeparatorView(const char* name, BView* labelView,
- enum orientation orientation, border_style border,
+ orientation orientation, border_style border,
const BAlignment& alignment)
:
BView(name, B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE)
@@ -55,7 +54,7 @@ BSeparatorView::BSeparatorView(const char* name, BView*
labelView,
BSeparatorView::BSeparatorView(const char* label,
- enum orientation orientation, border_style border,
+ orientation orientation, border_style border,
const BAlignment& alignment)
:
BView("", B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE)
@@ -65,7 +64,7 @@ BSeparatorView::BSeparatorView(const char* label,
BSeparatorView::BSeparatorView(BView* labelView,
- enum orientation orientation, border_style border,
+ orientation orientation, border_style border,
const BAlignment& alignment)
:
BView("", B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE)
@@ -331,7 +330,7 @@ BSeparatorView::PreferredSize()
void
-BSeparatorView::SetOrientation(enum orientation orientation)
+BSeparatorView::SetOrientation(orientation orientation)
{
if (orientation == fOrientation)
return;
@@ -437,7 +436,7 @@ BSeparatorView::DoLayout()
void
BSeparatorView::_Init(const char* label, BView* labelView,
- enum orientation orientation, BAlignment alignment, border_style border)
+ orientation orientation, BAlignment alignment, border_style border)
{
fLabel = "";
fLabelView = NULL;
diff --git a/src/kits/interface/SplitLayout.cpp
b/src/kits/interface/SplitLayout.cpp
index c1094cd..48537c2 100644
--- a/src/kits/interface/SplitLayout.cpp
+++ b/src/kits/interface/SplitLayout.cpp
@@ -153,8 +153,7 @@ private:
// #pragma mark -
-BSplitLayout::BSplitLayout(enum orientation orientation,
- float spacing)
+BSplitLayout::BSplitLayout(orientation orientation, float spacing)
:
fOrientation(orientation),
fLeftInset(0),
@@ -319,7 +318,7 @@ BSplitLayout::Orientation() const
void
-BSplitLayout::SetOrientation(enum orientation orientation)
+BSplitLayout::SetOrientation(orientation orientation)
{
if (orientation != fOrientation) {
fOrientation = orientation;
diff --git a/src/kits/interface/SplitLayout.h b/src/kits/interface/SplitLayout.h
index e2256ec..a570bf1 100644
--- a/src/kits/interface/SplitLayout.h
+++ b/src/kits/interface/SplitLayout.h
@@ -23,7 +23,7 @@ using BPrivate::Layout::LayoutInfo;
class BSplitLayout : public BAbstractLayout {
public:
-
BSplitLayout(enum orientation orientation,
+
BSplitLayout(orientation orientation,
float
spacing = 0.0f);
BSplitLayout(BMessage* from);
virtual ~BSplitLayout();
@@ -37,7 +37,7 @@ public:
void SetSpacing(float
spacing);
orientation Orientation() const;
- void SetOrientation(enum
orientation orientation);
+ void
SetOrientation(orientation orientation);
float SplitterSize() const;
void SetSplitterSize(float
size);
diff --git a/src/kits/interface/SplitLayoutBuilder.cpp
b/src/kits/interface/SplitLayoutBuilder.cpp
index b778d7c..518bfc9 100644
--- a/src/kits/interface/SplitLayoutBuilder.cpp
+++ b/src/kits/interface/SplitLayoutBuilder.cpp
@@ -12,7 +12,7 @@ using std::nothrow;
// constructor
-BSplitLayoutBuilder::BSplitLayoutBuilder(enum orientation orientation,
+BSplitLayoutBuilder::BSplitLayoutBuilder(orientation orientation,
float spacing)
: fView(new BSplitView(orientation, spacing))
{
diff --git a/src/kits/interface/SplitView.cpp b/src/kits/interface/SplitView.cpp
index 65b998e..6a174d5 100644
--- a/src/kits/interface/SplitView.cpp
+++ b/src/kits/interface/SplitView.cpp
@@ -14,7 +14,7 @@
#include "SplitLayout.h"
-BSplitView::BSplitView(enum orientation orientation, float spacing)
+BSplitView::BSplitView(orientation orientation, float spacing)
:
BView(NULL,
B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE |
B_INVALIDATE_AFTER_LAYOUT,
@@ -97,7 +97,7 @@ BSplitView::Orientation() const
void
-BSplitView::SetOrientation(enum orientation orientation)
+BSplitView::SetOrientation(orientation orientation)
{
fSplitLayout->SetOrientation(orientation);
}
@@ -358,7 +358,7 @@ BSplitView::Instantiate(BMessage* from)
void
BSplitView::DrawSplitter(BRect frame, const BRect& updateRect,
- enum orientation orientation, bool pressed)
+ orientation orientation, bool pressed)
{
_DrawDefaultSplitter(this, frame, updateRect, orientation, pressed);
}
@@ -366,7 +366,7 @@ BSplitView::DrawSplitter(BRect frame, const BRect&
updateRect,
void
BSplitView::_DrawDefaultSplitter(BView* view, BRect frame,
- const BRect& updateRect, enum orientation orientation, bool pressed)
+ const BRect& updateRect, orientation orientation, bool pressed)
{
uint32 flags = pressed ? BControlLook::B_ACTIVATED : 0;
be_control_look->DrawSplitter(view, frame, updateRect,
view->ViewColor(),
diff --git a/src/kits/interface/TwoDimensionalLayout.cpp
b/src/kits/interface/TwoDimensionalLayout.cpp
index 6c71fbd..c8545fe 100644
--- a/src/kits/interface/TwoDimensionalLayout.cpp
+++ b/src/kits/interface/TwoDimensionalLayout.cpp
@@ -56,7 +56,7 @@
// CompoundLayouter
class BTwoDimensionalLayout::CompoundLayouter : public BReferenceable {
public:
-
CompoundLayouter(enum orientation orientation);
+
CompoundLayouter(orientation orientation);
virtual ~CompoundLayouter();
orientation Orientation();
@@ -167,7 +167,7 @@ public:
float*
preferredHeight);
void
AlignWith(LocalLayouter* other,
- enum
orientation orientation);
+
orientation orientation);
// Archiving stuff
status_t
AddAlignedLayoutsToArchive(BArchiver* archiver);
@@ -203,7 +203,7 @@ public:
void SetCompoundLayouter(
CompoundLayouter* compoundLayouter,
- enum
orientation orientation);
+
orientation orientation);
void
InternalInvalidateLayout(
CompoundLayouter* compoundLayouter);
@@ -336,7 +336,7 @@ BTwoDimensionalLayout::GetInsets(float* left, float* top,
float* right,
void
BTwoDimensionalLayout::AlignLayoutWith(BTwoDimensionalLayout* other,
- enum orientation orientation)
+ orientation orientation)
{
if (!other || other == this)
return;
@@ -573,7 +573,7 @@ BTwoDimensionalLayout::SubtractInsets(BSize size)
void
-BTwoDimensionalLayout::PrepareItems(enum orientation orientation)
+BTwoDimensionalLayout::PrepareItems(orientation orientation)
{
}
@@ -603,7 +603,7 @@ BTwoDimensionalLayout::_ValidateMinMax()
BTwoDimensionalLayout::CompoundLayouter::CompoundLayouter(
- enum orientation orientation)
+ orientation orientation)
:
fLayouter(NULL),
fLayoutInfo(NULL),
@@ -1154,7 +1154,7 @@
BTwoDimensionalLayout::LocalLayouter::InternalGetHeightForWidth(float width,
void
BTwoDimensionalLayout::LocalLayouter::AlignWith(LocalLayouter* other,
- enum orientation orientation)
+ orientation orientation)
{
if (orientation == B_HORIZONTAL)
other->fHLayouter->AbsorbCompoundLayouter(fHLayouter);
@@ -1365,7 +1365,7 @@
BTwoDimensionalLayout::LocalLayouter::SetHeightForWidthConstraintsAdded(
void
BTwoDimensionalLayout::LocalLayouter::SetCompoundLayouter(
- CompoundLayouter* compoundLayouter, enum orientation orientation)
+ CompoundLayouter* compoundLayouter, orientation orientation)
{
CompoundLayouter* oldCompoundLayouter;
if (orientation == B_HORIZONTAL) {
############################################################################
Revision: hrev45833
Commit: 080bf8fe19351c11230363077b3b6e1a00192c58
URL: http://cgit.haiku-os.org/haiku/commit/?id=080bf8f
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Mon Jul 8 23:02:13 2013 UTC
Fix rest of warnings, doxygen now runs cleanly.
The BTextView::SetText() methods were included twice, update the first and
remove the second.
----------------------------------------------------------------------------
diff --git a/docs/user/interface/Layout.dox b/docs/user/interface/Layout.dox
index 627c8eb..0b322ca 100644
--- a/docs/user/interface/Layout.dox
+++ b/docs/user/interface/Layout.dox
@@ -528,10 +528,12 @@ topLayout->AddItem(nestedLayoutWithView);
/*!
- \fn void BLayout::LayoutInvalidated() = 0
+ \fn void BLayout::LayoutInvalidated(bool children)
Hook method called when this layout becomes invalid. This is a good
place
to clear any caches your object might hold.
+
+ \param children Whether or not child layouts have also been invalidated.
*/
diff --git a/docs/user/interface/ListItem.dox b/docs/user/interface/ListItem.dox
index 0c6319e..9a2692f 100644
--- a/docs/user/interface/ListItem.dox
+++ b/docs/user/interface/ListItem.dox
@@ -67,7 +67,7 @@
/*!
- \fn void DrawItem(BView* owner, BRect frame, bool complete)
+ \fn void BListItem::DrawItem(BView* owner, BRect frame, bool complete)
\brief Hook method called when the item is drawn.
\param owner The view that the list item is a child of.
diff --git a/docs/user/interface/ListView.dox b/docs/user/interface/ListView.dox
index 69475e3..730b5d8 100644
--- a/docs/user/interface/ListView.dox
+++ b/docs/user/interface/ListView.dox
@@ -268,17 +268,6 @@
/*!
- \fn void BListView::KeyUp(const char* bytes, int32 numBytes)
- \brief Hook method that is called when a keyboard key is released.
-
- \param bytes The \a bytes representing the keys released.
- \param numBytes The size of \a bytes.
-
- \see BView::KeyUp()
-*/
-
-
-/*!
\fn void BListView::MouseDown(BPoint point)
\brief Hook method that is called when a mouse button is pushed down
while
the cursor is contained in the view.
@@ -475,7 +464,7 @@
/*!
\fn bool BListView::AddList(BList* list)
- \fn Add a \a list of list items to the end of the list view.
+ \brief Add a \a list of list items to the end of the list view.
\param list The \a list of list items to add.
@@ -698,7 +687,7 @@
/*!
- \fn void BListView::DoForEach(bool (*func)(BListItem*))
+ \fn void BListView::DoForEach(bool (*func)(BListItem* item))
\brief Calls the specified function on each item in the list.
The \a func is called on the items in order starting with the item at
index 0
@@ -712,7 +701,8 @@
/*!
- \fn void BListView::DoForEach(bool (*func)(BListItem*, void*), void*
arg)
+ \fn void BListView::DoForEach(bool (*func)(BListItem* item, void* arg),
+ void* arg)
\brief Calls the specified function on each item in the list.
The \a func is called on the items in order starting with the item at
index 0
@@ -723,6 +713,7 @@
as the second argument.
\param func The function to call on each item.
+ \param arg The second argument of the function.
*/
diff --git a/docs/user/interface/TextView.dox b/docs/user/interface/TextView.dox
index 67a5626..d504f99 100644
--- a/docs/user/interface/TextView.dox
+++ b/docs/user/interface/TextView.dox
@@ -398,7 +398,8 @@
set in the BTextView with the font and color formats set by \a
runs.
\param text The text to set.
- \param runs The text styling to set, can be \c NULL.
+ \param runs Set the font and color formats of the new text if provided.
Only
+ applies if the BTextView permits multiple character formats.
*/
@@ -413,8 +414,9 @@
to 0 to clear the text from the BTextView.
\param text The text to set.
- \param length The number of bytes of text to set.
- \param runs The text styling to use, can be \c NULL.
+ \param length The maximum number of bytes of \a text to use.
+ \param runs Set the font and color formats of the new text if provided.
Only
+ applies if the BTextView permits multiple character formats.
*/
@@ -428,7 +430,8 @@
\param file The file to set the text from.
\param offset The position in the file to start reading text.
\param length The number of bytes of text to read from the file.
- \param runs The text styling to use, can be \c NULL.
+ \param runs Set the font and color formats of the new text if provided.
Only
+ applies if the BTextView permits multiple character formats.
*/
@@ -489,25 +492,6 @@
*/
-//! @{
-
-
-/*!
- \fn void BTextView::SetText(const char* text, const text_run_array*
runs)
-*/
-
-
-/*!
- \fn void BTextView::SetText(const char* text, int32 length,
- const text_run_array* runs)
-*/
-
-
-/*!
- \fn void BTextView::SetText(BFile* file, int32 offset, int32 length,
- const text_run_array* runs)
-*/
-
//! @}
Other related posts:
- » [haiku-commits] haiku: hrev45833 - headers/os/interface src/kits/interface docs/user/interface - jscipione
