TDE
/
koffice
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/koffice
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename tqsizeHint* to sizeHint*

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1241971 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 7c71ab86d1
commit abbfa2ecec
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File

24
kexi/widget/utils/kexiflowlayout.cpp
Unescape View File

@ -250,7 +250,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
TQPtrListIterator<TQLayoutItem> it2(currentLine); TQPtrListIterator<TQLayoutItem> it2(currentLine);
TQLayoutItem *item; TQLayoutItem *item;
int wx = r.x(); int wx = r.x();
int tqsizeHintWidth = 0 -spacing(), minSizeWidth=0 - spacing(), lineMinHeight=0; int sizeHintWidth = 0 -spacing(), minSizeWidth=0 - spacing(), lineMinHeight=0;
while( (item = it2.current()) != 0 ) { while( (item = it2.current()) != 0 ) {
TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take
TQSize itemMinSize = item->tqminimumSize(); // a while to get them TQSize itemMinSize = item->tqminimumSize(); // a while to get them
@ -273,11 +273,11 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
item->setGeometry( TQRect(TQPoint(wx, y), s) ); item->setGeometry( TQRect(TQPoint(wx, y), s) );
wx = wx + s.width() + spacing(); wx = wx + s.width() + spacing();
minSizeWidth = minSizeWidth + spacing() + itemMinSize.width(); minSizeWidth = minSizeWidth + spacing() + itemMinSize.width();
tqsizeHintWidth = tqsizeHintWidth + spacing() + itemSizeHint.width(); sizeHintWidth = sizeHintWidth + spacing() + itemSizeHint.width();
lineMinHeight = TQMAX( lineMinHeight, itemMinSize.height() ); lineMinHeight = TQMAX( lineMinHeight, itemMinSize.height() );
++it2; ++it2;
} }
tqsizeHint = tqsizeHint.expandedTo( TQSize(tqsizeHintWidth, 0) ); tqsizeHint = tqsizeHint.expandedTo( TQSize(sizeHintWidth, 0) );
minSize = minSize.expandedTo( TQSize(minSizeWidth, 0) ); minSize = minSize.expandedTo( TQSize(minSizeWidth, 0) );
minSizeHeight = minSizeHeight + spacing() + lineMinHeight; minSizeHeight = minSizeHeight + spacing() + lineMinHeight;
// start a new line // start a new line
@ -302,7 +302,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
TQPtrListIterator<TQLayoutItem> it2(currentLine); TQPtrListIterator<TQLayoutItem> it2(currentLine);
TQLayoutItem *item; TQLayoutItem *item;
int wx = r.x(); int wx = r.x();
int tqsizeHintWidth = 0 -spacing(), minSizeWidth=0 - spacing(), lineMinHeight=0; int sizeHintWidth = 0 -spacing(), minSizeWidth=0 - spacing(), lineMinHeight=0;
while( (item = it2.current()) != 0 ) { while( (item = it2.current()) != 0 ) {
TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take
TQSize itemMinSize = item->tqminimumSize(); // a while to get them TQSize itemMinSize = item->tqminimumSize(); // a while to get them
@ -325,11 +325,11 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
item->setGeometry( TQRect(TQPoint(wx, y), s) ); item->setGeometry( TQRect(TQPoint(wx, y), s) );
wx = wx + s.width() + spacing(); wx = wx + s.width() + spacing();
minSizeWidth = minSizeWidth + spacing() + itemMinSize.width(); minSizeWidth = minSizeWidth + spacing() + itemMinSize.width();
tqsizeHintWidth = tqsizeHintWidth + spacing() + itemSizeHint.width(); sizeHintWidth = sizeHintWidth + spacing() + itemSizeHint.width();
lineMinHeight = TQMAX( lineMinHeight, itemMinSize.height() ); lineMinHeight = TQMAX( lineMinHeight, itemMinSize.height() );
++it2; ++it2;
} }
tqsizeHint = tqsizeHint.expandedTo( TQSize(tqsizeHintWidth, y + spacing() + h) ); tqsizeHint = tqsizeHint.expandedTo( TQSize(sizeHintWidth, y + spacing() + h) );
minSizeHeight = minSizeHeight + spacing() + lineMinHeight; minSizeHeight = minSizeHeight + spacing() + lineMinHeight;
minSize = minSize.expandedTo( TQSize(minSizeWidth, minSizeHeight) ); minSize = minSize.expandedTo( TQSize(minSizeWidth, minSizeHeight) );
@ -366,7 +366,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
TQPtrListIterator<TQLayoutItem> it2(currentLine); TQPtrListIterator<TQLayoutItem> it2(currentLine);
TQLayoutItem *item; TQLayoutItem *item;
int wy = r.y(); int wy = r.y();
int tqsizeHintHeight = 0 - spacing(), minSizeHeight = 0 - spacing(), colMinWidth=0; int sizeHintHeight = 0 - spacing(), minSizeHeight = 0 - spacing(), colMinWidth=0;
while( (item = it2.current()) != 0 ) { while( (item = it2.current()) != 0 ) {
TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take
TQSize itemMinSize = item->tqminimumSize(); // a while to get them TQSize itemMinSize = item->tqminimumSize(); // a while to get them
@ -389,11 +389,11 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
item->setGeometry( TQRect(TQPoint(x, wy), s) ); item->setGeometry( TQRect(TQPoint(x, wy), s) );
wy = wy + s.height() + spacing(); wy = wy + s.height() + spacing();
minSizeHeight = minSizeHeight + spacing() + itemMinSize.height(); minSizeHeight = minSizeHeight + spacing() + itemMinSize.height();
tqsizeHintHeight = tqsizeHintHeight + spacing() + itemSizeHint.height(); sizeHintHeight = sizeHintHeight + spacing() + itemSizeHint.height();
colMinWidth = TQMAX( colMinWidth, itemMinSize.width() ); colMinWidth = TQMAX( colMinWidth, itemMinSize.width() );
++it2; ++it2;
} }
tqsizeHint = tqsizeHint.expandedTo( TQSize(0, tqsizeHintHeight) ); tqsizeHint = tqsizeHint.expandedTo( TQSize(0, sizeHintHeight) );
minSize = minSize.expandedTo( TQSize(0, minSizeHeight) ); minSize = minSize.expandedTo( TQSize(0, minSizeHeight) );
minSizeWidth = minSizeWidth + spacing() + colMinWidth; minSizeWidth = minSizeWidth + spacing() + colMinWidth;
// start a new column // start a new column
@ -418,7 +418,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
TQPtrListIterator<TQLayoutItem> it2(currentLine); TQPtrListIterator<TQLayoutItem> it2(currentLine);
TQLayoutItem *item; TQLayoutItem *item;
int wy = r.y(); int wy = r.y();
int tqsizeHintHeight = 0 - spacing(), minSizeHeight = 0 - spacing(), colMinWidth=0; int sizeHintHeight = 0 - spacing(), minSizeHeight = 0 - spacing(), colMinWidth=0;
while( (item = it2.current()) != 0 ) { while( (item = it2.current()) != 0 ) {
TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take
TQSize itemMinSize = item->tqminimumSize(); // a while to get them TQSize itemMinSize = item->tqminimumSize(); // a while to get them
@ -441,11 +441,11 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
item->setGeometry( TQRect(TQPoint(x, wy), s) ); item->setGeometry( TQRect(TQPoint(x, wy), s) );
wy = wy + s.height() + spacing(); wy = wy + s.height() + spacing();
minSizeHeight = minSizeHeight + spacing() + itemMinSize.height(); minSizeHeight = minSizeHeight + spacing() + itemMinSize.height();
tqsizeHintHeight = tqsizeHintHeight + spacing() + itemSizeHint.height(); sizeHintHeight = sizeHintHeight + spacing() + itemSizeHint.height();
colMinWidth = TQMAX( colMinWidth, itemMinSize.width() ); colMinWidth = TQMAX( colMinWidth, itemMinSize.width() );
++it2; ++it2;
} }
tqsizeHint = tqsizeHint.expandedTo( TQSize( x + spacing() + w, tqsizeHintHeight) ); tqsizeHint = tqsizeHint.expandedTo( TQSize( x + spacing() + w, sizeHintHeight) );
minSizeWidth = minSizeWidth + spacing() + colMinWidth; minSizeWidth = minSizeWidth + spacing() + colMinWidth;
minSize = minSize.expandedTo( TQSize(minSizeWidth, minSizeHeight) ); minSize = minSize.expandedTo( TQSize(minSizeWidth, minSizeHeight) );

Write Preview
Loading…
Cancel
Save