From c7abe18debba8f943dc685dc3fe91c81ca698def Mon Sep 17 00:00:00 2001 From: troy Date: Fri, 22 May 1998 04:03:14 +0000 Subject: [PATCH] Changed the nsBandTrapezoid::State enum values to conform to the coding standard git-svn-id: svn://10.0.0.236/trunk@2164 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/public/nsISpaceManager.h | 2 +- mozilla/layout/base/src/nsContainerFrame.cpp | 4 ++-- mozilla/layout/base/src/nsSpaceManager.cpp | 12 ++++++------ mozilla/layout/generic/nsBlockFrame.cpp | 4 ++-- mozilla/layout/generic/nsBlockReflowState.cpp | 4 ++-- mozilla/layout/generic/nsBlockReflowState.h | 4 ++-- mozilla/layout/generic/nsSpaceManager.cpp | 12 ++++++------ mozilla/layout/html/base/src/nsBlockFrame.cpp | 4 ++-- mozilla/layout/html/base/src/nsBlockReflowState.cpp | 4 ++-- mozilla/layout/html/base/src/nsBlockReflowState.h | 4 ++-- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/mozilla/layout/base/public/nsISpaceManager.h b/mozilla/layout/base/public/nsISpaceManager.h index 597b89026e0..ce9650e6536 100644 --- a/mozilla/layout/base/public/nsISpaceManager.h +++ b/mozilla/layout/base/public/nsISpaceManager.h @@ -41,7 +41,7 @@ struct nsSize; * */ struct nsBandTrapezoid { - enum State {smAvailable, smOccupied, smOccupiedMultiple}; + enum State {Available, Occupied, OccupiedMultiple}; nscoord yTop, yBottom; // top and bottom y-coordinates nscoord xTopLeft, xBottomLeft; // left edge x-coordinates diff --git a/mozilla/layout/base/src/nsContainerFrame.cpp b/mozilla/layout/base/src/nsContainerFrame.cpp index 9ee173b525c..c8a51d7c3c7 100644 --- a/mozilla/layout/base/src/nsContainerFrame.cpp +++ b/mozilla/layout/base/src/nsContainerFrame.cpp @@ -506,7 +506,7 @@ nsReflowStatus nsContainerFrame::ReflowChild(nsIFrame* aKidFrame, for (i = 0; i < bandData.count; i++) { nsBandTrapezoid* trapezoid = &trapezoids[i]; - if (trapezoid->state != nsBandTrapezoid::smAvailable) { + if (trapezoid->state != nsBandTrapezoid::Available) { nsStyleDisplay* display; // XXX Handle the case of multiple frames @@ -522,7 +522,7 @@ nsReflowStatus nsContainerFrame::ReflowChild(nsIFrame* aKidFrame, } } - if (nsBandTrapezoid::smAvailable == trapezoid->state) { + if (nsBandTrapezoid::Available == trapezoid->state) { // The trapezoid is available trapezoid->GetRect(availBand); } else { diff --git a/mozilla/layout/base/src/nsSpaceManager.cpp b/mozilla/layout/base/src/nsSpaceManager.cpp index 7f73630612d..dceb2a82c55 100644 --- a/mozilla/layout/base/src/nsSpaceManager.cpp +++ b/mozilla/layout/base/src/nsSpaceManager.cpp @@ -171,7 +171,7 @@ PRInt32 SpaceManager::GetBandAvailableSpace(const BandRect* aBand, if (aBand->left > left) { // The rect is to the right of our current left coordinate, so we've // found some available space - trapezoid->state = nsBandTrapezoid::smAvailable; + trapezoid->state = nsBandTrapezoid::Available; trapezoid->frame = nsnull; // Assign the trapezoid a rectangular shape. The trapezoid must be in the @@ -185,11 +185,11 @@ PRInt32 SpaceManager::GetBandAvailableSpace(const BandRect* aBand, // The rect represents unavailable space, so add another trapezoid if (1 == aBand->numFrames) { - trapezoid->state = nsBandTrapezoid::smOccupied; + trapezoid->state = nsBandTrapezoid::Occupied; trapezoid->frame = aBand->frame; } else { NS_ASSERTION(aBand->numFrames > 1, "unexpected frame count"); - trapezoid->state = nsBandTrapezoid::smOccupiedMultiple; + trapezoid->state = nsBandTrapezoid::OccupiedMultiple; trapezoid->frames = aBand->frames; } @@ -218,7 +218,7 @@ PRInt32 SpaceManager::GetBandAvailableSpace(const BandRect* aBand, // No more rects left in the band. If we haven't yet reached the right edge, // then all the remaining space is available if (left < rightEdge) { - trapezoid->state = nsBandTrapezoid::smAvailable; + trapezoid->state = nsBandTrapezoid::Available; trapezoid->frame = nsnull; // Assign the trapezoid a rectangular shape. The trapezoid must be in the @@ -243,7 +243,7 @@ PRInt32 SpaceManager::GetBandData(nscoord aYOffset, // All the requested space is available aBandData.count = 1; aBandData.trapezoids[0] = nsRect(0, aYOffset, aMaxSize.width, aMaxSize.height); - aBandData.trapezoids[0].state = nsBandTrapezoid::smAvailable; + aBandData.trapezoids[0].state = nsBandTrapezoid::Available; aBandData.trapezoids[0].frame = nsnull; } else { // Find the first band that contains the y-offset or is below the y-offset @@ -258,7 +258,7 @@ PRInt32 SpaceManager::GetBandData(nscoord aYOffset, aBandData.count = 1; aBandData.trapezoids[0] = nsRect(0, aYOffset, aMaxSize.width, PR_MIN(band->top - y, aMaxSize.height)); - aBandData.trapezoids[0].state = nsBandTrapezoid::smAvailable; + aBandData.trapezoids[0].state = nsBandTrapezoid::Available; aBandData.trapezoids[0].frame = nsnull; break; } else if (y < band->bottom) { diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index 46dbffa02db..d7659f09221 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -55,7 +55,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() for (i = 0; i < count; i++) { nsBandTrapezoid* trapezoid = &data[i]; - if (trapezoid->state != nsBandTrapezoid::smAvailable) { + if (trapezoid->state != nsBandTrapezoid::Available) { nsStyleDisplay* display; // XXX Handle the case of multiple frames @@ -71,7 +71,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() } } - if (nsBandTrapezoid::smAvailable == trapezoid->state) { + if (nsBandTrapezoid::Available == trapezoid->state) { // The trapezoid is available trapezoid->GetRect(availSpace); } else { diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp index 46dbffa02db..d7659f09221 100644 --- a/mozilla/layout/generic/nsBlockReflowState.cpp +++ b/mozilla/layout/generic/nsBlockReflowState.cpp @@ -55,7 +55,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() for (i = 0; i < count; i++) { nsBandTrapezoid* trapezoid = &data[i]; - if (trapezoid->state != nsBandTrapezoid::smAvailable) { + if (trapezoid->state != nsBandTrapezoid::Available) { nsStyleDisplay* display; // XXX Handle the case of multiple frames @@ -71,7 +71,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() } } - if (nsBandTrapezoid::smAvailable == trapezoid->state) { + if (nsBandTrapezoid::Available == trapezoid->state) { // The trapezoid is available trapezoid->GetRect(availSpace); } else { diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h index 46dbffa02db..d7659f09221 100644 --- a/mozilla/layout/generic/nsBlockReflowState.h +++ b/mozilla/layout/generic/nsBlockReflowState.h @@ -55,7 +55,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() for (i = 0; i < count; i++) { nsBandTrapezoid* trapezoid = &data[i]; - if (trapezoid->state != nsBandTrapezoid::smAvailable) { + if (trapezoid->state != nsBandTrapezoid::Available) { nsStyleDisplay* display; // XXX Handle the case of multiple frames @@ -71,7 +71,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() } } - if (nsBandTrapezoid::smAvailable == trapezoid->state) { + if (nsBandTrapezoid::Available == trapezoid->state) { // The trapezoid is available trapezoid->GetRect(availSpace); } else { diff --git a/mozilla/layout/generic/nsSpaceManager.cpp b/mozilla/layout/generic/nsSpaceManager.cpp index 7f73630612d..dceb2a82c55 100644 --- a/mozilla/layout/generic/nsSpaceManager.cpp +++ b/mozilla/layout/generic/nsSpaceManager.cpp @@ -171,7 +171,7 @@ PRInt32 SpaceManager::GetBandAvailableSpace(const BandRect* aBand, if (aBand->left > left) { // The rect is to the right of our current left coordinate, so we've // found some available space - trapezoid->state = nsBandTrapezoid::smAvailable; + trapezoid->state = nsBandTrapezoid::Available; trapezoid->frame = nsnull; // Assign the trapezoid a rectangular shape. The trapezoid must be in the @@ -185,11 +185,11 @@ PRInt32 SpaceManager::GetBandAvailableSpace(const BandRect* aBand, // The rect represents unavailable space, so add another trapezoid if (1 == aBand->numFrames) { - trapezoid->state = nsBandTrapezoid::smOccupied; + trapezoid->state = nsBandTrapezoid::Occupied; trapezoid->frame = aBand->frame; } else { NS_ASSERTION(aBand->numFrames > 1, "unexpected frame count"); - trapezoid->state = nsBandTrapezoid::smOccupiedMultiple; + trapezoid->state = nsBandTrapezoid::OccupiedMultiple; trapezoid->frames = aBand->frames; } @@ -218,7 +218,7 @@ PRInt32 SpaceManager::GetBandAvailableSpace(const BandRect* aBand, // No more rects left in the band. If we haven't yet reached the right edge, // then all the remaining space is available if (left < rightEdge) { - trapezoid->state = nsBandTrapezoid::smAvailable; + trapezoid->state = nsBandTrapezoid::Available; trapezoid->frame = nsnull; // Assign the trapezoid a rectangular shape. The trapezoid must be in the @@ -243,7 +243,7 @@ PRInt32 SpaceManager::GetBandData(nscoord aYOffset, // All the requested space is available aBandData.count = 1; aBandData.trapezoids[0] = nsRect(0, aYOffset, aMaxSize.width, aMaxSize.height); - aBandData.trapezoids[0].state = nsBandTrapezoid::smAvailable; + aBandData.trapezoids[0].state = nsBandTrapezoid::Available; aBandData.trapezoids[0].frame = nsnull; } else { // Find the first band that contains the y-offset or is below the y-offset @@ -258,7 +258,7 @@ PRInt32 SpaceManager::GetBandData(nscoord aYOffset, aBandData.count = 1; aBandData.trapezoids[0] = nsRect(0, aYOffset, aMaxSize.width, PR_MIN(band->top - y, aMaxSize.height)); - aBandData.trapezoids[0].state = nsBandTrapezoid::smAvailable; + aBandData.trapezoids[0].state = nsBandTrapezoid::Available; aBandData.trapezoids[0].frame = nsnull; break; } else if (y < band->bottom) { diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp index 46dbffa02db..d7659f09221 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.cpp +++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp @@ -55,7 +55,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() for (i = 0; i < count; i++) { nsBandTrapezoid* trapezoid = &data[i]; - if (trapezoid->state != nsBandTrapezoid::smAvailable) { + if (trapezoid->state != nsBandTrapezoid::Available) { nsStyleDisplay* display; // XXX Handle the case of multiple frames @@ -71,7 +71,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() } } - if (nsBandTrapezoid::smAvailable == trapezoid->state) { + if (nsBandTrapezoid::Available == trapezoid->state) { // The trapezoid is available trapezoid->GetRect(availSpace); } else { diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp index 46dbffa02db..d7659f09221 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp +++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp @@ -55,7 +55,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() for (i = 0; i < count; i++) { nsBandTrapezoid* trapezoid = &data[i]; - if (trapezoid->state != nsBandTrapezoid::smAvailable) { + if (trapezoid->state != nsBandTrapezoid::Available) { nsStyleDisplay* display; // XXX Handle the case of multiple frames @@ -71,7 +71,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() } } - if (nsBandTrapezoid::smAvailable == trapezoid->state) { + if (nsBandTrapezoid::Available == trapezoid->state) { // The trapezoid is available trapezoid->GetRect(availSpace); } else { diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h index 46dbffa02db..d7659f09221 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.h +++ b/mozilla/layout/html/base/src/nsBlockReflowState.h @@ -55,7 +55,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() for (i = 0; i < count; i++) { nsBandTrapezoid* trapezoid = &data[i]; - if (trapezoid->state != nsBandTrapezoid::smAvailable) { + if (trapezoid->state != nsBandTrapezoid::Available) { nsStyleDisplay* display; // XXX Handle the case of multiple frames @@ -71,7 +71,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() } } - if (nsBandTrapezoid::smAvailable == trapezoid->state) { + if (nsBandTrapezoid::Available == trapezoid->state) { // The trapezoid is available trapezoid->GetRect(availSpace); } else {