diff -r 000000000000 -r 1918ee327afb src/gui/text/qtexttable.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/text/qtexttable.h	Mon Jan 11 14:00:40 2010 +0000
@@ -0,0 +1,145 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTEXTTABLE_H
+#define QTEXTTABLE_H
+
+#include <QtCore/qglobal.h>
+#include <QtCore/qobject.h>
+#include <QtGui/qtextobject.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Gui)
+
+class QTextCursor;
+class QTextTable;
+class QTextTablePrivate;
+
+class Q_GUI_EXPORT QTextTableCell
+{
+public:
+    QTextTableCell() : table(0) {}
+    ~QTextTableCell() {}
+    QTextTableCell(const QTextTableCell &o) : table(o.table), fragment(o.fragment) {}
+    QTextTableCell &operator=(const QTextTableCell &o)
+    { table = o.table; fragment = o.fragment; return *this; }
+
+    void setFormat(const QTextCharFormat &format);
+    QTextCharFormat format() const;
+
+    int row() const;
+    int column() const;
+
+    int rowSpan() const;
+    int columnSpan() const;
+
+    inline bool isValid() const { return table != 0; }
+
+    QTextCursor firstCursorPosition() const;
+    QTextCursor lastCursorPosition() const;
+    int firstPosition() const;
+    int lastPosition() const;
+
+    inline bool operator==(const QTextTableCell &other) const
+    { return table == other.table && fragment == other.fragment; }
+    inline bool operator!=(const QTextTableCell &other) const
+    { return !operator==(other); }
+
+    QTextFrame::iterator begin() const;
+    QTextFrame::iterator end() const;
+
+    int tableCellFormatIndex() const;
+
+private:
+    friend class QTextTable;
+    QTextTableCell(const QTextTable *t, int f)
+        : table(t), fragment(f) {}
+
+    const QTextTable *table;
+    int fragment;
+};
+
+class Q_GUI_EXPORT QTextTable : public QTextFrame
+{
+    Q_OBJECT
+public:
+    explicit QTextTable(QTextDocument *doc);
+    ~QTextTable();
+
+    void resize(int rows, int cols);
+    void insertRows(int pos, int num);
+    void insertColumns(int pos, int num);
+    void appendRows(int count);
+    void appendColumns(int count);
+    void removeRows(int pos, int num);
+    void removeColumns(int pos, int num);
+
+    void mergeCells(int row, int col, int numRows, int numCols);
+    void mergeCells(const QTextCursor &cursor);
+    void splitCell(int row, int col, int numRows, int numCols);
+
+    int rows() const;
+    int columns() const;
+
+    QTextTableCell cellAt(int row, int col) const;
+    QTextTableCell cellAt(int position) const;
+    QTextTableCell cellAt(const QTextCursor &c) const;
+
+    QTextCursor rowStart(const QTextCursor &c) const;
+    QTextCursor rowEnd(const QTextCursor &c) const;
+
+    void setFormat(const QTextTableFormat &format);
+    QTextTableFormat format() const { return QTextObject::format().toTableFormat(); }
+
+private:
+    Q_DISABLE_COPY(QTextTable)
+    Q_DECLARE_PRIVATE(QTextTable)
+    friend class QTextTableCell;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QTEXTTABLE_H