From abbfa2ecec4464862ce2707972aa43bb5b2fb475 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 18 Jul 2011 05:24:10 +0000 Subject: [PATCH] Rename tqsizeHint* to sizeHint* git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1241971 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kexi/widget/utils/kexiflowlayout.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp index e5f98aee3..c7c7687cd 100644 --- a/kexi/widget/utils/kexiflowlayout.cpp +++ b/kexi/widget/utils/kexiflowlayout.cpp @@ -250,7 +250,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly) TQPtrListIterator it2(currentLine); TQLayoutItem *item; 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 ) { TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take 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) ); wx = wx + s.width() + spacing(); minSizeWidth = minSizeWidth + spacing() + itemMinSize.width(); - tqsizeHintWidth = tqsizeHintWidth + spacing() + itemSizeHint.width(); + sizeHintWidth = sizeHintWidth + spacing() + itemSizeHint.width(); lineMinHeight = TQMAX( lineMinHeight, itemMinSize.height() ); ++it2; } - tqsizeHint = tqsizeHint.expandedTo( TQSize(tqsizeHintWidth, 0) ); + tqsizeHint = tqsizeHint.expandedTo( TQSize(sizeHintWidth, 0) ); minSize = minSize.expandedTo( TQSize(minSizeWidth, 0) ); minSizeHeight = minSizeHeight + spacing() + lineMinHeight; // start a new line @@ -302,7 +302,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly) TQPtrListIterator it2(currentLine); TQLayoutItem *item; 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 ) { TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take 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) ); wx = wx + s.width() + spacing(); minSizeWidth = minSizeWidth + spacing() + itemMinSize.width(); - tqsizeHintWidth = tqsizeHintWidth + spacing() + itemSizeHint.width(); + sizeHintWidth = sizeHintWidth + spacing() + itemSizeHint.width(); lineMinHeight = TQMAX( lineMinHeight, itemMinSize.height() ); ++it2; } - tqsizeHint = tqsizeHint.expandedTo( TQSize(tqsizeHintWidth, y + spacing() + h) ); + tqsizeHint = tqsizeHint.expandedTo( TQSize(sizeHintWidth, y + spacing() + h) ); minSizeHeight = minSizeHeight + spacing() + lineMinHeight; minSize = minSize.expandedTo( TQSize(minSizeWidth, minSizeHeight) ); @@ -366,7 +366,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly) TQPtrListIterator it2(currentLine); TQLayoutItem *item; 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 ) { TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take 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) ); wy = wy + s.height() + spacing(); minSizeHeight = minSizeHeight + spacing() + itemMinSize.height(); - tqsizeHintHeight = tqsizeHintHeight + spacing() + itemSizeHint.height(); + sizeHintHeight = sizeHintHeight + spacing() + itemSizeHint.height(); colMinWidth = TQMAX( colMinWidth, itemMinSize.width() ); ++it2; } - tqsizeHint = tqsizeHint.expandedTo( TQSize(0, tqsizeHintHeight) ); + tqsizeHint = tqsizeHint.expandedTo( TQSize(0, sizeHintHeight) ); minSize = minSize.expandedTo( TQSize(0, minSizeHeight) ); minSizeWidth = minSizeWidth + spacing() + colMinWidth; // start a new column @@ -418,7 +418,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly) TQPtrListIterator it2(currentLine); TQLayoutItem *item; 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 ) { TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take 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) ); wy = wy + s.height() + spacing(); minSizeHeight = minSizeHeight + spacing() + itemMinSize.height(); - tqsizeHintHeight = tqsizeHintHeight + spacing() + itemSizeHint.height(); + sizeHintHeight = sizeHintHeight + spacing() + itemSizeHint.height(); colMinWidth = TQMAX( colMinWidth, itemMinSize.width() ); ++it2; } - tqsizeHint = tqsizeHint.expandedTo( TQSize( x + spacing() + w, tqsizeHintHeight) ); + tqsizeHint = tqsizeHint.expandedTo( TQSize( x + spacing() + w, sizeHintHeight) ); minSizeWidth = minSizeWidth + spacing() + colMinWidth; minSize = minSize.expandedTo( TQSize(minSizeWidth, minSizeHeight) );