-rw-r--r-- | microkde/qlayoutengine_p.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/microkde/qlayoutengine_p.h b/microkde/qlayoutengine_p.h index 2d6a556..e782703 100644 --- a/microkde/qlayoutengine_p.h +++ b/microkde/qlayoutengine_p.h @@ -1,16 +1,18 @@ +//Added by qt3to4: +#include <Q3MemArray> // THIS IS A COPY OF THE FILE FOUND IN $QTDIR/src/kernel. Needed to modify qsplitter /**************************************************************************** ** $Id$ ** ** Internal header file. ** ** Created : 981027 ** ** Copyright (C) 1998-99 by Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** ** This file may be distributed under the terms of the Q Public License ** as defined by Trolltech AS of Norway and appearing in the file ** LICENSE.QPL included in the packaging of this file. @@ -42,59 +44,55 @@ // // W A R N I N G // ------------- // // This file is not part of the Qt API. It exists for the convenience // of qlayout.cpp, qlayoutengine.cpp, qmainwindow.cpp and qsplitter.cpp. // This header file may change from version to version without notice, // or even be removed. // // We mean it. // // -#ifndef QT_H -#include "qabstractlayout.h" -#endif // QT_H - #ifndef QT_NO_LAYOUT struct QLayoutStruct { void initParameters() { minimumSize = sizeHint = 0; maximumSize = QWIDGETSIZE_MAX; expansive = FALSE; empty = TRUE; } void init() { stretch = 0; initParameters(); } //permanent storage: int stretch; //parameters: QCOORD sizeHint; QCOORD maximumSize; QCOORD minimumSize; bool expansive; bool empty; //temporary storage: bool done; //result: int pos; int size; }; -void qGeomCalc( QMemArray<QLayoutStruct> &chain, int start, int count, int pos, +void qGeomCalc( Q3MemArray<QLayoutStruct> &chain, int start, int count, int pos, int space, int spacer ); /* Modify total maximum (max) and total expansion (exp) when adding boxmax/boxexp. Expansive boxes win over non-expansive boxes. */ static inline void qMaxExpCalc( QCOORD & max, bool &exp, QCOORD boxmax, bool boxexp ) { if ( exp ) { if ( boxexp ) max = QMAX( max, boxmax ); |