summaryrefslogtreecommitdiffabout
path: root/microkde/qlayoutengine_p.h
Side-by-side diff
Diffstat (limited to 'microkde/qlayoutengine_p.h') (more/less context) (ignore whitespace changes)
-rw-r--r--microkde/qlayoutengine_p.h8
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,8 +1,10 @@
+//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
@@ -50,20 +52,16 @@
// 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;
@@ -76,17 +74,17 @@ struct QLayoutStruct
//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.