From 4d75f93557ba631d97a56e288a34ca27f4507653 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 10:00:14 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 6cdf35ab11c322f33feca5baf090ef56068b6049. --- kworldwatch/flow.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'kworldwatch/flow.cpp') diff --git a/kworldwatch/flow.cpp b/kworldwatch/flow.cpp index 519ed85..056f5aa 100644 --- a/kworldwatch/flow.cpp +++ b/kworldwatch/flow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** $Id$ ** -** Implementing your own layout: flow example +** Implementing your own tqlayout: flow example ** ** Copyright (C) 1996 by Trolltech AS. All rights reserved. ** @@ -76,9 +76,9 @@ bool SimpleFlow::hasHeightForWidth() const return TRUE; } -TQSize SimpleFlow::sizeHint() const +TQSize SimpleFlow::tqsizeHint() const { - return minimumSize(); + return tqminimumSize(); } TQSizePolicy::ExpandData SimpleFlow::expanding() const @@ -116,29 +116,29 @@ int SimpleFlow::doLayout( const TQRect &r, bool testonly ) TQLayoutItem *o; while ( (o=it.current()) != 0 ) { ++it; - int nextX = x + o->sizeHint().width() + spacing(); + int nextX = x + o->tqsizeHint().width() + spacing(); if ( nextX - spacing() > r.right() && h > 0 ) { x = r.x(); y = y + h + spacing(); - nextX = x + o->sizeHint().width() + spacing(); + nextX = x + o->tqsizeHint().width() + spacing(); h = 0; } if ( !testonly ) - o->setGeometry( TQRect( TQPoint( x, y ), o->sizeHint() ) ); + o->setGeometry( TQRect( TQPoint( x, y ), o->tqsizeHint() ) ); x = nextX; - h = TQMAX( h, o->sizeHint().height() ); + h = TQMAX( h, o->tqsizeHint().height() ); } return y + h - r.y(); } -TQSize SimpleFlow::minimumSize() const +TQSize SimpleFlow::tqminimumSize() const { TQSize s(0,0); TQPtrListIterator it(list); TQLayoutItem *o; while ( (o=it.current()) != 0 ) { ++it; - s = s.expandedTo( o->minimumSize() ); + s = s.expandedTo( o->tqminimumSize() ); } return s; } @@ -155,7 +155,7 @@ int SimpleFlow::count() const { \reimp */ TQLayoutItem* SimpleFlow::itemAt(int index) const { - return index >= 0 && index < list.count() ? (const_cast&>(list).at(index)) : 0; + return index >= 0 && index < list.count() ? (const_cast&>(list).tqat(index)) : 0; } /*! @@ -164,8 +164,8 @@ TQLayoutItem* SimpleFlow::itemAt(int index) const { TQLayoutItem* SimpleFlow::takeAt(int index) { if (index < 0 || index >= list.count()) return 0; - TQLayoutItem *item = list.at(index); - list.remove(list.at(index)); + TQLayoutItem *item = list.tqat(index); + list.remove(list.tqat(index)); delete item; invalidate(); -- cgit v1.2.1