From 10cf7de2c3fbfd83ff1880c030be82bb7235cd5a Mon Sep 17 00:00:00 2001 From: buster Date: Thu, 30 Apr 1998 18:04:16 +0000 Subject: [PATCH] fixed method names git-svn-id: svn://10.0.0.236/trunk@912 18797224-902f-48f8-a5cc-f745e15eee43 --- .../table/src/BasicTableLayoutStrategy.cpp | 42 +++++++++---------- .../html/table/src/BasicTableLayoutStrategy.h | 10 ++--- .../html/table/src/nsITableLayoutStrategy.h | 10 ++--- .../tables/BasicTableLayoutStrategy.cpp | 42 +++++++++---------- .../layout/tables/BasicTableLayoutStrategy.h | 10 ++--- .../layout/tables/nsITableLayoutStrategy.h | 10 ++--- 6 files changed, 62 insertions(+), 62 deletions(-) diff --git a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp index d48d0ac1a45..0553e2b7469 100644 --- a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp +++ b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp @@ -155,11 +155,11 @@ if there is space left over // Step 1 - assign the width of all fixed-width columns, // and calculate min/max table width PRBool BasicTableLayoutStrategy::AssignFixedColumnWidths(nsIPresContext* aPresContext, - PRInt32 maxWidth, - PRInt32 aNumCols, - PRInt32 &aTotalFixedWidth, - PRInt32 &aMinTableWidth, - PRInt32 &aMaxTableWidth) + PRInt32 maxWidth, + PRInt32 aNumCols, + PRInt32 &aTotalFixedWidth, + PRInt32 &aMinTableWidth, + PRInt32 &aMaxTableWidth) { #ifdef DEBUG nsIFrame *tablePIF=nsnull; @@ -378,10 +378,10 @@ PRBool BasicTableLayoutStrategy::AssignFixedColumnWidths(nsIPresContext* aPresCo } PRBool BasicTableLayoutStrategy::BalanceProportionalColumnsForSpecifiedWidthTable(nsIPresContext* aPresContext, - PRInt32 aAvailWidth, - PRInt32 aMaxWidth, - PRInt32 aMinTableWidth, - PRInt32 aMaxTableWidth) + PRInt32 aAvailWidth, + PRInt32 aMaxWidth, + PRInt32 aMinTableWidth, + PRInt32 aMaxTableWidth) { #ifdef DEBUG nsIFrame *tablePIF=nsnull; @@ -407,9 +407,9 @@ PRBool BasicTableLayoutStrategy::BalanceProportionalColumnsForSpecifiedWidthTabl } else { // the table fits somewhere between its min and desired size - if (gsDebug) printf (" * table desired size does not fit, calling BalanceColumnsHTML4Constrained\n"); - result = BalanceColumnsHTML4Constrained(aPresContext, aAvailWidth, - aMaxWidth, aMinTableWidth, aMaxTableWidth); + if (gsDebug) printf (" * table desired size does not fit, calling BalanceColumnsConstrained\n"); + result = BalanceColumnsConstrained(aPresContext, aAvailWidth, + aMaxWidth, aMinTableWidth, aMaxTableWidth); } return result; } @@ -439,9 +439,9 @@ PRBool BasicTableLayoutStrategy::BalanceProportionalColumnsForAutoWidthTable( ns } else { // the table fits somewhere between its min and desired size - if (gsDebug) printf (" * table desired size does not fit, calling BalanceColumnsHTML4Constrained\n"); - result = BalanceColumnsHTML4Constrained(aPresContext, aAvailWidth, - aMaxWidth, aMinTableWidth, aMaxTableWidth); + if (gsDebug) printf (" * table desired size does not fit, calling BalanceColumnsConstrained\n"); + result = BalanceColumnsConstrained(aPresContext, aAvailWidth, + aMaxWidth, aMinTableWidth, aMaxTableWidth); } return result; } @@ -506,7 +506,7 @@ PRBool BasicTableLayoutStrategy::SetColumnsToMinWidth(nsIPresContext* aPresConte } PRBool BasicTableLayoutStrategy::BalanceColumnsTableFits(nsIPresContext* aPresContext, - PRInt32 aAvailWidth) + PRInt32 aAvailWidth) { #ifdef DEBUG nsIFrame *tablePIF=nsnull; @@ -650,11 +650,11 @@ PRBool BasicTableLayoutStrategy::BalanceColumnsTableFits(nsIPresContext* aPresCo return result; } -PRBool BasicTableLayoutStrategy::BalanceColumnsHTML4Constrained(nsIPresContext* aPresContext, - PRInt32 aAvailWidth, - PRInt32 aMaxWidth, - PRInt32 aMinTableWidth, - PRInt32 aMaxTableWidth) +PRBool BasicTableLayoutStrategy::BalanceColumnsConstrained( nsIPresContext* aPresContext, + PRInt32 aAvailWidth, + PRInt32 aMaxWidth, + PRInt32 aMinTableWidth, + PRInt32 aMaxTableWidth) { #ifdef DEBUG nsIFrame *tablePIF=nsnull; diff --git a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.h b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.h index 23e6b13b6ed..0ffa7928abe 100644 --- a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.h +++ b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.h @@ -164,11 +164,11 @@ public: * * TODO: rename this method to reflect that it is a Nav4 compatibility method */ - virtual PRBool BalanceColumnsHTML4Constrained(nsIPresContext* aPresContext, - PRInt32 aAvailWidth, - PRInt32 aMaxWidth, - PRInt32 aMinTableWidth, - PRInt32 aMaxTableWidth); + virtual PRBool BalanceColumnsConstrained(nsIPresContext* aPresContext, + PRInt32 aAvailWidth, + PRInt32 aMaxWidth, + PRInt32 aMinTableWidth, + PRInt32 aMaxTableWidth); protected: diff --git a/mozilla/layout/html/table/src/nsITableLayoutStrategy.h b/mozilla/layout/html/table/src/nsITableLayoutStrategy.h index 125dc6284bb..509046d7ae5 100644 --- a/mozilla/layout/html/table/src/nsITableLayoutStrategy.h +++ b/mozilla/layout/html/table/src/nsITableLayoutStrategy.h @@ -147,11 +147,11 @@ public: * * TODO: rename this method to reflect that it is a Nav4 compatibility method */ - virtual PRBool BalanceColumnsHTML4Constrained(nsIPresContext* aPresContext, - PRInt32 aAvailWidth, - PRInt32 aMaxWidth, - PRInt32 aMinTableWidth, - PRInt32 aMaxTableWidth)=0; + virtual PRBool BalanceColumnsConstrained(nsIPresContext* aPresContext, + PRInt32 aAvailWidth, + PRInt32 aMaxWidth, + PRInt32 aMinTableWidth, + PRInt32 aMaxTableWidth)=0; }; diff --git a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp index d48d0ac1a45..0553e2b7469 100644 --- a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp +++ b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp @@ -155,11 +155,11 @@ if there is space left over // Step 1 - assign the width of all fixed-width columns, // and calculate min/max table width PRBool BasicTableLayoutStrategy::AssignFixedColumnWidths(nsIPresContext* aPresContext, - PRInt32 maxWidth, - PRInt32 aNumCols, - PRInt32 &aTotalFixedWidth, - PRInt32 &aMinTableWidth, - PRInt32 &aMaxTableWidth) + PRInt32 maxWidth, + PRInt32 aNumCols, + PRInt32 &aTotalFixedWidth, + PRInt32 &aMinTableWidth, + PRInt32 &aMaxTableWidth) { #ifdef DEBUG nsIFrame *tablePIF=nsnull; @@ -378,10 +378,10 @@ PRBool BasicTableLayoutStrategy::AssignFixedColumnWidths(nsIPresContext* aPresCo } PRBool BasicTableLayoutStrategy::BalanceProportionalColumnsForSpecifiedWidthTable(nsIPresContext* aPresContext, - PRInt32 aAvailWidth, - PRInt32 aMaxWidth, - PRInt32 aMinTableWidth, - PRInt32 aMaxTableWidth) + PRInt32 aAvailWidth, + PRInt32 aMaxWidth, + PRInt32 aMinTableWidth, + PRInt32 aMaxTableWidth) { #ifdef DEBUG nsIFrame *tablePIF=nsnull; @@ -407,9 +407,9 @@ PRBool BasicTableLayoutStrategy::BalanceProportionalColumnsForSpecifiedWidthTabl } else { // the table fits somewhere between its min and desired size - if (gsDebug) printf (" * table desired size does not fit, calling BalanceColumnsHTML4Constrained\n"); - result = BalanceColumnsHTML4Constrained(aPresContext, aAvailWidth, - aMaxWidth, aMinTableWidth, aMaxTableWidth); + if (gsDebug) printf (" * table desired size does not fit, calling BalanceColumnsConstrained\n"); + result = BalanceColumnsConstrained(aPresContext, aAvailWidth, + aMaxWidth, aMinTableWidth, aMaxTableWidth); } return result; } @@ -439,9 +439,9 @@ PRBool BasicTableLayoutStrategy::BalanceProportionalColumnsForAutoWidthTable( ns } else { // the table fits somewhere between its min and desired size - if (gsDebug) printf (" * table desired size does not fit, calling BalanceColumnsHTML4Constrained\n"); - result = BalanceColumnsHTML4Constrained(aPresContext, aAvailWidth, - aMaxWidth, aMinTableWidth, aMaxTableWidth); + if (gsDebug) printf (" * table desired size does not fit, calling BalanceColumnsConstrained\n"); + result = BalanceColumnsConstrained(aPresContext, aAvailWidth, + aMaxWidth, aMinTableWidth, aMaxTableWidth); } return result; } @@ -506,7 +506,7 @@ PRBool BasicTableLayoutStrategy::SetColumnsToMinWidth(nsIPresContext* aPresConte } PRBool BasicTableLayoutStrategy::BalanceColumnsTableFits(nsIPresContext* aPresContext, - PRInt32 aAvailWidth) + PRInt32 aAvailWidth) { #ifdef DEBUG nsIFrame *tablePIF=nsnull; @@ -650,11 +650,11 @@ PRBool BasicTableLayoutStrategy::BalanceColumnsTableFits(nsIPresContext* aPresCo return result; } -PRBool BasicTableLayoutStrategy::BalanceColumnsHTML4Constrained(nsIPresContext* aPresContext, - PRInt32 aAvailWidth, - PRInt32 aMaxWidth, - PRInt32 aMinTableWidth, - PRInt32 aMaxTableWidth) +PRBool BasicTableLayoutStrategy::BalanceColumnsConstrained( nsIPresContext* aPresContext, + PRInt32 aAvailWidth, + PRInt32 aMaxWidth, + PRInt32 aMinTableWidth, + PRInt32 aMaxTableWidth) { #ifdef DEBUG nsIFrame *tablePIF=nsnull; diff --git a/mozilla/layout/tables/BasicTableLayoutStrategy.h b/mozilla/layout/tables/BasicTableLayoutStrategy.h index 23e6b13b6ed..0ffa7928abe 100644 --- a/mozilla/layout/tables/BasicTableLayoutStrategy.h +++ b/mozilla/layout/tables/BasicTableLayoutStrategy.h @@ -164,11 +164,11 @@ public: * * TODO: rename this method to reflect that it is a Nav4 compatibility method */ - virtual PRBool BalanceColumnsHTML4Constrained(nsIPresContext* aPresContext, - PRInt32 aAvailWidth, - PRInt32 aMaxWidth, - PRInt32 aMinTableWidth, - PRInt32 aMaxTableWidth); + virtual PRBool BalanceColumnsConstrained(nsIPresContext* aPresContext, + PRInt32 aAvailWidth, + PRInt32 aMaxWidth, + PRInt32 aMinTableWidth, + PRInt32 aMaxTableWidth); protected: diff --git a/mozilla/layout/tables/nsITableLayoutStrategy.h b/mozilla/layout/tables/nsITableLayoutStrategy.h index 125dc6284bb..509046d7ae5 100644 --- a/mozilla/layout/tables/nsITableLayoutStrategy.h +++ b/mozilla/layout/tables/nsITableLayoutStrategy.h @@ -147,11 +147,11 @@ public: * * TODO: rename this method to reflect that it is a Nav4 compatibility method */ - virtual PRBool BalanceColumnsHTML4Constrained(nsIPresContext* aPresContext, - PRInt32 aAvailWidth, - PRInt32 aMaxWidth, - PRInt32 aMinTableWidth, - PRInt32 aMaxTableWidth)=0; + virtual PRBool BalanceColumnsConstrained(nsIPresContext* aPresContext, + PRInt32 aAvailWidth, + PRInt32 aMaxWidth, + PRInt32 aMinTableWidth, + PRInt32 aMaxTableWidth)=0; };