Fix gcc2 build + warnings.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38885 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler
2010-10-04 19:10:22 +00:00
parent 58cde5cff7
commit 6751b48834
3 changed files with 18 additions and 18 deletions
+8 -8
View File
@@ -86,14 +86,14 @@ public:
void SetShrinkPenalties(BSize shrink); void SetShrinkPenalties(BSize shrink);
void SetGrowPenalties(BSize grow); void SetGrowPenalties(BSize grow);
int32 LeftInset() const; float LeftInset() const;
int32 TopInset() const; float TopInset() const;
int32 RightInset() const; float RightInset() const;
int32 BottomInset() const; float BottomInset() const;
void SetLeftInset(int32 left); void SetLeftInset(float left);
void SetTopInset(int32 top); void SetTopInset(float top);
void SetRightInset(int32 right); void SetRightInset(float right);
void SetBottomInset(int32 bottom); void SetBottomInset(float bottom);
operator BString() const; operator BString() const;
void GetString(BString& string) const; void GetString(BString& string) const;
+2 -2
View File
@@ -277,7 +277,7 @@ BALMLayout::_ParseGroupItem(GroupItem& item, XTab* left, YTab* top, XTab* right,
else { else {
for (unsigned int i = 0; i < item.GroupItems().size(); i++) { for (unsigned int i = 0; i < item.GroupItems().size(); i++) {
GroupItem& current = const_cast<GroupItem&>( GroupItem& current = const_cast<GroupItem&>(
item.GroupItems().at(i)); item.GroupItems()[i]);
if (item.Orientation() == B_HORIZONTAL) { if (item.Orientation() == B_HORIZONTAL) {
XTab* r = (i == item.GroupItems().size() - 1) ? right XTab* r = (i == item.GroupItems().size() - 1) ? right
: AddXTab(); : AddXTab();
@@ -417,7 +417,7 @@ bool
BALMLayout::AddItem(int32 index, BLayoutItem* item) BALMLayout::AddItem(int32 index, BLayoutItem* item)
{ {
if (!item) if (!item)
return NULL; return false;
// simply add the item at the upper right corner of the previous item // simply add the item at the upper right corner of the previous item
// TODO maybe find a more elegant solution // TODO maybe find a more elegant solution
+8 -8
View File
@@ -368,7 +368,7 @@ Area::SetContentAspectRatio(double ratio)
/** /**
* Gets left inset between area and its content. * Gets left inset between area and its content.
*/ */
int32 float
Area::LeftInset() const Area::LeftInset() const
{ {
if (fTopLeftInset.IsWidthSet()) if (fTopLeftInset.IsWidthSet())
@@ -384,7 +384,7 @@ Area::LeftInset() const
/** /**
* Gets top inset between area and its content. * Gets top inset between area and its content.
*/ */
int32 float
Area::TopInset() const Area::TopInset() const
{ {
if (fTopLeftInset.IsHeightSet()) if (fTopLeftInset.IsHeightSet())
@@ -400,7 +400,7 @@ Area::TopInset() const
/** /**
* Gets right inset between area and its content. * Gets right inset between area and its content.
*/ */
int32 float
Area::RightInset() const Area::RightInset() const
{ {
if (fRightBottomInset.IsWidthSet()) if (fRightBottomInset.IsWidthSet())
@@ -416,7 +416,7 @@ Area::RightInset() const
/** /**
* Gets bottom inset between area and its content. * Gets bottom inset between area and its content.
*/ */
int32 float
Area::BottomInset() const Area::BottomInset() const
{ {
if (fRightBottomInset.IsHeightSet()) if (fRightBottomInset.IsHeightSet())
@@ -433,7 +433,7 @@ Area::BottomInset() const
* Sets left inset between area and its content. * Sets left inset between area and its content.
*/ */
void void
Area::SetLeftInset(int32 left) Area::SetLeftInset(float left)
{ {
fTopLeftInset.width = left; fTopLeftInset.width = left;
fLayoutItem->Layout()->InvalidateLayout(); fLayoutItem->Layout()->InvalidateLayout();
@@ -444,7 +444,7 @@ Area::SetLeftInset(int32 left)
* Sets top inset between area and its content. * Sets top inset between area and its content.
*/ */
void void
Area::SetTopInset(int32 top) Area::SetTopInset(float top)
{ {
fTopLeftInset.height = top; fTopLeftInset.height = top;
fLayoutItem->Layout()->InvalidateLayout(); fLayoutItem->Layout()->InvalidateLayout();
@@ -455,7 +455,7 @@ Area::SetTopInset(int32 top)
* Sets right inset between area and its content. * Sets right inset between area and its content.
*/ */
void void
Area::SetRightInset(int32 right) Area::SetRightInset(float right)
{ {
fRightBottomInset.width = right; fRightBottomInset.width = right;
fLayoutItem->Layout()->InvalidateLayout(); fLayoutItem->Layout()->InvalidateLayout();
@@ -466,7 +466,7 @@ Area::SetRightInset(int32 right)
* Sets bottom inset between area and its content. * Sets bottom inset between area and its content.
*/ */
void void
Area::SetBottomInset(int32 bottom) Area::SetBottomInset(float bottom)
{ {
fRightBottomInset.height = bottom; fRightBottomInset.height = bottom;
fLayoutItem->Layout()->InvalidateLayout(); fLayoutItem->Layout()->InvalidateLayout();