summaryrefslogtreecommitdiffstats
path: root/experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-07-17 19:19:26 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-07-17 19:19:26 -0500
commit07b6965cbac26077a27faf4071487d9a25fb3aa0 (patch)
tree8c5910ccfcab2269f7948dbd74a83048cd99d2ac /experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp
parent1c210202b89d0161f34432bc74157a278670f4dc (diff)
downloadtde-07b6965cbac26077a27faf4071487d9a25fb3aa0.tar.gz
tde-07b6965cbac26077a27faf4071487d9a25fb3aa0.zip
Revert "Rename tqsize* to size*"
This reverts commit e33879600503bacc0b4ef090f7f79ab80bb6b0da.
Diffstat (limited to 'experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp')
-rw-r--r--experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp86
1 files changed, 43 insertions, 43 deletions
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp b/experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp
index a5c86dd79..e9f5493d1 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp
@@ -46,7 +46,7 @@
#include "tqwidget.h"
#include "tqmenubar.h"
#include "tqptrlist.h"
-#include "sizepolicy.h"
+#include "tqsizepolicy.h"
#include "tqlayoutengine_p.h"
@@ -98,7 +98,7 @@ TQLayout *TQLayout::tqlayout() {
return this;
}
-TQSize TQLayout::sizeHint() const {
+TQSize TQLayout::tqsizeHint() const {
return sizeHint();
}
@@ -1451,7 +1451,7 @@ public:
{ item_ = TQT_TQLAYOUTITEM(new TQSpacerItem( w, h, hData, vData )); }
~TQGridBox() { delete item_; }
- QSize sizeHint() const { return item_->sizeHint(); }
+ QSize tqsizeHint() const { return item_->sizeHint(); }
QSize tqminimumSize() const { return item_->minimumSize(); }
QSize tqmaximumSize() const { return item_->maximumSize(); }
TQ_SPExpandData expandingDirections() const { return item_->expandingDirections(); }
@@ -1505,7 +1505,7 @@ public:
void add( TQGridBox*, int row, int col );
void add( TQGridBox*, int row1, int row2, int col1, int col2 );
- QSize sizeHint( int ) const;
+ QSize tqsizeHint( int ) const;
QSize tqminimumSize( int ) const;
QSize tqmaximumSize( int ) const;
@@ -1650,7 +1650,7 @@ void TQGridLayoutData::recalcHFW( int w, int spacing )
int mh = 0;
int n = 0;
for ( int r = 0; r < rr; r++ ) {
- h += rData[r].sizeHint;
+ h += rData[r].tqsizeHint;
mh += rData[r].tqminimumSize;
if ( !rData[r].empty )
n++;
@@ -1765,9 +1765,9 @@ TQ_SPExpandData TQGridLayoutData::expanding( int spacing )
return (TQ_SPExpandData) ret;
}
-QSize TQGridLayoutData::sizeHint( int spacer ) const
+QSize TQGridLayoutData::tqsizeHint( int spacer ) const
{
- return tqfindSize( &TQLayoutStruct::sizeHint, spacer );
+ return tqfindSize( &TQLayoutStruct::tqsizeHint, spacer );
}
QSize TQGridLayoutData::tqmaximumSize( int spacer ) const
@@ -1878,7 +1878,7 @@ void TQGridLayoutData::add( TQGridBox *box, int row1, int row2, int col1,
void TQGridLayoutData::addData( TQGridBox *box, bool r, bool c )
{
- TQSize hint = box->sizeHint();
+ TQSize hint = box->tqsizeHint();
TQSize minS = box->tqminimumSize();
TQSize maxS = box->tqmaximumSize();
@@ -1886,8 +1886,8 @@ void TQGridLayoutData::addData( TQGridBox *box, bool r, bool c )
if ( !cStretch[box->col] )
colData[box->col].stretch = TQMAX( colData[box->col].stretch,
box->hStretch() );
- colData[box->col].sizeHint = TQMAX( hint.width(),
- colData[box->col].sizeHint );
+ colData[box->col].tqsizeHint = TQMAX( hint.width(),
+ colData[box->col].tqsizeHint );
colData[box->col].tqminimumSize = TQMAX( minS.width(),
colData[box->col].tqminimumSize );
@@ -1899,8 +1899,8 @@ void TQGridLayoutData::addData( TQGridBox *box, bool r, bool c )
if ( !rStretch[box->row] )
rowData[box->row].stretch = TQMAX( rowData[box->row].stretch,
box->vStretch() );
- rowData[box->row].sizeHint = TQMAX( hint.height(),
- rowData[box->row].sizeHint );
+ rowData[box->row].tqsizeHint = TQMAX( hint.height(),
+ rowData[box->row].tqsizeHint );
rowData[box->row].tqminimumSize = TQMAX( minS.height(),
rowData[box->row].tqminimumSize );
@@ -1935,7 +1935,7 @@ void TQGridLayoutData::addData( TQGridBox *box, bool r, bool c )
static void distributeMultiBox( TQMemArray<TQLayoutStruct> &chain, int spacing,
int start, int end,
- int minSize, int sizeHint,
+ int minSize, int tqsizeHint,
TQMemArray<int> &stretchArray, int stretch )
{
int i;
@@ -1944,7 +1944,7 @@ static void distributeMultiBox( TQMemArray<TQLayoutStruct> &chain, int spacing,
int max = 0;
for ( i = start; i <= end; i++ ) {
w += chain[i].tqminimumSize;
- wh += chain[i].sizeHint;
+ wh += chain[i].tqsizeHint;
max += chain[i].tqmaximumSize;
chain[i].empty = FALSE;
if ( stretchArray[i] == 0 )
@@ -1983,11 +1983,11 @@ static void distributeMultiBox( TQMemArray<TQLayoutStruct> &chain, int spacing,
}
}
- if ( wh < sizeHint ) {
- qGeomCalc( chain, start, end - start + 1, 0, sizeHint, spacing );
+ if ( wh < tqsizeHint ) {
+ qGeomCalc( chain, start, end - start + 1, 0, tqsizeHint, spacing );
for ( i = start; i <= end; i++ ) {
- if ( chain[i].sizeHint < chain[i].size )
- chain[i].sizeHint = chain[i].size;
+ if ( chain[i].tqsizeHint < chain[i].size )
+ chain[i].tqsizeHint = chain[i].size;
}
}
}
@@ -2031,7 +2031,7 @@ void TQGridLayoutData::setupLayoutData( int spacing )
if ( c2 < 0 )
c2 = cc - 1;
- TQSize hint = box->sizeHint();
+ TQSize hint = box->tqsizeHint();
TQSize min = box->tqminimumSize();
if ( box->hasHeightForWidth() )
has_hfw = TRUE;
@@ -2065,13 +2065,13 @@ void TQGridLayoutData::addHfwData( TQGridBox *box, int width )
TQMemArray<TQLayoutStruct> &rData = *hfwData;
if ( box->hasHeightForWidth() ) {
int hint = box->heightForWidth( width );
- rData[box->row].sizeHint = TQMAX( hint, rData[box->row].sizeHint );
+ rData[box->row].tqsizeHint = TQMAX( hint, rData[box->row].tqsizeHint );
rData[box->row].tqminimumSize = TQMAX( hint, rData[box->row].tqminimumSize );
} else {
- TQSize hint = box->sizeHint();
+ TQSize hint = box->tqsizeHint();
TQSize minS = box->tqminimumSize();
- rData[box->row].sizeHint = TQMAX( hint.height(),
- rData[box->row].sizeHint );
+ rData[box->row].tqsizeHint = TQMAX( hint.height(),
+ rData[box->row].tqsizeHint );
rData[box->row].tqminimumSize = TQMAX( minS.height(),
rData[box->row].tqminimumSize );
}
@@ -2079,7 +2079,7 @@ void TQGridLayoutData::addHfwData( TQGridBox *box, int width )
/*
Similar to setupLayoutData(), but uses heightForWidth(colData)
- instead of sizeHint(). Assumes that setupLayoutData() and
+ instead of tqsizeHint(). Assumes that setupLayoutData() and
qGeomCalc(colData) has been called.
*/
void TQGridLayoutData::setupHfwLayoutData( int spacing )
@@ -2088,7 +2088,7 @@ void TQGridLayoutData::setupHfwLayoutData( int spacing )
int i;
for ( i = 0; i < rr; i++ ) {
rData[i] = rowData[i];
- rData[i].tqminimumSize = rData[i].sizeHint = 0;
+ rData[i].tqminimumSize = rData[i].tqsizeHint = 0;
}
TQPtrListIterator<TQGridBox> it( things );
TQGridBox * box;
@@ -2114,7 +2114,7 @@ void TQGridLayoutData::setupHfwLayoutData( int spacing )
if ( r1 == r2 ) {
addHfwData( box, w );
} else {
- TQSize hint = box->sizeHint();
+ TQSize hint = box->tqsizeHint();
TQSize min = box->tqminimumSize();
if ( box->hasHeightForWidth() ) {
int hfwh = box->heightForWidth( w );
@@ -2465,9 +2465,9 @@ int TQGridLayout::numCols() const
/*!
Returns the preferred size of this grid.
*/
-TQSize TQGridLayout::sizeHint() const
+TQSize TQGridLayout::tqsizeHint() const
{
- return data->sizeHint( spacing() ) + TQSize( 2 * margin(), 2 * margin() );
+ return data->tqsizeHint( spacing() ) + TQSize( 2 * margin(), 2 * margin() );
}
/*!
@@ -2641,7 +2641,7 @@ void TQGridLayout::addMultiCell( QLayoutItem *item, int fromRow, int toRow,
\i From TQt 3.0, the \a tqalignment parameter is interpreted more
aggressively than in previous versions of TQt. A non-default
tqalignment now indicates that the widget should not grow to fill
- the available space, but should be sized according to sizeHint().
+ the available space, but should be sized according to tqsizeHint().
\endlist
\sa addMultiCellWidget()
@@ -2673,7 +2673,7 @@ void TQGridLayout::addWidget( TQWidget *w, int row, int col, int tqalignment )
A non-zero tqalignment indicates that the widget should not grow to
fill the available space but should be sized according to
- sizeHint().
+ tqsizeHint().
\sa addWidget()
*/
@@ -2714,7 +2714,7 @@ void TQGridLayout::addLayout( TQLayout *tqlayout, int row, int col )
A non-zero tqalignment indicates that the tqlayout should not grow to
fill the available space but should be sized according to
- sizeHint().
+ tqsizeHint().
\a tqlayout becomes a child of the grid tqlayout.
@@ -2858,7 +2858,7 @@ int TQGridLayout::colSpacing( int col ) const
/*!
Returns whether this tqlayout can make use of more space than
- sizeHint(). A value of \c Vertical or \c Horizontal means that it wants
+ tqsizeHint(). A value of \c Vertical or \c Horizontal means that it wants
to grow in only one dimension, whereas \c BothDirections means that
it wants to grow in both dimensions.
*/
@@ -2998,7 +2998,7 @@ public:
int hfwWidth;
int hfwHeight;
int hfwMinHeight;
- TQSize sizeHint;
+ TQSize tqsizeHint;
TQSize minSize;
TQSize maxSize;
TQ_SPExpandData expanding;
@@ -3206,13 +3206,13 @@ TQBoxLayout::~TQBoxLayout()
/*!
Returns the preferred size of this box tqlayout.
*/
-TQSize TQBoxLayout::sizeHint() const
+TQSize TQBoxLayout::tqsizeHint() const
{
if ( data->dirty ) {
TQBoxLayout *that = (TQBoxLayout*)this;
that->setupGeom();
}
- return data->sizeHint + TQSize( 2 * margin(), 2 * margin() );
+ return data->tqsizeHint + TQSize( 2 * margin(), 2 * margin() );
}
/*!
@@ -3328,7 +3328,7 @@ TQLayoutItem* TQBoxLayout::takeAt(int index) {
/*!
Returns whether this tqlayout can make use of more space than
- sizeHint(). A value of \c Vertical or \c Horizontal means that it wants
+ tqsizeHint(). A value of \c Vertical or \c Horizontal means that it wants
to grow in only one dimension, whereas \c BothDirections means that
it wants to grow in both dimensions.
*/
@@ -3362,7 +3362,7 @@ void TQBoxLayout::setGeometry( const TQRect &r )
for ( int i = 0; i < n; i++ ) {
TQBoxLayoutItem *box = data->list.at( i );
if ( box->item->hasHeightForWidth() )
- a[i].sizeHint = a[i].tqminimumSize =
+ a[i].tqsizeHint = a[i].tqminimumSize =
box->item->heightForWidth( s.width() );
}
}
@@ -3528,7 +3528,7 @@ void TQBoxLayout::insertLayout( int index, TQLayout *tqlayout, int stretch )
From TQt 3.0, the \a tqalignment parameter is interpreted more
aggressively than in previous versions of TQt. A non-default
tqalignment now indicates that the widget should not grow to fill
- the available space, but should be sized according to sizeHint().
+ the available space, but should be sized according to tqsizeHint().
\sa setAutoAdd(), insertLayout(), insertSpacing()
*/
@@ -3592,7 +3592,7 @@ void TQBoxLayout::addStretch( int stretch )
From TQt 3.0, the \a tqalignment parameter is interpreted more
aggressively than in previous versions of TQt. A non-default
tqalignment now indicates that the widget should not grow to fill
- the available space, but should be sized according to sizeHint().
+ the available space, but should be sized according to tqsizeHint().
\sa insertWidget(), setAutoAdd(), addLayout(), addSpacing()
*/
@@ -3717,7 +3717,7 @@ void TQBoxLayout::setDirection( Direction direction )
if ( sp ) {
if ( sp->expandingDirections() == TQSizePolicy::NoDirection ) {
//spacing or strut
- TQSize s = sp->sizeHint();
+ TQSize s = sp->tqsizeHint();
sp->changeSize( s.height(), s.width(),
horz(direction) ? TQSizePolicy::Fixed:TQSizePolicy::Minimum,
horz(direction) ? TQSizePolicy::Minimum:TQSizePolicy::Fixed );
@@ -3795,7 +3795,7 @@ void TQBoxLayout::setupGeom()
minh = TQMAX( minh, min.height() );
hinth = TQMAX( hinth, hint.height() );
- a[i].sizeHint = hint.width();
+ a[i].tqsizeHint = hint.width();
a[i].tqmaximumSize = max.width();
a[i].tqminimumSize = min.width();
a[i].expansive = expand;
@@ -3812,7 +3812,7 @@ void TQBoxLayout::setupGeom()
minw = TQMAX( minw, min.width() );
hintw = TQMAX( hintw, hint.width() );
- a[i].sizeHint = hint.height();
+ a[i].tqsizeHint = hint.height();
a[i].tqmaximumSize = max.height();
a[i].tqminimumSize = min.height();
a[i].expansive = expand;
@@ -3831,7 +3831,7 @@ void TQBoxLayout::setupGeom()
( (horexp ? TQSizePolicy::Horizontally : 0)
| (verexp ? TQSizePolicy::Vertically : 0) );
- data->sizeHint = TQSize( hintw, hinth )
+ data->tqsizeHint = TQSize( hintw, hinth )
.expandedTo( data->minSize )
.boundedTo( data->maxSize );