Dropped unused code.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

37 files changed, 0 insertions, 18077 deletions

diff --git a/qtinterface/tqt4/Qt/q3cstring.h b/qtinterface/tqt4/Qt/q3cstring.h
deleted file mode 100644
index 615e0e7..0000000
--- a/qtinterface/tqt4/Qt/q3cstring.h
+++ /dev/null
@@ -1,281 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3Support module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef Q3CSTRING_H
-#define Q3CSTRING_H
-
-#include <QtCore/qbytearray.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3SupportLight)
-
-/*****************************************************************************
-  QCString class
- *****************************************************************************/
-
-class QRegExp;
-
-class Q_COMPAT_EXPORT Q3CString : public QByteArray
-{
-public:
-    Q3CString() {}
-    Q3CString(int size) : QByteArray(size, '\0') {}
-    Q3CString(const Q3CString &s) : QByteArray(s) {}
-    Q3CString(const QByteArray &ba) : QByteArray(ba) {}
-    Q3CString(const char *str) : QByteArray(str) {}
-    Q3CString(const char *str, uint maxlen) : QByteArray(str, qMin(qstrlen(str), maxlen - 1)) {}
-
-    Q3CString    &operator=(const Q3CString &s) {
-        QByteArray::operator=(s); return *this;
-    }
-    Q3CString    &operator=(const char *str) {
-        QByteArray::operator=(str); return *this;
-    }
-    Q3CString    &operator=(const QByteArray &ba) {
-        QByteArray::operator=(ba); return *this;
-    }
-
-    Q3CString        copy()        const { return *this; }
-    Q3CString    &sprintf(const char *format, ...);
-
-    Q3CString        left(uint len)  const { return QByteArray::left(len); }
-    Q3CString        right(uint len) const { return QByteArray::right(len); }
-    Q3CString        mid(uint index, uint len=0xffffffff) const { return QByteArray::mid(index, len); }
-
-    Q3CString        leftJustify(uint width, char fill=' ', bool trunc=false)const;
-    Q3CString        rightJustify(uint width, char fill=' ',bool trunc=false)const;
-
-    Q3CString        lower() const { return QByteArray::toLower(); }
-    Q3CString        upper() const { return QByteArray::toUpper(); }
-
-    Q3CString        stripWhiteSpace()        const { return QByteArray::trimmed(); }
-    Q3CString        simplifyWhiteSpace()        const { return QByteArray::simplified(); }
-
-    Q3CString    &insert(uint index, const char *c) { QByteArray::insert(index, c); return *this; }
-    Q3CString    &insert(uint index, char c) { QByteArray::insert(index, c); return *this; }
-    Q3CString    &append(const char *c) { QByteArray::append(c); return *this; }
-    Q3CString    &prepend(const char *c) { QByteArray::prepend(c); return *this; }
-    Q3CString    &remove(uint index, uint len) { QByteArray::remove(index, len); return *this; }
-    Q3CString    &replace(uint index, uint len, const char *c)
-    { QByteArray::replace(index, len, c); return *this; }
-#ifndef QT_NO_REGEXP
-    Q3CString    &replace( const QRegExp &, const char * );
-#endif
-    Q3CString    &replace(char c, const Q3CString &after) { return replace(c, after.constData()); }
-    Q3CString    &replace(char c, const char *after) { QByteArray::replace(c, after); return *this; }
-    Q3CString    &replace(const Q3CString &b, const Q3CString &a)
-    { return replace(b.constData(), a.constData()); }
-    Q3CString    &replace(const char *b, const char *a) { QByteArray::replace(b, a); return *this; }
-    Q3CString    &replace(char b, char a) { QByteArray::replace(b, a); return *this; }
-
-    short        toShort(bool *ok=0)        const;
-    ushort        toUShort(bool *ok=0)        const;
-    int                toInt(bool *ok=0)        const;
-    uint        toUInt(bool *ok=0)        const;
-    long        toLong(bool *ok=0)        const;
-    ulong        toULong(bool *ok=0)        const;
-    float        toFloat(bool *ok=0)        const;
-    double        toDouble(bool *ok=0)        const;
-
-    Q3CString    &setStr(const char *s) { *this = s; return *this; }
-    Q3CString    &setNum(short);
-    Q3CString    &setNum(ushort);
-    Q3CString    &setNum(int);
-    Q3CString    &setNum(uint);
-    Q3CString    &setNum(long);
-    Q3CString    &setNum(ulong);
-    Q3CString    &setNum(float, char f='g', int prec=6);
-    Q3CString    &setNum(double, char f='g', int prec=6);
-
-    bool        setExpand(uint index, char c);
-
-public:
-#ifndef QT_NO_REGEXP
-    int		contains( const QRegExp & ) const;
-#endif
-    int 	contains(const char *a) const;
-};
-
-
-/*****************************************************************************
-  Q3CString stream functions
- *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
-Q_COMPAT_EXPORT QDataStream &operator<<(QDataStream &d, const Q3CString &s);
-Q_COMPAT_EXPORT QDataStream &operator>>(QDataStream &d, Q3CString &s);
-#endif
-
-/*****************************************************************************
-  Q3CString inline functions
- *****************************************************************************/
-
-inline Q3CString &Q3CString::setNum(short n)
-{ return setNum(long(n)); }
-
-inline Q3CString &Q3CString::setNum(ushort n)
-{ return setNum(ulong(n)); }
-
-inline Q3CString &Q3CString::setNum(int n)
-{ return setNum(long(n)); }
-
-inline Q3CString &Q3CString::setNum(uint n)
-{ return setNum(ulong(n)); }
-
-inline Q3CString &Q3CString::setNum(float n, char f, int prec)
-{ return setNum(double(n),f,prec); }
-
-/*****************************************************************************
-  Q3CString non-member operators
- *****************************************************************************/
-
-Q_COMPAT_EXPORT inline bool operator==(const Q3CString &s1, const Q3CString &s2)
-{ return qstrcmp(s1, s2) == 0; }
-
-Q_COMPAT_EXPORT inline bool operator==(const Q3CString &s1, const char *s2)
-{ return qstrcmp(s1, s2) == 0; }
-
-Q_COMPAT_EXPORT inline bool operator==(const char *s1, const Q3CString &s2)
-{ return qstrcmp(s1, s2) == 0; }
-
-Q_COMPAT_EXPORT inline bool operator!=(const Q3CString &s1, const Q3CString &s2)
-{ return qstrcmp(s1, s2) != 0; }
-
-Q_COMPAT_EXPORT inline bool operator!=(const Q3CString &s1, const char *s2)
-{ return qstrcmp(s1, s2) != 0; }
-
-Q_COMPAT_EXPORT inline bool operator!=(const char *s1, const Q3CString &s2)
-{ return qstrcmp(s1, s2) != 0; }
-
-Q_COMPAT_EXPORT inline bool operator<(const Q3CString &s1, const Q3CString& s2)
-{ return qstrcmp(s1, s2) < 0; }
-
-Q_COMPAT_EXPORT inline bool operator<(const Q3CString &s1, const char *s2)
-{ return qstrcmp(s1, s2) < 0; }
-
-Q_COMPAT_EXPORT inline bool operator<(const char *s1, const Q3CString &s2)
-{ return qstrcmp(s1, s2) < 0; }
-
-Q_COMPAT_EXPORT inline bool operator<=(const Q3CString &s1, const Q3CString &s2)
-{ return qstrcmp(s1, s2) <= 0; }
-
-Q_COMPAT_EXPORT inline bool operator<=(const Q3CString &s1, const char *s2)
-{ return qstrcmp(s1, s2) <= 0; }
-
-Q_COMPAT_EXPORT inline bool operator<=(const char *s1, const Q3CString &s2)
-{ return qstrcmp(s1, s2) <= 0; }
-
-Q_COMPAT_EXPORT inline bool operator>(const Q3CString &s1, const Q3CString &s2)
-{ return qstrcmp(s1, s2) > 0; }
-
-Q_COMPAT_EXPORT inline bool operator>(const Q3CString &s1, const char *s2)
-{ return qstrcmp(s1, s2) > 0; }
-
-Q_COMPAT_EXPORT inline bool operator>(const char *s1, const Q3CString &s2)
-{ return qstrcmp(s1, s2) > 0; }
-
-Q_COMPAT_EXPORT inline bool operator>=(const Q3CString &s1, const Q3CString& s2)
-{ return qstrcmp(s1, s2) >= 0; }
-
-Q_COMPAT_EXPORT inline bool operator>=(const Q3CString &s1, const char *s2)
-{ return qstrcmp(s1, s2) >= 0; }
-
-Q_COMPAT_EXPORT inline bool operator>=(const char *s1, const Q3CString &s2)
-{ return qstrcmp(s1, s2) >= 0; }
-
-Q_COMPAT_EXPORT inline const Q3CString operator+(const Q3CString &s1,
-                                          const Q3CString &s2)
-{
-    Q3CString tmp(s1);
-    tmp += s2;
-    return tmp;
-}
-Q_COMPAT_EXPORT inline const Q3CString operator+(const Q3CString &s1,
-                                          const QByteArray &s2)
-{
-    QByteArray tmp(s1);
-    tmp += s2;
-    return tmp;
-}
-Q_COMPAT_EXPORT inline const Q3CString operator+(const QByteArray &s1,
-                                          const Q3CString &s2)
-{
-    QByteArray tmp(s1);
-    tmp += s2;
-    return tmp;
-}
-
-Q_COMPAT_EXPORT inline const Q3CString operator+(const Q3CString &s1, const char *s2)
-{
-    Q3CString tmp(s1);
-    tmp += s2;
-    return tmp;
-}
-
-Q_COMPAT_EXPORT inline const Q3CString operator+(const char *s1, const Q3CString &s2)
-{
-    Q3CString tmp(s1);
-    tmp += s2;
-    return tmp;
-}
-
-Q_COMPAT_EXPORT inline const Q3CString operator+(const Q3CString &s1, char c2)
-{
-    Q3CString tmp(s1);
-    tmp += c2;
-    return tmp;
-}
-
-Q_COMPAT_EXPORT inline const Q3CString operator+(char c1, const Q3CString &s2)
-{
-    Q3CString tmp;
-    tmp += c1;
-    tmp += s2;
-    return tmp;
-}
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // Q3CSTRING_H
diff --git a/qtinterface/tqt4/Qt/q3painter.h b/qtinterface/tqt4/Qt/q3painter.h
deleted file mode 100644
index a48ad54..0000000
--- a/qtinterface/tqt4/Qt/q3painter.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3Support module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef Q3PAINTER_H
-#define Q3PAINTER_H
-
-#include <QtGui/qpainter.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3SupportLight)
-
-class Q_COMPAT_EXPORT Q3Painter : public QPainter
-{
-public:
-    Q3Painter() : QPainter() { }
-    Q3Painter(QPaintDevice *pdev) : QPainter(pdev) { }
-    Q3Painter( const QPaintDevice *, bool unclipped );
-
-    inline void drawRect(const QRect &rect);
-    inline void drawRect(int x1, int y1, int w, int h)
-    { drawRect(QRect(x1, y1, w, h)); }
-
-    inline void drawRoundRect(const QRect &r, int xround = 25, int yround = 25);
-    inline void drawRoundRect(int x, int y, int w, int h, int xround = 25, int yround = 25)
-    { drawRoundRect(QRect(x, y, w, h), xround, yround); }
-
-    inline void drawEllipse(const QRect &r);
-    inline void drawEllipse(int x, int y, int w, int h)
-    { drawEllipse(QRect(x, y, w, h)); }
-
-    inline void drawArc(const QRect &r, int a, int alen);
-    inline void drawArc(int x, int y, int w, int h, int a, int alen)
-    { drawArc(QRect(x, y, w, h), a, alen); }
-
-    inline void drawPie(const QRect &r, int a, int alen);
-    inline void drawPie(int x, int y, int w, int h, int a, int alen)
-    { drawPie(QRect(x, y, w, h), a, alen); }
-
-    inline void drawChord(const QRect &r, int a, int alen);
-    inline void drawChord(int x, int y, int w, int h, int a, int alen)
-    { drawChord(QRect(x, y, w, h), a, alen); }
-
-    void setRasterOp( Qt::RasterOp );
-
-//     void flush( const QRegion &region, CoordinateMode cm = CoordDevice );
-    void flush();
-
-private:
-    QRect adjustedRectangle(const QRect &r);
-
-    Q_DISABLE_COPY(Q3Painter)
-};
-
-void inline Q3Painter::drawRect(const QRect &r)
-{
-    QPainter::drawRect(adjustedRectangle(r));
-}
-
-void inline Q3Painter::drawEllipse(const QRect &r)
-{
-    QPainter::drawEllipse(adjustedRectangle(r));
-}
-
-void inline Q3Painter::drawRoundRect(const QRect &r, int xrnd, int yrnd)
-{
-    QPainter::drawRoundRect(adjustedRectangle(r), xrnd, yrnd);
-}
-
-void inline Q3Painter::drawArc(const QRect &r, int angle, int arcLength)
-{
-    QPainter::drawArc(adjustedRectangle(r), angle, arcLength);
-}
-
-void inline Q3Painter::drawPie(const QRect &r, int angle, int arcLength)
-{
-    QPainter::drawPie(adjustedRectangle(r), angle, arcLength);
-}
-
-void inline Q3Painter::drawChord(const QRect &r, int angle, int arcLength)
-{
-    QPainter::drawChord(adjustedRectangle(r), angle, arcLength);
-}
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // Q3PAINTER_H
diff --git a/qtinterface/tqt4/Qt/q3pointarray.h b/qtinterface/tqt4/Qt/q3pointarray.h
deleted file mode 100644
index c11c8a4..0000000
--- a/qtinterface/tqt4/Qt/q3pointarray.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3Support module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef Q3POINTARRAY_H
-#define Q3POINTARRAY_H
-
-#include <QtGui/qpolygon.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3SupportLight)
-
-class Q_COMPAT_EXPORT Q3PointArray : public QPolygon
-{
-public:
-    inline Q3PointArray() : QPolygon() {}
-    inline Q3PointArray(const QRect &r, bool closed=false) : QPolygon(r, closed) {}
-    inline Q3PointArray(const QPolygon& a) : QPolygon(a) {}
-    Q3PointArray( int nPoints, const QCOORD *points );
-
-    inline Q3PointArray copy() const { return *this; }
-    inline bool isNull() { return isEmpty(); }
-    void makeEllipse(int x, int y, int w, int h);
-#ifndef QT_NO_WMATRIX
-    void makeArc(int x, int y, int w, int h, int a1, int a2);
-    void makeArc(int x, int y, int w, int h, int a1, int a2, const QMatrix &matrix);
-#endif
-    Q3PointArray cubicBezier() const;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // Q3POINTARRAY_H
diff --git a/qtinterface/tqt4/Qt/q3popupmenu.h b/qtinterface/tqt4/Qt/q3popupmenu.h
deleted file mode 100644
index 2c138da..0000000
--- a/qtinterface/tqt4/Qt/q3popupmenu.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3Support module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef Q3POPUPMENU_H
-#define Q3POPUPMENU_H
-
-#include <QtGui/qmenu.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3SupportLight)
-
-class Q_COMPAT_EXPORT Q3PopupMenu : public QMenu
-{
-    Q_OBJECT
-public:
-    inline Q3PopupMenu(QWidget *parent = 0, const char *name = 0) : QMenu(parent)
-    { setObjectName(QLatin1String(name)); }
-
-    inline int exec() { return findIdForAction(QMenu::exec()); }
-    inline int exec(const QPoint & pos, int indexAtPoint = 0) {
-        return findIdForAction(QMenu::exec(pos, actions().value(indexAtPoint)));
-    }
-
-    void setFrameRect(QRect) {}
-    QRect frameRect() const { return QRect(); }
-    enum DummyFrame { Box, Sunken, Plain, Raised, MShadow, NoFrame, Panel, StyledPanel,
-                      HLine, VLine, GroupBoxPanel, WinPanel, ToolBarPanel, MenuBarPanel,
-                      PopupPanel, LineEditPanel, TabWidgetPanel, MShape };
-    void setFrameShadow(DummyFrame) {}
-    DummyFrame frameShadow() const { return Plain; }
-    void setFrameShape(DummyFrame) {}
-    DummyFrame frameShape() const { return NoFrame; }
-    void setFrameStyle(int) {}
-    int frameStyle() const  { return 0; }
-    int frameWidth() const { return 0; }
-    void setLineWidth(int) {}
-    int lineWidth() const { return 0; }
-    void setMargin(int margin) { setContentsMargins(margin, margin, margin, margin); }
-    int margin() const
-    { int margin; int dummy; getContentsMargins(&margin, &dummy, &dummy, &dummy);  return margin; }
-    void setMidLineWidth(int) {}
-    int midLineWidth() const { return 0; }
-
-    void changeItem( int id, const QString &text );				// obsolete
-    void changeItem( const QString &text, int id );				// obsolete
-    void changeItem( const QPixmap &pixmap, int id );				// obsolete
-    void changeItem( const QIconSet &icon, const QString &text, int id );	// obsolete
-
-private:
-    Q_DISABLE_COPY(Q3PopupMenu)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QPOPUPMENU_H
diff --git a/qtinterface/tqt4/Qt/q3whatsthis.h b/qtinterface/tqt4/Qt/q3whatsthis.h
deleted file mode 100644
index c6c6086..0000000
--- a/qtinterface/tqt4/Qt/q3whatsthis.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3Support module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef Q3WHATSTHIS_H
-#define Q3WHATSTHIS_H
-
-#include <QtGui/qcursor.h>
-#include <QtGui/qwhatsthis.h>
-#include <QtGui/qwidget.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3SupportLight)
-
-#ifndef QT_NO_WHATSTHIS
-
-class QToolButton;
-
-class Q_COMPAT_EXPORT Q3WhatsThis: public QObject
-{
-    Q_OBJECT
-public:
-    Q3WhatsThis(QWidget *);
-    ~Q3WhatsThis();
-    bool eventFilter(QObject *, QEvent *);
-
-    static inline void enterWhatsThisMode() { QWhatsThis::enterWhatsThisMode(); }
-    static inline bool inWhatsThisMode() { return QWhatsThis::inWhatsThisMode(); }
-
-    static inline void add(QWidget *w, const QString &s) { w->setWhatsThis(s); }
-    static inline void remove(QWidget *w) { w->setWhatsThis(QString()); }
-    static QToolButton * whatsThisButton(QWidget * parent);
-    static inline void leaveWhatsThisMode(const QString& text = QString(), const QPoint& pos = QCursor::pos(), QWidget* w = 0)
-        { QWhatsThis::showText(pos, text, w); }
-    static inline void display(const QString& text, const QPoint& pos = QCursor::pos(), QWidget* w = 0)
-        { QWhatsThis::showText(pos, text, w); }
-
-    virtual QString text(const QPoint &);
-    virtual bool clicked(const QString& href);
-
-    static QString textFor( QWidget *, const QPoint & pos = QPoint(), bool includeParents = FALSE );
-};
-
-#endif // QT_NO_WHATSTHIS
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // Q3WHATSTHIS_H
diff --git a/qtinterface/tqt4/Qt/qapplication.h b/qtinterface/tqt4/Qt/qapplication.h
deleted file mode 100644
index e87a940..0000000
--- a/qtinterface/tqt4/Qt/qapplication.h
+++ /dev/null
@@ -1,419 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 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$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QAPPLICATION_H
-#define QAPPLICATION_H
-
-#include <QtCore/qcoreapplication.h>
-#include <QtGui/qwindowdefs.h>
-#include <QtCore/qpoint.h>
-#include <QtCore/qsize.h>
-#include <QtGui/qcursor.h>
-#ifdef TQT_INCLUDE_COMPAT
-# include <QtGui/qdesktopwidget.h>
-#endif
-#ifdef QT3_SUPPORT
-# include <QtGui/qwidget.h>
-# include <QtGui/qpalette.h>
-#endif
-#ifdef Q_WS_QWS
-# include <QtGui/qrgb.h>
-# include <QtGui/qtransportauth_qws.h>
-#endif
-
-QT_BEGIN_HEADER
-
-#if defined(Q_WS_S60)
-class CApaApplication;
-#endif
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-class QSessionManager;
-class QDesktopWidget;
-class QStyle;
-class QEventLoop;
-class QIcon;
-class QInputContext;
-template <typename T> class QList;
-class QLocale;
-#if defined(Q_WS_QWS)
-class QDecoration;
-#endif
-#if defined(Q_OS_SYMBIAN)
-class QSymbianEvent;
-#endif
-
-class QApplication;
-class QApplicationPrivate;
-#if defined(qApp)
-#undef qApp
-#endif
-#define qApp (static_cast<QApplication *>(QCoreApplication::instance()))
-
-
-class Q_GUI_EXPORT QApplication : public QCoreApplication
-{
-    Q_OBJECT
-    Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection)
-    Q_PROPERTY(QIcon windowIcon READ windowIcon WRITE setWindowIcon)
-    Q_PROPERTY(int cursorFlashTime READ cursorFlashTime WRITE setCursorFlashTime)
-    Q_PROPERTY(int doubleClickInterval  READ doubleClickInterval WRITE setDoubleClickInterval)
-    Q_PROPERTY(int keyboardInputInterval READ keyboardInputInterval WRITE setKeyboardInputInterval)
-#ifndef QT_NO_WHEELEVENT
-    Q_PROPERTY(int wheelScrollLines  READ wheelScrollLines WRITE setWheelScrollLines)
-#endif
-    Q_PROPERTY(QSize globalStrut READ globalStrut WRITE setGlobalStrut)
-    Q_PROPERTY(int startDragTime  READ startDragTime WRITE setStartDragTime)
-    Q_PROPERTY(int startDragDistance  READ startDragDistance WRITE setStartDragDistance)
-    Q_PROPERTY(bool quitOnLastWindowClosed  READ quitOnLastWindowClosed WRITE setQuitOnLastWindowClosed)
-#ifndef QT_NO_STYLE_STYLESHEET
-    Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
-#endif
-#ifdef Q_WS_WINCE
-    Q_PROPERTY(int autoMaximizeThreshold READ autoMaximizeThreshold WRITE setAutoMaximizeThreshold)
-#endif
-    Q_PROPERTY(bool autoSipEnabled READ autoSipEnabled WRITE setAutoSipEnabled)
-
-public:
-    enum Type { Tty, GuiClient, GuiServer };
-
-    void installTranslator( QTranslator * );
-    void removeTranslator( QTranslator * );
-
-#ifdef Q_WS_S60
-    typedef CApaApplication * (*QS60MainApplicationFactory)();
-#endif
-
-#ifndef qdoc
-    QApplication(int &argc, char **argv, int = QT_VERSION);
-    QApplication(int &argc, char **argv, bool GUIenabled, int = QT_VERSION);
-    QApplication(int &argc, char **argv, Type, int = QT_VERSION);
-#if defined(Q_WS_X11)
-    QApplication(Display* dpy, Qt::HANDLE visual = 0, Qt::HANDLE cmap = 0, int = QT_VERSION);
-    QApplication(Display *dpy, int &argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap= 0, int = QT_VERSION);
-#endif
-#if defined(Q_WS_S60)
-    QApplication(QApplication::QS60MainApplicationFactory factory, int &argc, char **argv, int = QT_VERSION);
-#endif
-#endif
-    virtual ~QApplication();
-
-    static Type type();
-
-    static QStyle *style();
-    static void setStyle(QStyle*);
-    static QStyle *setStyle(const QString&);
-    enum ColorSpec { NormalColor=0, CustomColor=1, ManyColor=2 };
-    static int colorSpec();
-    static void setColorSpec(int);
-    static void setGraphicsSystem(const QString &);
-
-#ifndef QT_NO_CURSOR
-    static QCursor *overrideCursor();
-    static void setOverrideCursor(const QCursor &);
-    static void changeOverrideCursor(const QCursor &);
-    static void restoreOverrideCursor();
-#endif
-    static QPalette palette();
-    static QPalette palette(const QWidget *);
-    static QPalette palette(const char *className);
-    static void setPalette(const QPalette &, const char* className = 0);
-    static QFont font();
-    static QFont font(const QWidget*);
-    static QFont font(const char *className);
-    static void setFont(const QFont &, const char* className = 0);
-    static QFontMetrics fontMetrics();
-
-    static void setWindowIcon(const QIcon &icon);
-    static QIcon windowIcon();
-
-
-#ifdef QT3_SUPPORT
-    static QT3_SUPPORT QWidget *mainWidget();
-    static QT3_SUPPORT void setMainWidget(QWidget *);
-#endif
-
-    static QWidgetList allWidgets();
-    static QWidgetList topLevelWidgets();
-
-    static QDesktopWidget *desktop();
-
-    static QWidget *activePopupWidget();
-    static QWidget *activeModalWidget();
-#ifndef QT_NO_CLIPBOARD
-    static QClipboard *clipboard();
-#endif
-    static QWidget *focusWidget();
-
-    static QWidget *activeWindow();
-    static void setActiveWindow(QWidget* act);
-
-    static QWidget *widgetAt(const QPoint &p);
-    static inline QWidget *widgetAt(int x, int y) { return widgetAt(QPoint(x, y)); }
-    static QWidget *topLevelAt(const QPoint &p);
-    static inline QWidget *topLevelAt(int x, int y)  { return topLevelAt(QPoint(x, y)); }
-
-    static void syncX();
-    static void beep();
-    static void alert(QWidget *widget, int duration = 0);
-
-    static Qt::KeyboardModifiers keyboardModifiers();
-    static Qt::MouseButtons mouseButtons();
-
-    static void setDesktopSettingsAware(bool);
-    static bool desktopSettingsAware();
-
-    static void setCursorFlashTime(int);
-    static int cursorFlashTime();
-
-    static void setDoubleClickInterval(int);
-    static int doubleClickInterval();
-
-    static void setKeyboardInputInterval(int);
-    static int keyboardInputInterval();
-
-#ifndef QT_NO_WHEELEVENT
-    static void setWheelScrollLines(int);
-    static int wheelScrollLines();
-#endif
-    static void setGlobalStrut(const QSize &);
-    static QSize globalStrut();
-
-    static void setStartDragTime(int ms);
-    static int startDragTime();
-    static void setStartDragDistance(int l);
-    static int startDragDistance();
-
-    static void setLayoutDirection(Qt::LayoutDirection direction);
-    static Qt::LayoutDirection layoutDirection();
-
-    static inline bool isRightToLeft() { return layoutDirection() == Qt::RightToLeft; }
-    static inline bool isLeftToRight() { return layoutDirection() == Qt::LeftToRight; }
-
-    static bool isEffectEnabled(Qt::UIEffect);
-    static void setEffectEnabled(Qt::UIEffect, bool enable = true);
-
-#if defined(Q_WS_MAC)
-    virtual bool macEventFilter(EventHandlerCallRef, EventRef);
-#endif
-#if defined(Q_WS_X11)
-    virtual bool x11EventFilter(XEvent *);
-    virtual int x11ClientMessage(QWidget*, XEvent*, bool passive_only);
-    int x11ProcessEvent(XEvent*);
-#endif
-#if defined(Q_OS_SYMBIAN)
-    int symbianProcessEvent(const QSymbianEvent *event);
-    virtual bool symbianEventFilter(const QSymbianEvent *event);
-#endif
-#if defined(Q_WS_QWS)
-    virtual bool qwsEventFilter(QWSEvent *);
-    int qwsProcessEvent(QWSEvent*);
-    void qwsSetCustomColors(QRgb *colortable, int start, int numColors);
-#ifndef QT_NO_QWS_MANAGER
-    static QDecoration &qwsDecoration();
-    static void qwsSetDecoration(QDecoration *);
-    static QDecoration *qwsSetDecoration(const QString &decoration);
-#endif
-#endif
-
-
-#if defined(Q_WS_WIN)
-    void winFocus(QWidget *, bool);
-    static void winMouseButtonUp();
-#endif
-#ifndef QT_NO_SESSIONMANAGER
-    // session management
-    bool isSessionRestored() const;
-    QString sessionId() const;
-    QString sessionKey() const;
-    virtual void commitData(QSessionManager& sm);
-    virtual void saveState(QSessionManager& sm);
-#endif
-    void setInputContext(QInputContext *);
-    QInputContext *inputContext() const;
-
-    static QLocale keyboardInputLocale();
-    static Qt::LayoutDirection keyboardInputDirection();
-
-    static int exec();
-    bool notify(QObject *, QEvent *);
-
-
-    static void setQuitOnLastWindowClosed(bool quit);
-    static bool quitOnLastWindowClosed();
-
-#ifdef QT_KEYPAD_NAVIGATION
-    static Q_DECL_DEPRECATED void setKeypadNavigationEnabled(bool);
-    static bool keypadNavigationEnabled();
-    static void setNavigationMode(Qt::NavigationMode mode);
-    static Qt::NavigationMode navigationMode();
-#endif
-
-Q_SIGNALS:
-    void lastWindowClosed();
-    void focusChanged(QWidget *old, QWidget *now);
-    void fontDatabaseChanged();
-#ifndef QT_NO_SESSIONMANAGER
-    void commitDataRequest(QSessionManager &sessionManager);
-    void saveStateRequest(QSessionManager &sessionManager);
-#endif
-
-public:
-    QString styleSheet() const;
-public Q_SLOTS:
-#ifndef QT_NO_STYLE_STYLESHEET
-    void setStyleSheet(const QString& sheet);
-#endif
-#ifdef Q_WS_WINCE
-    void setAutoMaximizeThreshold(const int threshold);
-    int autoMaximizeThreshold() const;
-#endif
-    void setAutoSipEnabled(const bool enabled);
-    bool autoSipEnabled() const;
-    static void closeAllWindows();
-    static void aboutQt();
-
-protected:
-#if defined(Q_WS_QWS)
-    void setArgs(int, char **);
-#endif
-    bool event(QEvent *);
-    bool compressEvent(QEvent *, QObject *receiver, QPostEventList *);
-
-#ifdef QT3_SUPPORT
-public:
-    static TQEventLoop *eventLoop();
-    static inline QT3_SUPPORT void setReverseLayout(bool b) { setLayoutDirection(b?Qt::RightToLeft:Qt::LeftToRight); }
-    static inline bool QT3_SUPPORT reverseLayout() { return layoutDirection() == Qt::RightToLeft; }
-    static QT3_SUPPORT Qt::Alignment horizontalAlignment(Qt::Alignment align);
-    typedef int ColorMode;
-    enum { NormalColors = NormalColor, CustomColors = CustomColor };
-    static inline QT3_SUPPORT ColorMode colorMode() { return static_cast<ColorMode>(colorSpec()); }
-    static inline QT3_SUPPORT void setColorMode(ColorMode mode) { setColorSpec(int(mode)); }
-#if defined(Q_OS_WIN32) || defined(Q_OS_CYGWIN)
-    static QT3_SUPPORT Qt::WindowsVersion winVersion() { return (Qt::WindowsVersion)QSysInfo::WindowsVersion; }
-#endif
-#if defined(Q_OS_MAC)
-    static QT3_SUPPORT Qt::MacintoshVersion macVersion() { return (Qt::MacintoshVersion)QSysInfo::MacintoshVersion; }
-#endif
-#  ifndef QT_NO_CURSOR
-    inline static  QT3_SUPPORT void setOverrideCursor(const QCursor &cursor, bool replace)
-    { if (replace) changeOverrideCursor(cursor); else setOverrideCursor(cursor); }
-#  endif
-    inline static QT3_SUPPORT bool hasGlobalMouseTracking() {return true;}
-    inline static QT3_SUPPORT void setGlobalMouseTracking(bool) {}
-    inline static QT3_SUPPORT void flushX() { flush(); }
-    static inline QT3_SUPPORT void setWinStyleHighlightColor(const QColor &c) {
-        QPalette p(palette());
-        p.setColor(QPalette::Highlight, c);
-        setPalette(p);
-    }
-    static inline QT3_SUPPORT const QColor &winStyleHighlightColor()
-        { return palette().color(QPalette::Active, QPalette::Highlight); }
-    static inline QT3_SUPPORT void setPalette(const QPalette &pal, bool, const char* className = 0)
-        { setPalette(pal, className); }
-    static inline QT3_SUPPORT void setFont(const QFont &font, bool, const char* className = 0)
-        { setFont(font, className); }
-
-    static inline QT3_SUPPORT QWidget *widgetAt(int x, int y, bool child)
-        { QWidget *w = widgetAt(x, y); return child ? w : (w ? w->window() : 0); }
-    static inline QT3_SUPPORT QWidget *widgetAt(const QPoint &p, bool child)
-        { QWidget *w = widgetAt(p); return child ? w : (w ? w->window() : 0); }
-#endif // QT3_SUPPORT
-
-#if defined(Q_INTERNAL_QAPP_SRC) || defined(qdoc)
-    QApplication(int &argc, char **argv);
-    QApplication(int &argc, char **argv, bool GUIenabled);
-    QApplication(int &argc, char **argv, Type);
-#if defined(Q_WS_X11)
-    QApplication(Display* dpy, Qt::HANDLE visual = 0, Qt::HANDLE cmap = 0);
-    QApplication(Display *dpy, int &argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap= 0);
-#endif
-#if defined(Q_WS_S60) || defined(qdoc)
-    QApplication(QApplication::QS60MainApplicationFactory factory, int &argc, char **argv);
-#endif
-#endif
-
-private:
-    Q_DISABLE_COPY(QApplication)
-    Q_DECLARE_PRIVATE(QApplication)
-
-    friend class QGraphicsWidget;
-    friend class QGraphicsScene;
-    friend class QGraphicsScenePrivate;
-    friend class QWidget;
-    friend class QWidgetPrivate;
-    friend class QETWidget;
-    friend class Q3AccelManager;
-    friend class QTranslator;
-    friend class QWidgetAnimator;
-#ifndef QT_NO_SHORTCUT
-    friend class QShortcut;
-    friend class QLineEdit;
-    friend class QTextControl;
-#endif
-    friend class QAction;
-    friend class QFontDatabasePrivate;
-
-#if defined(Q_WS_QWS)
-    friend class QInputContext;
-    friend class QWSDirectPainterSurface;
-    friend class QDirectPainter;
-    friend class QDirectPainterPrivate;
-#endif
-    friend class QGestureManager;
-
-#if defined(Q_WS_MAC) || defined(Q_WS_X11)
-    Q_PRIVATE_SLOT(d_func(), void _q_alertTimeOut())
-#endif
-#if defined(QT_RX71_MULTITOUCH)
-    Q_PRIVATE_SLOT(d_func(), void _q_readRX71MultiTouchEvents())
-#endif
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QAPPLICATION_H
diff --git a/qtinterface/tqt4/Qt/qbytearray.h b/qtinterface/tqt4/Qt/qbytearray.h
deleted file mode 100644
index 9ee2be3..0000000
--- a/qtinterface/tqt4/Qt/qbytearray.h
+++ /dev/null
@@ -1,601 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QBYTEARRAY_H
-#define QBYTEARRAY_H
-
-#include <QtCore/qatomic.h>
-#include <QtCore/qnamespace.h>
-
-#include <string.h>
-#include <stdarg.h>
-
-#ifdef truncate
-#error qbytearray.h must be included before any header file that defines truncate
-#endif
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Core)
-
-/*****************************************************************************
-  Safe and portable C string functions; extensions to standard string.h
- *****************************************************************************/
-
-Q_CORE_EXPORT char *qstrdup(const char *);
-
-inline uint qstrlen(const char *str)
-{ return str ? uint(strlen(str)) : 0; }
-
-inline uint qstrnlen(const char *str, uint maxlen)
-{
-    uint length = 0;
-    if (str) {
-        while (length < maxlen && *str++)
-            length++;
-    }
-    return length;
-}
-
-Q_CORE_EXPORT char *qstrcpy(char *dst, const char *src);
-Q_CORE_EXPORT char *qstrncpy(char *dst, const char *src, uint len);
-
-Q_CORE_EXPORT int qstrcmp(const char *str1, const char *str2);
-Q_CORE_EXPORT int qstrcmp(const QByteArray &str1, const QByteArray &str2);
-Q_CORE_EXPORT int qstrcmp(const QByteArray &str1, const char *str2);
-static inline int qstrcmp(const char *str1, const QByteArray &str2)
-{ return -qstrcmp(str2, str1); }
-
-inline int qstrncmp(const char *str1, const char *str2, uint len)
-{
-    return (str1 && str2) ? strncmp(str1, str2, len)
-        : (str1 ? 1 : (str2 ? -1 : 0));
-}
-Q_CORE_EXPORT int qstricmp(const char *, const char *);
-Q_CORE_EXPORT int qstrnicmp(const char *, const char *, uint len);
-
-// implemented in qvsnprintf.cpp
-Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap);
-Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...);
-
-#ifdef QT3_SUPPORT
-inline QT3_SUPPORT void *qmemmove(void *dst, const void *src, uint len)
-{ return memmove(dst, src, len); }
-inline QT3_SUPPORT uint cstrlen(const char *str)
-{ return uint(strlen(str)); }
-inline QT3_SUPPORT char *cstrcpy(char *dst, const char *src)
-{ return qstrcpy(dst,src); }
-inline QT3_SUPPORT int cstrcmp(const char *str1, const char *str2)
-{ return strcmp(str1,str2); }
-inline QT3_SUPPORT int cstrncmp(const char *str1, const char *str2, uint len)
-{ return strncmp(str1,str2,len); }
-#endif
-
-// qChecksum: Internet checksum
-
-Q_CORE_EXPORT quint16 qChecksum(const char *s, uint len);
-
-class QByteRef;
-class QString;
-class QDataStream;
-template <typename T> class QList;
-
-class Q_CORE_EXPORT QByteArray
-{
-private:
-    struct Data {
-        QBasicAtomicInt ref;
-        int alloc, size;
-        // ### Qt 5.0: We need to add the missing capacity bit
-        // (like other tool classes have), to maintain the
-        // reserved memory on resize.
-        char *data;
-        char array[1];
-    };
-
-public:
-    inline QByteArray();
-    QByteArray(const char *);
-    QByteArray(const char *, int size);
-    QByteArray(int size, char c);
-    QByteArray(int size, Qt::Initialization);
-    inline QByteArray(const QByteArray &);
-    inline ~QByteArray();
-
-    QByteArray &operator=(const QByteArray &);
-    QByteArray &operator=(const char *str);
-
-    inline int size() const;
-    bool isEmpty() const;
-    void resize(int size);
-
-    QByteArray &fill(char c, int size = -1);
-
-    int capacity() const;
-    void reserve(int size);
-    void squeeze();
-
-#ifndef QT_NO_CAST_FROM_BYTEARRAY
-    operator const char *() const;
-    operator const void *() const;
-    operator QByteArray *() const;
-#endif
-    char *data();
-    char *data() const;
-    inline const char *constData() const;
-    inline void detach();
-    bool isDetached() const;
-    void clear();
-
-#ifdef Q_COMPILER_MANGLES_RETURN_TYPE
-    const char at(int i) const;
-    const char operator[](int i) const;
-    const char operator[](uint i) const;
-#else
-    char at(int i) const;
-    char operator[](int i) const;
-    char operator[](uint i) const;
-#endif
-    QByteRef operator[](int i);
-    QByteRef operator[](uint i);
-
-    int indexOf(char c, int from = 0) const;
-    int indexOf(const char *c, int from = 0) const;
-    int indexOf(const QByteArray &a, int from = 0) const;
-    int lastIndexOf(char c, int from = -1) const;
-    int lastIndexOf(const char *c, int from = -1) const;
-    int lastIndexOf(const QByteArray &a, int from = -1) const;
-
-    QBool contains(char c) const;
-    QBool contains(const char *a) const;
-    QBool contains(const QByteArray &a) const;
-    int count(char c) const;
-    int count(const char *a) const;
-    int count(const QByteArray &a) const;
-
-    QByteArray left(int len) const;
-    QByteArray right(int len) const;
-    QByteArray mid(int index, int len = -1) const;
-
-    bool startsWith(const QByteArray &a) const;
-    bool startsWith(char c) const;
-    bool startsWith(const char *c) const;
-
-    bool endsWith(const QByteArray &a) const;
-    bool endsWith(char c) const;
-    bool endsWith(const char *c) const;
-
-    void truncate(int pos);
-    void chop(int n);
-
-    QByteArray toLower() const;
-    QByteArray toUpper() const;
-
-    QByteArray trimmed() const;
-    QByteArray simplified() const;
-    QByteArray leftJustified(int width, char fill = ' ', bool truncate = false) const;
-    QByteArray rightJustified(int width, char fill = ' ', bool truncate = false) const;
-
-#ifdef QT3_SUPPORT
-    inline QT3_SUPPORT QByteArray leftJustify(uint width, char aFill = ' ', bool aTruncate = false) const
-    { return leftJustified(int(width), aFill, aTruncate); }
-    inline QT3_SUPPORT QByteArray rightJustify(uint width, char aFill = ' ', bool aTruncate = false) const
-    { return rightJustified(int(width), aFill, aTruncate); }
-#endif
-
-    QByteArray copy() const;
-
-    QByteArray &prepend(char c);
-    QByteArray &prepend(const char *s);
-    QByteArray &prepend(const char *s, int len);
-    QByteArray &prepend(const QByteArray &a);
-    QByteArray &append(char c);
-    QByteArray &append(const char *s);
-    QByteArray &append(const char *s, int len);
-    QByteArray &append(const QByteArray &a);
-    QByteArray &insert(int i, char c);
-    QByteArray &insert(int i, const char *s);
-    QByteArray &insert(int i, const char *s, int len);
-    QByteArray &insert(int i, const QByteArray &a);
-    QByteArray &remove(int index, int len);
-    QByteArray &replace(int index, int len, const char *s);
-    QByteArray &replace(int index, int len, const QByteArray &s);
-    QByteArray &replace(char before, const char *after);
-    QByteArray &replace(char before, const QByteArray &after);
-    QByteArray &replace(const char *before, const char *after);
-    QByteArray &replace(const char *before, int bsize, const char *after, int asize);
-    QByteArray &replace(const QByteArray &before, const QByteArray &after);
-    QByteArray &replace(const QByteArray &before, const char *after);
-    QByteArray &replace(const char *before, const QByteArray &after);
-    QByteArray &replace(char before, char after);
-    QByteArray &operator+=(char c);
-    QByteArray &operator+=(const char *s);
-    QByteArray &operator+=(const QByteArray &a);
-
-    QList<QByteArray> split(char sep) const;
-
-    QByteArray repeated(int times) const;
-
-#ifndef QT_NO_CAST_TO_ASCII
-    QT_ASCII_CAST_WARN QByteArray &append(const QString &s);
-    QT_ASCII_CAST_WARN QByteArray &insert(int i, const QString &s);
-    QT_ASCII_CAST_WARN QByteArray &replace(const QString &before, const char *after);
-    QT_ASCII_CAST_WARN QByteArray &replace(char c, const QString &after);
-    QT_ASCII_CAST_WARN QByteArray &replace(const QString &before, const QByteArray &after);
-
-    QT_ASCII_CAST_WARN QByteArray &operator+=(const QString &s);
-    QT_ASCII_CAST_WARN int indexOf(const QString &s, int from = 0) const;
-    QT_ASCII_CAST_WARN int lastIndexOf(const QString &s, int from = -1) const;
-#endif
-#ifndef QT_NO_CAST_FROM_ASCII
-    inline QT_ASCII_CAST_WARN bool operator==(const QString &s2) const;
-    inline QT_ASCII_CAST_WARN bool operator!=(const QString &s2) const;
-    inline QT_ASCII_CAST_WARN bool operator<(const QString &s2) const;
-    inline QT_ASCII_CAST_WARN bool operator>(const QString &s2) const;
-    inline QT_ASCII_CAST_WARN bool operator<=(const QString &s2) const;
-    inline QT_ASCII_CAST_WARN bool operator>=(const QString &s2) const;
-#endif
-
-    short toShort(bool *ok = 0, int base = 10) const;
-    ushort toUShort(bool *ok = 0, int base = 10) const;
-    int toInt(bool *ok = 0, int base = 10) const;
-    uint toUInt(bool *ok = 0, int base = 10) const;
-    long toLong(bool *ok = 0, int base = 10) const;
-    ulong toULong(bool *ok = 0, int base = 10) const;
-    qlonglong toLongLong(bool *ok = 0, int base = 10) const;
-    qulonglong toULongLong(bool *ok = 0, int base = 10) const;
-    float toFloat(bool *ok = 0) const;
-    double toDouble(bool *ok = 0) const;
-    QByteArray toBase64() const;
-    QByteArray toHex() const;
-    QByteArray toPercentEncoding(const QByteArray &exclude = QByteArray(),
-                                 const QByteArray &include = QByteArray(),
-                                 char percent = '%') const;
-
-    QByteArray &setNum(short, int base = 10);
-    QByteArray &setNum(ushort, int base = 10);
-    QByteArray &setNum(int, int base = 10);
-    QByteArray &setNum(uint, int base = 10);
-    QByteArray &setNum(qlonglong, int base = 10);
-    QByteArray &setNum(qulonglong, int base = 10);
-    QByteArray &setNum(float, char f = 'g', int prec = 6);
-    QByteArray &setNum(double, char f = 'g', int prec = 6);
-
-    static QByteArray number(int, int base = 10);
-    static QByteArray number(uint, int base = 10);
-    static QByteArray number(qlonglong, int base = 10);
-    static QByteArray number(qulonglong, int base = 10);
-    static QByteArray number(double, char f = 'g', int prec = 6);
-    static QByteArray fromRawData(const char *, int size);
-    static QByteArray fromBase64(const QByteArray &base64);
-    static QByteArray fromHex(const QByteArray &hexEncoded);
-    static QByteArray fromPercentEncoding(const QByteArray &pctEncoded, char percent = '%');
-
-
-    typedef char *iterator;
-    typedef const char *const_iterator;
-    typedef iterator Iterator;
-    typedef const_iterator ConstIterator;
-    iterator begin();
-    const_iterator begin() const;
-    const_iterator constBegin() const;
-    iterator end();
-    const_iterator end() const;
-    const_iterator constEnd() const;
-
-    // stl compatibility
-    typedef const char & const_reference;
-    typedef char & reference;
-    typedef char value_type;
-    void push_back(char c);
-    void push_back(const char *c);
-    void push_back(const QByteArray &a);
-    void push_front(char c);
-    void push_front(const char *c);
-    void push_front(const QByteArray &a);
-
-    inline int count() const { return d->size; }
-    int length() const { return d->size; }
-    bool isNull() const;
-
-    // compatibility
-#ifdef QT3_SUPPORT
-    QT3_SUPPORT_CONSTRUCTOR QByteArray(int size);
-    inline QT3_SUPPORT QByteArray& duplicate(const QByteArray& a) { *this = a; return *this; }
-    inline QT3_SUPPORT QByteArray& duplicate(const char *a, uint n)
-    { *this = QByteArray(a, n); return *this; }
-    inline QT3_SUPPORT QByteArray& setRawData(const char *a, uint n)
-    { *this = fromRawData(a, n); return *this; }
-    inline QT3_SUPPORT void resetRawData(const char *, uint) { clear(); }
-    inline QT3_SUPPORT QByteArray lower() const { return toLower(); }
-    inline QT3_SUPPORT QByteArray upper() const { return toUpper(); }
-    inline QT3_SUPPORT QByteArray stripWhiteSpace() const { return trimmed(); }
-    inline QT3_SUPPORT QByteArray simplifyWhiteSpace() const { return simplified(); }
-    inline QT3_SUPPORT int find(char c, int from = 0) const { return indexOf(c, from); }
-    inline QT3_SUPPORT int find(const char *c, int from = 0) const { return indexOf(c, from); }
-    inline QT3_SUPPORT int find(const QByteArray &ba, int from = 0) const { return indexOf(ba, from); }
-    inline QT3_SUPPORT int findRev(char c, int from = -1) const { return lastIndexOf(c, from); }
-    inline QT3_SUPPORT int findRev(const char *c, int from = -1) const { return lastIndexOf(c, from); }
-    inline QT3_SUPPORT int findRev(const QByteArray &ba, int from = -1) const { return lastIndexOf(ba, from); }
-#ifndef QT_NO_CAST_TO_ASCII
-    QT3_SUPPORT int find(const QString &s, int from = 0) const;
-    QT3_SUPPORT int findRev(const QString &s, int from = -1) const;
-#endif
-#endif
-
-public:
-    operator QNoImplicitBoolCast() const;
-private:
-//    operator QNoImplicitBoolCast() const;
-    static Data shared_null;
-    static Data shared_empty;
-    Data *d;
-    QByteArray(Data *dd, int /*dummy*/, int /*dummy*/) : d(dd) {}
-    void realloc(int alloc);
-    void expand(int i);
-    QByteArray nulTerminated() const;
-
-    friend class QByteRef;
-    friend class QString;
-    friend Q_CORE_EXPORT QByteArray qUncompress(const uchar *data, int nbytes);
-public:
-    typedef Data * DataPtr;
-    inline DataPtr &data_ptr() { return d; }
-};
-
-inline QByteArray::QByteArray(): d(&shared_null) { d->ref.ref(); }
-inline QByteArray::~QByteArray() { if (!d->ref.deref()) qFree(d); }
-inline int QByteArray::size() const
-{ return d->size; }
-
-#ifdef Q_COMPILER_MANGLES_RETURN_TYPE
-inline const char QByteArray::at(int i) const
-{ Q_ASSERT(i >= 0 && i < size()); return d->data[i]; }
-inline const char QByteArray::operator[](int i) const
-{ Q_ASSERT(i >= 0 && i < size()); return d->data[i]; }
-inline const char QByteArray::operator[](uint i) const
-{ Q_ASSERT(i < uint(size())); return d->data[i]; }
-#else
-inline char QByteArray::at(int i) const
-{ Q_ASSERT(i >= 0 && i < size()); return d->data[i]; }
-inline char QByteArray::operator[](int i) const
-{ Q_ASSERT(i >= 0 && i < size()); return d->data[i]; }
-inline char QByteArray::operator[](uint i) const
-{ Q_ASSERT(i < uint(size())); return d->data[i]; }
-#endif
-
-inline bool QByteArray::isEmpty() const
-{ return d->size == 0; }
-#ifndef QT_NO_CAST_FROM_BYTEARRAY
-inline QByteArray::operator const char *() const
-{ return d->data; }
-inline QByteArray::operator const void *() const
-{ return d->data; }
-#endif
-inline char *QByteArray::data()
-{ detach(); return d->data; }
-inline char *QByteArray::data() const
-{ return d->data; }
-inline const char *QByteArray::constData() const
-{ return d->data; }
-inline void QByteArray::detach()
-{ if (d->ref != 1 || d->data != d->array) realloc(d->size); }
-inline bool QByteArray::isDetached() const
-{ return d->ref == 1; }
-inline QByteArray::QByteArray(const QByteArray &a) : d(a.d)
-{ d->ref.ref(); }
-#ifdef QT3_SUPPORT
-inline QByteArray::QByteArray(int aSize) : d(&shared_null)
-{ d->ref.ref(); if (aSize > 0) fill('\0', aSize); }
-#endif
-
-inline int QByteArray::capacity() const
-{ return d->alloc; }
-
-inline void QByteArray::reserve(int asize)
-{ if (d->ref != 1 || asize > d->alloc) realloc(asize); }
-
-inline void QByteArray::squeeze()
-{ if (d->size < d->alloc) realloc(d->size); }
-
-class Q_CORE_EXPORT QByteRef {
-    QByteArray &a;
-    int i;
-    inline QByteRef(QByteArray &array, int idx)
-        : a(array),i(idx) {}
-    friend class QByteArray;
-public:
-#ifdef Q_COMPILER_MANGLES_RETURN_TYPE
-    inline operator const char() const
-        { return i < a.d->size ? a.d->data[i] : char(0); }
-#else
-    inline operator char() const
-        { return i < a.d->size ? a.d->data[i] : char(0); }
-#endif
-    inline QByteRef &operator=(char c)
-        { if (i >= a.d->size) a.expand(i); else a.detach();
-          a.d->data[i] = c;  return *this; }
-    inline QByteRef &operator=(const QByteRef &c)
-        { if (i >= a.d->size) a.expand(i); else a.detach();
-          a.d->data[i] = c.a.d->data[c.i];  return *this; }
-    inline bool operator==(char c) const
-    { return a.d->data[i] == c; }
-    inline bool operator!=(char c) const
-    { return a.d->data[i] != c; }
-    inline bool operator>(char c) const
-    { return a.d->data[i] > c; }
-    inline bool operator>=(char c) const
-    { return a.d->data[i] >= c; }
-    inline bool operator<(char c) const
-    { return a.d->data[i] < c; }
-    inline bool operator<=(char c) const
-    { return a.d->data[i] <= c; }
-};
-
-inline QByteRef QByteArray::operator[](int i)
-{ Q_ASSERT(i >= 0); return QByteRef(*this, i); }
-inline QByteRef QByteArray::operator[](uint i)
-{ return QByteRef(*this, i); }
-inline QByteArray::iterator QByteArray::begin()
-{ detach(); return d->data; }
-inline QByteArray::const_iterator QByteArray::begin() const
-{ return d->data; }
-inline QByteArray::const_iterator QByteArray::constBegin() const
-{ return d->data; }
-inline QByteArray::iterator QByteArray::end()
-{ detach(); return d->data + d->size; }
-inline QByteArray::const_iterator QByteArray::end() const
-{ return d->data + d->size; }
-inline QByteArray::const_iterator QByteArray::constEnd() const
-{ return d->data + d->size; }
-inline QByteArray &QByteArray::operator+=(char c)
-{ return append(c); }
-inline QByteArray &QByteArray::operator+=(const char *s)
-{ return append(s); }
-inline QByteArray &QByteArray::operator+=(const QByteArray &a)
-{ return append(a); }
-inline void QByteArray::push_back(char c)
-{ append(c); }
-inline void QByteArray::push_back(const char *c)
-{ append(c); }
-inline void QByteArray::push_back(const QByteArray &a)
-{ append(a); }
-inline void QByteArray::push_front(char c)
-{ prepend(c); }
-inline void QByteArray::push_front(const char *c)
-{ prepend(c); }
-inline void QByteArray::push_front(const QByteArray &a)
-{ prepend(a); }
-inline QBool QByteArray::contains(const QByteArray &a) const
-{ return QBool(indexOf(a) != -1); }
-inline QBool QByteArray::contains(char c) const
-{ return QBool(indexOf(c) != -1); }
-inline bool operator==(const QByteArray &a1, const QByteArray &a2)
-{ return (a1.size() == a2.size()) && (memcmp(a1.constData(), a2.constData(), a1.size())==0); }
-inline bool operator==(const QByteArray &a1, const char *a2)
-{ return a2 ? qstrcmp(a1,a2) == 0 : a1.isEmpty(); }
-inline bool operator==(const char *a1, const QByteArray &a2)
-{ return a1 ? qstrcmp(a1,a2) == 0 : a2.isEmpty(); }
-inline bool operator!=(const QByteArray &a1, const QByteArray &a2)
-{ return !(a1==a2); }
-inline bool operator!=(const QByteArray &a1, const char *a2)
-{ return a2 ? qstrcmp(a1,a2) != 0 : !a1.isEmpty(); }
-inline bool operator!=(const char *a1, const QByteArray &a2)
-{ return a1 ? qstrcmp(a1,a2) != 0 : !a2.isEmpty(); }
-inline bool operator<(const QByteArray &a1, const QByteArray &a2)
-{ return qstrcmp(a1, a2) < 0; }
- inline bool operator<(const QByteArray &a1, const char *a2)
-{ return qstrcmp(a1, a2) < 0; }
-inline bool operator<(const char *a1, const QByteArray &a2)
-{ return qstrcmp(a1, a2) < 0; }
-inline bool operator<=(const QByteArray &a1, const QByteArray &a2)
-{ return qstrcmp(a1, a2) <= 0; }
-inline bool operator<=(const QByteArray &a1, const char *a2)
-{ return qstrcmp(a1, a2) <= 0; }
-inline bool operator<=(const char *a1, const QByteArray &a2)
-{ return qstrcmp(a1, a2) <= 0; }
-inline bool operator>(const QByteArray &a1, const QByteArray &a2)
-{ return qstrcmp(a1, a2) > 0; }
-inline bool operator>(const QByteArray &a1, const char *a2)
-{ return qstrcmp(a1, a2) > 0; }
-inline bool operator>(const char *a1, const QByteArray &a2)
-{ return qstrcmp(a1, a2) > 0; }
-inline bool operator>=(const QByteArray &a1, const QByteArray &a2)
-{ return qstrcmp(a1, a2) >= 0; }
-inline bool operator>=(const QByteArray &a1, const char *a2)
-{ return qstrcmp(a1, a2) >= 0; }
-inline bool operator>=(const char *a1, const QByteArray &a2)
-{ return qstrcmp(a1, a2) >= 0; }
-inline const QByteArray operator+(const QByteArray &a1, const QByteArray &a2)
-{ return QByteArray(a1) += a2; }
-inline const QByteArray operator+(const QByteArray &a1, const char *a2)
-{ return QByteArray(a1) += a2; }
-inline const QByteArray operator+(const QByteArray &a1, char a2)
-{ return QByteArray(a1) += a2; }
-inline const QByteArray operator+(const char *a1, const QByteArray &a2)
-{ return QByteArray(a1) += a2; }
-inline const QByteArray operator+(char a1, const QByteArray &a2)
-{ return QByteArray(&a1, 1) += a2; }
-inline QBool QByteArray::contains(const char *c) const
-{ return QBool(indexOf(c) != -1); }
-inline QByteArray &QByteArray::replace(char before, const char *c)
-{ return replace(&before, 1, c, qstrlen(c)); }
-inline QByteArray &QByteArray::replace(const QByteArray &before, const char *c)
-{ return replace(before.constData(), before.size(), c, qstrlen(c)); }
-inline QByteArray &QByteArray::replace(const char *before, const char *after)
-{ return replace(before, qstrlen(before), after, qstrlen(after)); }
-
-inline QByteArray &QByteArray::setNum(short n, int base)
-{ return setNum(qlonglong(n), base); }
-inline QByteArray &QByteArray::setNum(ushort n, int base)
-{ return setNum(qulonglong(n), base); }
-inline QByteArray &QByteArray::setNum(int n, int base)
-{ return setNum(qlonglong(n), base); }
-inline QByteArray &QByteArray::setNum(uint n, int base)
-{ return setNum(qulonglong(n), base); }
-inline QByteArray &QByteArray::setNum(float n, char f, int prec)
-{ return setNum(double(n),f,prec); }
-
-
-#if !defined(QT_NO_DATASTREAM) || (defined(QT_BOOTSTRAPPED) && !defined(QT_BUILD_QMAKE))
-Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QByteArray &);
-Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QByteArray &);
-#endif
-
-#ifndef QT_NO_COMPRESS
-Q_CORE_EXPORT QByteArray qCompress(const uchar* data, int nbytes, int compressionLevel = -1);
-Q_CORE_EXPORT QByteArray qUncompress(const uchar* data, int nbytes);
-inline QByteArray qCompress(const QByteArray& data, int compressionLevel = -1)
-{ return qCompress(reinterpret_cast<const uchar *>(data.constData()), data.size(), compressionLevel); }
-inline QByteArray qUncompress(const QByteArray& data)
-{ return qUncompress(reinterpret_cast<const uchar*>(data.constData()), data.size()); }
-#endif
-
-Q_DECLARE_TYPEINFO(QByteArray, Q_MOVABLE_TYPE);
-Q_DECLARE_SHARED(QByteArray)
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QBYTEARRAY_H
diff --git a/qtinterface/tqt4/Qt/qchar.h b/qtinterface/tqt4/Qt/qchar.h
deleted file mode 100644
index 6a86199..0000000
--- a/qtinterface/tqt4/Qt/qchar.h
+++ /dev/null
@@ -1,399 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QCHAR_H
-#define QCHAR_H
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Core)
-
-class QString;
-
-struct QLatin1Char
-{
-public:
-    inline explicit QLatin1Char(char c) : ch(c) {}
-#ifdef Q_COMPILER_MANGLES_RETURN_TYPE
-    inline const char toLatin1() const { return ch; }
-    inline const ushort unicode() const { return ushort(uchar(ch)); }
-#else
-    inline char toLatin1() const { return ch; }
-    inline ushort unicode() const { return ushort(uchar(ch)); }
-#endif
-
-private:
-    char ch;
-};
-
-
-class Q_CORE_EXPORT QChar {
-public:
-    QChar();
-#ifndef QT_NO_CAST_FROM_ASCII
-    QT_ASCII_CAST_WARN_CONSTRUCTOR QChar(char c);
-    QT_ASCII_CAST_WARN_CONSTRUCTOR QChar(uchar c);
-#endif
-    QChar(QLatin1Char ch);
-    QChar(uchar c, uchar r);
-    inline QChar(ushort rc) : ucs(rc){}
-    QChar(short rc);
-    QChar(uint rc);
-    QChar(int rc);
-    enum SpecialCharacter {
-        Null = 0x0000,
-        Nbsp = 0x00a0,
-        ReplacementCharacter = 0xfffd,
-        ObjectReplacementCharacter = 0xfffc,
-        ByteOrderMark = 0xfeff,
-        ByteOrderSwapped = 0xfffe,
-#ifdef QT3_SUPPORT
-        null = Null,
-        replacement = ReplacementCharacter,
-        byteOrderMark = ByteOrderMark,
-        byteOrderSwapped = ByteOrderSwapped,
-        nbsp = Nbsp,
-#endif
-        ParagraphSeparator = 0x2029,
-        LineSeparator = 0x2028
-    };
-    QChar(SpecialCharacter sc);
-
-    // Unicode information
-
-    enum Category
-    {
-        NoCategory,
-
-        Mark_NonSpacing,          //   Mn
-        Mark_SpacingCombining,    //   Mc
-        Mark_Enclosing,           //   Me
-
-        Number_DecimalDigit,      //   Nd
-        Number_Letter,            //   Nl
-        Number_Other,             //   No
-
-        Separator_Space,          //   Zs
-        Separator_Line,           //   Zl
-        Separator_Paragraph,      //   Zp
-
-        Other_Control,            //   Cc
-        Other_Format,             //   Cf
-        Other_Surrogate,          //   Cs
-        Other_PrivateUse,         //   Co
-        Other_NotAssigned,        //   Cn
-
-        Letter_Uppercase,         //   Lu
-        Letter_Lowercase,         //   Ll
-        Letter_Titlecase,         //   Lt
-        Letter_Modifier,          //   Lm
-        Letter_Other,             //   Lo
-
-        Punctuation_Connector,    //   Pc
-        Punctuation_Dash,         //   Pd
-        Punctuation_Open,         //   Ps
-        Punctuation_Close,        //   Pe
-        Punctuation_InitialQuote, //   Pi
-        Punctuation_FinalQuote,   //   Pf
-        Punctuation_Other,        //   Po
-
-        Symbol_Math,              //   Sm
-        Symbol_Currency,          //   Sc
-        Symbol_Modifier,          //   Sk
-        Symbol_Other,             //   So
-
-        Punctuation_Dask = Punctuation_Dash // oops
-    };
-
-    enum Direction
-    {
-        DirL, DirR, DirEN, DirES, DirET, DirAN, DirCS, DirB, DirS, DirWS, DirON,
-        DirLRE, DirLRO, DirAL, DirRLE, DirRLO, DirPDF, DirNSM, DirBN
-    };
-
-    enum Decomposition
-    {
-        NoDecomposition,
-        Canonical,
-        Font,
-        NoBreak,
-        Initial,
-        Medial,
-        Final,
-        Isolated,
-        Circle,
-        Super,
-        Sub,
-        Vertical,
-        Wide,
-        Narrow,
-        Small,
-        Square,
-        Compat,
-        Fraction
-
-#ifdef QT3_SUPPORT
-        , Single = NoDecomposition
-#endif
-    };
-
-    enum Joining
-    {
-        OtherJoining, Dual, Right, Center
-    };
-
-    enum CombiningClass
-    {
-        Combining_BelowLeftAttached       = 200,
-        Combining_BelowAttached           = 202,
-        Combining_BelowRightAttached      = 204,
-        Combining_LeftAttached            = 208,
-        Combining_RightAttached           = 210,
-        Combining_AboveLeftAttached       = 212,
-        Combining_AboveAttached           = 214,
-        Combining_AboveRightAttached      = 216,
-
-        Combining_BelowLeft               = 218,
-        Combining_Below                   = 220,
-        Combining_BelowRight              = 222,
-        Combining_Left                    = 224,
-        Combining_Right                   = 226,
-        Combining_AboveLeft               = 228,
-        Combining_Above                   = 230,
-        Combining_AboveRight              = 232,
-
-        Combining_DoubleBelow             = 233,
-        Combining_DoubleAbove             = 234,
-        Combining_IotaSubscript           = 240
-    };
-
-    enum UnicodeVersion {
-        Unicode_Unassigned,
-        Unicode_1_1,
-        Unicode_2_0,
-        Unicode_2_1_2,
-        Unicode_3_0,
-        Unicode_3_1,
-        Unicode_3_2,
-        Unicode_4_0,
-        Unicode_4_1,
-        Unicode_5_0
-    };
-    // ****** WHEN ADDING FUNCTIONS, CONSIDER ADDING TO QCharRef TOO
-
-    Category category() const;
-    Direction direction() const;
-    Joining joining() const;
-    bool hasMirrored() const;
-    unsigned char combiningClass() const;
-
-    QChar mirroredChar() const;
-    QString decomposition() const;
-    Decomposition decompositionTag() const;
-
-    int digitValue() const;
-    QChar toLower() const;
-    QChar toUpper() const;
-    QChar toTitleCase() const;
-    QChar toCaseFolded() const;
-
-    UnicodeVersion unicodeVersion() const;
-
-#ifdef Q_COMPILER_MANGLES_RETURN_TYPE
-    const char toAscii() const;
-    inline const char toLatin1() const;
-    inline const ushort unicode() const { return ucs; }
-#else
-    char toAscii() const;
-    inline char toLatin1() const;
-    inline ushort unicode() const { return ucs; }
-#endif
-#ifdef Q_NO_PACKED_REFERENCE
-    inline ushort &unicode() { return const_cast<ushort&>(ucs); }
-#else
-    inline ushort &unicode() { return ucs; }
-#endif
-
-    static QChar fromAscii(char c);
-    static QChar fromLatin1(char c);
-
-    inline bool isNull() const { return ucs == 0; }
-    bool isPrint() const;
-    bool isPunct() const;
-    bool isSpace() const;
-    bool isMark() const;
-    bool isLetter() const;
-    bool isNumber() const;
-    bool isLetterOrNumber() const;
-    bool isDigit() const;
-    bool isSymbol() const;
-    inline bool isLower() const { return category() == Letter_Lowercase; }
-    inline bool isUpper() const { return category() == Letter_Uppercase; }
-    inline bool isTitleCase() const { return category() == Letter_Titlecase; }
-
-    inline bool isHighSurrogate() const {
-        return ((ucs & 0xfc00) == 0xd800);
-    }
-    inline bool isLowSurrogate() const {
-        return ((ucs & 0xfc00) == 0xdc00);
-    }
-
-    inline uchar cell() const { return uchar(ucs & 0xff); }
-    inline uchar row() const { return uchar((ucs>>8)&0xff); }
-    inline void setCell(uchar cell);
-    inline void setRow(uchar row);
-
-    static inline uint surrogateToUcs4(ushort high, ushort low) {
-        return (uint(high)<<10) + low - 0x35fdc00;
-    }
-    static inline uint surrogateToUcs4(QChar high, QChar low) {
-        return (uint(high.ucs)<<10) + low.ucs - 0x35fdc00;
-    }
-    static inline ushort highSurrogate(uint ucs4) {
-        return ushort((ucs4>>10) + 0xd7c0);
-    }
-    static inline ushort lowSurrogate(uint ucs4) {
-        return ushort(ucs4%0x400 + 0xdc00);
-    }
-
-    static Category QT_FASTCALL category(uint ucs4);
-    static Category QT_FASTCALL category(ushort ucs2);
-    static Direction QT_FASTCALL direction(uint ucs4);
-    static Direction QT_FASTCALL direction(ushort ucs2);
-    static Joining QT_FASTCALL joining(uint ucs4);
-    static Joining QT_FASTCALL joining(ushort ucs2);
-    static unsigned char QT_FASTCALL combiningClass(uint ucs4);
-    static unsigned char QT_FASTCALL combiningClass(ushort ucs2);
-
-    static uint QT_FASTCALL mirroredChar(uint ucs4);
-    static ushort QT_FASTCALL mirroredChar(ushort ucs2);
-    static Decomposition QT_FASTCALL decompositionTag(uint ucs4);
-
-    static int QT_FASTCALL digitValue(uint ucs4);
-    static int QT_FASTCALL digitValue(ushort ucs2);
-    static uint QT_FASTCALL toLower(uint ucs4);
-    static ushort QT_FASTCALL toLower(ushort ucs2);
-    static uint QT_FASTCALL toUpper(uint ucs4);
-    static ushort QT_FASTCALL toUpper(ushort ucs2);
-    static uint QT_FASTCALL toTitleCase(uint ucs4);
-    static ushort QT_FASTCALL toTitleCase(ushort ucs2);
-    static uint QT_FASTCALL toCaseFolded(uint ucs4);
-    static ushort QT_FASTCALL toCaseFolded(ushort ucs2);
-
-    static UnicodeVersion QT_FASTCALL unicodeVersion(uint ucs4);
-    static UnicodeVersion QT_FASTCALL unicodeVersion(ushort ucs2);
-
-    static QString QT_FASTCALL decomposition(uint ucs4);
-
-#ifdef QT3_SUPPORT
-    inline QT3_SUPPORT bool mirrored() const { return hasMirrored(); }
-    inline QT3_SUPPORT QChar lower() const { return toLower(); }
-    inline QT3_SUPPORT QChar upper() const { return toUpper(); }
-    static inline QT3_SUPPORT bool networkOrdered() {
-        return QSysInfo::ByteOrder == QSysInfo::BigEndian;
-    }
-#ifdef Q_COMPILER_MANGLES_RETURN_TYPE
-    inline QT3_SUPPORT const char latin1() const { return toLatin1(); }
-    inline QT3_SUPPORT const char ascii() const { return toAscii(); }
-#else
-    inline QT3_SUPPORT char latin1() const { return toLatin1(); }
-    inline QT3_SUPPORT char ascii() const { return toAscii(); }
-#endif
-#endif
-
-    operator int () const;
-
-private:
-#ifdef QT_NO_CAST_FROM_ASCII
-    QChar(char c);
-    QChar(uchar c);
-#endif
-    ushort ucs;
-}
-#if (defined(__arm__) || defined(__ARMEL__))
-    Q_PACKED
-#endif
-    ;
-
-Q_DECLARE_TYPEINFO(QChar, Q_MOVABLE_TYPE);
-
-inline QChar::QChar() : ucs(0) {}
-
-#ifdef Q_COMPILER_MANGLES_RETURN_TYPE
-inline const char QChar::toLatin1() const { return ucs > 0xff ? '\0' : char(ucs); }
-#else
-inline char QChar::toLatin1() const { return ucs > 0xff ? '\0' : char(ucs); }
-#endif
-inline QChar QChar::fromLatin1(char c) { return QChar(ushort(uchar(c))); }
-
-inline QChar::QChar(uchar c, uchar r) : ucs(ushort((r << 8) | c)){}
-inline QChar::QChar(short rc) : ucs(ushort(rc)){}
-inline QChar::QChar(uint rc) : ucs(ushort(rc & 0xffff)){}
-inline QChar::QChar(int rc) : ucs(ushort(rc & 0xffff)){}
-inline QChar::QChar(SpecialCharacter s) : ucs(ushort(s)) {}
-inline QChar::QChar(QLatin1Char ch) : ucs(ch.unicode()) {}
-
-inline void QChar::setCell(uchar acell)
-{ ucs = ushort((ucs & 0xff00) + acell); }
-inline void QChar::setRow(uchar arow)
-{ ucs = ushort((ushort(arow)<<8) + (ucs&0xff)); }
-
-inline bool operator==(QChar c1, QChar c2) { return c1.unicode() == c2.unicode(); }
-inline bool operator!=(QChar c1, QChar c2) { return c1.unicode() != c2.unicode(); }
-inline bool operator<=(QChar c1, QChar c2) { return c1.unicode() <= c2.unicode(); }
-inline bool operator>=(QChar c1, QChar c2) { return c1.unicode() >= c2.unicode(); }
-inline bool operator<(QChar c1, QChar c2) { return c1.unicode() < c2.unicode(); }
-inline bool operator>(QChar c1, QChar c2) { return c1.unicode() > c2.unicode(); }
-
-#ifndef QT_NO_DATASTREAM
-Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QChar &);
-Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QChar &);
-#endif
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QCHAR_H
diff --git a/qtinterface/tqt4/Qt/qcommonstyle.h b/qtinterface/tqt4/Qt/qcommonstyle.h
deleted file mode 100644
index 974bb0f..0000000
--- a/qtinterface/tqt4/Qt/qcommonstyle.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 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$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QCOMMONSTYLE_H
-#define QCOMMONSTYLE_H
-
-#include <QtGui/qstyle.h>
-#include <QtGui/qstyleoption.h>
-
-class Q3Painter;
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-QT_MODULE(Gui)
-
-class QCommonStylePrivate;
-
-class Q_GUI_EXPORT QCommonStyle: public QStyle
-{
-    Q_OBJECT
-
-public:
-    QCommonStyle();
-    ~QCommonStyle();
-
-    void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p,
-                       const QWidget *w = 0) const;
-//     void drawPrimitive(ControlElement element, const QStyleOption *opt, QPainter *p,
-//                        const QWidget *w = 0) const;
-    void drawPrimitive( PrimitiveElement pe,
-			Q3Painter *p,
-			const QRect &r,
-			const QColorGroup &cg,
-			SFlags flags = State_Default,
-			const QStyleOption& = QStyleOption::SO_Default ) const;
-    void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p,
-                     const QWidget *w = 0) const;
-    void drawControl( ControlElement element,
-		      Q3Painter *p,
-		      const QWidget *widget,
-		      const QRect &r,
-		      const QColorGroup &cg,
-		      SFlags how = State_Default,
-		      const QStyleOption& = QStyleOption::SO_Default ) const;
-    QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const;
-    QRect subRect( SubElement r, const QWidget *widget ) const;
-    void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p,
-                            const QWidget *w = 0) const;
-    void drawComplexControl( ComplexControl control,
-			     Q3Painter *p,
-			     const QWidget *widget,
-			     const QRect &r,
-			     const QColorGroup &cg,
-			     SFlags how = State_Default,
-			     SCFlags sub = SC_All,
-			     SCFlags subActive = SC_None,
-			     const QStyleOption& = QStyleOption::SO_Default ) const;
-    SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt,
-                                     const QPoint &pt, const QWidget *w = 0) const;
-    SubControl querySubControl( ComplexControl control,
-				const QWidget *widget,
-				const QPoint &pos,
-				const QStyleOption& = QStyleOption::SO_Default ) const;
-    QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc,
-                         const QWidget *w = 0) const;
-    QRect querySubControlMetrics( ComplexControl control,
-				  const QWidget *widget,
-				  SubControl sc,
-				  const QStyleOption& = QStyleOption::SO_Default ) const;
-
-    QSize sizeFromContents(ContentsType ct, const QStyleOption *opt,
-                           const QSize &contentsSize, const QWidget *widget = 0) const;
-
-    int pixelMetric(PixelMetric m, const QStyleOption *opt = 0, const QWidget *widget = 0) const;
-    int pixelMetric( PixelMetric m, const QWidget *widget = 0 ) const;
-
-    int styleHint(StyleHint sh, const QStyleOption *opt = 0, const QWidget *w = 0,
-                  QStyleHintReturn *shret = 0) const;
-    int styleHint(StyleHint sh, const QWidget *, const QStyleOption &, QStyleHintReturn *) const;
-
-    QPixmap standardPixmap(StandardPixmap sp, const QStyleOption *opt = 0,
-                           const QWidget *widget = 0) const;
-    QPixmap stylePixmap( StandardPixmap stylepixmap,
-                           const QWidget *widget = 0,
-                           const QStyleOption& = QStyleOption::SO_Default ) const;
-
-    QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap,
-                                const QStyleOption *opt) const;
-
-    void polish(QPalette &);
-    void polish(QApplication *app);
-    void polish(QWidget *widget);
-    void unpolish(QWidget *widget);
-    void unpolish(QApplication *application);
-
-protected Q_SLOTS:
-    QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt = 0,
-                                     const QWidget *widget = 0) const;
-
-protected:
-    QCommonStyle(QCommonStylePrivate &dd);
-
-private:
-    Q_DECLARE_PRIVATE(QCommonStyle)
-    Q_DISABLE_COPY(QCommonStyle)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QCOMMONSTYLE_H
diff --git a/qtinterface/tqt4/Qt/qdatastream.h b/qtinterface/tqt4/Qt/qdatastream.h
deleted file mode 100644
index f43fbd3..0000000
--- a/qtinterface/tqt4/Qt/qdatastream.h
+++ /dev/null
@@ -1,439 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDATASTREAM_H
-#define QDATASTREAM_H
-
-#include <QtCore/qscopedpointer.h>
-#include <QtCore/qiodevice.h>
-#include <QtCore/qglobal.h>
-
-#ifdef Status
-#error qdatastream.h must be included before any header file that defines Status
-#endif
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Core)
-
-class QByteArray;
-class QIODevice;
-
-template <typename T> class QList;
-template <typename T> class QLinkedList;
-template <typename T> class QVector;
-template <typename T> class QSet;
-template <class Key, class T> class QHash;
-template <class Key, class T> class QMap;
-
-#if !defined(QT_NO_DATASTREAM) || defined(QT_BOOTSTRAPPED)
-class QDataStreamPrivate;
-class Q_CORE_EXPORT QDataStream
-{
-public:
-    enum Version {
-        Qt_1_0 = 1,
-        Qt_2_0 = 2,
-        Qt_2_1 = 3,
-        Qt_3_0 = 4,
-        Qt_3_1 = 5,
-        Qt_3_3 = 6,
-        Qt_4_0 = 7,
-        Qt_4_1 = Qt_4_0,
-        Qt_4_2 = 8,
-        Qt_4_3 = 9,
-        Qt_4_4 = 10,
-        Qt_4_5 = 11,
-        Qt_4_6 = 12
-#if QT_VERSION >= 0x040700
-#error Add the datastream version for this Qt version
-        Qt_4_7 = Qt_4_6
-#endif
-    };
-
-    enum ByteOrder {
-        BigEndian = QSysInfo::BigEndian,
-        LittleEndian = QSysInfo::LittleEndian
-    };
-
-    enum Status {
-        Ok,
-        ReadPastEnd,
-	ReadCorruptData
-    };
-
-    enum FloatingPointPrecision {
-        SinglePrecision,
-        DoublePrecision
-    };
-
-    QDataStream();
-    explicit QDataStream(QIODevice *);
-#ifdef QT3_SUPPORT
-    QDataStream(QByteArray *, int mode);
-#endif
-    QDataStream(QByteArray *, QIODevice::OpenMode flags);
-    QDataStream(const QByteArray &);
-    virtual ~QDataStream();
-
-    QIODevice *device() const;
-    void setDevice(QIODevice *);
-    void unsetDevice();
-
-    bool atEnd() const;
-#ifdef QT3_SUPPORT
-    inline QT3_SUPPORT bool eof() const { return atEnd(); }
-#endif
-
-    Status status() const;
-    void setStatus(Status status);
-    void resetStatus();
-
-    FloatingPointPrecision floatingPointPrecision() const;
-    void setFloatingPointPrecision(FloatingPointPrecision precision);
-
-    ByteOrder byteOrder() const;
-    void setByteOrder(ByteOrder);
-
-    int version() const;
-    void setVersion(int);
-
-    QDataStream &operator>>(qint8 &i);
-    QDataStream &operator>>(quint8 &i);
-    QDataStream &operator>>(qint16 &i);
-    QDataStream &operator>>(quint16 &i);
-    QDataStream &operator>>(qint32 &i);
-    QDataStream &operator>>(quint32 &i);
-    QDataStream &operator>>(qint64 &i);
-    QDataStream &operator>>(quint64 &i);
-    QDataStream &operator>>(bool &i);
-    QDataStream &operator>>(float &f);
-    QDataStream &operator>>(double &f);
-    QDataStream &operator>>(char *&str);
-    QDataStream &operator>>(long &i);
-    QDataStream &operator>>(long unsigned int &i);
-
-    QDataStream &operator<<(qint8 i);
-    QDataStream &operator<<(quint8 i);
-    QDataStream &operator<<(qint16 i);
-    QDataStream &operator<<(quint16 i);
-    QDataStream &operator<<(qint32 i);
-    QDataStream &operator<<(quint32 i);
-    QDataStream &operator<<(qint64 i);
-    QDataStream &operator<<(quint64 i);
-    QDataStream &operator<<(bool i);
-    QDataStream &operator<<(float f);
-    QDataStream &operator<<(double f);
-    QDataStream &operator<<(const char *str);
-    QDataStream &operator<<(long i);
-    QDataStream &operator<<(long unsigned int i);
-
-    QDataStream &readBytes(char *&, uint &len);
-    int readRawData(char *, int len);
-
-    QDataStream &writeBytes(const char *, uint len);
-    int writeRawData(const char *, int len);
-
-    int skipRawData(int len);
-
-#ifdef QT3_SUPPORT
-    inline QT3_SUPPORT QDataStream &readRawBytes(char *str, uint len)
-        { readRawData(str, static_cast<int>(len)); return *this; }
-    inline QT3_SUPPORT QDataStream &writeRawBytes(const char *str, uint len)
-        { writeRawData(str, static_cast<int>(len)); return *this; }
-    inline QT3_SUPPORT bool isPrintableData() const { return false; }
-    inline QT3_SUPPORT void setPrintableData(bool) {}
-#endif
-
-private:
-    Q_DISABLE_COPY(QDataStream)
-
-    QScopedPointer<QDataStreamPrivate> d;
-
-    QIODevice *dev;
-    bool owndev;
-    bool noswap;
-    ByteOrder byteorder;
-    int ver;
-    Status q_status;
-};
-
-
-/*****************************************************************************
-  QDataStream inline functions
- *****************************************************************************/
-
-inline QIODevice *QDataStream::device() const
-{ return dev; }
-
-inline QDataStream::ByteOrder QDataStream::byteOrder() const
-{ return byteorder; }
-
-inline int QDataStream::version() const
-{ return ver; }
-
-inline void QDataStream::setVersion(int v)
-{ ver = v; }
-
-inline QDataStream &QDataStream::operator>>(quint8 &i)
-{ return *this >> reinterpret_cast<qint8&>(i); }
-
-inline QDataStream &QDataStream::operator>>(quint16 &i)
-{ return *this >> reinterpret_cast<qint16&>(i); }
-
-inline QDataStream &QDataStream::operator>>(quint32 &i)
-{ return *this >> reinterpret_cast<qint32&>(i); }
-
-inline QDataStream &QDataStream::operator>>(quint64 &i)
-{ return *this >> reinterpret_cast<qint64&>(i); }
-
-inline QDataStream &QDataStream::operator<<(quint8 i)
-{ return *this << qint8(i); }
-
-inline QDataStream &QDataStream::operator<<(quint16 i)
-{ return *this << qint16(i); }
-
-inline QDataStream &QDataStream::operator<<(quint32 i)
-{ return *this << qint32(i); }
-
-inline QDataStream &QDataStream::operator<<(quint64 i)
-{ return *this << qint64(i); }
-
-template <typename T>
-QDataStream& operator>>(QDataStream& s, QList<T>& l)
-{
-    l.clear();
-    quint32 c;
-    s >> c;
-    for(quint32 i = 0; i < c; ++i)
-    {
-        T t;
-        s >> t;
-        l.append(t);
-        if (s.atEnd())
-            break;
-    }
-    return s;
-}
-
-template <typename T>
-QDataStream& operator<<(QDataStream& s, const QList<T>& l)
-{
-    s << quint32(l.size());
-    for (int i = 0; i < l.size(); ++i)
-        s << l.at(i);
-    return s;
-}
-
-template <typename T>
-QDataStream& operator>>(QDataStream& s, QLinkedList<T>& l)
-{
-    l.clear();
-    quint32 c;
-    s >> c;
-    for(quint32 i = 0; i < c; ++i)
-    {
-        T t;
-        s >> t;
-        l.append(t);
-        if (s.atEnd())
-            break;
-    }
-    return s;
-}
-
-template <typename T>
-QDataStream& operator<<(QDataStream& s, const QLinkedList<T>& l)
-{
-    s << quint32(l.size());
-    typename QLinkedList<T>::ConstIterator it = l.constBegin();
-    for(; it != l.constEnd(); ++it)
-        s << *it;
-    return s;
-}
-
-template<typename T>
-QDataStream& operator>>(QDataStream& s, QVector<T>& v)
-{
-    v.clear();
-    quint32 c;
-    s >> c;
-    v.resize(c);
-    for(quint32 i = 0; i < c; ++i) {
-        T t;
-        s >> t;
-        v[i] = t;
-    }
-    return s;
-}
-
-template<typename T>
-QDataStream& operator<<(QDataStream& s, const QVector<T>& v)
-{
-    s << quint32(v.size());
-    for (typename QVector<T>::const_iterator it = v.begin(); it != v.end(); ++it)
-        s << *it;
-    return s;
-}
-
-template <typename T>
-QDataStream &operator>>(QDataStream &in, QSet<T> &set)
-{
-    set.clear();
-    quint32 c;
-    in >> c;
-    for (quint32 i = 0; i < c; ++i) {
-        T t;
-        in >> t;
-        set << t;
-        if (in.atEnd())
-            break;
-    }
-    return in;
-}
-
-template <typename T>
-QDataStream& operator<<(QDataStream &out, const QSet<T> &set)
-{
-    out << quint32(set.size());
-    typename QSet<T>::const_iterator i = set.constBegin();
-    while (i != set.constEnd()) {
-        out << *i;
-        ++i;
-    }
-    return out;
-}
-
-template <class Key, class T>
-Q_OUTOFLINE_TEMPLATE QDataStream &operator>>(QDataStream &in, QHash<Key, T> &hash)
-{
-    QDataStream::Status oldStatus = in.status();
-    in.resetStatus();
-    hash.clear();
-
-    quint32 n;
-    in >> n;
-
-    for (quint32 i = 0; i < n; ++i) {
-        if (in.status() != QDataStream::Ok)
-            break;
-
-        Key k;
-        T t;
-        in >> k >> t;
-        hash.insertMulti(k, t);
-    }
-
-    if (in.status() != QDataStream::Ok)
-        hash.clear();
-    if (oldStatus != QDataStream::Ok)
-        in.setStatus(oldStatus);
-    return in;
-}
-
-template <class Key, class T>
-Q_OUTOFLINE_TEMPLATE QDataStream &operator<<(QDataStream &out, const QHash<Key, T>& hash)
-{
-    out << quint32(hash.size());
-    typename QHash<Key, T>::ConstIterator it = hash.end();
-    typename QHash<Key, T>::ConstIterator begin = hash.begin();
-    while (it != begin) {
-        --it;
-        out << it.key() << it.value();
-    }
-    return out;
-}
-#ifdef qdoc
-template <class Key, class T>
-Q_OUTOFLINE_TEMPLATE QDataStream &operator>>(QDataStream &in, QMap<Key, T> &map)
-#else
-template <class aKey, class aT>
-Q_OUTOFLINE_TEMPLATE QDataStream &operator>>(QDataStream &in, QMap<aKey, aT> &map)
-#endif
-{
-    QDataStream::Status oldStatus = in.status();
-    in.resetStatus();
-    map.clear();
-
-    quint32 n;
-    in >> n;
-
-    map.detach();
-    map.setInsertInOrder(true);
-    for (quint32 i = 0; i < n; ++i) {
-        if (in.status() != QDataStream::Ok)
-            break;
-
-        aKey key;
-        aT value;
-        in >> key >> value;
-        map.insertMulti(key, value);
-    }
-    map.setInsertInOrder(false);
-    if (in.status() != QDataStream::Ok)
-        map.clear();
-    if (oldStatus != QDataStream::Ok)
-        in.setStatus(oldStatus);
-    return in;
-}
-
-template <class Key, class T>
-Q_OUTOFLINE_TEMPLATE QDataStream &operator<<(QDataStream &out, const QMap<Key, T> &map)
-{
-    out << quint32(map.size());
-    typename QMap<Key, T>::ConstIterator it = map.end();
-    typename QMap<Key, T>::ConstIterator begin = map.begin();
-    while (it != begin) {
-        --it;
-        out << it.key() << it.value();
-    }
-    return out;
-}
-
-#endif // QT_NO_DATASTREAM
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QDATASTREAM_H
diff --git a/qtinterface/tqt4/Qt/qdir.h b/qtinterface/tqt4/Qt/qdir.h
deleted file mode 100644
index e2248e1..0000000
--- a/qtinterface/tqt4/Qt/qdir.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDIR_H
-#define QDIR_H
-
-#include <QtCore/qstring.h>
-#include <QtCore/qfileinfo.h>
-#include <QtCore/qstringlist.h>
-#include <QtCore/qscopedpointer.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Core)
-
-class QDirPrivate;
-
-class Q_CORE_EXPORT QDir
-{
-protected:
-    QScopedPointer<QDirPrivate> d_ptr;
-private:
-    Q_DECLARE_PRIVATE(QDir)
-public:
-    enum Filter { Dirs        = 0x001,
-                  Files       = 0x002,
-                  Drives      = 0x004,
-                  NoSymLinks  = 0x008,
-                  AllEntries  = Dirs | Files | Drives,
-                  TypeMask    = 0x00f,
-#ifdef QT3_SUPPORT
-                  All         = AllEntries,
-#endif
-
-                  Readable    = 0x010,
-                  Writable    = 0x020,
-                  Executable  = 0x040,
-                  PermissionMask    = 0x070,
-#ifdef QT3_SUPPORT
-                  RWEMask     = 0x070,
-#endif
-
-                  Modified    = 0x080,
-                  Hidden      = 0x100,
-                  System      = 0x200,
-
-                  AccessMask  = 0x3F0,
-
-                  AllDirs       = 0x400,
-                  CaseSensitive = 0x800,
-                  NoDotAndDotDot = 0x1000,
-
-                  NoFilter = -1
-#ifdef QT3_SUPPORT
-                  ,DefaultFilter = NoFilter
-#endif
-    };
-    Q_DECLARE_FLAGS(Filters, Filter)
-#ifdef QT3_SUPPORT
-    typedef Filters FilterSpec;
-#endif
-
-    enum SortFlag { Name        = 0x00,
-                    Time        = 0x01,
-                    Size        = 0x02,
-                    Unsorted    = 0x03,
-                    SortByMask  = 0x03,
-
-                    DirsFirst   = 0x04,
-                    Reversed    = 0x08,
-                    IgnoreCase  = 0x10,
-                    DirsLast    = 0x20,
-                    LocaleAware = 0x40,
-                    Type        = 0x80,
-                    NoSort = -1
-#ifdef QT3_SUPPORT
-                  ,DefaultSort = NoSort
-#endif
-    };
-    Q_DECLARE_FLAGS(SortFlags, SortFlag)
-
-    QDir(const QDir &);
-    QDir(const QString &path = QString());
-    QDir(const QString &path, const QString &nameFilter,
-         SortFlags sort = SortFlags(Name | IgnoreCase), Filters filter = AllEntries);
-    ~QDir();
-
-    QDir &operator=(const QDir &);
-    QDir &operator=(const QString &path);
-
-    void setPath(const QString &path);
-    QString path() const;
-    QString absolutePath() const;
-    QString canonicalPath() const;
-
-    static void addResourceSearchPath(const QString &path);
-
-    static void setSearchPaths(const QString &prefix, const QStringList &searchPaths);
-    static void addSearchPath(const QString &prefix, const QString &path);
-    static QStringList searchPaths(const QString &prefix);
-
-    QString dirName() const;
-    QString filePath(const QString &fileName) const;
-    QString absoluteFilePath(const QString &fileName) const;
-    QString relativeFilePath(const QString &fileName) const;
-
-#ifdef QT_DEPRECATED
-    QT_DEPRECATED static QString convertSeparators(const QString &pathName);
-#endif
-    static QString toNativeSeparators(const QString &pathName);
-    static QString fromNativeSeparators(const QString &pathName);
-
-    bool cd(const QString &dirName);
-    bool cdUp();
-
-    QStringList nameFilters() const;
-    void setNameFilters(const QStringList &nameFilters);
-
-    Filters filter() const;
-    void setFilter(Filters filter);
-    SortFlags sorting() const;
-    void setSorting(SortFlags sort);
-
-    uint count() const;
-    QString operator[](int) const;
-
-    static QStringList nameFiltersFromString(const QString &nameFilter);
-
-    QStringList entryList(Filters filters = NoFilter, SortFlags sort = NoSort) const;
-    QStringList entryList(const QStringList &nameFilters, Filters filters = NoFilter,
-                          SortFlags sort = NoSort) const;
-
-    QFileInfoList entryInfoList(Filters filters = NoFilter, SortFlags sort = NoSort) const;
-    QFileInfoList entryInfoList(const QStringList &nameFilters, Filters filters = NoFilter,
-                                SortFlags sort = NoSort) const;
-
-    bool mkdir(const QString &dirName) const;
-    bool rmdir(const QString &dirName) const;
-    bool mkpath(const QString &dirPath) const;
-    bool rmpath(const QString &dirPath) const;
-
-    bool isReadable() const;
-    bool exists() const;
-    bool isRoot() const;
-
-    static bool isRelativePath(const QString &path);
-    inline static bool isAbsolutePath(const QString &path) { return !isRelativePath(path); }
-    bool isRelative() const;
-    inline bool isAbsolute() const { return !isRelative(); }
-    bool makeAbsolute();
-
-    bool operator==(const QDir &dir) const;
-    inline bool operator!=(const QDir &dir) const {  return !operator==(dir); }
-
-    bool remove(const QString &fileName);
-    bool rename(const QString &oldName, const QString &newName);
-    bool exists(const QString &name) const;
-    virtual bool exists( const QString &name, bool acceptAbsPath = TRUE );
-
-    static QFileInfoList drives();
-
-    static QChar separator();
-
-    static bool setCurrent(const QString &path);
-    static inline QDir current() { return QDir(currentPath()); }
-    static QString currentPath();
-
-    static inline QDir home() { return QDir(homePath()); }
-    static QString homePath();
-    static inline QDir root() { return QDir(rootPath()); }
-    static QString rootPath();
-    static inline QDir temp() { return QDir(tempPath()); }
-    static QString tempPath();
-
-#ifndef QT_NO_REGEXP
-    static bool match(const QStringList &filters, const QString &fileName);
-    static bool match(const QString &filter, const QString &fileName);
-#endif
-    static QString cleanPath(const QString &path);
-    void refresh() const;
-
-#ifdef QT3_SUPPORT
-    typedef SortFlags SortSpec;
-    inline QT3_SUPPORT QString absPath() const { return absolutePath(); }
-    inline QT3_SUPPORT QString absFilePath(const QString &fileName, bool acceptAbsPath = true) const
-       { Q_UNUSED(acceptAbsPath); return absoluteFilePath(fileName); }
-    QT3_SUPPORT bool matchAllDirs() const;
-    QT3_SUPPORT void setMatchAllDirs(bool on);
-    inline QT3_SUPPORT QStringList entryList(const QString &nameFilter, Filters filters = NoFilter,
-                                           SortFlags sort = NoSort) const
-    { return entryList(nameFiltersFromString(nameFilter), filters, sort); }
-    inline QT3_SUPPORT QFileInfoList entryInfoList(const QString &nameFilter,
-                                                 Filters filters = NoFilter,
-                                                 SortFlags sort = NoSort) const
-    { return entryInfoList(nameFiltersFromString(nameFilter), filters, sort); }
-
-    QT3_SUPPORT QString nameFilter() const;
-    QT3_SUPPORT void setNameFilter(const QString &nameFilter);
-
-    inline QT3_SUPPORT bool mkdir(const QString &dirName, bool acceptAbsPath) const
-        { Q_UNUSED(acceptAbsPath); return mkdir(dirName); }
-    inline QT3_SUPPORT bool rmdir(const QString &dirName, bool acceptAbsPath) const
-        { Q_UNUSED(acceptAbsPath); return rmdir(dirName); }
-
-    inline QT3_SUPPORT void convertToAbs() { makeAbsolute(); }
-    inline QT3_SUPPORT static QString currentDirPath() { return currentPath(); }
-    inline QT3_SUPPORT static QString homeDirPath() { return homePath(); }
-    inline QT3_SUPPORT static QString rootDirPath() { return rootPath(); }
-    inline QT3_SUPPORT static QString cleanDirPath(const QString &name) { return cleanPath(name); }
-#endif
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QDir::Filters)
-Q_DECLARE_OPERATORS_FOR_FLAGS(QDir::SortFlags)
-
-#ifndef QT_NO_DEBUG_STREAM
-class QDebug;
-Q_CORE_EXPORT QDebug operator<<(QDebug debug, QDir::Filters filters);
-Q_CORE_EXPORT QDebug operator<<(QDebug debug, const QDir &dir);
-#endif
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QDIR_H
diff --git a/qtinterface/tqt4/Qt/qfileinfo.h b/qtinterface/tqt4/Qt/qfileinfo.h
deleted file mode 100644
index ea56cdd..0000000
--- a/qtinterface/tqt4/Qt/qfileinfo.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QFILEINFO_H
-#define QFILEINFO_H
-
-#include <QtCore/qfile.h>
-#include <QtCore/qlist.h>
-#include <QtCore/qscopedpointer.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Core)
-
-class QDir;
-class QDateTime;
-class QFileInfoPrivate;
-
-class Q_CORE_EXPORT QFileInfo
-{
-public:
-    QFileInfo();
-    QFileInfo(const QString &file);
-    QFileInfo(const QFile &file);
-    QFileInfo(const QDir &dir, const QString &file);
-    QFileInfo(const QFileInfo &fileinfo);
-    ~QFileInfo();
-
-    QFileInfo &operator=(const QFileInfo &fileinfo);
-    bool operator==(const QFileInfo &fileinfo); // 5.0 - remove me
-    bool operator==(const QFileInfo &fileinfo) const;
-    inline bool operator!=(const QFileInfo &fileinfo) { return !(operator==(fileinfo)); } // 5.0 - remove me
-    inline bool operator!=(const QFileInfo &fileinfo) const { return !(operator==(fileinfo)); }
-
-    void setFile(const QString &file);
-    void setFile(const QFile &file);
-    void setFile(const QDir &dir, const QString &file);
-    bool exists() const;
-    void refresh();
-
-    QString filePath() const;
-    QString absoluteFilePath() const;
-    QString canonicalFilePath() const;
-    QString fileName() const;
-    QString baseName() const;
-    QString completeBaseName() const;
-    QString suffix() const;
-    QString bundleName() const;
-    QString completeSuffix() const;
-
-    QString path() const;
-    QString absolutePath() const;
-    QString canonicalPath() const;
-    QDir dir() const;
-    QDir absoluteDir() const;
-
-    bool isReadable() const;
-    bool isWritable() const;
-    bool isExecutable() const;
-    bool isHidden() const;
-
-    bool isRelative() const;
-    inline bool isAbsolute() const { return !isRelative(); }
-    bool makeAbsolute();
-
-    bool isFile() const;
-    bool isDir() const;
-    bool isSymLink() const;
-    bool isRoot() const;
-    bool isBundle() const;
-
-    QString readLink() const;
-    inline QString symLinkTarget() const { return readLink(); }
-
-    QString owner() const;
-    uint ownerId() const;
-    QString group() const;
-    uint groupId() const;
-
-    bool permission(QFile::Permissions permissions) const;
-    QFile::Permissions permissions() const;
-
-    qint64 size() const;
-
-    QDateTime created() const;
-    QDateTime lastModified() const;
-    QDateTime lastRead() const;
-
-    void detach();
-
-    bool caching() const;
-    void setCaching(bool on);
-
-#ifdef QT3_SUPPORT
-    enum Permission {
-        ReadOwner = QFile::ReadOwner, WriteOwner = QFile::WriteOwner, ExeOwner = QFile::ExeOwner,
-        ReadUser  = QFile::ReadUser,  WriteUser  = QFile::WriteUser,  ExeUser  = QFile::ExeUser,
-        ReadGroup = QFile::ReadGroup, WriteGroup = QFile::WriteGroup, ExeGroup = QFile::ExeGroup,
-        ReadOther = QFile::ReadOther, WriteOther = QFile::WriteOther, ExeOther = QFile::ExeOther
-    };
-    Q_DECLARE_FLAGS(PermissionSpec, Permission)
-
-    inline QT3_SUPPORT QString baseName(bool complete) {
-        if(complete)
-            return completeBaseName();
-        return baseName();
-    }
-    inline QT3_SUPPORT QString extension(bool complete = true) const {
-        if(complete)
-            return completeSuffix();
-        return suffix();
-    }
-    inline QT3_SUPPORT QString absFilePath() const { return absoluteFilePath(); }
-
-    inline QT3_SUPPORT QString dirPath(bool absPath = false) const {
-        if(absPath)
-            return absolutePath();
-        return path();
-    }
-    QT3_SUPPORT QDir dir(bool absPath) const;
-    inline QT3_SUPPORT bool convertToAbs() { return makeAbsolute(); }
-#if !defined(Q_NO_TYPESAFE_FLAGS)
-    inline QT3_SUPPORT bool permission(PermissionSpec permissions) const
-    { return permission(QFile::Permissions(static_cast<int>(permissions))); }
-#endif
-    operator QFileInfo *() const;
-#endif
-
-protected:
-    QScopedPointer<QFileInfoPrivate> d_ptr;
-private:
-    Q_DECLARE_PRIVATE(QFileInfo)
-};
-Q_DECLARE_TYPEINFO(QFileInfo, Q_MOVABLE_TYPE);
-
-#ifdef QT3_SUPPORT
-Q_DECLARE_OPERATORS_FOR_FLAGS(QFileInfo::PermissionSpec)
-#endif
-
-typedef QList<QFileInfo> QFileInfoList;
-#ifdef QT3_SUPPORT
-typedef QList<QFileInfo>::Iterator QFileInfoListIterator;
-#endif
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QFILEINFO_H
diff --git a/qtinterface/tqt4/Qt/qglobal.h b/qtinterface/tqt4/Qt/qglobal.h
deleted file mode 100644
index 2406997..0000000
--- a/qtinterface/tqt4/Qt/qglobal.h
+++ /dev/null
@@ -1,2650 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGLOBAL_H
-#define QGLOBAL_H
-
-#include <stddef.h>
-
-#define QT_VERSION_STR "4.6.2"
-/*
-   QT_VERSION is (major << 16) + (minor << 8) + patch.
-*/
-#define QT_VERSION 0x040602
-/*
-   can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
-*/
-#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
-
-#define QT_PACKAGEDATE_STR "2010-02-12"
-
-#define QT_PACKAGE_TAG "244b440f11a519bbd0f6a2c5cde90edb1732f2ea"
-
-#if !defined(QT_BUILD_MOC)
-#include <QtCore/qconfig.h>
-#endif
-
-#ifdef __cplusplus
-
-#ifndef QT_NAMESPACE /* user namespace */
-
-# define QT_PREPEND_NAMESPACE(name) ::name
-# define QT_USE_NAMESPACE
-# define QT_BEGIN_NAMESPACE
-# define QT_END_NAMESPACE
-# define QT_BEGIN_INCLUDE_NAMESPACE
-# define QT_END_INCLUDE_NAMESPACE
-# define QT_BEGIN_MOC_NAMESPACE
-# define QT_END_MOC_NAMESPACE
-# define QT_FORWARD_DECLARE_CLASS(name) class name;
-# define QT_FORWARD_DECLARE_STRUCT(name) struct name;
-# define QT_MANGLE_NAMESPACE(name) name
-
-#else /* user namespace */
-
-# define QT_PREPEND_NAMESPACE(name) ::QT_NAMESPACE::name
-# define QT_USE_NAMESPACE using namespace ::QT_NAMESPACE;
-# define QT_BEGIN_NAMESPACE namespace QT_NAMESPACE {
-# define QT_END_NAMESPACE }
-# define QT_BEGIN_INCLUDE_NAMESPACE }
-# define QT_END_INCLUDE_NAMESPACE namespace QT_NAMESPACE {
-# define QT_BEGIN_MOC_NAMESPACE QT_USE_NAMESPACE
-# define QT_END_MOC_NAMESPACE
-# define QT_FORWARD_DECLARE_CLASS(name) \
-    QT_BEGIN_NAMESPACE class name; QT_END_NAMESPACE \
-    using QT_PREPEND_NAMESPACE(name);
-
-# define QT_FORWARD_DECLARE_STRUCT(name) \
-    QT_BEGIN_NAMESPACE struct name; QT_END_NAMESPACE \
-    using QT_PREPEND_NAMESPACE(name);
-
-# define QT_MANGLE_NAMESPACE0(x) x
-# define QT_MANGLE_NAMESPACE1(a, b) a##_##b
-# define QT_MANGLE_NAMESPACE2(a, b) QT_MANGLE_NAMESPACE1(a,b)
-# define QT_MANGLE_NAMESPACE(name) QT_MANGLE_NAMESPACE2( \
-        QT_MANGLE_NAMESPACE0(name), QT_MANGLE_NAMESPACE0(QT_NAMESPACE))
-
-namespace QT_NAMESPACE {}
-
-# ifndef QT_BOOTSTRAPPED
-# ifndef QT_NO_USING_NAMESPACE
-   /*
-    This expands to a "using QT_NAMESPACE" also in _header files_.
-    It is the only way the feature can be used without too much
-    pain, but if people _really_ do not want it they can add
-    DEFINES += QT_NO_USING_NAMESPACE to their .pro files.
-    */
-   QT_USE_NAMESPACE
-# endif
-# endif
-
-#endif /* user namespace */
-
-#else /* __cplusplus */
-
-# define QT_BEGIN_NAMESPACE
-# define QT_END_NAMESPACE
-# define QT_USE_NAMESPACE
-# define QT_BEGIN_INCLUDE_NAMESPACE
-# define QT_END_INCLUDE_NAMESPACE
-
-#endif /* __cplusplus */
-
-#if defined(Q_OS_MAC) && !defined(Q_CC_INTEL)
-#define QT_BEGIN_HEADER extern "C++" {
-#define QT_END_HEADER }
-#define QT_BEGIN_INCLUDE_HEADER }
-#define QT_END_INCLUDE_HEADER extern "C++" {
-#else
-#define QT_BEGIN_HEADER
-#define QT_END_HEADER
-#define QT_BEGIN_INCLUDE_HEADER
-#define QT_END_INCLUDE_HEADER extern "C++"
-#endif
-
-/*
-   The operating system, must be one of: (Q_OS_x)
-
-     DARWIN   - Darwin OS (synonym for Q_OS_MAC)
-     SYMBIAN  - Symbian
-     MSDOS    - MS-DOS and Windows
-     OS2      - OS/2
-     OS2EMX   - XFree86 on OS/2 (not PM)
-     WIN32    - Win32 (Windows 2000/XP/Vista/7 and Windows Server 2003/2008)
-     WINCE    - WinCE (Windows CE 5.0)
-     CYGWIN   - Cygwin
-     SOLARIS  - Sun Solaris
-     HPUX     - HP-UX
-     ULTRIX   - DEC Ultrix
-     LINUX    - Linux
-     FREEBSD  - FreeBSD
-     NETBSD   - NetBSD
-     OPENBSD  - OpenBSD
-     BSDI     - BSD/OS
-     IRIX     - SGI Irix
-     OSF      - HP Tru64 UNIX
-     SCO      - SCO OpenServer 5
-     UNIXWARE - UnixWare 7, Open UNIX 8
-     AIX      - AIX
-     HURD     - GNU Hurd
-     DGUX     - DG/UX
-     RELIANT  - Reliant UNIX
-     DYNIX    - DYNIX/ptx
-     QNX      - QNX
-     QNX6     - QNX RTP 6.1
-     LYNX     - LynxOS
-     BSD4     - Any BSD 4.4 system
-     UNIX     - Any UNIX BSD/SYSV system
-*/
-
-#if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__))
-#  define Q_OS_DARWIN
-#  define Q_OS_BSD4
-#  ifdef __LP64__
-#    define Q_OS_DARWIN64
-#  else
-#    define Q_OS_DARWIN32
-#  endif
-#elif defined(__SYMBIAN32__) || defined(SYMBIAN)
-#  define Q_OS_SYMBIAN
-#  define Q_NO_POSIX_SIGNALS
-#  define QT_NO_GETIFADDRS
-#elif defined(__CYGWIN__)
-#  define Q_OS_CYGWIN
-#elif defined(MSDOS) || defined(_MSDOS)
-#  define Q_OS_MSDOS
-#elif defined(__OS2__)
-#  if defined(__EMX__)
-#    define Q_OS_OS2EMX
-#  else
-#    define Q_OS_OS2
-#  endif
-#elif !defined(SAG_COM) && (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))
-#  define Q_OS_WIN32
-#  define Q_OS_WIN64
-#elif !defined(SAG_COM) && (defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__))
-#  if defined(WINCE) || defined(_WIN32_WCE)
-#    define Q_OS_WINCE
-#  else
-#    define Q_OS_WIN32
-#  endif
-#elif defined(__MWERKS__) && defined(__INTEL__)
-#  define Q_OS_WIN32
-#elif defined(__sun) || defined(sun)
-#  define Q_OS_SOLARIS
-#elif defined(hpux) || defined(__hpux)
-#  define Q_OS_HPUX
-#elif defined(__ultrix) || defined(ultrix)
-#  define Q_OS_ULTRIX
-#elif defined(sinix)
-#  define Q_OS_RELIANT
-#elif defined(__linux__) || defined(__linux)
-#  define Q_OS_LINUX
-#  define Q_OS_GLIBC
-#elif defined(__GNU_HURD__) || defined(__GNU__)
-#  define Q_OS_HURD
-#  define Q_OS_GLIBC
-#elif defined(__GLIBC__)
-#  define Q_OS_GLIBC
-#elif defined(__FreeBSD__) || defined(__DragonFly__)
-#  define Q_OS_FREEBSD
-#  define Q_OS_BSD4
-#elif defined(__NetBSD__)
-#  define Q_OS_NETBSD
-#  define Q_OS_BSD4
-#elif defined(__OpenBSD__)
-#  define Q_OS_OPENBSD
-#  define Q_OS_BSD4
-#elif defined(__bsdi__)
-#  define Q_OS_BSDI
-#  define Q_OS_BSD4
-#elif defined(__sgi)
-#  define Q_OS_IRIX
-#elif defined(__osf__)
-#  define Q_OS_OSF
-#elif defined(_AIX)
-#  define Q_OS_AIX
-#elif defined(__Lynx__)
-#  define Q_OS_LYNX
-#elif defined(__DGUX__)
-#  define Q_OS_DGUX
-#elif defined(__QNXNTO__)
-#  define Q_OS_QNX
-#elif defined(_SEQUENT_)
-#  define Q_OS_DYNIX
-#elif defined(_SCO_DS) /* SCO OpenServer 5 + GCC */
-#  define Q_OS_SCO
-#elif defined(__USLC__) /* all SCO platforms + UDK or OUDK */
-#  define Q_OS_UNIXWARE
-#elif defined(__svr4__) && defined(i386) /* Open UNIX 8 + GCC */
-#  define Q_OS_UNIXWARE
-#elif defined(__INTEGRITY)
-#  define Q_OS_INTEGRITY
-#elif defined(VXWORKS) /* there is no "real" VxWorks define - this has to be set in the mkspec! */
-#  define Q_OS_VXWORKS
-#elif defined(__MAKEDEPEND__)
-#else
-#  error "Qt has not been ported to this OS - talk to qt-bugs@trolltech.com"
-#endif
-
-#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) || defined(Q_OS_WINCE)
-#  define Q_OS_WIN
-#endif
-
-#if defined(Q_OS_DARWIN)
-#  define Q_OS_MAC /* Q_OS_MAC is mostly for compatibility, but also more clear */
-#  define Q_OS_MACX /* Q_OS_MACX is only for compatibility.*/
-#  if defined(Q_OS_DARWIN64)
-#     define Q_OS_MAC64
-#  elif defined(Q_OS_DARWIN32)
-#     define Q_OS_MAC32
-#  endif
-#endif
-
-#ifdef AUTODETECT_COCOA
-#  ifdef Q_OS_MAC64
-#    define QT_MAC_USE_COCOA 1
-#    define QT_BUILD_KEY QT_BUILD_KEY_COCOA
-#  else
-#    define QT_BUILD_KEY QT_BUILD_KEY_CARBON
-#  endif
-#endif
-
-#if defined(Q_OS_MAC64) && !defined(QT_MAC_USE_COCOA) && !defined(QT_BUILD_QMAKE)
-#error "You are building a 64-bit application, but using a 32-bit version of Qt. Check your build configuration."
-#endif
-
-#if defined(Q_OS_MSDOS) || defined(Q_OS_OS2) || defined(Q_OS_WIN)
-#  undef Q_OS_UNIX
-#elif !defined(Q_OS_UNIX)
-#  define Q_OS_UNIX
-#endif
-
-#if defined(Q_OS_DARWIN) && !defined(QT_LARGEFILE_SUPPORT)
-#  define QT_LARGEFILE_SUPPORT 64
-#endif
-
-#ifdef Q_OS_DARWIN
-#  ifdef MAC_OS_X_VERSION_MIN_REQUIRED
-#    undef MAC_OS_X_VERSION_MIN_REQUIRED
-#  endif
-#  define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_4
-#  include <AvailabilityMacros.h>
-#  if !defined(MAC_OS_X_VERSION_10_3)
-#     define MAC_OS_X_VERSION_10_3 MAC_OS_X_VERSION_10_2 + 1
-#  endif
-#  if !defined(MAC_OS_X_VERSION_10_4)
-#       define MAC_OS_X_VERSION_10_4 MAC_OS_X_VERSION_10_3 + 1
-#  endif
-#  if !defined(MAC_OS_X_VERSION_10_5)
-#       define MAC_OS_X_VERSION_10_5 MAC_OS_X_VERSION_10_4 + 1
-#  endif
-#  if !defined(MAC_OS_X_VERSION_10_6)
-#       define MAC_OS_X_VERSION_10_6 MAC_OS_X_VERSION_10_5 + 1
-#  endif
-#  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_6)
-#    warning "This version of Mac OS X is unsupported"
-#  endif
-#endif
-
-#ifdef __LSB_VERSION__
-#  if __LSB_VERSION__ < 40
-#    error "This version of the Linux Standard Base is unsupported"
-#  endif
-#ifndef QT_LINUXBASE
-#  define QT_LINUXBASE
-#endif
-#endif
-
-/*
-   The compiler, must be one of: (Q_CC_x)
-
-     SYM      - Digital Mars C/C++ (used to be Symantec C++)
-     MWERKS   - Metrowerks CodeWarrior
-     MSVC     - Microsoft Visual C/C++, Intel C++ for Windows
-     BOR      - Borland/Turbo C++
-     WAT      - Watcom C++
-     GNU      - GNU C++
-     COMEAU   - Comeau C++
-     EDG      - Edison Design Group C++
-     OC       - CenterLine C++
-     SUN      - Forte Developer, or Sun Studio C++
-     MIPS     - MIPSpro C++
-     DEC      - DEC C++
-     HPACC    - HP aC++
-     USLC     - SCO OUDK and UDK
-     CDS      - Reliant C++
-     KAI      - KAI C++
-     INTEL    - Intel C++ for Linux, Intel C++ for Windows
-     HIGHC    - MetaWare High C/C++
-     PGI      - Portland Group C++
-     GHS      - Green Hills Optimizing C++ Compilers
-     GCCE     - GCCE (Symbian GCCE builds)
-     RVCT     - ARM Realview Compiler Suite
-     NOKIAX86 - Nokia x86 (Symbian WINSCW builds)
-
-
-   Should be sorted most to least authoritative.
-*/
-
-#if defined(__ghs)
-#  define Q_OUTOFLINE_TEMPLATE inline
-#endif
-
-/* Symantec C++ is now Digital Mars */
-#if defined(__DMC__) || defined(__SC__)
-#  define Q_CC_SYM
-/* "explicit" semantics implemented in 8.1e but keyword recognized since 7.5 */
-#  if defined(__SC__) && __SC__ < 0x750
-#    define Q_NO_EXPLICIT_KEYWORD
-#  endif
-#  define Q_NO_USING_KEYWORD
-
-#elif defined(__MWERKS__)
-#  define Q_CC_MWERKS
-#  if defined(__EMU_SYMBIAN_OS__)
-#    define Q_CC_NOKIAX86
-#  endif
-/* "explicit" recognized since 4.0d1 */
-
-#elif defined(_MSC_VER)
-#  define Q_CC_MSVC
-/* proper support of bool for _MSC_VER >= 1100 */
-#  define Q_CANNOT_DELETE_CONSTANT
-#  define Q_OUTOFLINE_TEMPLATE inline
-#  define Q_NO_TEMPLATE_FRIENDS
-#  define QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION
-#    define Q_ALIGNOF(type)   __alignof(type)
-#    define Q_DECL_ALIGN(n)   __declspec(align(n))
-
-/* Visual C++.Net issues for _MSC_VER >= 1300 */
-#  if _MSC_VER >= 1300
-#    define Q_CC_MSVC_NET
-#    if _MSC_VER < 1310 || (defined(Q_OS_WIN64) && defined(_M_IA64))
-#      define Q_TYPENAME
-#    else
-#      undef QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION
-#    endif
-#  else
-#    define Q_NO_USING_KEYWORD
-#    define QT_NO_MEMBER_TEMPLATES
-#  endif
-#  if _MSC_VER < 1310
-#     define QT_NO_QOBJECT_CHECK
-#     define Q_TYPENAME
-#     define QT_NO_TEMPLATE_TEMPLATE_PARAMETERS
-#  endif
-/* Intel C++ disguising as Visual C++: the `using' keyword avoids warnings */
-#  if defined(__INTEL_COMPILER)
-#    define Q_CC_INTEL
-#  endif
-/* x64 does not support mmx intrinsics on windows */
-#  if (defined(Q_OS_WIN64) && defined(_M_X64))
-#    undef QT_HAVE_SSE
-#    undef QT_HAVE_SSE2
-#    undef QT_HAVE_MMX
-#    undef QT_HAVE_3DNOW
-#  endif
-
-
-#elif defined(__BORLANDC__) || defined(__TURBOC__)
-#  define Q_CC_BOR
-#  define Q_INLINE_TEMPLATE
-#  if __BORLANDC__ < 0x502
-#    define Q_NO_BOOL_TYPE
-#    define Q_NO_EXPLICIT_KEYWORD
-#  endif
-#  define Q_NO_USING_KEYWORD
-
-#elif defined(__WATCOMC__)
-#  define Q_CC_WAT
-
-/* Symbian GCCE */
-#elif defined(__GCCE__)
-#  define Q_CC_GCCE
-#  define QT_VISIBILITY_AVAILABLE
-#  if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)
-#    define QT_HAVE_ARMV6
-#  endif
-
-/* ARM Realview Compiler Suite
-   RVCT compiler also defines __EDG__ and __GNUC__ (if --gnu flag is given),
-   so check for it before that */
-#elif defined(__ARMCC__) || defined(__CC_ARM)
-#  define Q_CC_RVCT
-#  if __TARGET_ARCH_ARM >= 6
-#    define QT_HAVE_ARMV6
-#  endif
-#elif defined(__GNUC__)
-#  define Q_CC_GNU
-#  define Q_C_CALLBACKS
-#  if defined(__MINGW32__)
-#    define Q_CC_MINGW
-#  endif
-#  if defined(__INTEL_COMPILER)
-/* Intel C++ also masquerades as GCC 3.2.0 */
-#    define Q_CC_INTEL
-#    define Q_NO_TEMPLATE_FRIENDS
-#  endif
-#  ifdef __APPLE__
-#    define Q_NO_DEPRECATED_CONSTRUCTORS
-#  endif
-#  if __GNUC__ == 2 && __GNUC_MINOR__ <= 7
-#    define Q_FULL_TEMPLATE_INSTANTIATION
-#  endif
-/* GCC 2.95 knows "using" but does not support it correctly */
-#  if __GNUC__ == 2 && __GNUC_MINOR__ <= 95
-#    define Q_NO_USING_KEYWORD
-#    define TQT_NO_STL_WCHAR
-#  endif
-#  if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-#    define Q_ALIGNOF(type)   __alignof__(type)
-#    define Q_TYPEOF(expr)    __typeof__(expr)
-#    define Q_DECL_ALIGN(n)   __attribute__((__aligned__(n)))
-#  endif
-/* GCC 3.1 and GCC 3.2 wrongly define _SB_CTYPE_MACROS on HP-UX */
-#  if defined(Q_OS_HPUX) && __GNUC__ == 3 && __GNUC_MINOR__ >= 1
-#    define Q_WRONG_SB_CTYPE_MACROS
-#  endif
-/* GCC <= 3.3 cannot handle template friends */
-#  if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ <= 3)
-#    define Q_NO_TEMPLATE_FRIENDS
-#  endif
-/* Apple's GCC 3.1 chokes on our streaming qDebug() */
-#  if defined(Q_OS_DARWIN) && __GNUC__ == 3 && (__GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 3)
-#    define Q_BROKEN_DEBUG_STREAM
-#  endif
-#  if (defined(Q_CC_GNU) || defined(Q_CC_INTEL)) && !defined(QT_MOC_CPP)
-#    define Q_PACKED __attribute__ ((__packed__))
-#    define Q_NO_PACKED_REFERENCE
-#    ifndef __ARM_EABI__
-#      define QT_NO_ARM_EABI
-#    endif
-#  endif
-
-/* IBM compiler versions are a bit messy. There are actually two products:
-   the C product, and the C++ product. The C++ compiler is always packaged
-   with the latest version of the C compiler. Version numbers do not always
-   match. This little table (I'm not sure it's accurate) should be helpful:
-
-   C++ product                C product
-
-   C Set 3.1                  C Compiler 3.0
-   ...                        ...
-   C++ Compiler 3.6.6         C Compiler 4.3
-   ...                        ...
-   Visual Age C++ 4.0         ...
-   ...                        ...
-   Visual Age C++ 5.0         C Compiler 5.0
-   ...                        ...
-   Visual Age C++ 6.0         C Compiler 6.0
-
-   Now:
-   __xlC__    is the version of the C compiler in hexadecimal notation
-              is only an approximation of the C++ compiler version
-   __IBMCPP__ is the version of the C++ compiler in decimal notation
-              but it is not defined on older compilers like C Set 3.1 */
-#elif defined(__xlC__)
-#  define Q_CC_XLC
-#  define Q_FULL_TEMPLATE_INSTANTIATION
-#  if __xlC__ < 0x400
-#    define Q_NO_BOOL_TYPE
-#    define Q_NO_EXPLICIT_KEYWORD
-#    define Q_NO_USING_KEYWORD
-#    define Q_TYPENAME
-#    define Q_OUTOFLINE_TEMPLATE inline
-#    define Q_BROKEN_TEMPLATE_SPECIALIZATION
-#    define Q_CANNOT_DELETE_CONSTANT
-#  elif __xlC__ >= 0x0600
-#    define Q_ALIGNOF(type)     __alignof__(type)
-#    define Q_TYPEOF(expr)      __typeof__(expr)
-#    define Q_DECL_ALIGN(n)     __attribute__((__aligned__(n)))
-#    define Q_PACKED            __attribute__((__packed__))
-#  endif
-
-/* Older versions of DEC C++ do not define __EDG__ or __EDG - observed
-   on DEC C++ V5.5-004. New versions do define  __EDG__ - observed on
-   Compaq C++ V6.3-002.
-   This compiler is different enough from other EDG compilers to handle
-   it separately anyway. */
-#elif defined(__DECCXX) || defined(__DECC)
-#  define Q_CC_DEC
-/* Compaq C++ V6 compilers are EDG-based but I'm not sure about older
-   DEC C++ V5 compilers. */
-#  if defined(__EDG__)
-#    define Q_CC_EDG
-#  endif
-/* Compaq have disabled EDG's _BOOL macro and use _BOOL_EXISTS instead
-   - observed on Compaq C++ V6.3-002.
-   In any case versions prior to Compaq C++ V6.0-005 do not have bool. */
-#  if !defined(_BOOL_EXISTS)
-#    define Q_NO_BOOL_TYPE
-#  endif
-/* Spurious (?) error messages observed on Compaq C++ V6.5-014. */
-#  define Q_NO_USING_KEYWORD
-/* Apply to all versions prior to Compaq C++ V6.0-000 - observed on
-   DEC C++ V5.5-004. */
-#  if __DECCXX_VER < 60060000
-#    define Q_TYPENAME
-#    define Q_BROKEN_TEMPLATE_SPECIALIZATION
-#    define Q_CANNOT_DELETE_CONSTANT
-#  endif
-/* avoid undefined symbol problems with out-of-line template members */
-#  define Q_OUTOFLINE_TEMPLATE inline
-
-/* The Portland Group C++ compiler is based on EDG and does define __EDG__
-   but the C compiler does not */
-#elif defined(__PGI)
-#  define Q_CC_PGI
-#  if defined(__EDG__)
-#    define Q_CC_EDG
-#  endif
-
-/* Compilers with EDG front end are similar. To detect them we test:
-   __EDG documented by SGI, observed on MIPSpro 7.3.1.1 and KAI C++ 4.0b
-   __EDG__ documented in EDG online docs, observed on Compaq C++ V6.3-002
-   and PGI C++ 5.2-4 */
-#elif !defined(Q_OS_HPUX) && (defined(__EDG) || defined(__EDG__))
-#  define Q_CC_EDG
-/* From the EDG documentation (does not seem to apply to Compaq C++):
-   _BOOL
-        Defined in C++ mode when bool is a keyword. The name of this
-        predefined macro is specified by a configuration flag. _BOOL
-        is the default.
-   __BOOL_DEFINED
-        Defined in Microsoft C++ mode when bool is a keyword. */
-#  if !defined(_BOOL) && !defined(__BOOL_DEFINED)
-#    define Q_NO_BOOL_TYPE
-#  endif
-
-/* The Comeau compiler is based on EDG and does define __EDG__ */
-#  if defined(__COMO__)
-#    define Q_CC_COMEAU
-#    define Q_C_CALLBACKS
-
-/* The `using' keyword was introduced to avoid KAI C++ warnings
-   but it's now causing KAI C++ errors instead. The standard is
-   unclear about the use of this keyword, and in practice every
-   compiler is using its own set of rules. Forget it. */
-#  elif defined(__KCC)
-#    define Q_CC_KAI
-#    define Q_NO_USING_KEYWORD
-
-/* Using the `using' keyword avoids Intel C++ for Linux warnings */
-#  elif defined(__INTEL_COMPILER)
-#    define Q_CC_INTEL
-
-/* Uses CFront, make sure to read the manual how to tweak templates. */
-#  elif defined(__ghs)
-#    define Q_CC_GHS
-
-#  elif defined(__DCC__)
-#    define Q_CC_DIAB
-#    undef Q_NO_BOOL_TYPE
-#    if !defined(__bool)
-#      define Q_NO_BOOL_TYPE
-#    endif
-
-/* The UnixWare 7 UDK compiler is based on EDG and does define __EDG__ */
-#  elif defined(__USLC__) && defined(__SCO_VERSION__)
-#    define Q_CC_USLC
-/* The latest UDK 7.1.1b does not need this, but previous versions do */
-#    if !defined(__SCO_VERSION__) || (__SCO_VERSION__ < 302200010)
-#      define Q_OUTOFLINE_TEMPLATE inline
-#    endif
-#    define Q_NO_USING_KEYWORD /* ### check "using" status */
-
-/* Never tested! */
-#  elif defined(CENTERLINE_CLPP) || defined(OBJECTCENTER)
-#    define Q_CC_OC
-#    define Q_NO_USING_KEYWORD
-
-/* CDS++ defines __EDG__ although this is not documented in the Reliant
-   documentation. It also follows conventions like _BOOL and this documented */
-#  elif defined(sinix)
-#    define Q_CC_CDS
-#    define Q_NO_USING_KEYWORD
-
-/* The MIPSpro compiler defines __EDG */
-#  elif defined(__sgi)
-#    define Q_CC_MIPS
-#    define Q_NO_USING_KEYWORD /* ### check "using" status */
-#    define Q_NO_TEMPLATE_FRIENDS
-#    if defined(_COMPILER_VERSION) && (_COMPILER_VERSION >= 740)
-#      define Q_OUTOFLINE_TEMPLATE inline
-#      pragma set woff 3624,3625,3649 /* turn off some harmless warnings */
-#    endif
-#  endif
-
-/* VxWorks' DIAB toolchain has an additional EDG type C++ compiler
-   (see __DCC__ above). This one is for C mode files (__EDG is not defined) */
-#elif defined(_DIAB_TOOL)
-#  define Q_CC_DIAB
-
-/* Never tested! */
-#elif defined(__HIGHC__)
-#  define Q_CC_HIGHC
-
-#elif defined(__SUNPRO_CC) || defined(__SUNPRO_C)
-#  define Q_CC_SUN
-/* 5.0 compiler or better
-    'bool' is enabled by default but can be disabled using -features=nobool
-    in which case _BOOL is not defined
-        this is the default in 4.2 compatibility mode triggered by -compat=4 */
-#  if __SUNPRO_CC >= 0x500
-#    define QT_NO_TEMPLATE_TEMPLATE_PARAMETERS
-   /* see http://developers.sun.com/sunstudio/support/Ccompare.html */
-#    if __SUNPRO_CC >= 0x590
-#      define Q_ALIGNOF(type)   __alignof__(type)
-#      define Q_TYPEOF(expr)    __typeof__(expr)
-#      define Q_DECL_ALIGN(n)   __attribute__((__aligned__(n)))
-// using CC 5.9: Warning: attribute visibility is unsupported and will be skipped..
-//#      define Q_DECL_EXPORT     __attribute__((__visibility__("default")))
-#    endif
-#    if __SUNPRO_CC < 0x5a0
-#      define Q_NO_TEMPLATE_FRIENDS
-#    endif
-#    if !defined(_BOOL)
-#      define Q_NO_BOOL_TYPE
-#    endif
-#    if defined(__SUNPRO_CC_COMPAT) && (__SUNPRO_CC_COMPAT <= 4)
-#      define Q_NO_USING_KEYWORD
-#    endif
-#    define Q_C_CALLBACKS
-/* 4.2 compiler or older */
-#  else
-#    define Q_NO_BOOL_TYPE
-#    define Q_NO_EXPLICIT_KEYWORD
-#    define Q_NO_USING_KEYWORD
-#  endif
-
-/* CDS++ does not seem to define __EDG__ or __EDG according to Reliant
-   documentation but nevertheless uses EDG conventions like _BOOL */
-#elif defined(sinix)
-#  define Q_CC_EDG
-#  define Q_CC_CDS
-#  if !defined(_BOOL)
-#    define Q_NO_BOOL_TYPE
-#  endif
-#  define Q_BROKEN_TEMPLATE_SPECIALIZATION
-
-#elif defined(Q_OS_HPUX)
-/* __HP_aCC was not defined in first aCC releases */
-#  if defined(__HP_aCC) || __cplusplus >= 199707L
-#    define Q_NO_TEMPLATE_FRIENDS
-#    define Q_CC_HPACC
-#    if __HP_aCC-0 < 060000
-#      define QT_NO_TEMPLATE_TEMPLATE_PARAMETERS
-#      define Q_DECL_EXPORT     __declspec(dllexport)
-#      define Q_DECL_IMPORT     __declspec(dllimport)
-#    endif
-#    if __HP_aCC-0 >= 061200
-#      define Q_DECL_ALIGNED(n) __attribute__((aligned(n)))
-#    endif
-#    if __HP_aCC-0 >= 062000
-#      define Q_DECL_EXPORT     __attribute__((visibility("default")))
-#      define Q_DECL_IMPORT     Q_DECL_EXPORT
-#    endif
-#  else
-#    define Q_CC_HP
-#    define Q_NO_BOOL_TYPE
-#    define Q_FULL_TEMPLATE_INSTANTIATION
-#    define Q_BROKEN_TEMPLATE_SPECIALIZATION
-#    define Q_NO_EXPLICIT_KEYWORD
-#  endif
-#  define Q_NO_USING_KEYWORD /* ### check "using" status */
-
-#elif defined(__WINSCW__) && !defined(Q_CC_NOKIAX86)
-#  define Q_CC_NOKIAX86
-
-
-#else
-#  error "Qt has not been tested with this compiler - talk to qt-bugs@trolltech.com"
-#endif
-
-#ifndef Q_PACKED
-#  define Q_PACKED
-#  undef Q_NO_PACKED_REFERENCE
-#endif
-
-#ifndef Q_CONSTRUCTOR_FUNCTION
-# define Q_CONSTRUCTOR_FUNCTION0(AFUNC) \
-   static const int AFUNC ## __init_variable__ = AFUNC();
-# define Q_CONSTRUCTOR_FUNCTION(AFUNC) Q_CONSTRUCTOR_FUNCTION0(AFUNC)
-#endif
-
-#ifndef Q_DESTRUCTOR_FUNCTION
-# define Q_DESTRUCTOR_FUNCTION0(AFUNC) \
-    class AFUNC ## __dest_class__ { \
-    public: \
-       inline AFUNC ## __dest_class__() { } \
-       inline ~ AFUNC ## __dest_class__() { AFUNC(); } \
-    } AFUNC ## __dest_instance__;
-# define Q_DESTRUCTOR_FUNCTION(AFUNC) Q_DESTRUCTOR_FUNCTION0(AFUNC)
-#endif
-
-#ifndef Q_REQUIRED_RESULT
-#  if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1))
-#    define Q_REQUIRED_RESULT __attribute__ ((warn_unused_result))
-#  else
-#    define Q_REQUIRED_RESULT
-#  endif
-#endif
-
-#ifndef Q_COMPILER_MANGLES_RETURN_TYPE
-#  if defined(Q_CC_MSVC)
-#    define Q_COMPILER_MANGLES_RETURN_TYPE
-#  endif
-#endif
-
-/*
-   The window system, must be one of: (Q_WS_x)
-
-     MACX     - Mac OS X
-     MAC9     - Mac OS 9
-     QWS      - Qt for Embedded Linux
-     WIN32    - Windows
-     X11      - X Window System
-     S60      - Symbian S60
-     PM       - unsupported
-     WIN16    - unsupported
-*/
-
-#if defined(Q_OS_MSDOS)
-#  define Q_WS_WIN16
-#  error "Qt requires Win32 and does not work with Windows 3.x"
-#elif defined(_WIN32_X11_)
-#  define Q_WS_X11
-#elif defined(Q_OS_WIN32)
-#  define Q_WS_WIN32
-#  if defined(Q_OS_WIN64)
-#    define Q_WS_WIN64
-#  endif
-#elif defined(Q_OS_WINCE)
-#  define Q_WS_WIN32
-#  define Q_WS_WINCE
-#  if defined(Q_OS_WINCE_WM)
-#    define Q_WS_WINCE_WM
-#  endif
-#elif defined(Q_OS_OS2)
-#  define Q_WS_PM
-#  error "Qt does not work with OS/2 Presentation Manager or Workplace Shell"
-#elif defined(Q_OS_UNIX)
-#  if defined(Q_OS_MAC) && !defined(__USE_WS_X11__) && !defined(Q_WS_QWS)
-#    define Q_WS_MAC
-#    define Q_WS_MACX
-#    if defined(Q_OS_MAC64)
-#      define Q_WS_MAC64
-#    elif defined(Q_OS_MAC32)
-#      define Q_WS_MAC32
-#    endif
-#  elif defined(Q_OS_SYMBIAN)
-#    if (defined(__SERIES60_31__) || defined(__S60_32__) || defined(__S60_50__)) && !defined(QT_NO_S60)
-#      define Q_WS_S60
-#    endif
-#  elif !defined(Q_WS_QWS)
-#    define Q_WS_X11
-#  endif
-#endif
-
-#if defined(Q_WS_WIN16) || defined(Q_WS_WIN32) || defined(Q_WS_WINCE)
-#  define Q_WS_WIN
-#endif
-
-QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE
-
-/*
-   Size-dependent types (architechture-dependent byte order)
-
-   Make sure to update QMetaType when changing these typedefs
-*/
-
-typedef signed char qint8;         /* 8 bit signed */
-typedef unsigned char quint8;      /* 8 bit unsigned */
-typedef short qint16;              /* 16 bit signed */
-typedef unsigned short quint16;    /* 16 bit unsigned */
-typedef int qint32;                /* 32 bit signed */
-typedef unsigned int quint32;      /* 32 bit unsigned */
-#if defined(Q_OS_WIN) && !defined(Q_CC_GNU) && !defined(Q_CC_MWERKS)
-#  define Q_INT64_C(c) c ## i64    /* signed 64 bit constant */
-#  define Q_UINT64_C(c) c ## ui64   /* unsigned 64 bit constant */
-typedef __int64 qint64;            /* 64 bit signed */
-typedef unsigned __int64 quint64;  /* 64 bit unsigned */
-#else
-#  define Q_INT64_C(c) static_cast<long long>(c ## LL)     /* signed 64 bit constant */
-#  define Q_UINT64_C(c) static_cast<unsigned long long>(c ## ULL) /* unsigned 64 bit constant */
-typedef long long qint64;           /* 64 bit signed */
-typedef unsigned long long quint64; /* 64 bit unsigned */
-#endif
-
-typedef qint64 qlonglong;
-typedef quint64 qulonglong;
-
-#ifndef QT_POINTER_SIZE
-#  if defined(Q_OS_WIN64)
-#   define QT_POINTER_SIZE 8
-#  elif defined(Q_OS_WIN32) || defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
-#   define QT_POINTER_SIZE 4
-#  endif
-#endif
-
-#define Q_INIT_RESOURCE(name) \
-    do { extern int QT_MANGLE_NAMESPACE(qInitResources_ ## name) ();       \
-        QT_MANGLE_NAMESPACE(qInitResources_ ## name) (); } while (0)
-#define Q_CLEANUP_RESOURCE(name) \
-    do { extern int QT_MANGLE_NAMESPACE(qCleanupResources_ ## name) ();    \
-        QT_MANGLE_NAMESPACE(qCleanupResources_ ## name) (); } while (0)
-
-#if defined(__cplusplus)
-
-/*
-  quintptr and qptrdiff is guaranteed to be the same size as a pointer, i.e.
-
-      sizeof(void *) == sizeof(quintptr)
-      && sizeof(void *) == sizeof(qptrdiff)
-*/
-template <int> struct QIntegerForSize;
-template <>    struct QIntegerForSize<1> { typedef quint8  Unsigned; typedef qint8  Signed; };
-template <>    struct QIntegerForSize<2> { typedef quint16 Unsigned; typedef qint16 Signed; };
-template <>    struct QIntegerForSize<4> { typedef quint32 Unsigned; typedef qint32 Signed; };
-template <>    struct QIntegerForSize<8> { typedef quint64 Unsigned; typedef qint64 Signed; };
-template <class T> struct QIntegerForSizeof: QIntegerForSize<sizeof(T)> { };
-typedef QIntegerForSizeof<void*>::Unsigned quintptr;
-typedef QIntegerForSizeof<void*>::Signed qptrdiff;
-
-/*
-   Useful type definitions for Qt
-*/
-
-QT_BEGIN_INCLUDE_NAMESPACE
-typedef unsigned char uchar;
-typedef unsigned short ushort;
-typedef unsigned int uint;
-typedef unsigned long ulong;
-QT_END_INCLUDE_NAMESPACE
-
-#if defined(Q_NO_BOOL_TYPE)
-#error "Compiler doesn't support the bool type"
-#endif
-
-/*
-   Constant bool values
-*/
-
-#ifndef QT_LINUXBASE /* the LSB defines TRUE and FALSE for us */
-/* Symbian OS defines TRUE = 1 and FALSE = 0,
-redefine to built-in booleans to make autotests work properly */
-#ifdef Q_OS_SYMBIAN
-    #include <e32def.h> /* Symbian OS defines */
-
-    #undef TRUE
-    #undef FALSE
-#endif
-#  ifndef TRUE
-#   define TRUE true
-#   define FALSE false
-#  endif
-#endif
-
-/*
-   Proper for-scoping in VC++6 and MIPSpro CC
-*/
-#ifndef QT_NO_KEYWORDS
-#  if (defined(Q_CC_MSVC) && !defined(Q_CC_MSVC_NET) && !defined(Q_CC_INTEL)) || defined(Q_CC_MIPS) || (defined(Q_CC_HPACC) && defined(__ia64))
-#    define for if(0){}else for
-#  endif
-#endif
-
-/*
-   Workaround for static const members on MSVC++.
-*/
-
-#if defined(Q_CC_MSVC)
-#  define QT_STATIC_CONST static
-#  define QT_STATIC_CONST_IMPL
-#else
-#  define QT_STATIC_CONST static const
-#  define QT_STATIC_CONST_IMPL const
-#endif
-
-/*
-   Warnings and errors when using deprecated methods
-*/
-#if defined(Q_MOC_RUN)
-#  define Q_DECL_DEPRECATED Q_DECL_DEPRECATED
-#elif (defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && (__GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 >= 2))) || defined(Q_CC_RVCT)
-#  define Q_DECL_DEPRECATED __attribute__ ((__deprecated__))
-#elif defined(Q_CC_MSVC) && (_MSC_VER >= 1300)
-#  define Q_DECL_DEPRECATED __declspec(deprecated)
-#  if defined (Q_CC_INTEL)
-#    define Q_DECL_VARIABLE_DEPRECATED
-#  else
-#  endif
-#else
-#  define Q_DECL_DEPRECATED
-#endif
-#ifndef Q_DECL_VARIABLE_DEPRECATED
-#  define Q_DECL_VARIABLE_DEPRECATED Q_DECL_DEPRECATED
-#endif
-#ifndef Q_DECL_CONSTRUCTOR_DEPRECATED
-#  if defined(Q_MOC_RUN)
-#    define Q_DECL_CONSTRUCTOR_DEPRECATED Q_DECL_CONSTRUCTOR_DEPRECATED
-#  elif defined(Q_NO_DEPRECATED_CONSTRUCTORS)
-#    define Q_DECL_CONSTRUCTOR_DEPRECATED
-#  else
-#    define Q_DECL_CONSTRUCTOR_DEPRECATED Q_DECL_DEPRECATED
-#  endif
-#endif
-
-#if defined(QT_NO_DEPRECATED)
-/* disable Qt3 support as well */
-#  undef QT3_SUPPORT_WARNINGS
-#  undef QT3_SUPPORT
-#  undef QT_DEPRECATED
-#  undef QT_DEPRECATED_VARIABLE
-#  undef QT_DEPRECATED_CONSTRUCTOR
-#elif defined(QT_DEPRECATED_WARNINGS)
-/* enable Qt3 support warnings as well */
-#  undef QT3_SUPPORT_WARNINGS
-#  define QT3_SUPPORT_WARNINGS
-#  undef QT_DEPRECATED
-#  define QT_DEPRECATED Q_DECL_DEPRECATED
-#  undef QT_DEPRECATED_VARIABLE
-#  define QT_DEPRECATED_VARIABLE Q_DECL_VARIABLE_DEPRECATED
-#  undef QT_DEPRECATED_CONSTRUCTOR
-#  define QT_DEPRECATED_CONSTRUCTOR explicit Q_DECL_CONSTRUCTOR_DEPRECATED
-#else
-#  undef QT_DEPRECATED
-#  define QT_DEPRECATED
-#  undef QT_DEPRECATED_VARIABLE
-#  define QT_DEPRECATED_VARIABLE
-#  undef QT_DEPRECATED_CONSTRUCTOR
-#  define QT_DEPRECATED_CONSTRUCTOR
-#endif
-
-#if defined(QT3_SUPPORT_WARNINGS)
-#  if !defined(QT_COMPAT_WARNINGS) /* also enable compat */
-#    define QT_COMPAT_WARNINGS
-#  endif
-#  undef QT3_SUPPORT
-#  define QT3_SUPPORT Q_DECL_DEPRECATED
-#  undef QT3_SUPPORT_VARIABLE
-#  define QT3_SUPPORT_VARIABLE Q_DECL_VARIABLE_DEPRECATED
-#  undef QT3_SUPPORT_CONSTRUCTOR
-#  define QT3_SUPPORT_CONSTRUCTOR explicit Q_DECL_CONSTRUCTOR_DEPRECATED
-#elif defined(QT3_SUPPORT) /* define back to nothing */
-#  if !defined(QT_COMPAT) /* also enable qt3 support */
-#    define QT_COMPAT
-#  endif
-#  undef QT3_SUPPORT
-#  define QT3_SUPPORT
-#  undef QT3_SUPPORT_VARIABLE
-#  define QT3_SUPPORT_VARIABLE
-#  undef QT3_SUPPORT_CONSTRUCTOR
-#  define QT3_SUPPORT_CONSTRUCTOR explicit
-#endif
-
-/* moc compats (signals/slots) */
-#ifndef QT_MOC_COMPAT
-#  if defined(QT3_SUPPORT)
-#    define QT_MOC_COMPAT QT3_SUPPORT
-#  else
-#    define QT_MOC_COMPAT
-#  endif
-#else
-#  undef QT_MOC_COMPAT
-#  define QT_MOC_COMPAT
-#endif
-
-#ifdef QT_ASCII_CAST_WARNINGS
-#  define QT_ASCII_CAST_WARN Q_DECL_DEPRECATED
-#  if defined(Q_CC_GNU) && __GNUC__ < 4
-     /* gcc < 4 doesn't like Q_DECL_DEPRECATED in front of constructors */
-#    define QT_ASCII_CAST_WARN_CONSTRUCTOR
-#  else
-#    define QT_ASCII_CAST_WARN_CONSTRUCTOR Q_DECL_CONSTRUCTOR_DEPRECATED
-#  endif
-#else
-#  define QT_ASCII_CAST_WARN
-#  define QT_ASCII_CAST_WARN_CONSTRUCTOR
-#endif
-
-#if defined(__i386__) || defined(_WIN32) || defined(_WIN32_WCE)
-#  if defined(Q_CC_GNU)
-#if !defined(Q_CC_INTEL) && ((100*(__GNUC__ - 0) + 10*(__GNUC_MINOR__ - 0) + __GNUC_PATCHLEVEL__) >= 332)
-#    define QT_FASTCALL __attribute__((regparm(3)))
-#else
-#    define QT_FASTCALL
-#endif
-#  elif defined(Q_CC_MSVC) && (_MSC_VER > 1300 || defined(Q_CC_INTEL))
-#    define QT_FASTCALL __fastcall
-#  else
-#     define QT_FASTCALL
-#  endif
-#else
-#  define QT_FASTCALL
-#endif
-
-typedef int QNoImplicitBoolCast;
-
-#if defined(QT_ARCH_ARM) || defined(QT_ARCH_ARMV6) || defined(QT_ARCH_AVR32) || (defined(QT_ARCH_MIPS) && (defined(Q_WS_QWS) || defined(Q_OS_WINCE))) || defined(QT_ARCH_SH) || defined(QT_ARCH_SH4A)
-#define QT_NO_FPU
-#endif
-
-// This logic must match the one in qmetatype.h
-#if defined(QT_COORD_TYPE)
-typedef QT_COORD_TYPE qreal;
-#elif defined(QT_NO_FPU) || defined(QT_ARCH_ARM) || defined(QT_ARCH_WINDOWSCE) || defined(QT_ARCH_SYMBIAN)
-typedef float qreal;
-#else
-typedef double qreal;
-#endif
-
-/*
-   Utility macros and inline functions
-*/
-
-template <typename T>
-inline T qAbs(const T &t) { return t >= 0 ? t : -t; }
-
-inline int qRound(qreal d)
-{ return d >= 0.0 ? int(d + 0.5) : int(d - int(d-1) + 0.5) + int(d-1); }
-
-#if defined(QT_NO_FPU) || defined(QT_ARCH_ARM) || defined(QT_ARCH_WINDOWSCE) || defined(QT_ARCH_SYMBIAN)
-inline qint64 qRound64(double d)
-{ return d >= 0.0 ? qint64(d + 0.5) : qint64(d - qreal(qint64(d-1)) + 0.5) + qint64(d-1); }
-#else
-inline qint64 qRound64(qreal d)
-{ return d >= 0.0 ? qint64(d + 0.5) : qint64(d - qreal(qint64(d-1)) + 0.5) + qint64(d-1); }
-#endif
-
-template <typename T>
-inline const T &qMin(const T &a, const T &b) { if (a < b) return a; return b; }
-template <typename T>
-inline const T &qMax(const T &a, const T &b) { if (a < b) return b; return a; }
-template <typename T>
-inline const T &qBound(const T &min, const T &val, const T &max)
-{ return qMax(min, qMin(max, val)); }
-
-#ifdef QT3_SUPPORT
-typedef qint8 Q_INT8;
-typedef quint8 Q_UINT8;
-typedef qint16 Q_INT16;
-typedef quint16 Q_UINT16;
-typedef qint32 Q_INT32;
-typedef quint32 Q_UINT32;
-typedef qint64 Q_INT64;
-typedef quint64 Q_UINT64;
-
-typedef qint64 Q_LLONG;
-typedef quint64 Q_ULLONG;
-#if defined(Q_OS_WIN64)
-typedef __int64 Q_LONG;             /* word up to 64 bit signed */
-typedef unsigned __int64 Q_ULONG;   /* word up to 64 bit unsigned */
-#else
-typedef long Q_LONG;                /* word up to 64 bit signed */
-typedef unsigned long Q_ULONG;      /* word up to 64 bit unsigned */
-#endif
-
-#  define QABS(a) qAbs(a)
-#  define QMAX(a, b) qMax((a), (b))
-#  define QMIN(a, b) qMin((a), (b))
-#endif
-
-/*
-   Data stream functions are provided by many classes (defined in qdatastream.h)
-*/
-
-class QDataStream;
-
-#ifndef QT_BUILD_KEY
-#define QT_BUILD_KEY "unspecified"
-#endif
-
-#if defined(Q_WS_MAC)
-#  ifndef QMAC_QMENUBAR_NO_EVENT
-#    define QMAC_QMENUBAR_NO_EVENT
-#  endif
-#endif
-
-#if !defined(Q_WS_QWS) && !defined(QT_NO_COP)
-#  define QT_NO_COP
-#endif
-
-#if defined(Q_OS_VXWORKS)
-#  define QT_NO_CRASHHANDLER     // no popen
-#  define QT_NO_PROCESS          // no exec*, no fork
-#  define QT_NO_LPR
-#  define QT_NO_SHAREDMEMORY     // only POSIX, no SysV and in the end...
-#  define QT_NO_SYSTEMSEMAPHORE  // not needed at all in a flat address space
-#  define QT_NO_QWS_MULTIPROCESS // no processes
-#endif
-
-# include <QtCore/qfeatures.h>
-
-#define QT_SUPPORTS(FEATURE) (!defined(QT_NO_##FEATURE))
-
-#ifndef Q_DECL_EXPORT
-#  if defined(Q_OS_WIN) || defined(Q_CC_NOKIAX86) || defined(Q_CC_RVCT)
-#    define Q_DECL_EXPORT __declspec(dllexport)
-#  elif defined(QT_VISIBILITY_AVAILABLE)
-#    define Q_DECL_EXPORT __attribute__((visibility("default")))
-#  endif
-#  ifndef Q_DECL_EXPORT
-#    define Q_DECL_EXPORT
-#  endif
-#endif
-#ifndef Q_DECL_IMPORT
-#  if defined(Q_OS_WIN) || defined(Q_CC_NOKIAX86) || defined(Q_CC_RVCT)
-#    define Q_DECL_IMPORT __declspec(dllimport)
-#  else
-#    define Q_DECL_IMPORT
-#  endif
-#endif
-
-/*
-   Create Qt DLL if QT_DLL is defined (Windows and Symbian only)
-*/
-
-#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
-#  if defined(QT_NODLL)
-#    undef QT_MAKEDLL
-#    undef QT_DLL
-#  elif defined(QT_MAKEDLL)        /* create a Qt DLL library */
-#    if defined(QT_DLL)
-#      undef QT_DLL
-#    endif
-#    if defined(QT_BUILD_CORE_LIB)
-#      define Q_CORE_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_CORE_EXPORT Q_DECL_IMPORT
-#    endif
-#    if defined(QT_BUILD_GUI_LIB)
-#      define Q_GUI_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_GUI_EXPORT Q_DECL_IMPORT
-#    endif
-#    if defined(QT_BUILD_SQL_LIB)
-#      define Q_SQL_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_SQL_EXPORT Q_DECL_IMPORT
-#    endif
-#    if defined(QT_BUILD_NETWORK_LIB)
-#      define Q_NETWORK_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_NETWORK_EXPORT Q_DECL_IMPORT
-#    endif
-#    if defined(QT_BUILD_SVG_LIB)
-#      define Q_SVG_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_SVG_EXPORT Q_DECL_IMPORT
-#    endif
-#    if defined(QT_BUILD_DECLARATIVE_LIB)
-#      define Q_DECLARATIVE_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_DECLARATIVE_EXPORT Q_DECL_IMPORT
-#    endif
-#    if defined(QT_BUILD_OPENGL_LIB)
-#      define Q_OPENGL_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_OPENGL_EXPORT Q_DECL_IMPORT
-#    endif
-#    if defined(QT_BUILD_MULTIMEDIA_LIB)
-#      define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT
-#    endif
-#    if defined(QT_BUILD_OPENVG_LIB)
-#      define Q_OPENVG_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_OPENVG_EXPORT Q_DECL_IMPORT
-#    endif
-#    if defined(QT_BUILD_XML_LIB)
-#      define Q_XML_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_XML_EXPORT Q_DECL_IMPORT
-#    endif
-#    if defined(QT_BUILD_XMLPATTERNS_LIB)
-#      define Q_XMLPATTERNS_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_XMLPATTERNS_EXPORT Q_DECL_IMPORT
-#    endif
-#    if defined(QT_BUILD_SCRIPT_LIB)
-#      define Q_SCRIPT_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_SCRIPT_EXPORT Q_DECL_IMPORT
-#    endif
-#    if defined(QT_BUILD_SCRIPTTOOLS_LIB)
-#      define Q_SCRIPTTOOLS_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_SCRIPTTOOLS_EXPORT Q_DECL_IMPORT
-#    endif
-#    if defined(QT_BUILD_CANVAS_LIB)
-#      define Q_CANVAS_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_CANVAS_EXPORT Q_DECL_IMPORT
-#    endif
-#    if defined(QT_BUILD_COMPAT_LIB)
-#      define Q_COMPAT_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_COMPAT_EXPORT Q_DECL_IMPORT
-#    endif
-#    define Q_TEMPLATEDLL
-#  elif defined(QT_DLL) /* use a Qt DLL library */
-#    define Q_CORE_EXPORT Q_DECL_IMPORT
-#    define Q_GUI_EXPORT Q_DECL_IMPORT
-#    define Q_SQL_EXPORT Q_DECL_IMPORT
-#    define Q_NETWORK_EXPORT Q_DECL_IMPORT
-#    define Q_SVG_EXPORT Q_DECL_IMPORT
-#    define Q_DECLARATIVE_EXPORT Q_DECL_IMPORT
-#    define Q_CANVAS_EXPORT Q_DECL_IMPORT
-#    define Q_OPENGL_EXPORT Q_DECL_IMPORT
-#    define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT
-#    define Q_OPENVG_EXPORT Q_DECL_IMPORT
-#    define Q_XML_EXPORT Q_DECL_IMPORT
-#    define Q_XMLPATTERNS_EXPORT Q_DECL_IMPORT
-#    define Q_SCRIPT_EXPORT Q_DECL_IMPORT
-#    define Q_SCRIPTTOOLS_EXPORT Q_DECL_IMPORT
-#    define Q_COMPAT_EXPORT Q_DECL_IMPORT
-#    define Q_TEMPLATEDLL
-#  endif
-#  define Q_NO_DECLARED_NOT_DEFINED
-#else
-#  if defined(Q_OS_LINUX) && defined(Q_CC_BOR)
-#    define Q_TEMPLATEDLL
-#    define Q_NO_DECLARED_NOT_DEFINED
-#  endif
-#  undef QT_MAKEDLL /* ignore these for other platforms */
-#  undef QT_DLL
-#endif
-
-#if !defined(Q_CORE_EXPORT)
-#  if defined(QT_SHARED)
-#    define Q_CORE_EXPORT Q_DECL_EXPORT
-#    define Q_GUI_EXPORT Q_DECL_EXPORT
-#    define Q_SQL_EXPORT Q_DECL_EXPORT
-#    define Q_NETWORK_EXPORT Q_DECL_EXPORT
-#    define Q_SVG_EXPORT Q_DECL_EXPORT
-#    define Q_DECLARATIVE_EXPORT Q_DECL_EXPORT
-#    define Q_OPENGL_EXPORT Q_DECL_EXPORT
-#    define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT
-#    define Q_OPENVG_EXPORT Q_DECL_EXPORT
-#    define Q_XML_EXPORT Q_DECL_EXPORT
-#    define Q_XMLPATTERNS_EXPORT Q_DECL_EXPORT
-#    define Q_SCRIPT_EXPORT Q_DECL_EXPORT
-#    define Q_SCRIPTTOOLS_EXPORT Q_DECL_EXPORT
-#    define Q_COMPAT_EXPORT Q_DECL_EXPORT
-#  else
-#    define Q_CORE_EXPORT
-#    define Q_GUI_EXPORT
-#    define Q_SQL_EXPORT
-#    define Q_NETWORK_EXPORT
-#    define Q_SVG_EXPORT
-#    define Q_DECLARATIVE_EXPORT
-#    define Q_OPENGL_EXPORT
-#    define Q_MULTIMEDIA_EXPORT
-#    define Q_XML_EXPORT
-#    define Q_XMLPATTERNS_EXPORT
-#    define Q_SCRIPT_EXPORT
-#    define Q_SCRIPTTOOLS_EXPORT
-#    define Q_COMPAT_EXPORT
-#  endif
-#endif
-
-// Functions marked as Q_GUI_EXPORT_INLINE were exported and inlined by mistake.
-// Compilers like MinGW complain that the import attribute is ignored.
-#if defined(Q_CC_MINGW)
-#    if defined(QT_BUILD_CORE_LIB)
-#      define Q_CORE_EXPORT_INLINE Q_CORE_EXPORT inline
-#    else
-#      define Q_CORE_EXPORT_INLINE inline
-#    endif
-#    if defined(QT_BUILD_GUI_LIB)
-#      define Q_GUI_EXPORT_INLINE Q_GUI_EXPORT inline
-#    else
-#      define Q_GUI_EXPORT_INLINE inline
-#    endif
-#elif defined(Q_CC_RVCT)
-// we force RVCT not to export inlines by passing --visibility_inlines_hidden
-// so we need to just inline it, rather than exporting and inlining
-// note: this affects the contents of the DEF files (ie. these functions do not appear)
-#    define Q_CORE_EXPORT_INLINE inline
-#    define Q_GUI_EXPORT_INLINE inline
-#else
-#    define Q_CORE_EXPORT_INLINE Q_CORE_EXPORT inline
-#    define Q_GUI_EXPORT_INLINE Q_GUI_EXPORT inline
-#endif
-
-/*
-   No, this is not an evil backdoor. QT_BUILD_INTERNAL just exports more symbols
-   for Qt's internal unit tests. If you want slower loading times and more
-   symbols that can vanish from version to version, feel free to define QT_BUILD_INTERNAL.
-*/
-#if defined(QT_BUILD_INTERNAL) && (defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && defined(QT_MAKEDLL)
-#    define Q_AUTOTEST_EXPORT Q_DECL_EXPORT
-#elif defined(QT_BUILD_INTERNAL) && (defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && defined(QT_DLL)
-#    define Q_AUTOTEST_EXPORT Q_DECL_IMPORT
-#elif defined(QT_BUILD_INTERNAL) && !(defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && defined(QT_SHARED)
-#    define Q_AUTOTEST_EXPORT Q_DECL_EXPORT
-#else
-#    define Q_AUTOTEST_EXPORT
-#endif
-
-inline void qt_noop() {}
-
-/* These wrap try/catch so we can switch off exceptions later.
-
-   Beware - do not use more than one QT_CATCH per QT_TRY, and do not use
-   the exception instance in the catch block.
-   If you can't live with those constraints, don't use these macros.
-   Use the QT_NO_EXCEPTIONS macro to protect your code instead.
-*/
-
-#ifdef QT_BOOTSTRAPPED
-#  define QT_NO_EXCEPTIONS
-#endif
-#if !defined(QT_NO_EXCEPTIONS) && defined(Q_CC_GNU) && !defined (__EXCEPTIONS) && !defined(Q_MOC_RUN)
-#  define QT_NO_EXCEPTIONS
-#endif
-
-#ifdef QT_NO_EXCEPTIONS
-#  define QT_TRY if (true)
-#  define QT_CATCH(A) else
-#  define QT_THROW(A) qt_noop()
-#  define QT_RETHROW qt_noop()
-#else
-#  define QT_TRY try
-#  define QT_CATCH(A) catch (A)
-#  define QT_THROW(A) throw A
-#  define QT_RETHROW throw
-#endif
-
-/*
-   System information
-*/
-
-class QString;
-class Q_CORE_EXPORT QSysInfo {
-public:
-    enum Sizes {
-        WordSize = (sizeof(void *)<<3)
-    };
-
-#if defined(QT_BUILD_QMAKE)
-    enum Endian {
-        BigEndian,
-        LittleEndian
-    };
-    /* needed to bootstrap qmake */
-    static const int ByteOrder;
-#elif defined(Q_BYTE_ORDER)
-    enum Endian {
-        BigEndian,
-        LittleEndian
-
-#  ifdef qdoc
-        , ByteOrder = <platform-dependent>
-#  elif Q_BYTE_ORDER == Q_BIG_ENDIAN
-        , ByteOrder = BigEndian
-#  elif Q_BYTE_ORDER == Q_LITTLE_ENDIAN
-        , ByteOrder = LittleEndian
-#  else
-#    error "Undefined byte order"
-#  endif
-    };
-#else
-#  error "Qt not configured correctly, please run configure"
-#endif
-#if defined(Q_WS_WIN) || defined(Q_OS_CYGWIN)
-    enum WinVersion {
-        WV_32s      = 0x0001,
-        WV_95       = 0x0002,
-        WV_98       = 0x0003,
-        WV_Me       = 0x0004,
-        WV_DOS_based= 0x000f,
-
-        /* codenames */
-        WV_NT       = 0x0010,
-        WV_2000     = 0x0020,
-        WV_XP       = 0x0030,
-        WV_2003     = 0x0040,
-        WV_VISTA    = 0x0080,
-        WV_WINDOWS7 = 0x0090,
-        WV_NT_based = 0x00f0,
-
-        /* version numbers */
-        WV_4_0      = WV_NT,
-        WV_5_0      = WV_2000,
-        WV_5_1      = WV_XP,
-        WV_5_2      = WV_2003,
-        WV_6_0      = WV_VISTA,
-        WV_6_1      = WV_WINDOWS7,
-
-        WV_CE       = 0x0100,
-        WV_CENET    = 0x0200,
-        WV_CE_5     = 0x0300,
-        WV_CE_6     = 0x0400,
-        WV_CE_based = 0x0f00
-    };
-    static const WinVersion WindowsVersion;
-    static WinVersion windowsVersion();
-
-#endif
-#ifdef Q_OS_MAC
-    enum MacVersion {
-        MV_Unknown = 0x0000,
-
-        /* version */
-        MV_9 = 0x0001,
-        MV_10_0 = 0x0002,
-        MV_10_1 = 0x0003,
-        MV_10_2 = 0x0004,
-        MV_10_3 = 0x0005,
-        MV_10_4 = 0x0006,
-        MV_10_5 = 0x0007,
-        MV_10_6 = 0x0008,
-
-        /* codenames */
-        MV_CHEETAH = MV_10_0,
-        MV_PUMA = MV_10_1,
-        MV_JAGUAR = MV_10_2,
-        MV_PANTHER = MV_10_3,
-        MV_TIGER = MV_10_4,
-        MV_LEOPARD = MV_10_5,
-        MV_SNOWLEOPARD = MV_10_6
-    };
-    static const MacVersion MacintoshVersion;
-#endif
-#ifdef Q_OS_SYMBIAN
-    enum SymbianVersion {
-        SV_Unknown = 0x0000,
-        //These are the Symbian Ltd versions 9.2-9.4
-        SV_9_2 = 10,
-        SV_9_3 = 20,
-        SV_9_4 = 30,
-        //Following values are the symbian foundation versions, i.e. Symbian^1 == SV_SF_1
-        SV_SF_1 = SV_9_4,
-        SV_SF_2 = 40,
-        SV_SF_3 = 50,
-        SV_SF_4 = 60
-    };
-    static SymbianVersion symbianVersion();
-    enum S60Version {
-        SV_S60_None = 0,
-        SV_S60_Unknown = 1,
-        SV_S60_3_1 = SV_9_2,
-        SV_S60_3_2 = SV_9_3,
-        SV_S60_5_0 = SV_9_4,
-        //versions beyond 5.0 are to be confirmed - it is better to use symbian version
-        SV_S60_5_1 = SV_SF_2,
-        SV_S60_5_2 = SV_SF_3
-    };
-    static S60Version s60Version();
-#endif
-};
-
-Q_CORE_EXPORT const char *qVersion();
-Q_CORE_EXPORT bool qSharedBuild();
-
-#if defined(Q_OS_MAC)
-inline int qMacVersion() { return QSysInfo::MacintoshVersion; }
-#endif
-
-#ifdef QT3_SUPPORT
-inline QT3_SUPPORT bool qSysInfo(int *wordSize, bool *bigEndian)
-{
-    *wordSize = QSysInfo::WordSize;
-    *bigEndian = (QSysInfo::ByteOrder == QSysInfo::BigEndian);
-    return true;
-}
-#endif
-
-#if defined(Q_WS_WIN) || defined(Q_OS_CYGWIN)
-#if defined(QT3_SUPPORT)
-inline QT3_SUPPORT bool qt_winUnicode() { return true; }
-inline QT3_SUPPORT int qWinVersion() { return QSysInfo::WindowsVersion; }
-#endif
-
-#define QT_WA(unicode, ansi) unicode
-#define QT_WA_INLINE(unicode, ansi) (unicode)
-
-#endif /* Q_WS_WIN */
-
-#ifndef Q_OUTOFLINE_TEMPLATE
-#  define Q_OUTOFLINE_TEMPLATE
-#endif
-#ifndef Q_INLINE_TEMPLATE
-#  define Q_INLINE_TEMPLATE inline
-#endif
-
-#ifndef Q_TYPENAME
-#  define Q_TYPENAME typename
-#endif
-
-/*
-   Avoid "unused parameter" warnings
-*/
-
-#if defined(Q_CC_INTEL) && !defined(Q_OS_WIN) || defined(Q_CC_RVCT)
-template <typename T>
-inline void qUnused(T &x) { (void)x; }
-#  define Q_UNUSED(x) qUnused(x);
-#else
-#  define Q_UNUSED(x) (void)x;
-#endif
-
-/*
-   Debugging and error handling
-*/
-
-/*
-   On Symbian we do not know beforehand whether we are compiling in
-   release or debug mode, so check the Symbian build define here,
-   and set the QT_NO_DEBUG define appropriately.
-*/
-#if defined(Q_OS_SYMBIAN) && defined(NDEBUG) && !defined(QT_NO_DEBUG)
-#  define QT_NO_DEBUG
-#endif
-
-#if !defined(QT_NO_DEBUG) && !defined(QT_DEBUG)
-#  define QT_DEBUG
-#endif
-
-#ifndef qPrintable
-#  define qPrintable(string) (string).toLocal8Bit().constData()
-#endif
-
-Q_CORE_EXPORT void qDebug(const char *, ...) /* print debug message */
-#if defined(Q_CC_GNU) && !defined(__INSURE__)
-    __attribute__ ((format (printf, 1, 2)))
-#endif
-;
-
-Q_CORE_EXPORT void qWarning(const char *, ...) /* print warning message */
-#if defined(Q_CC_GNU) && !defined(__INSURE__)
-    __attribute__ ((format (printf, 1, 2)))
-#endif
-;
-
-class QString;
-Q_CORE_EXPORT QString qt_error_string(int errorCode = -1);
-Q_CORE_EXPORT void qCritical(const char *, ...) /* print critical message */
-#if defined(Q_CC_GNU) && !defined(__INSURE__)
-    __attribute__ ((format (printf, 1, 2)))
-#endif
-;
-Q_CORE_EXPORT void qFatal(const char *, ...) /* print fatal message and exit */
-#if defined(Q_CC_GNU) && !defined(__INSURE__)
-    __attribute__ ((format (printf, 1, 2)))
-#endif
-;
-
-#ifdef QT3_SUPPORT
-Q_CORE_EXPORT QT3_SUPPORT void qSystemWarning(const char *msg, int code = -1);
-#endif /* QT3_SUPPORT */
-Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...);
-Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...);
-
-#if (defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_TEXTSTREAM)) && !defined(QT_NO_DEBUG_STREAM)
-#define QT_NO_DEBUG_STREAM
-#endif
-
-/*
-  Forward declarations only.
-
-  In order to use the qDebug() stream, you must #include<QDebug>
-*/
-class QDebug;
-class QNoDebug;
-#ifndef QT_NO_DEBUG_STREAM
-Q_CORE_EXPORT_INLINE QDebug qDebug();
-Q_CORE_EXPORT_INLINE QDebug qWarning();
-Q_CORE_EXPORT_INLINE QDebug qCritical();
-#else
-inline QNoDebug qDebug();
-#endif
-
-#define QT_NO_QDEBUG_MACRO while (false) qDebug
-#ifdef QT_NO_DEBUG_OUTPUT
-#  define qDebug QT_NO_QDEBUG_MACRO
-#endif
-#define QT_NO_QWARNING_MACRO while (false) qWarning
-#ifdef QT_NO_WARNING_OUTPUT
-#  define qWarning QT_NO_QWARNING_MACRO
-#endif
-
-
-Q_CORE_EXPORT void qt_assert(const char *assertion, const char *file, int line);
-
-#if !defined(Q_ASSERT)
-#  ifndef QT_NO_DEBUG
-#    define Q_ASSERT(cond) ((!(cond)) ? qt_assert(#cond,__FILE__,__LINE__) : qt_noop())
-#  else
-#    define Q_ASSERT(cond) qt_noop()
-#  endif
-#endif
-
-#if defined(QT_NO_DEBUG) && !defined(QT_PAINT_DEBUG)
-#define QT_NO_PAINT_DEBUG
-#endif
-
-Q_CORE_EXPORT void qt_assert_x(const char *where, const char *what, const char *file, int line);
-
-#if !defined(Q_ASSERT_X)
-#  ifndef QT_NO_DEBUG
-#    define Q_ASSERT_X(cond, where, what) ((!(cond)) ? qt_assert_x(where, what,__FILE__,__LINE__) : qt_noop())
-#  else
-#    define Q_ASSERT_X(cond, where, what) qt_noop()
-#  endif
-#endif
-
-Q_CORE_EXPORT void qt_check_pointer(const char *, int);
-
-#ifndef QT_NO_EXCEPTIONS
-Q_CORE_EXPORT void qBadAlloc();
-#endif
-
-#ifdef QT_NO_EXCEPTIONS
-#  if defined(QT_NO_DEBUG)
-#    define Q_CHECK_PTR(p) qt_noop();
-#  else
-#    define Q_CHECK_PTR(p) do {if(!(p))qt_check_pointer(__FILE__,__LINE__);} while (0)
-#  endif
-#else
-#  define Q_CHECK_PTR(p) do { if (!(p)) qBadAlloc(); } while (0)
-#endif
-
-template <typename T>
-inline T *q_check_ptr(T *p) { Q_CHECK_PTR(p); return p; }
-
-#if (defined(Q_CC_GNU) && !defined(Q_OS_SOLARIS)) || defined(Q_CC_HPACC) || defined(Q_CC_DIAB)
-#  define Q_FUNC_INFO __PRETTY_FUNCTION__
-#elif defined(_MSC_VER)
-    /* MSVC 2002 doesn't have __FUNCSIG__ nor can it handle QT_STRINGIFY. */
-#  if _MSC_VER <= 1300
-#      define Q_FUNC_INFO __FILE__ "(line number unavailable)"
-#  else
-#      define Q_FUNC_INFO __FUNCSIG__
-#  endif
-#else
-#   if defined(Q_OS_SOLARIS) || defined(Q_CC_XLC) || defined(Q_OS_SYMBIAN)
-#      define Q_FUNC_INFO __FILE__ "(line number unavailable)"
-#   else
-        /* These two macros makes it possible to turn the builtin line expander into a
-         * string literal. */
-#       define QT_STRINGIFY2(x) #x
-#       define QT_STRINGIFY(x) QT_STRINGIFY2(x)
-#       define Q_FUNC_INFO __FILE__ ":" QT_STRINGIFY(__LINE__)
-#   endif
-    /* The MIPSpro and RVCT compilers postpones macro expansion,
-       and therefore macros must be in scope when being used. */
-#   if !defined(Q_CC_MIPS) && !defined(Q_CC_RVCT) && !defined(Q_CC_NOKIAX86)
-#       undef QT_STRINGIFY2
-#       undef QT_STRINGIFY
-#   endif
-#endif
-
-enum QtMsgType { QtDebugMsg, QtWarningMsg, QtCriticalMsg, QtFatalMsg, QtSystemMsg = QtCriticalMsg };
-
-Q_CORE_EXPORT void qt_message_output(QtMsgType, const char *buf);
-
-typedef void (*QtMsgHandler)(QtMsgType, const char *);
-Q_CORE_EXPORT QtMsgHandler qInstallMsgHandler(QtMsgHandler);
-
-#ifdef QT3_SUPPORT
-inline QT3_SUPPORT void qSuppressObsoleteWarnings(bool = true) {}
-inline QT3_SUPPORT void qObsolete(const char *, const char * = 0, const char * = 0) {}
-#endif
-
-#if defined(QT_NO_THREAD)
-
-template <typename T>
-class QGlobalStatic
-{
-public:
-    T *pointer;
-    inline QGlobalStatic(T *p) : pointer(p) { }
-    inline ~QGlobalStatic() { pointer = 0; }
-};
-
-#define Q_GLOBAL_STATIC(TYPE, NAME)                              \
-    static TYPE *NAME()                                          \
-    {                                                            \
-        static TYPE this_##NAME;                                 \
-        static QGlobalStatic<TYPE > global_##NAME(&this_##NAME); \
-        return global_##NAME.pointer;                            \
-    }
-
-#define Q_GLOBAL_STATIC_WITH_ARGS(TYPE, NAME, ARGS)              \
-    static TYPE *NAME()                                          \
-    {                                                            \
-        static TYPE this_##NAME ARGS;                            \
-        static QGlobalStatic<TYPE > global_##NAME(&this_##NAME); \
-        return global_##NAME.pointer;                            \
-    }
-
-#define Q_GLOBAL_STATIC_WITH_INITIALIZER(TYPE, NAME, INITIALIZER) \
-    static TYPE *NAME()                                           \
-    {                                                             \
-        static TYPE this_##NAME;                                  \
-        static QGlobalStatic<TYPE > global_##NAME(0);             \
-        if (!global_##NAME.pointer) {                             \
-            TYPE *x = global_##NAME.pointer = &this_##NAME;       \
-            INITIALIZER;                                          \
-        }                                                         \
-        return global_##NAME.pointer;                             \
-    }
-
-#else
-
-// forward declaration, since qatomic.h needs qglobal.h
-template <typename T> class QBasicAtomicPointer;
-
-// POD for Q_GLOBAL_STATIC
-template <typename T>
-class QGlobalStatic
-{
-public:
-    QBasicAtomicPointer<T> pointer;
-    bool destroyed;
-};
-
-// Created as a function-local static to delete a QGlobalStatic<T>
-template <typename T>
-class QGlobalStaticDeleter
-{
-public:
-    QGlobalStatic<T> &globalStatic;
-    QGlobalStaticDeleter(QGlobalStatic<T> &_globalStatic)
-        : globalStatic(_globalStatic)
-    { }
-
-    inline ~QGlobalStaticDeleter()
-    {
-        delete globalStatic.pointer;
-        globalStatic.pointer = 0;
-        globalStatic.destroyed = true;
-    }
-};
-
-#define Q_GLOBAL_STATIC_INIT(TYPE, NAME)                              \
-    static QGlobalStatic<TYPE > this_##NAME = { Q_BASIC_ATOMIC_INITIALIZER(0), false }
-
-#define Q_GLOBAL_STATIC(TYPE, NAME)                                     \
-    Q_GLOBAL_STATIC_INIT(TYPE, NAME);                                   \
-    static TYPE *NAME()                                                 \
-    {                                                                   \
-        if (!this_##NAME.pointer && !this_##NAME.destroyed) {           \
-            TYPE *x = new TYPE;                                         \
-            if (!this_##NAME.pointer.testAndSetOrdered(0, x))           \
-                delete x;                                               \
-            else                                                        \
-                static QGlobalStaticDeleter<TYPE > cleanup(this_##NAME); \
-        }                                                               \
-        return this_##NAME.pointer;                                     \
-    }
-
-#define Q_GLOBAL_STATIC_WITH_ARGS(TYPE, NAME, ARGS)                     \
-    Q_GLOBAL_STATIC_INIT(TYPE, NAME);                                   \
-    static TYPE *NAME()                                                 \
-    {                                                                   \
-        if (!this_##NAME.pointer && !this_##NAME.destroyed) {           \
-            TYPE *x = new TYPE ARGS;                                    \
-            if (!this_##NAME.pointer.testAndSetOrdered(0, x))           \
-                delete x;                                               \
-            else                                                        \
-                static QGlobalStaticDeleter<TYPE > cleanup(this_##NAME); \
-        }                                                               \
-        return this_##NAME.pointer;                                     \
-    }
-
-#define Q_GLOBAL_STATIC_WITH_INITIALIZER(TYPE, NAME, INITIALIZER)       \
-    Q_GLOBAL_STATIC_INIT(TYPE, NAME);                                   \
-    static TYPE *NAME()                                                 \
-    {                                                                   \
-        if (!this_##NAME.pointer && !this_##NAME.destroyed) {           \
-            QScopedPointer<TYPE > x(new TYPE);                          \
-            INITIALIZER;                                                \
-            if (this_##NAME.pointer.testAndSetOrdered(0, x.data())) {   \
-                static QGlobalStaticDeleter<TYPE > cleanup(this_##NAME); \
-                x.take();                                               \
-            }                                                           \
-        }                                                               \
-        return this_##NAME.pointer;                                     \
-    }
-
-#endif
-
-class QBool
-{
-    bool b;
-
-public:
-    inline explicit QBool(bool B) : b(B) {}
-    inline operator const void *() const
-    { return b ? static_cast<const void *>(this) : static_cast<const void *>(0); }
-    operator uint () const;
-};
-
-inline bool operator==(QBool b1, bool b2) { return !b1 == !b2; }
-inline bool operator==(bool b1, QBool b2) { return !b1 == !b2; }
-inline bool operator==(QBool b1, QBool b2) { return !b1 == !b2; }
-inline bool operator!=(QBool b1, bool b2) { return !b1 != !b2; }
-inline bool operator!=(bool b1, QBool b2) { return !b1 != !b2; }
-inline bool operator!=(QBool b1, QBool b2) { return !b1 != !b2; }
-
-static inline bool qFuzzyCompare(double p1, double p2)
-{
-    return (qAbs(p1 - p2) <= 0.000000000001 * qMin(qAbs(p1), qAbs(p2)));
-}
-
-static inline bool qFuzzyCompare(float p1, float p2)
-{
-    return (qAbs(p1 - p2) <= 0.00001f * qMin(qAbs(p1), qAbs(p2)));
-}
-
-/*!
-  \internal
-*/
-static inline bool qFuzzyIsNull(double d)
-{
-    return qAbs(d) <= 0.000000000001;
-}
-
-/*!
-  \internal
-*/
-static inline bool qFuzzyIsNull(float f)
-{
-    return qAbs(f) <= 0.00001f;
-}
-
-/*
-   This function tests a double for a null value. It doesn't
-   check whether the actual value is 0 or close to 0, but whether
-   it is binary 0.
-*/
-static inline bool qIsNull(double d)
-{
-    union U {
-        double d;
-        quint64 u;
-    };
-    U val;
-    val.d = d;
-    return val.u == quint64(0);
-}
-
-/*
-   This function tests a float for a null value. It doesn't
-   check whether the actual value is 0 or close to 0, but whether
-   it is binary 0.
-*/
-static inline bool qIsNull(float f)
-{
-    union U {
-        float f;
-        quint32 u;
-    };
-    U val;
-    val.f = f;
-    return val.u == 0u;
-}
-
-/*
-   Compilers which follow outdated template instantiation rules
-   require a class to have a comparison operator to exist when
-   a QList of this type is instantiated. It's not actually
-   used in the list, though. Hence the dummy implementation.
-   Just in case other code relies on it we better trigger a warning
-   mandating a real implementation.
-*/
-
-#ifdef Q_FULL_TEMPLATE_INSTANTIATION
-#  define Q_DUMMY_COMPARISON_OPERATOR(C) \
-    bool operator==(const C&) const { \
-        qWarning(#C"::operator==(const "#C"&) was called"); \
-        return false; \
-    }
-#else
-#  define Q_DUMMY_COMPARISON_OPERATOR(C)
-#endif
-
-
-/*
-   QTypeInfo     - type trait functionality
-   qIsDetached   - data sharing functionality
-*/
-
-#ifndef QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION
-
-/*
-  The catch-all template.
-*/
-
-template <typename T> inline bool qIsDetached(T &) { return true; }
-
-template <typename T>
-class QTypeInfo
-{
-public:
-    enum {
-        isPointer = false,
-        isComplex = true,
-        isStatic = true,
-        isLarge = (sizeof(T)>sizeof(void*)),
-        isDummy = false
-    };
-};
-
-template <typename T>
-class QTypeInfo<T*>
-{
-public:
-    enum {
-        isPointer = true,
-        isComplex = false,
-        isStatic = false,
-        isLarge = false,
-        isDummy = false
-    };
-};
-
-#else
-
-template <typename T> char QTypeInfoHelper(T*(*)());
-void* QTypeInfoHelper(...);
-
-template <typename T> inline bool qIsDetached(T &) { return true; }
-
-template <typename T>
-class QTypeInfo
-{
-public:
-    enum {
-        isPointer = (1 == sizeof(QTypeInfoHelper((T(*)())0))),
-        isComplex = !isPointer,
-        isStatic = !isPointer,
-        isLarge = (sizeof(T)>sizeof(void*)),
-        isDummy = false
-    };
-};
-
-#endif /* QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION */
-
-/*
-   Specialize a specific type with:
-
-     Q_DECLARE_TYPEINFO(type, flags);
-
-   where 'type' is the name of the type to specialize and 'flags' is
-   logically-OR'ed combination of the flags below.
-*/
-enum { /* TYPEINFO flags */
-    Q_COMPLEX_TYPE = 0,
-    Q_PRIMITIVE_TYPE = 0x1,
-    Q_STATIC_TYPE = 0,
-    Q_MOVABLE_TYPE = 0x2,
-    Q_DUMMY_TYPE = 0x4
-};
-
-#define Q_DECLARE_TYPEINFO(TYPE, FLAGS) \
-template <> \
-class QTypeInfo<TYPE > \
-{ \
-public: \
-    enum { \
-        isComplex = (((FLAGS) & Q_PRIMITIVE_TYPE) == 0), \
-        isStatic = (((FLAGS) & (Q_MOVABLE_TYPE | Q_PRIMITIVE_TYPE)) == 0), \
-        isLarge = (sizeof(TYPE)>sizeof(void*)), \
-        isPointer = false, \
-        isDummy = (((FLAGS) & Q_DUMMY_TYPE) != 0) \
-    }; \
-    static inline const char *name() { return #TYPE; } \
-}
-
-template <typename T>
-inline void qSwap(T &value1, T &value2)
-{
-    const T t = value1;
-    value1 = value2;
-    value2 = t;
-}
-
-/*
-   Specialize a shared type with:
-
-     Q_DECLARE_SHARED(type);
-
-   where 'type' is the name of the type to specialize.  NOTE: shared
-   types must declare a 'bool isDetached(void) const;' member for this
-   to work.
-*/
-#define Q_DECLARE_SHARED(TYPE)                                          \
-template <> inline bool qIsDetached<TYPE>(TYPE &t) { return t.isDetached(); } \
-template <> inline void qSwap<TYPE>(TYPE &value1, TYPE &value2) \
-{ \
-    qSwap(value1.data_ptr(), value2.data_ptr()); \
-}
-
-/*
-   QTypeInfo primitive specializations
-*/
-Q_DECLARE_TYPEINFO(bool, Q_PRIMITIVE_TYPE);
-Q_DECLARE_TYPEINFO(char, Q_PRIMITIVE_TYPE);
-Q_DECLARE_TYPEINFO(signed char, Q_PRIMITIVE_TYPE);
-Q_DECLARE_TYPEINFO(uchar, Q_PRIMITIVE_TYPE);
-Q_DECLARE_TYPEINFO(short, Q_PRIMITIVE_TYPE);
-Q_DECLARE_TYPEINFO(ushort, Q_PRIMITIVE_TYPE);
-Q_DECLARE_TYPEINFO(int, Q_PRIMITIVE_TYPE);
-Q_DECLARE_TYPEINFO(uint, Q_PRIMITIVE_TYPE);
-Q_DECLARE_TYPEINFO(long, Q_PRIMITIVE_TYPE);
-Q_DECLARE_TYPEINFO(ulong, Q_PRIMITIVE_TYPE);
-Q_DECLARE_TYPEINFO(qint64, Q_PRIMITIVE_TYPE);
-Q_DECLARE_TYPEINFO(quint64, Q_PRIMITIVE_TYPE);
-Q_DECLARE_TYPEINFO(float, Q_PRIMITIVE_TYPE);
-Q_DECLARE_TYPEINFO(double, Q_PRIMITIVE_TYPE);
-#ifndef Q_OS_DARWIN
-Q_DECLARE_TYPEINFO(long double, Q_PRIMITIVE_TYPE);
-#endif
-
-/*
-   These functions make it possible to use standard C++ functions with
-   a similar name from Qt header files (especially template classes).
-*/
-Q_CORE_EXPORT void *qMalloc(size_t size);
-Q_CORE_EXPORT void qFree(void *ptr);
-Q_CORE_EXPORT void *qRealloc(void *ptr, size_t size);
-Q_CORE_EXPORT void *qMallocAligned(size_t size, size_t alignment);
-Q_CORE_EXPORT void *qReallocAligned(void *ptr, size_t size, size_t oldsize, size_t alignment);
-Q_CORE_EXPORT void qFreeAligned(void *ptr);
-Q_CORE_EXPORT void *qMemCopy(void *dest, const void *src, size_t n);
-Q_CORE_EXPORT void *qMemSet(void *dest, int c, size_t n);
-
-
-/*
-   Avoid some particularly useless warnings from some stupid compilers.
-   To get ALL C++ compiler warnings, define QT_CC_WARNINGS or comment out
-   the line "#define QT_NO_WARNINGS".
-*/
-#if !defined(QT_CC_WARNINGS)
-#  define QT_NO_WARNINGS
-#endif
-#if defined(QT_NO_WARNINGS)
-#  if defined(Q_CC_MSVC)
-#    pragma warning(disable: 4251) /* class 'A' needs to have dll interface for to be used by clients of class 'B'. */
-#    pragma warning(disable: 4244) /* 'conversion' conversion from 'type1' to 'type2', possible loss of data */
-#    pragma warning(disable: 4275) /* non - DLL-interface classkey 'identifier' used as base for DLL-interface classkey 'identifier' */
-#    pragma warning(disable: 4514) /* unreferenced inline/local function has been removed */
-#    pragma warning(disable: 4800) /* 'type' : forcing value to bool 'true' or 'false' (performance warning) */
-#    pragma warning(disable: 4097) /* typedef-name 'identifier1' used as synonym for class-name 'identifier2' */
-#    pragma warning(disable: 4706) /* assignment within conditional expression */
-#    pragma warning(disable: 4786) /* truncating debug info after 255 characters */
-#    pragma warning(disable: 4660) /* template-class specialization 'identifier' is already instantiated */
-#    pragma warning(disable: 4355) /* 'this' : used in base member initializer list */
-#    pragma warning(disable: 4231) /* nonstandard extension used : 'extern' before template explicit instantiation */
-#    pragma warning(disable: 4710) /* function not inlined */
-#    pragma warning(disable: 4530) /* C++ exception handler used, but unwind semantics are not enabled. Specify -GX */
-#    if _MSC_VER < 1300
-#      pragma warning(disable: 4284) /* return type for 'type1::operator ->' is 'type2 *' */
-                                     /* (ie; not a UDT or reference to a UDT.  Will produce errors if applied using infix notation) */
-#    endif
-#  elif defined(Q_CC_BOR)
-#    pragma option -w-inl
-#    pragma option -w-aus
-#    pragma warn -inl
-#    pragma warn -pia
-#    pragma warn -ccc
-#    pragma warn -rch
-#    pragma warn -sig
-#  endif
-#endif
-
-class Q_CORE_EXPORT QFlag
-{
-    int i;
-public:
-    inline QFlag(int i);
-    inline operator int() const { return i; }
-};
-
-inline QFlag::QFlag(int ai) : i(ai) {}
-
-class Q_CORE_EXPORT QIncompatibleFlag
-{
-    int i;
-public:
-    inline explicit QIncompatibleFlag(int i);
-    inline operator int() const { return i; }
-};
-
-inline QIncompatibleFlag::QIncompatibleFlag(int ai) : i(ai) {}
-
-
-#ifndef Q_NO_TYPESAFE_FLAGS
-
-template<typename Enum>
-class QFlags
-{
-    typedef void **Zero;
-    int i;
-public:
-    typedef Enum enum_type;
-    inline QFlags(const QFlags &f) : i(f.i) {}
-    inline QFlags(Enum f) : i(f) {}
-    inline QFlags(Zero = 0) : i(0) {}
-    inline QFlags(QFlag f) : i(f) {}
-
-    inline QFlags &operator=(const QFlags &f) { i = f.i; return *this; }
-    inline QFlags &operator&=(int mask) { i &= mask; return *this; }
-    inline QFlags &operator&=(uint mask) { i &= mask; return *this; }
-    inline QFlags &operator|=(QFlags f) { i |= f.i; return *this; }
-    inline QFlags &operator|=(Enum f) { i |= f; return *this; }
-    inline QFlags &operator^=(QFlags f) { i ^= f.i; return *this; }
-    inline QFlags &operator^=(Enum f) { i ^= f; return *this; }
-
-    inline operator int() const { return i; }
-
-    inline QFlags operator|(QFlags f) const { QFlags g; g.i = i | f.i; return g; }
-    inline QFlags operator|(Enum f) const { QFlags g; g.i = i | f; return g; }
-    inline QFlags operator^(QFlags f) const { QFlags g; g.i = i ^ f.i; return g; }
-    inline QFlags operator^(Enum f) const { QFlags g; g.i = i ^ f; return g; }
-    inline QFlags operator&(int mask) const { QFlags g; g.i = i & mask; return g; }
-    inline QFlags operator&(uint mask) const { QFlags g; g.i = i & mask; return g; }
-    inline QFlags operator&(Enum f) const { QFlags g; g.i = i & f; return g; }
-    inline QFlags operator~() const { QFlags g; g.i = ~i; return g; }
-
-    inline bool operator!() const { return !i; }
-
-    inline bool testFlag(Enum f) const { return (i & f) == f && (f != 0 || i == int(f) ); }
-};
-
-#define Q_DECLARE_FLAGS(Flags, Enum)\
-typedef QFlags<Enum> Flags;
-
-#if defined Q_CC_MSVC && _MSC_VER < 1300
-# define Q_DECLARE_INCOMPATIBLE_FLAGS(Flags)
-#else
-# define Q_DECLARE_INCOMPATIBLE_FLAGS(Flags) \
-inline QIncompatibleFlag operator|(Flags::enum_type f1, int f2) \
-{ return QIncompatibleFlag(int(f1) | f2); }
-#endif
-
-#define Q_DECLARE_OPERATORS_FOR_FLAGS(Flags) \
-inline QFlags<Flags::enum_type> operator|(Flags::enum_type f1, Flags::enum_type f2) \
-{ return QFlags<Flags::enum_type>(f1) | f2; } \
-inline QFlags<Flags::enum_type> operator|(Flags::enum_type f1, QFlags<Flags::enum_type> f2) \
-{ return f2 | f1; } Q_DECLARE_INCOMPATIBLE_FLAGS(Flags)
-
-
-#else /* Q_NO_TYPESAFE_FLAGS */
-
-#define Q_DECLARE_FLAGS(Flags, Enum)\
-typedef uint Flags;
-#define Q_DECLARE_OPERATORS_FOR_FLAGS(Flags)
-
-#endif /* Q_NO_TYPESAFE_FLAGS */
-
-#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_RVCT)
-/* make use of typeof-extension */
-template <typename T>
-class QForeachContainer {
-public:
-    inline QForeachContainer(const T& t) : c(t), brk(0), i(c.begin()), e(c.end()) { }
-    const T c;
-    int brk;
-    typename T::const_iterator i, e;
-};
-
-#define Q_FOREACH(variable, container)                                \
-for (QForeachContainer<__typeof__(container)> _container_(container); \
-     !_container_.brk && _container_.i != _container_.e;              \
-     __extension__  ({ ++_container_.brk; ++_container_.i; }))                       \
-    for (variable = *_container_.i;; __extension__ ({--_container_.brk; break;}))
-
-#else
-
-struct QForeachContainerBase {};
-
-template <typename T>
-class QForeachContainer : public QForeachContainerBase {
-public:
-    inline QForeachContainer(const T& t): c(t), brk(0), i(c.begin()), e(c.end()){};
-    const T c;
-    mutable int brk;
-    mutable typename T::const_iterator i, e;
-    inline bool condition() const { return (!brk++ && i != e); }
-};
-
-template <typename T> inline T *qForeachPointer(const T &) { return 0; }
-
-template <typename T> inline QForeachContainer<T> qForeachContainerNew(const T& t)
-{ return QForeachContainer<T>(t); }
-
-template <typename T>
-inline const QForeachContainer<T> *qForeachContainer(const QForeachContainerBase *base, const T *)
-{ return static_cast<const QForeachContainer<T> *>(base); }
-
-#if (defined(Q_CC_MSVC) && !defined(Q_CC_MSVC_NET) && !defined(Q_CC_INTEL)) || defined(Q_CC_MIPS)
-/*
-   Proper for-scoping in VC++6 and MIPSpro CC
-*/
-#  define Q_FOREACH(variable,container)                                                             \
-    if(0){}else                                                                                     \
-    for (const QForeachContainerBase &_container_ = qForeachContainerNew(container);                \
-         qForeachContainer(&_container_, true ? 0 : qForeachPointer(container))->condition();       \
-         ++qForeachContainer(&_container_, true ? 0 : qForeachPointer(container))->i)               \
-        for (variable = *qForeachContainer(&_container_, true ? 0 : qForeachPointer(container))->i; \
-             qForeachContainer(&_container_, true ? 0 : qForeachPointer(container))->brk;           \
-             --qForeachContainer(&_container_, true ? 0 : qForeachPointer(container))->brk)
-
-#elif defined(Q_CC_DIAB)
-// VxWorks DIAB generates unresolvable symbols, if container is a function call
-#  define Q_FOREACH(variable,container)                                                             \
-    if(0){}else                                                                                     \
-    for (const QForeachContainerBase &_container_ = qForeachContainerNew(container);                \
-         qForeachContainer(&_container_, (__typeof__(container) *) 0)->condition();       \
-         ++qForeachContainer(&_container_, (__typeof__(container) *) 0)->i)               \
-        for (variable = *qForeachContainer(&_container_, (__typeof__(container) *) 0)->i; \
-             qForeachContainer(&_container_, (__typeof__(container) *) 0)->brk;           \
-             --qForeachContainer(&_container_, (__typeof__(container) *) 0)->brk)
-
-#else
-#  define Q_FOREACH(variable, container) \
-    for (const QForeachContainerBase &_container_ = qForeachContainerNew(container); \
-         qForeachContainer(&_container_, true ? 0 : qForeachPointer(container))->condition();       \
-         ++qForeachContainer(&_container_, true ? 0 : qForeachPointer(container))->i)               \
-        for (variable = *qForeachContainer(&_container_, true ? 0 : qForeachPointer(container))->i; \
-             qForeachContainer(&_container_, true ? 0 : qForeachPointer(container))->brk;           \
-             --qForeachContainer(&_container_, true ? 0 : qForeachPointer(container))->brk)
-#endif // MSVC6 || MIPSpro
-
-#endif
-
-#define Q_FOREVER for(;;)
-#ifndef QT_NO_KEYWORDS
-#  ifndef foreach
-#    define foreach Q_FOREACH
-#  endif
-#  ifndef forever
-#    define forever Q_FOREVER
-#  endif
-#endif
-
-#if 0
-/* tell gcc to use its built-in methods for some common functions */
-#if defined(QT_NO_DEBUG) && defined(Q_CC_GNU)
-#  define qMemCopy __builtin_memcpy
-#  define qMemSet __builtin_memset
-#endif
-#endif
-
-template <typename T> static inline T *qGetPtrHelper(T *ptr) { return ptr; }
-template <typename Wrapper> static inline typename Wrapper::pointer qGetPtrHelper(const Wrapper &p) { return p.data(); }
-
-#define Q_DECLARE_PRIVATE(Class) \
-    inline Class##Private* d_func() { return reinterpret_cast<Class##Private *>(qGetPtrHelper(d_ptr)); } \
-    inline const Class##Private* d_func() const { return reinterpret_cast<const Class##Private *>(qGetPtrHelper(d_ptr)); } \
-    friend class Class##Private;
-
-#define Q_DECLARE_PRIVATE_D(Dptr, Class) \
-    inline Class##Private* d_func() { return reinterpret_cast<Class##Private *>(Dptr); } \
-    inline const Class##Private* d_func() const { return reinterpret_cast<const Class##Private *>(Dptr); } \
-    friend class Class##Private;
-
-#define Q_DECLARE_PUBLIC(Class)                                    \
-    inline Class* q_func() { return static_cast<Class *>(q_ptr); } \
-    inline const Class* q_func() const { return static_cast<const Class *>(q_ptr); } \
-    friend class Class;
-
-#define Q_D(Class) Class##Private * const d = d_func()
-#define Q_Q(Class) Class * const q = q_func()
-
-#define QT_TR_NOOP(x) (x)
-#define QT_TR_NOOP_UTF8(x) (x)
-#define QT_TRANSLATE_NOOP(scope, x) (x)
-#define QT_TRANSLATE_NOOP_UTF8(scope, x) (x)
-#define QT_TRANSLATE_NOOP3(scope, x, comment) {x, comment}
-#define QT_TRANSLATE_NOOP3_UTF8(scope, x, comment) {x, comment}
-
-#ifndef TQT_NO_TRANSLATION // ### This should enclose the NOOPs above
-
-// Defined in qcoreapplication.cpp
-// The better name qTrId() is reserved for an upcoming function which would
-// return a much more powerful QStringFormatter instead of a QString.
-Q_CORE_EXPORT QString qtTrId(const char *id, int n = -1);
-
-#define QT_TRID_NOOP(id) id
-
-#endif // TQT_NO_TRANSLATION
-
-#define QDOC_PROPERTY(text)
-
-/*
-   When RTTI is not available, define this macro to force any uses of
-   dynamic_cast to cause a compile failure.
-*/
-
-#ifdef QT_NO_DYNAMIC_CAST
-#  define dynamic_cast QT_PREPEND_NAMESPACE(qt_dynamic_cast_check)
-
-  template<typename T, typename X>
-  T qt_dynamic_cast_check(X, T* = 0)
-  { return T::dynamic_cast_will_always_fail_because_rtti_is_disabled; }
-#endif
-
-/*
-   Some classes do not permit copies to be made of an object. These
-   classes contains a private copy constructor and assignment
-   operator to disable copying (the compiler gives an error message).
-*/
-#define Q_DISABLE_COPY(Class) \
-    Class(const Class &); \
-    Class &operator=(const Class &);
-
-class QByteArray;
-Q_CORE_EXPORT QByteArray qgetenv(const char *varName);
-Q_CORE_EXPORT bool qputenv(const char *varName, const QByteArray& value);
-
-inline int qIntCast(double f) { return int(f); }
-inline int qIntCast(float f) { return int(f); }
-
-/*
-  Reentrant versions of basic rand() functions for random number generation
-*/
-Q_CORE_EXPORT void qsrand(uint seed);
-Q_CORE_EXPORT int qrand();
-
-/*
-   Compat functions that were generated by configure
-*/
-#ifdef QT3_SUPPORT
-#ifndef QT_PRODUCT_LICENSEE
-#  define QT_PRODUCT_LICENSEE QLibraryInfo::licensee()
-#endif
-#ifndef QT_PRODUCT_LICENSE
-#  define QT_PRODUCT_LICENSE QLibraryInfo::licensedProducts()
-#endif
-QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPath();
-QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathDocs();
-QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathHeaders();
-QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathLibs();
-QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathBins();
-QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathPlugins();
-QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathData();
-QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathTranslations();
-QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf();
-#endif
-
-#if defined(Q_OS_SYMBIAN)
-
-#ifdef SYMBIAN_GRAPHICS_USE_GCE
-//RWsPointerCursor is fixed, so don't use low performance sprites
-#define Q_SYMBIAN_FIXED_POINTER_CURSORS
-#define Q_SYMBIAN_HAS_EXTENDED_BITMAP_TYPE
-//enabling new graphics resources
-#define QT_SYMBIAN_SUPPORTS_SGIMAGE
-#define QT_SYMBIAN_SUPPORTS_ADVANCED_POINTER
-
-#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
-#define Q_SYMBIAN_SEMITRANSPARENT_BG_SURFACE
-#endif
-#endif
-
-
-//Symbian does not support data imports from a DLL
-#define Q_NO_DATA_RELOCATION
-
-QT_END_NAMESPACE
-// forward declare std::exception
-#ifdef __cplusplus
-namespace std { class exception; }
-#endif
-QT_BEGIN_NAMESPACE
-Q_CORE_EXPORT void qt_symbian_throwIfError(int error);
-Q_CORE_EXPORT void qt_symbian_exception2LeaveL(const std::exception& ex);
-Q_CORE_EXPORT int qt_symbian_exception2Error(const std::exception& ex);
-
-#define QT_TRAP_THROWING(_f)                        \
-    {                                               \
-        TInt ____error;                             \
-        TRAP(____error, _f);                        \
-        qt_symbian_throwIfError(____error);                 \
-     }
-
-#define QT_TRYCATCH_ERROR(_err, _f)                         \
-    {                                                       \
-        _err = KErrNone;                                    \
-        try {                                               \
-            _f;                                             \
-        } catch (const std::exception &____ex) {            \
-            _err = qt_symbian_exception2Error(____ex);       \
-        }                                                   \
-    }
-
-#define QT_TRYCATCH_LEAVING(_f)                         \
-    {                                                   \
-    TInt ____err;                                       \
-    QT_TRYCATCH_ERROR(____err, _f)                      \
-    User::LeaveIfError(____err);                        \
-    }
-#endif
-
-
-/*
-   This gives us the possibility to check which modules the user can
-   use. These are purely compile time checks and will generate no code.
-*/
-
-/* Qt modules */
-#define QT_MODULE_CORE                 0x00001
-#define QT_MODULE_GUI                  0x00002
-#define QT_MODULE_NETWORK              0x00004
-#define QT_MODULE_OPENGL               0x00008
-#define QT_MODULE_SQL                  0x00010
-#define QT_MODULE_XML                  0x00020
-#define QT_MODULE_QT3SUPPORTLIGHT      0x00040
-#define QT_MODULE_QT3SUPPORT           0x00080
-#define QT_MODULE_SVG                  0x00100
-#define QT_MODULE_ACTIVEQT             0x00200
-#define QT_MODULE_GRAPHICSVIEW         0x00400
-#define QT_MODULE_SCRIPT               0x00800
-#define QT_MODULE_XMLPATTERNS          0x01000
-#define QT_MODULE_HELP                 0x02000
-#define QT_MODULE_TEST                 0x04000
-#define QT_MODULE_DBUS                 0x08000
-#define QT_MODULE_SCRIPTTOOLS          0x10000
-#define QT_MODULE_OPENVG               0x20000
-#define QT_MODULE_MULTIMEDIA           0x40000
-#define QT_MODULE_DECLARATIVE          0x80000
-
-/* Qt editions */
-#define QT_EDITION_CONSOLE      (QT_MODULE_CORE \
-                                 | QT_MODULE_NETWORK \
-                                 | QT_MODULE_SQL \
-                                 | QT_MODULE_SCRIPT \
-                                 | QT_MODULE_MULTIMEDIA \
-                                 | QT_MODULE_XML \
-                                 | QT_MODULE_XMLPATTERNS \
-                                 | QT_MODULE_TEST \
-                                 | QT_MODULE_DBUS)
-#define QT_EDITION_DESKTOPLIGHT (QT_MODULE_CORE \
-                                 | QT_MODULE_GUI \
-                                 | QT_MODULE_QT3SUPPORTLIGHT \
-                                 | QT_MODULE_TEST \
-                                 | QT_MODULE_DBUS)
-#define QT_EDITION_OPENSOURCE   (QT_MODULE_CORE \
-                                 | QT_MODULE_GUI \
-                                 | QT_MODULE_NETWORK \
-                                 | QT_MODULE_OPENGL \
-                                 | QT_MODULE_OPENVG \
-                                 | QT_MODULE_SQL \
-                                 | QT_MODULE_MULTIMEDIA \
-                                 | QT_MODULE_XML \
-                                 | QT_MODULE_XMLPATTERNS \
-                                 | QT_MODULE_SCRIPT \
-                                 | QT_MODULE_SCRIPTTOOLS \
-                                 | QT_MODULE_QT3SUPPORTLIGHT \
-                                 | QT_MODULE_QT3SUPPORT \
-                                 | QT_MODULE_SVG \
-                                 | QT_MODULE_DECLARATIVE \
-                                 | QT_MODULE_GRAPHICSVIEW \
-                                 | QT_MODULE_HELP \
-                                 | QT_MODULE_TEST \
-                                 | QT_MODULE_DBUS \
-                                 | QT_MODULE_ACTIVEQT)
-#define QT_EDITION_DESKTOP      (QT_EDITION_OPENSOURCE)
-#define QT_EDITION_UNIVERSAL    QT_EDITION_DESKTOP
-#define QT_EDITION_ACADEMIC     QT_EDITION_DESKTOP
-#define QT_EDITION_EDUCATIONAL  QT_EDITION_DESKTOP
-#define QT_EDITION_EVALUATION   QT_EDITION_DESKTOP
-
-/* Determine which modules can be used */
-#ifndef QT_EDITION
-#  ifdef QT_BUILD_QMAKE
-#    define QT_EDITION QT_EDITION_DESKTOP
-#  else
-#    error "Qt not configured correctly, please run configure"
-#  endif
-#endif
-
-#define QT_LICENSED_MODULE(x) \
-    enum QtValidLicenseFor##x##Module { Licensed##x = true };
-
-/* qdoc is really unhappy with the following block of preprocessor checks,
-   making it difficult to document classes properly after this point. */
-
-#if (QT_EDITION & QT_MODULE_CORE)
-QT_LICENSED_MODULE(Core)
-#endif
-#if (QT_EDITION & QT_MODULE_GUI)
-QT_LICENSED_MODULE(Gui)
-#endif
-#if (QT_EDITION & QT_MODULE_NETWORK)
-QT_LICENSED_MODULE(Network)
-#endif
-#if (QT_EDITION & QT_MODULE_OPENGL)
-QT_LICENSED_MODULE(OpenGL)
-#endif
-#if (QT_EDITION & QT_MODULE_OPENVG)
-QT_LICENSED_MODULE(OpenVG)
-#endif
-#if (QT_EDITION & QT_MODULE_SQL)
-QT_LICENSED_MODULE(Sql)
-#endif
-#if (QT_EDITION & QT_MODULE_MULTIMEDIA)
-QT_LICENSED_MODULE(Multimedia)
-#endif
-#if (QT_EDITION & QT_MODULE_XML)
-QT_LICENSED_MODULE(Xml)
-#endif
-#if (QT_EDITION & QT_MODULE_XMLPATTERNS)
-QT_LICENSED_MODULE(XmlPatterns)
-#endif
-#if (QT_EDITION & QT_MODULE_HELP)
-QT_LICENSED_MODULE(Help)
-#endif
-#if (QT_EDITION & QT_MODULE_SCRIPT) || defined(QT_BUILD_QMAKE)
-QT_LICENSED_MODULE(Script)
-#endif
-#if (QT_EDITION & QT_MODULE_SCRIPTTOOLS)
-QT_LICENSED_MODULE(ScriptTools)
-#endif
-#if (QT_EDITION & QT_MODULE_QT3SUPPORTLIGHT)
-QT_LICENSED_MODULE(Qt3SupportLight)
-#endif
-#if (QT_EDITION & QT_MODULE_QT3SUPPORT)
-QT_LICENSED_MODULE(Qt3Support)
-#endif
-#if (QT_EDITION & QT_MODULE_SVG)
-QT_LICENSED_MODULE(Svg)
-#endif
-#if (QT_EDITION & QT_MODULE_DECLARATIVE)
-QT_LICENSED_MODULE(Declarative)
-#endif
-#if (QT_EDITION & QT_MODULE_ACTIVEQT)
-QT_LICENSED_MODULE(ActiveQt)
-#endif
-#if (QT_EDITION & QT_MODULE_TEST)
-QT_LICENSED_MODULE(Test)
-#endif
-#if (QT_EDITION & QT_MODULE_DBUS)
-QT_LICENSED_MODULE(DBus)
-#endif
-
-#define QT_MODULE(x) \
-    typedef QtValidLicenseFor##x##Module Qt##x##Module;
-
-#ifdef QT_NO_CONCURRENT
-#  define QT_NO_QFUTURE
-#endif
-
-// MSVC 6.0 and MSVC .NET 2002,  can`t handle the map(), etc templates,
-// but the QFuture class compiles.
-#if (defined(Q_CC_MSVC) && _MSC_VER <= 1300)
-#  define QT_NO_CONCURRENT
-#endif
-
-// gcc 3 version has problems with some of the
-// map/filter overloads.
-#if defined(Q_CC_GNU) && (__GNUC__ < 4)
-#  define QT_NO_CONCURRENT_MAP
-#  define QT_NO_CONCURRENT_FILTER
-#endif
-
-#ifdef Q_OS_QNX
-// QNX doesn't have SYSV style shared memory. Multiprocess QWS apps,
-// shared fonts and QSystemSemaphore + QSharedMemory are not available
-#  define QT_NO_QWS_MULTIPROCESS
-#  define QT_NO_QWS_SHARE_FONTS
-#  define QT_NO_SYSTEMSEMAPHORE
-#  define QT_NO_SHAREDMEMORY
-// QNX currently doesn't support forking in a thread, so disable QProcess
-#  define QT_NO_PROCESS
-#endif
-
-QT_END_NAMESPACE
-QT_END_HEADER
-
-#endif /* __cplusplus */
-
-#endif /* QGLOBAL_H */
diff --git a/qtinterface/tqt4/Qt/qicon.h b/qtinterface/tqt4/Qt/qicon.h
deleted file mode 100644
index 7485a9a..0000000
--- a/qtinterface/tqt4/Qt/qicon.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 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$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QICON_H
-#define QICON_H
-
-#include <QtCore/qglobal.h>
-#include <QtCore/qsize.h>
-#include <QtCore/qlist.h>
-#include <QtGui/qpixmap.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-class QIconPrivate;
-class QIconEngine;
-class QIconEngineV2;
-class TQIconFactory;
-
-class Q_GUI_EXPORT QIcon
-{
-public:
-    enum Mode { Normal, Disabled, Active, Selected };
-    enum State { On, Off };
-
-    QIcon();
-    QIcon(const QPixmap &pixmap);
-    QIcon(const QIcon &other);
-    explicit QIcon(const QString &fileName); // file or resource name
-    explicit QIcon(QIconEngine *engine);
-    explicit QIcon(QIconEngineV2 *engine);
-    ~QIcon();
-    QIcon &operator=(const QIcon &other);
-    operator QVariant() const;
-
-    QPixmap pixmap(const QSize &size, Mode mode = Normal, State state = Off) const;
-    inline QPixmap pixmap(int w, int h, Mode mode = Normal, State state = Off) const
-        { return pixmap(QSize(w, h), mode, state); }
-    inline QPixmap pixmap(int extent, Mode mode = Normal, State state = Off) const
-        { return pixmap(QSize(extent, extent), mode, state); }
-
-    QSize actualSize(const QSize &size, Mode mode = Normal, State state = Off) const;
-
-    void paint(QPainter *painter, const QRect &rect, Qt::Alignment alignment = Qt::AlignCenter, Mode mode = Normal, State state = Off) const;
-    inline void paint(QPainter *painter, int x, int y, int w, int h, Qt::Alignment alignment = Qt::AlignCenter, Mode mode = Normal, State state = Off) const
-        { paint(painter, QRect(x, y, w, h), alignment, mode, state); }
-
-    bool isNull() const;
-    bool isDetached() const;
-    void detach();
-
-    int serialNumber() const;
-    qint64 cacheKey() const;
-
-    void addPixmap(const QPixmap &pixmap, Mode mode = Normal, State state = Off);
-    void addFile(const QString &fileName, const QSize &size = QSize(), Mode mode = Normal, State state = Off);
-
-    QList<QSize> availableSizes(Mode mode = Normal, State state = Off) const;
-
-    static QIcon fromTheme(const QString &name, const QIcon &fallback = QIcon());
-    static bool hasThemeIcon(const QString &name);
-
-    static QStringList themeSearchPaths();
-    static void setThemeSearchPaths(const QStringList &searchpath);
-
-    static QString themeName();
-    static void setThemeName(const QString &path);
-
-
-#ifdef QT3_SUPPORT
-    enum Size { Small, Large, Automatic = Small };
-    static QT3_SUPPORT void setPixmapSize(Size which, const QSize &size);
-    static QT3_SUPPORT QSize pixmapSize(Size which);
-    inline QT3_SUPPORT void reset(const QPixmap &pixmap, Size /*size*/) { *this = QIcon(pixmap); }
-    inline QT3_SUPPORT void setPixmap(const QPixmap &pixmap, Size, Mode mode = Normal, State state = Off)
-        { addPixmap(pixmap, mode, state); }
-    inline QT3_SUPPORT void setPixmap(const QString &fileName, Size, Mode mode = Normal, State state = Off)
-        { addPixmap(QPixmap(fileName), mode, state); }
-    QT3_SUPPORT QPixmap pixmap(Size size, Mode mode, State state = Off) const;
-    QT3_SUPPORT QPixmap pixmap(Size size, bool enabled, State state = Off) const;
-    QT3_SUPPORT QPixmap pixmap() const;
-
-    void installIconFactory( TQIconFactory *factory );
-#endif
-
-    Q_DUMMY_COMPARISON_OPERATOR(QIcon)
-
-private:
-    QIconPrivate *d;
-#if !defined(QT_NO_DATASTREAM)
-    friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QIcon &);
-    friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QIcon &);
-#endif
-
-public:
-    typedef QIconPrivate * DataPtr;
-    inline DataPtr &data_ptr() { return d; }
-};
-
-Q_DECLARE_SHARED(QIcon)
-Q_DECLARE_TYPEINFO(QIcon, Q_MOVABLE_TYPE);
-
-#if !defined(QT_NO_DATASTREAM)
-Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QIcon &);
-Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QIcon &);
-#endif
-
-#ifdef QT3_SUPPORT
-typedef QIcon QIconSet;
-#endif
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QICON_H
diff --git a/qtinterface/tqt4/Qt/qimage.h b/qtinterface/tqt4/Qt/qimage.h
deleted file mode 100644
index f2cd539..0000000
--- a/qtinterface/tqt4/Qt/qimage.h
+++ /dev/null
@@ -1,362 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 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$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QIMAGE_H
-#define QIMAGE_H
-
-#include <QtGui/qtransform.h>
-#include <QtGui/qpaintdevice.h>
-#include <QtGui/qrgb.h>
-#include <QtCore/qbytearray.h>
-#include <QtCore/qrect.h>
-#include <QtCore/qstring.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-class QIODevice;
-class QStringList;
-class QMatrix;
-class QTransform;
-class QVariant;
-template <class T> class QList;
-template <class T> class QVector;
-
-struct QImageData;
-class QImageDataMisc; // internal
-#ifndef QT_NO_IMAGE_TEXT
-class Q_GUI_EXPORT QImageTextKeyLang {
-public:
-    QImageTextKeyLang(const char* k, const char* l) : key(k), lang(l) { }
-    QImageTextKeyLang() { }
-
-    QByteArray key;
-    QByteArray lang;
-
-    bool operator< (const QImageTextKeyLang& other) const
-        { return key < other.key || (key==other.key && lang < other.lang); }
-    bool operator== (const QImageTextKeyLang& other) const
-        { return key==other.key && lang==other.lang; }
-    inline bool operator!= (const QImageTextKeyLang &other) const
-        { return !operator==(other); }
-};
-#endif //QT_NO_IMAGE_TEXT
-
-
-class Q_GUI_EXPORT QImage : public QPaintDevice
-{
-public:
-    enum InvertMode { InvertRgb, InvertRgba };
-    enum Format {
-        Format_Invalid,
-        Format_Mono,
-        Format_MonoLSB,
-        Format_Indexed8,
-        Format_RGB32,
-        Format_ARGB32,
-        Format_ARGB32_Premultiplied,
-        Format_RGB16,
-        Format_ARGB8565_Premultiplied,
-        Format_RGB666,
-        Format_ARGB6666_Premultiplied,
-        Format_RGB555,
-        Format_ARGB8555_Premultiplied,
-        Format_RGB888,
-        Format_RGB444,
-        Format_ARGB4444_Premultiplied,
-#if 0
-        // reserved for future use
-        Format_RGB15,
-        Format_Grayscale16,
-        Format_Grayscale8,
-        Format_Grayscale4,
-        Format_Grayscale4LSB,
-        Format_Grayscale2,
-        Format_Grayscale2LSB
-#endif
-#ifndef qdoc
-        NImageFormats
-#endif
-    };
-
-    QImage();
-    QImage(const QSize &size, Format format);
-    QImage(int width, int height, Format format);
-    QImage(uchar *data, int width, int height, Format format);
-    QImage(const uchar *data, int width, int height, Format format);
-    QImage(uchar *data, int width, int height, int bytesPerLine, Format format);
-    QImage(const uchar *data, int width, int height, int bytesPerLine, Format format);
-
-#ifndef QT_NO_IMAGEFORMAT_XPM
-    explicit QImage(const char * const xpm[]);
-#endif
-    explicit QImage(const QString &fileName, const char *format = 0);
-#ifndef QT_NO_CAST_FROM_ASCII
-    explicit QImage(const char *fileName, const char *format = 0);
-#endif
-
-    QImage(const QImage &);
-    ~QImage();
-
-    QImage &operator=(const QImage &);
-    bool isNull() const;
-
-    int devType() const;
-
-    bool operator==(const QImage &) const;
-    bool operator!=(const QImage &) const;
-    operator QVariant() const;
-    void detach();
-    bool isDetached() const;
-
-    QImage copy(const QRect &rect = QRect()) const;
-    inline QImage copy(int x, int y, int w, int h) const
-        { return copy(QRect(x, y, w, h)); }
-
-    Format format() const;
-
-    QImage convertToFormat(Format f, Qt::ImageConversionFlags flags = Qt::AutoColor) const Q_REQUIRED_RESULT;
-    QImage convertToFormat(Format f, const QVector<QRgb> &colorTable, Qt::ImageConversionFlags flags = Qt::AutoColor) const Q_REQUIRED_RESULT;
-
-    int width() const;
-    int height() const;
-    QSize size() const;
-    QRect rect() const;
-
-    int depth() const;
-#ifdef QT_DEPRECATED
-    QT_DEPRECATED int numColors() const;
-#endif
-    int colorCount() const;
-
-    QRgb color(int i) const;
-    void setColor(int i, QRgb c);
-#ifdef QT_DEPRECATED
-    QT_DEPRECATED void setNumColors(int);
-#endif
-    void setColorCount(int);
-
-    bool allGray() const;
-    bool isGrayscale() const;
-
-    uchar *bits();
-    const uchar *bits() const;
-#ifdef QT_DEPRECATED
-    QT_DEPRECATED int numBytes() const;
-#endif
-    int byteCount() const;
-
-    uchar *scanLine(int);
-    uchar *scanLine(int) const;
-    int bytesPerLine() const;
-
-    bool valid(int x, int y) const;
-    bool valid(const QPoint &pt) const;
-
-    int pixelIndex(int x, int y) const;
-    int pixelIndex(const QPoint &pt) const;
-
-    QRgb pixel(int x, int y) const;
-    QRgb pixel(const QPoint &pt) const;
-
-    void setPixel(int x, int y, uint index_or_rgb);
-    void setPixel(const QPoint &pt, uint index_or_rgb);
-
-    QVector<QRgb> colorTable() const;
-    QRgb *ptrColorTable() const;
-    void setColorTable(const QVector<QRgb> colors);
-
-    void fill(uint pixel);
-
-    bool hasAlphaChannel() const;
-    void setAlphaChannel(const QImage &alphaChannel);
-    QImage alphaChannel() const;
-    QImage createAlphaMask(Qt::ImageConversionFlags flags = Qt::AutoColor) const;
-#ifndef QT_NO_IMAGE_HEURISTIC_MASK
-    QImage createHeuristicMask(bool clipTight = true) const;
-#endif
-    QImage createMaskFromColor(QRgb color, Qt::MaskMode mode = Qt::MaskInColor) const;
-
-    inline QImage scaled(int w, int h, Qt::AspectRatioMode aspectMode = Qt::IgnoreAspectRatio,
-                        Qt::TransformationMode mode = Qt::FastTransformation) const
-        { return scaled(QSize(w, h), aspectMode, mode); }
-    QImage scaled(const QSize &s, Qt::AspectRatioMode aspectMode = Qt::IgnoreAspectRatio,
-                 Qt::TransformationMode mode = Qt::FastTransformation) const;
-    QImage scaledToWidth(int w, Qt::TransformationMode mode = Qt::FastTransformation) const;
-    QImage scaledToHeight(int h, Qt::TransformationMode mode = Qt::FastTransformation) const;
-    QImage transformed(const QMatrix &matrix, Qt::TransformationMode mode = Qt::FastTransformation) const;
-    static QMatrix trueMatrix(const QMatrix &, int w, int h);
-    QImage transformed(const QTransform &matrix, Qt::TransformationMode mode = Qt::FastTransformation) const;
-    static QTransform trueMatrix(const QTransform &, int w, int h);
-    QImage mirrored(bool horizontally = false, bool vertically = true) const;
-    QImage rgbSwapped() const;
-    void invertPixels(InvertMode = InvertRgb);
-
-
-    bool load(QIODevice *device, const char* format);
-    bool load(const QString &fileName, const char* format=0);
-    bool loadFromData(const uchar *buf, int len, const char *format = 0);
-    inline bool loadFromData(const QByteArray &data, const char* aformat=0)
-        { return loadFromData(reinterpret_cast<const uchar *>(data.constData()), data.size(), aformat); }
-
-    bool save(const QString &fileName, const char* format=0, int quality=-1) const;
-    bool save(QIODevice *device, const char* format=0, int quality=-1) const;
-
-    static QImage fromData(const uchar *data, int size, const char *format = 0);
-    inline static QImage fromData(const QByteArray &data, const char *format = 0)
-        { return fromData(reinterpret_cast<const uchar *>(data.constData()), data.size(), format); }
-
-    int serialNumber() const;
-    qint64 cacheKey() const;
-
-    QPaintEngine *paintEngine() const;
-
-    // Auxiliary data
-    int dotsPerMeterX() const;
-    int dotsPerMeterY() const;
-    void setDotsPerMeterX(int);
-    void setDotsPerMeterY(int);
-    QPoint offset() const;
-    void setOffset(const QPoint&);
-#ifndef QT_NO_IMAGE_TEXT
-    QStringList textKeys() const;
-    QString text(const QString &key = QString()) const;
-    void setText(const QString &key, const QString &value);
-
-    // The following functions are obsolete as of 4.1
-    QString text(const char* key, const char* lang=0) const;
-    QList<QImageTextKeyLang> textList() const;
-    QStringList textLanguages() const;
-    QString text(const QImageTextKeyLang&) const;
-    void setText(const char* key, const char* lang, const QString&);
-#endif
-
-#ifdef QT3_SUPPORT
-    enum Endian { BigEndian, LittleEndian, IgnoreEndian };
-    QT3_SUPPORT_CONSTRUCTOR QImage(int width, int height, int depth, int numColors=0, Endian bitOrder=IgnoreEndian);
-    QT3_SUPPORT_CONSTRUCTOR QImage(const QSize&, int depth, int numColors=0, Endian bitOrder=IgnoreEndian);
-    QT3_SUPPORT_CONSTRUCTOR QImage(uchar *data, int w, int h, int depth, const QRgb *colortable, int numColors, Endian bitOrder);
-#ifdef Q_WS_QWS
-    QT3_SUPPORT_CONSTRUCTOR QImage(uchar *data, int w, int h, int depth, int pbl, const QRgb *colortable, int numColors, Endian bitOrder);
-#endif
-    inline QT3_SUPPORT Endian bitOrder() const {
-        Format f = format();
-        return f == Format_Mono ? BigEndian : (f == Format_MonoLSB ? LittleEndian : IgnoreEndian);
-    }
-    QT3_SUPPORT QImage convertDepth(int, Qt::ImageConversionFlags flags = Qt::AutoColor) const;
-    QT3_SUPPORT QImage convertDepthWithPalette(int, QRgb* p, int pc, Qt::ImageConversionFlags flags = Qt::AutoColor) const;
-    QT3_SUPPORT QImage convertBitOrder(Endian) const;
-    QT3_SUPPORT bool hasAlphaBuffer() const;
-    QT3_SUPPORT void setAlphaBuffer(bool);
-    QT3_SUPPORT uchar **jumpTable();
-    QT3_SUPPORT const uchar * const *jumpTable() const;
-    inline QT3_SUPPORT void reset() { *this = QImage(); }
-    static inline QT3_SUPPORT Endian systemByteOrder()
-        { return QSysInfo::ByteOrder == QSysInfo::BigEndian ? BigEndian : LittleEndian; }
-    inline QT3_SUPPORT QImage swapRGB() const { return rgbSwapped(); }
-    inline QT3_SUPPORT QImage mirror(bool horizontally = false, bool vertically = true) const
-        { return mirrored(horizontally, vertically); }
-    QT3_SUPPORT bool create(const QSize&, int depth, int numColors=0, Endian bitOrder=IgnoreEndian);
-    QT3_SUPPORT bool create(int width, int height, int depth, int numColors=0, Endian bitOrder=IgnoreEndian);
-    inline QT3_SUPPORT QImage xForm(const QMatrix &matrix) const { return transformed(QTransform(matrix)); }
-    inline QT3_SUPPORT QImage smoothScale(int w, int h, Qt::AspectRatioMode mode = Qt::IgnoreAspectRatio) const
-        { return scaled(QSize(w, h), mode, Qt::SmoothTransformation); }
-    inline QImage QT3_SUPPORT smoothScale(const QSize &s, Qt::AspectRatioMode mode = Qt::IgnoreAspectRatio) const
-        { return scaled(s, mode, Qt::SmoothTransformation); }
-    inline QT3_SUPPORT QImage scaleWidth(int w) const { return scaledToWidth(w); }
-    inline QT3_SUPPORT QImage scaleHeight(int h) const { return scaledToHeight(h); }
-    inline QT3_SUPPORT void invertPixels(bool invertAlpha) { invertAlpha ? invertPixels(InvertRgba) : invertPixels(InvertRgb); }
-    inline QT3_SUPPORT QImage copy(int x, int y, int w, int h, Qt::ImageConversionFlags) const
-        { return copy(QRect(x, y, w, h)); }
-    inline QT3_SUPPORT QImage copy(const QRect &rect, Qt::ImageConversionFlags) const
-        { return copy(rect); }
-    static QT3_SUPPORT Endian systemBitOrder();
-    inline QT3_SUPPORT_CONSTRUCTOR QImage(const QByteArray &data)
-        { d = 0; *this = QImage::fromData(data); }
-#endif
-
-protected:
-    virtual int metric(PaintDeviceMetric metric) const;
-
-private:
-    friend class QWSOnScreenSurface;
-    QImageData *d;
-
-    friend class QRasterPixmapData;
-    friend class QPixmapCacheEntry;
-    friend Q_GUI_EXPORT qint64 qt_image_id(const QImage &image);
-    friend const QVector<QRgb> *qt_image_colortable(const QImage &image);
-
-public:
-    typedef QImageData * DataPtr;
-    inline DataPtr &data_ptr() { return d; }
-};
-
-Q_DECLARE_SHARED(QImage)
-Q_DECLARE_TYPEINFO(QImage, Q_MOVABLE_TYPE);
-
-// Inline functions...
-
-Q_GUI_EXPORT_INLINE bool QImage::valid(const QPoint &pt) const { return valid(pt.x(), pt.y()); }
-Q_GUI_EXPORT_INLINE int QImage::pixelIndex(const QPoint &pt) const { return pixelIndex(pt.x(), pt.y());}
-Q_GUI_EXPORT_INLINE QRgb QImage::pixel(const QPoint &pt) const { return pixel(pt.x(), pt.y()); }
-Q_GUI_EXPORT_INLINE void QImage::setPixel(const QPoint &pt, uint index_or_rgb) { setPixel(pt.x(), pt.y(), index_or_rgb); }
-
-// QImage stream functions
-
-#if !defined(QT_NO_DATASTREAM)
-Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QImage &);
-Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QImage &);
-#endif
-
-#ifdef QT3_SUPPORT
-Q_GUI_EXPORT QT3_SUPPORT void bitBlt(QImage* dst, int dx, int dy, const QImage* src,
-                                     int sx=0, int sy=0, int sw=-1, int sh=-1, Qt::ImageConversionFlags flags = Qt::AutoColor);
-#endif
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QIMAGE_H
diff --git a/qtinterface/tqt4/Qt/qiodevice.h b/qtinterface/tqt4/Qt/qiodevice.h
deleted file mode 100644
index 2dbc9f1..0000000
--- a/qtinterface/tqt4/Qt/qiodevice.h
+++ /dev/null
@@ -1,259 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QIODEVICE_H
-#define QIODEVICE_H
-
-#ifndef QT_NO_QOBJECT
-#include <QtCore/qobject.h>
-#else
-#include <QtCore/qobjectdefs.h>
-#include <QtCore/qscopedpointer.h>
-#endif
-#include <QtCore/qstring.h>
-
-#ifdef open
-#error qiodevice.h must be included before any header file that defines open
-#endif
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Core)
-
-class QByteArray;
-class QIODevicePrivate;
-
-class Q_CORE_EXPORT QIODevice
-#ifndef QT_NO_QOBJECT
-    : public QObject
-#endif
-{
-#ifndef QT_NO_QOBJECT
-    Q_OBJECT
-#endif
-public:
-    enum OpenModeFlag {
-        NotOpen = 0x0000,
-        ReadOnly = 0x0001,
-        WriteOnly = 0x0002,
-        ReadWrite = ReadOnly | WriteOnly,
-        Append = 0x0004,
-        Truncate = 0x0008,
-        Text = 0x0010,
-        Unbuffered = 0x0020
-    };
-    Q_DECLARE_FLAGS(OpenMode, OpenModeFlag)
-
-    QIODevice();
-#ifndef QT_NO_QOBJECT
-    explicit QIODevice(QObject *parent);
-#endif
-    virtual ~QIODevice();
-
-    OpenMode openMode() const;
-
-    void setTextModeEnabled(bool enabled);
-    bool isTextModeEnabled() const;
-
-    bool isOpen() const;
-    bool isReadable() const;
-    bool isWritable() const;
-    virtual bool isSequential() const;
-
-    virtual bool open(OpenMode mode);
-    virtual void close();
-
-    // ### Qt 5: pos() and seek() should not be virtual, and
-    // ### seek() should call a virtual seekData() function.
-    virtual qint64 pos() const;
-    virtual qint64 size() const;
-    virtual bool seek(qint64 pos);
-    virtual bool atEnd() const;
-    virtual bool reset();
-
-    virtual qint64 bytesAvailable() const;
-    virtual qint64 bytesToWrite() const;
-
-    qint64 read(char *data, qint64 maxlen);
-    QByteArray read(qint64 maxlen);
-    QByteArray readAll();
-    qint64 readLine(char *data, qint64 maxlen);
-    qint64 readLine(QString & s, qint64 maxlen);
-    QByteArray readLine(qint64 maxlen = 0);
-    virtual bool canReadLine() const;
-
-    qint64 write(const char *data, qint64 len);
-    qint64 write(const char *data);
-    inline qint64 write(const QByteArray &data)
-    { return write(data.constData(), data.size()); }
-
-    qint64 peek(char *data, qint64 maxlen);
-    QByteArray peek(qint64 maxlen);
-
-    virtual bool waitForReadyRead(int msecs);
-    virtual bool waitForBytesWritten(int msecs);
-
-    void ungetChar(char c);
-    bool putChar(char c);
-    bool getChar(char *c);
-
-    QString errorString() const;
-
-#ifndef QT_NO_QOBJECT
-Q_SIGNALS:
-    void readyRead();
-    void bytesWritten(qint64 bytes);
-    void aboutToClose();
-    void readChannelFinished();
-#endif
-
-protected:
-#ifdef QT_NO_QOBJECT
-    QIODevice(QIODevicePrivate &dd);
-#else
-    QIODevice(QIODevicePrivate &dd, QObject *parent = 0);
-#endif
-//     virtual qint64 readData(char *data, qint64 maxlen) = 0;
-    virtual qint64 readLineData(char *data, qint64 maxlen);
-//     virtual qint64 writeData(const char *data, qint64 len) = 0;
-
-    void setOpenMode(OpenMode openMode);
-
-    void setErrorString(const QString &errorString);
-
-#ifdef QT_NO_QOBJECT
-    QScopedPointer<QIODevicePrivate> d_ptr;
-#endif
-
-    void setState( int s );
-    void setFlags( int f );
-    void setStatus( int s );
-
-private:
-    Q_DECLARE_PRIVATE(QIODevice)
-    Q_DISABLE_COPY(QIODevice)
-
-#ifdef QT3_SUPPORT
-public:
-    typedef qint64 Offset;
-
-    inline QT3_SUPPORT int flags() const { return static_cast<int>(openMode()); }
-    inline QT3_SUPPORT int mode() const { return static_cast<int>(openMode()); }
-    inline QT3_SUPPORT int state() const;
-
-    inline QT3_SUPPORT bool isDirectAccess() const { return !isSequential(); }
-    inline QT3_SUPPORT bool isSequentialAccess() const { return isSequential(); }
-    inline QT3_SUPPORT bool isCombinedAccess() const { return false; }
-    inline QT3_SUPPORT bool isBuffered() const { return true; }
-    inline QT3_SUPPORT bool isRaw() const { return false; }
-    inline QT3_SUPPORT bool isSynchronous() const { return true; }
-    inline QT3_SUPPORT bool isAsynchronous() const { return false; }
-    inline QT3_SUPPORT bool isTranslated() const { return (openMode() & Text) != 0; }
-    inline QT3_SUPPORT bool isInactive() const { return !isOpen(); }
-
-    typedef int Status;
-    QT3_SUPPORT Status status() const;
-    QT3_SUPPORT void resetStatus();
-
-    inline QT3_SUPPORT Offset at() const { return pos(); }
-    inline QT3_SUPPORT bool at(Offset offset) { return seek(offset); }
-
-    inline QT3_SUPPORT qint64 readBlock(char *data, quint64 maxlen) { return read(data, maxlen); }
-    inline QT3_SUPPORT qint64 writeBlock(const char *data, quint64 len) { return write(data, len); }
-    inline QT3_SUPPORT qint64 writeBlock(const QByteArray &data) { return write(data); }
-
-    inline QT3_SUPPORT int getch() { char c; return getChar(&c) ? int(uchar(c)) : -1; }
-    inline QT3_SUPPORT int putch(int c) { return putChar(char(c)) ? int(uchar(c)) : -1; }
-    inline QT3_SUPPORT int ungetch(int c) { ungetChar(uchar(c)); return c; }
-#endif
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QIODevice::OpenMode)
-
-#ifdef QT3_SUPPORT
-static QT3_SUPPORT_VARIABLE const uint IO_Direct = 0x0100;
-static QT3_SUPPORT_VARIABLE const uint IO_Sequential = 0x0200;
-static QT3_SUPPORT_VARIABLE const uint IO_Combined = 0x0300;
-static QT3_SUPPORT_VARIABLE const uint IO_TypeMask = 0x0300;
-
-static QT3_SUPPORT_VARIABLE const uint IO_Raw = 0x0000;
-static QT3_SUPPORT_VARIABLE const uint IO_Async = 0x0000;
-
-#define IO_ReadOnly QIODevice::ReadOnly
-#define IO_WriteOnly QIODevice::WriteOnly
-#define IO_ReadWrite QIODevice::ReadWrite
-#define IO_Append QIODevice::Append
-#define IO_Truncate QIODevice::Truncate
-#define IO_Translate QIODevice::Text
-#define IO_ModeMask 0x00ff
-
-static QT3_SUPPORT_VARIABLE const uint IO_Open = 0x1000;
-static QT3_SUPPORT_VARIABLE const uint IO_StateMask = 0xf000;
-
-static QT3_SUPPORT_VARIABLE const uint IO_Ok = 0;
-static QT3_SUPPORT_VARIABLE const uint IO_ReadError = 1;
-static QT3_SUPPORT_VARIABLE const uint IO_WriteError = 2;
-static QT3_SUPPORT_VARIABLE const uint IO_FatalError = 3;
-static QT3_SUPPORT_VARIABLE const uint IO_ResourceError = 4;
-static QT3_SUPPORT_VARIABLE const uint IO_OpenError = 5;
-static QT3_SUPPORT_VARIABLE const uint IO_ConnectError = 5;
-static QT3_SUPPORT_VARIABLE const uint IO_AbortError = 6;
-static QT3_SUPPORT_VARIABLE const uint IO_TimeOutError = 7;
-static QT3_SUPPORT_VARIABLE const uint IO_UnspecifiedError	= 8;
-
-inline QT3_SUPPORT int QIODevice::state() const
-{
-    return isOpen() ? 0x1000 : 0;
-}
-#endif
-
-#if !defined(QT_NO_DEBUG_STREAM)
-class QDebug;
-Q_CORE_EXPORT QDebug operator<<(QDebug debug, QIODevice::OpenMode modes);
-#endif
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QIODEVICE_H
diff --git a/qtinterface/tqt4/Qt/qlist.h b/qtinterface/tqt4/Qt/qlist.h
deleted file mode 100644
index ba072a4..0000000
--- a/qtinterface/tqt4/Qt/qlist.h
+++ /dev/null
@@ -1,806 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QLIST_H
-#define QLIST_H
-
-#include <QtCore/qiterator.h>
-#include <QtCore/qatomic.h>
-#include <QtCore/qalgorithms.h>
-
-#ifndef TQT_NO_STL
-#include <iterator>
-#include <list>
-#endif
-
-#include <new>
-#include <string.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Core)
-
-template <typename T> class QVector;
-template <typename T> class QSet;
-
-struct Q_CORE_EXPORT QListData {
-    struct Data {
-        QBasicAtomicInt ref;
-        int alloc, begin, end;
-        uint sharable : 1;
-        void *array[1];
-    };
-    enum { DataHeaderSize = sizeof(Data) - sizeof(void *) };
-
-    Data *detach(); // remove in 5.0
-    Data *detach2(); // remove in 5.0
-    Data *detach3();
-    void realloc(int alloc);
-    static Data shared_null;
-    Data *d;
-    void **erase(void **xi);
-    void **append();
-    void **append(const QListData &l);
-    void **append2(const QListData &l); // remove in 5.0
-    void **prepend();
-    void **insert(int i);
-    void remove(int i);
-    void remove(int i, int n);
-    void move(int from, int to);
-    inline int size() const { return d->end - d->begin; }
-    inline bool isEmpty() const { return d->end  == d->begin; }
-    inline void **at(int i) const { return d->array + d->begin + i; }
-    inline void **begin() const { return d->array + d->begin; }
-    inline void **end() const { return d->array + d->end; }
-};
-
-template <typename T>
-class QList
-{
-    struct Node { void *v;
-#if defined(Q_CC_BOR)
-        Q_INLINE_TEMPLATE T &t();
-#else
-        Q_INLINE_TEMPLATE T &t()
-        { return *reinterpret_cast<T*>(QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic
-                                       ? v : this); }
-#endif
-    };
-
-    union { QListData p; QListData::Data *d; };
-
-public:
-    inline QList() : d(&QListData::shared_null) { d->ref.ref(); current_index=0; }
-    inline QList(const QList<T> &l) : d(l.d) { d->ref.ref(); if (!d->sharable) detach_helper(); current_index=0; }
-    ~QList();
-    QList<T> &operator=(const QList<T> &l);
-    bool operator==(const QList<T> &l) const;
-    inline bool operator!=(const QList<T> &l) const { return !(*this == l); }
-
-    operator bool() const;
-
-    inline operator const QList<T> *() const { return const_cast<QList<T> *>(this); }
-    inline operator QList<T> *() const { return const_cast<QList<T> *>(this); }
-
-    inline int size() const { return p.size(); }
-
-    inline void detach() { if (d->ref != 1) detach_helper(); }
-
-    inline void detachShared()
-    {
-        // The "this->" qualification is needed for GCCE.
-        if (d->ref != 1 && this->d != &QListData::shared_null)
-            detach_helper();
-    }
-
-    inline bool isDetached() const { return d->ref == 1; }
-    inline void setSharable(bool sharable) { if (!sharable) detach(); d->sharable = sharable; }
-
-    inline bool isEmpty() const { return p.isEmpty(); }
-
-    void clear();
-
-    const T &at(int i) const;
-    const T &operator[](int i) const;
-    T &operator[](int i);
-
-    void append(const T &t);
-    void append(const QList<T> &t);
-    void prepend(const T &t);
-    void insert(int i, const T &t);
-    void replace(int i, const T &t);
-    void removeAt(int i);
-    int removeAll(const T &t);
-    bool removeOne(const T &t);
-    T takeAt(int i);
-    T takeFirst();
-    T takeLast();
-    void move(int from, int to);
-    void swap(int i, int j);
-    int indexOf(const T &t, int from = 0) const;
-    int lastIndexOf(const T &t, int from = -1) const;
-    QBool contains(const T &t) const;
-    inline uint containsRef( const T &t ) { return count(t); };
-    int count(const T &t) const;
-
-    inline T next() { current_index++; return this[current_index]; }
-    inline T prev() { current_index--; return this[current_index]; }
-
-    class const_iterator;
-
-    class iterator {
-    public:
-        Node *i;
-        typedef std::random_access_iterator_tag  iterator_category;
-        typedef ptrdiff_t  difference_type;
-        typedef T value_type;
-        typedef T *pointer;
-        typedef T &reference;
-
-        inline iterator() : i(0) {}
-        inline iterator(Node *n) : i(n) {}
-        inline iterator(const iterator &o): i(o.i){}
-        inline T &operator*() const { return i->t(); }
-        inline T *operator->() const { return &i->t(); }
-        inline T &operator[](int j) const { return i[j].t(); }
-        inline bool operator==(const iterator &o) const { return i == o.i; }
-        inline bool operator!=(const iterator &o) const { return i != o.i; }
-        inline bool operator<(const iterator& other) const { return i < other.i; }
-        inline bool operator<=(const iterator& other) const { return i <= other.i; }
-        inline bool operator>(const iterator& other) const { return i > other.i; }
-        inline bool operator>=(const iterator& other) const { return i >= other.i; }
-#ifndef QT_STRICT_ITERATORS
-        inline bool operator==(const const_iterator &o) const
-            { return i == o.i; }
-        inline bool operator!=(const const_iterator &o) const
-            { return i != o.i; }
-        inline bool operator<(const const_iterator& other) const
-            { return i < other.i; }
-        inline bool operator<=(const const_iterator& other) const
-            { return i <= other.i; }
-        inline bool operator>(const const_iterator& other) const
-            { return i > other.i; }
-        inline bool operator>=(const const_iterator& other) const
-            { return i >= other.i; }
-#endif
-        inline iterator &operator++() { ++i; return *this; }
-        inline iterator operator++(int) { Node *n = i; ++i; return n; }
-        inline iterator &operator--() { i--; return *this; }
-        inline iterator operator--(int) { Node *n = i; i--; return n; }
-        inline iterator &operator+=(int j) { i+=j; return *this; }
-        inline iterator &operator-=(int j) { i-=j; return *this; }
-        inline iterator operator+(int j) const { return iterator(i+j); }
-        inline iterator operator-(int j) const { return iterator(i-j); }
-        inline int operator-(iterator j) const { return int(i - j.i); }
-    };
-    friend class iterator;
-
-    class const_iterator {
-    public:
-        Node *i;
-        typedef std::random_access_iterator_tag  iterator_category;
-        typedef ptrdiff_t difference_type;
-        typedef T value_type;
-        typedef const T *pointer;
-        typedef const T &reference;
-
-        inline const_iterator() : i(0) {}
-        inline const_iterator(Node *n) : i(n) {}
-        inline const_iterator(const const_iterator &o): i(o.i) {}
-#ifdef QT_STRICT_ITERATORS
-        inline explicit const_iterator(const iterator &o): i(o.i) {}
-#else
-        inline const_iterator(const iterator &o): i(o.i) {}
-#endif
-        inline const T &operator*() const { return i->t(); }
-        inline const T *operator->() const { return &i->t(); }
-        inline const T &operator[](int j) const { return i[j].t(); }
-        inline bool operator==(const const_iterator &o) const { return i == o.i; }
-        inline bool operator!=(const const_iterator &o) const { return i != o.i; }
-        inline bool operator<(const const_iterator& other) const { return i < other.i; }
-        inline bool operator<=(const const_iterator& other) const { return i <= other.i; }
-        inline bool operator>(const const_iterator& other) const { return i > other.i; }
-        inline bool operator>=(const const_iterator& other) const { return i >= other.i; }
-        inline const_iterator &operator++() { ++i; return *this; }
-        inline const_iterator operator++(int) { Node *n = i; ++i; return n; }
-        inline const_iterator &operator--() { i--; return *this; }
-        inline const_iterator operator--(int) { Node *n = i; i--; return n; }
-        inline const_iterator &operator+=(int j) { i+=j; return *this; }
-        inline const_iterator &operator-=(int j) { i-=j; return *this; }
-        inline const_iterator operator+(int j) const { return const_iterator(i+j); }
-        inline const_iterator operator-(int j) const { return const_iterator(i-j); }
-        inline int operator-(const_iterator j) const { return i - j.i; }
-    };
-    friend class const_iterator;
-
-    // stl style
-    inline iterator begin() { detach(); return reinterpret_cast<Node *>(p.begin()); }
-    inline const_iterator begin() const { return reinterpret_cast<Node *>(p.begin()); }
-    inline const_iterator constBegin() const { return reinterpret_cast<Node *>(p.begin()); }
-    inline iterator end() { detach(); return reinterpret_cast<Node *>(p.end()); }
-    inline const_iterator end() const { return reinterpret_cast<Node *>(p.end()); }
-    inline const_iterator constEnd() const { return reinterpret_cast<Node *>(p.end()); }
-    iterator insert(iterator before, const T &t);
-    void insert(iterator pos, int n, const T &x);
-    iterator erase(iterator pos);
-    iterator erase(iterator first, iterator last);
-
-    // more Qt
-    typedef iterator Iterator;
-    typedef const_iterator ConstIterator;
-    inline int count() const { return p.size(); }
-    inline int length() const { return p.size(); } // Same as count()
-    inline T& first() { Q_ASSERT(!isEmpty()); current_index=0; return *begin(); }
-    inline const T& first() const { Q_ASSERT(!isEmpty()); current_index=0; return *begin(); }
-    T& last() { Q_ASSERT(!isEmpty()); return *(--end()); }
-    const T& last() const { Q_ASSERT(!isEmpty()); current_index=count()-1; return *(--end()); }
-    inline void removeFirst() { Q_ASSERT(!isEmpty()); erase(begin()); }
-    inline void removeLast() { Q_ASSERT(!isEmpty()); erase(--end()); }
-    inline bool startsWith(const T &t) const { return !isEmpty() && first() == t; }
-    inline bool endsWith(const T &t) const { return !isEmpty() && last() == t; }
-    QList<T> mid(int pos, int length = -1) const;
-
-    T value(int i) const;
-    T value(int i, const T &defaultValue) const;
-
-    // stl compatibility
-    inline void push_back(const T &t) { append(t); }
-    inline void push_front(const T &t) { prepend(t); }
-    inline T& front() { return first(); }
-    inline const T& front() const { return first(); }
-    inline T& back() { return last(); }
-    inline const T& back() const { return last(); }
-    inline void pop_front() { removeFirst(); }
-    inline void pop_back() { removeLast(); }
-    inline bool empty() const { return isEmpty(); }
-    typedef int size_type;
-    typedef T value_type;
-    typedef value_type *pointer;
-    typedef const value_type *const_pointer;
-    typedef value_type &reference;
-    typedef const value_type &const_reference;
-    typedef ptrdiff_t difference_type;
-
-#ifdef QT3_SUPPORT
-    inline QT3_SUPPORT iterator remove(iterator pos) { return erase(pos); }
-    inline QT3_SUPPORT int remove(const T &t) { return removeAll(t); }
-    inline QT3_SUPPORT int findIndex(const T& t) const { return indexOf(t); }
-    inline QT3_SUPPORT iterator find(const T& t)
-    { int i = indexOf(t); return (i == -1 ? end() : (begin()+i)); }
-    inline QT3_SUPPORT const_iterator find (const T& t) const
-    { int i = indexOf(t); return (i == -1 ? end() : (begin()+i)); }
-    inline QT3_SUPPORT iterator find(iterator from, const T& t)
-    { int i = indexOf(t, from - begin()); return i == -1 ? end() : begin()+i; }
-    inline QT3_SUPPORT const_iterator find(const_iterator from, const T& t) const
-    { int i = indexOf(t, from - begin()); return i == -1 ? end() : begin()+i; }
-#endif
-
-    // comfort
-    QList<T> &operator+=(const QList<T> &l);
-    inline QList<T> operator+(const QList<T> &l) const
-    { QList n = *this; n += l; return n; }
-    inline QList<T> &operator+=(const T &t)
-    { append(t); return *this; }
-    inline QList<T> &operator<< (const T &t)
-    { append(t); return *this; }
-    inline QList<T> &operator<<(const QList<T> &l)
-    { *this += l; return *this; }
-
-    QVector<T> toVector() const;
-    QSet<T> toSet() const;
-
-    static QList<T> fromVector(const QVector<T> &vector);
-    static QList<T> fromSet(const QSet<T> &set);
-
-#ifndef TQT_NO_STL
-    static inline QList<T> fromStdList(const std::list<T> &list)
-    { QList<T> tmp; qCopy(list.begin(), list.end(), std::back_inserter(tmp)); return tmp; }
-    inline std::list<T> toStdList() const
-    { std::list<T> tmp; qCopy(constBegin(), constEnd(), std::back_inserter(tmp)); return tmp; }
-#endif
-
-private:
-    void detach_helper();
-    void free(QListData::Data *d);
-
-    void node_construct(Node *n, const T &t);
-    void node_destruct(Node *n);
-    void node_copy(Node *from, Node *to, Node *src);
-    void node_destruct(Node *from, Node *to);
-
-    int current_index;
-};
-
-#if defined(Q_CC_BOR)
-template <typename T>
-Q_INLINE_TEMPLATE T &QList<T>::Node::t()
-{ return QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic ? *(T*)v:*(T*)this; }
-#endif
-
-template <typename T>
-Q_INLINE_TEMPLATE void QList<T>::node_construct(Node *n, const T &t)
-{
-    if (QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic) n->v = new T(t);
-    else if (QTypeInfo<T>::isComplex) new (n) T(t);
-    else *reinterpret_cast<T*>(n) = t;
-}
-
-template <typename T>
-Q_INLINE_TEMPLATE void QList<T>::node_destruct(Node *n)
-{
-    if (QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic) delete reinterpret_cast<T*>(n->v);
-    else if (QTypeInfo<T>::isComplex) reinterpret_cast<T*>(n)->~T();
-}
-
-template <typename T>
-Q_INLINE_TEMPLATE void QList<T>::node_copy(Node *from, Node *to, Node *src)
-{
-    Node *current = from;
-    if (QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic) {
-        QT_TRY {
-            while(current != to) {
-                current->v = new T(*reinterpret_cast<T*>(src->v));
-                ++current;
-                ++src;
-            }
-        } QT_CATCH(...) {
-            while (current-- != from)
-                delete reinterpret_cast<T*>(current->v);
-            QT_RETHROW;
-        }
-
-    } else if (QTypeInfo<T>::isComplex) {
-        QT_TRY {
-            while(current != to) {
-                new (current) T(*reinterpret_cast<T*>(src));
-                ++current;
-                ++src;
-            }
-        } QT_CATCH(...) {
-            while (current-- != from)
-                (reinterpret_cast<T*>(current))->~T();
-            QT_RETHROW;
-        }
-    } else {
-        if (src != from && to - from > 0)
-            memcpy(from, src, (to - from) * sizeof(Node *));
-    }
-}
-
-template <typename T>
-Q_INLINE_TEMPLATE void QList<T>::node_destruct(Node *from, Node *to)
-{
-    if (QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic)
-        while(from != to) --to, delete reinterpret_cast<T*>(to->v);
-    else if (QTypeInfo<T>::isComplex)
-        while (from != to) --to, reinterpret_cast<T*>(to)->~T();
-}
-
-template <typename T>
-Q_INLINE_TEMPLATE QList<T> &QList<T>::operator=(const QList<T> &l)
-{
-    if (d != l.d) {
-        l.d->ref.ref();
-        if (!d->ref.deref())
-            free(d);
-        d = l.d;
-        if (!d->sharable)
-            detach_helper();
-    }
-    return *this;
-}
-template <typename T>
-inline typename QList<T>::iterator QList<T>::insert(iterator before, const T &t)
-{
-    int iBefore = int(before.i - reinterpret_cast<Node *>(p.begin()));
-    Node *n = reinterpret_cast<Node *>(p.insert(iBefore));
-    QT_TRY {
-        node_construct(n, t);
-    } QT_CATCH(...) {
-        p.remove(iBefore);
-        QT_RETHROW;
-    }
-    return n;
-}
-
-template <typename T>
-inline void QList<T>::insert(iterator pos, int n, const T &x)
-{
-    int q;
-    for (q=0;q<n;q++) {
-        this->insert(pos, x);
-    }
-}
-
-template <typename T>
-inline typename QList<T>::iterator QList<T>::erase(iterator it)
-{ node_destruct(it.i);
- return reinterpret_cast<Node *>(p.erase(reinterpret_cast<void**>(it.i))); }
-template <typename T>
-inline const T &QList<T>::at(int i) const
-{ Q_ASSERT_X(i >= 0 && i < p.size(), "QList<T>::at", "index out of range");
- return reinterpret_cast<Node *>(p.at(i))->t(); }
-template <typename T>
-inline const T &QList<T>::operator[](int i) const
-{ Q_ASSERT_X(i >= 0 && i < p.size(), "QList<T>::operator[]", "index out of range");
- return reinterpret_cast<Node *>(p.at(i))->t(); }
-template <typename T>
-inline T &QList<T>::operator[](int i)
-{ Q_ASSERT_X(i >= 0 && i < p.size(), "QList<T>::operator[]", "index out of range");
-  detach(); return reinterpret_cast<Node *>(p.at(i))->t(); }
-template <typename T>
-inline void QList<T>::removeAt(int i)
-{ if(i >= 0 && i < p.size()) { detach();
- node_destruct(reinterpret_cast<Node *>(p.at(i))); p.remove(i); } }
-template <typename T>
-inline T QList<T>::takeAt(int i)
-{ Q_ASSERT_X(i >= 0 && i < p.size(), "QList<T>::take", "index out of range");
- detach(); Node *n = reinterpret_cast<Node *>(p.at(i)); T t = n->t(); node_destruct(n);
- p.remove(i); return t; }
-template <typename T>
-inline T QList<T>::takeFirst()
-{ T t = first(); removeFirst(); return t; }
-template <typename T>
-inline T QList<T>::takeLast()
-{ T t = last(); removeLast(); return t; }
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE void QList<T>::append(const T &t)
-{
-    detach();
-    if (QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic) {
-        Node *n = reinterpret_cast<Node *>(p.append());
-        QT_TRY {
-            node_construct(n, t);
-        } QT_CATCH(...) {
-            --d->end;
-            QT_RETHROW;
-        }
-    } else {
-        const T cpy(t);
-        Node *n = reinterpret_cast<Node *>(p.append());
-        QT_TRY {
-            node_construct(n, cpy);
-        } QT_CATCH(...) {
-            --d->end;
-            QT_RETHROW;
-        }
-    }
-}
-
-template <typename T>
-inline void QList<T>::prepend(const T &t)
-{
-    detach();
-    if (QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic) {
-        Node *n = reinterpret_cast<Node *>(p.prepend());
-        QT_TRY {
-            node_construct(n, t);
-        } QT_CATCH(...) {
-            ++d->begin;
-            QT_RETHROW;
-        }
-    } else {
-        const T cpy(t);
-        Node *n = reinterpret_cast<Node *>(p.prepend());
-        QT_TRY {
-            node_construct(n, cpy);
-        } QT_CATCH(...) {
-            ++d->begin;
-            QT_RETHROW;
-        }
-    }
-}
-
-template <typename T>
-inline void QList<T>::insert(int i, const T &t)
-{
-    detach();
-    if (QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic) {
-        Node *n = reinterpret_cast<Node *>(p.insert(i));
-        QT_TRY {
-            node_construct(n, t);
-        } QT_CATCH(...) {
-            p.remove(i);
-            QT_RETHROW;
-        }
-    } else {
-        const T cpy(t);
-        Node *n = reinterpret_cast<Node *>(p.insert(i));
-        QT_TRY {
-            node_construct(n, cpy);
-        } QT_CATCH(...) {
-            p.remove(i);
-            QT_RETHROW;
-        }
-    }
-}
-
-template <typename T>
-inline void QList<T>::replace(int i, const T &t)
-{
-    Q_ASSERT_X(i >= 0 && i < p.size(), "QList<T>::replace", "index out of range");
-    detach();
-    if (QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic) {
-        reinterpret_cast<Node *>(p.at(i))->t() = t;
-    } else {
-        const T cpy(t);
-        reinterpret_cast<Node *>(p.at(i))->t() = cpy;
-    }
-}
-
-template <typename T>
-inline void QList<T>::swap(int i, int j)
-{
-    Q_ASSERT_X(i >= 0 && i < p.size() && j >= 0 && j < p.size(),
-                "QList<T>::swap", "index out of range");
-    detach();
-    void *t = d->array[d->begin + i];
-    d->array[d->begin + i] = d->array[d->begin + j];
-    d->array[d->begin + j] = t;
-}
-
-template <typename T>
-inline void QList<T>::move(int from, int to)
-{
-    Q_ASSERT_X(from >= 0 && from < p.size() && to >= 0 && to < p.size(),
-               "QList<T>::move", "index out of range");
-    detach();
-    p.move(from, to);
-}
-
-template<typename T>
-Q_OUTOFLINE_TEMPLATE QList<T> QList<T>::mid(int pos, int alength) const
-{
-    if (alength < 0)
-        alength = size() - pos;
-    if (pos == 0 && alength == size())
-        return *this;
-    QList<T> cpy;
-    if (pos + alength > size())
-        alength = size() - pos;
-    for (int i = pos; i < pos + alength; ++i)
-        cpy += at(i);
-    return cpy;
-}
-
-template<typename T>
-Q_OUTOFLINE_TEMPLATE T QList<T>::value(int i) const
-{
-    if (i < 0 || i >= p.size()) {
-        return T();
-    }
-    return reinterpret_cast<Node *>(p.at(i))->t();
-}
-
-template<typename T>
-Q_OUTOFLINE_TEMPLATE T QList<T>::value(int i, const T& defaultValue) const
-{
-    return ((i < 0 || i >= p.size()) ? defaultValue : reinterpret_cast<Node *>(p.at(i))->t());
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE void QList<T>::detach_helper()
-{
-    Node *n = reinterpret_cast<Node *>(p.begin());
-    QListData::Data *x = p.detach3();
-    QT_TRY {
-        node_copy(reinterpret_cast<Node *>(p.begin()), reinterpret_cast<Node *>(p.end()), n);
-    } QT_CATCH(...) {
-        qFree(d);
-        d = x;
-        QT_RETHROW;
-    }
-
-    if (!x->ref.deref())
-        free(x);
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE QList<T>::~QList()
-{
-    if (d && !d->ref.deref())
-        free(d);
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE bool QList<T>::operator==(const QList<T> &l) const
-{
-    if (p.size() != l.p.size())
-        return false;
-    if (d == l.d)
-        return true;
-    Node *i = reinterpret_cast<Node *>(p.end());
-    Node *b = reinterpret_cast<Node *>(p.begin());
-    Node *li = reinterpret_cast<Node *>(l.p.end());
-    while (i != b) {
-        --i; --li;
-        if (!(i->t() == li->t()))
-            return false;
-    }
-    return true;
-}
-
-// ### Qt 5: rename freeData() to avoid confusion with std::free()
-template <typename T>
-Q_OUTOFLINE_TEMPLATE void QList<T>::free(QListData::Data *data)
-{
-    node_destruct(reinterpret_cast<Node *>(data->array + data->begin),
-                  reinterpret_cast<Node *>(data->array + data->end));
-    if (data->ref == 0)
-        qFree(data);
-}
-
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE void QList<T>::clear()
-{
-    *this = QList<T>();
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE int QList<T>::removeAll(const T &_t)
-{
-    detachShared();
-    const T t = _t;
-    int removedCount=0, i=0;
-    Node *n;
-    while (i < p.size())
-        if ((n = reinterpret_cast<Node *>(p.at(i)))->t() == t) {
-            node_destruct(n);
-            p.remove(i);
-            ++removedCount;
-        } else {
-            ++i;
-        }
-    return removedCount;
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE bool QList<T>::removeOne(const T &_t)
-{
-    detachShared();
-    int index = indexOf(_t);
-    if (index != -1) {
-        removeAt(index);
-        return true;
-    }
-    return false;
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE typename QList<T>::iterator QList<T>::erase(typename QList<T>::iterator afirst,
-                                                                 typename QList<T>::iterator alast)
-{
-    for (Node *n = afirst.i; n < alast.i; ++n)
-        node_destruct(n);
-    int idx = afirst - begin();
-    p.remove(idx, alast - afirst);
-    return begin() + idx;
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE QList<T> &QList<T>::operator+=(const QList<T> &l)
-{
-    detach();
-    Node *n = reinterpret_cast<Node *>(p.append2(l.p));
-    QT_TRY{
-        node_copy(n, reinterpret_cast<Node *>(p.end()), reinterpret_cast<Node *>(l.p.begin()));
-    } QT_CATCH(...) {
-        // restore the old end
-        d->end -= int(reinterpret_cast<Node *>(p.end()) - n);
-        QT_RETHROW;
-    }
-    return *this;
-}
-
-template <typename T>
-inline void QList<T>::append(const QList<T> &t)
-{
-    *this += t;
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE int QList<T>::indexOf(const T &t, int from) const
-{
-    if (from < 0)
-        from = qMax(from + p.size(), 0);
-    if (from < p.size()) {
-        Node *n = reinterpret_cast<Node *>(p.at(from -1));
-        Node *e = reinterpret_cast<Node *>(p.end());
-        while (++n != e)
-            if (n->t() == t)
-                return int(n - reinterpret_cast<Node *>(p.begin()));
-    }
-    return -1;
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE int QList<T>::lastIndexOf(const T &t, int from) const
-{
-    if (from < 0)
-        from += p.size();
-    else if (from >= p.size())
-        from = p.size()-1;
-    if (from >= 0) {
-        Node *b = reinterpret_cast<Node *>(p.begin());
-        Node *n = reinterpret_cast<Node *>(p.at(from + 1));
-        while (n-- != b) {
-            if (n->t() == t)
-                return n - b;
-        }
-    }
-    return -1;
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE QBool QList<T>::contains(const T &t) const
-{
-    Node *b = reinterpret_cast<Node *>(p.begin());
-    Node *i = reinterpret_cast<Node *>(p.end());
-    while (i-- != b)
-        if (i->t() == t)
-            return QBool(true);
-    return QBool(false);
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE int QList<T>::count(const T &t) const
-{
-    int c = 0;
-    Node *b = reinterpret_cast<Node *>(p.begin());
-    Node *i = reinterpret_cast<Node *>(p.end());
-    while (i-- != b)
-        if (i->t() == t)
-            ++c;
-    return c;
-}
-
-Q_DECLARE_SEQUENTIAL_ITERATOR(List)
-Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(List)
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QLIST_H
diff --git a/qtinterface/tqt4/Qt/qmenu.h b/qtinterface/tqt4/Qt/qmenu.h
deleted file mode 100644
index a64cd6c..0000000
--- a/qtinterface/tqt4/Qt/qmenu.h
+++ /dev/null
@@ -1,429 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 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$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMENU_H
-#define QMENU_H
-
-#include <QtGui/qwidget.h>
-#include <QtCore/qstring.h>
-#include <QtGui/qicon.h>
-#include <QtGui/qaction.h>
-
-#ifdef QT3_SUPPORT
-#include <QtGui/qpixmap.h>
-#endif
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-#ifndef QT_NO_MENU
-
-class QMenuPrivate;
-class QStyleOptionMenuItem;
-#ifdef QT3_SUPPORT
-class QMenuItem;
-#endif
-
-class Q_GUI_EXPORT QMenu : public QWidget
-{
-private:
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QMenu)
-
-    Q_PROPERTY(bool tearOffEnabled READ isTearOffEnabled WRITE setTearOffEnabled)
-    Q_PROPERTY(QString title READ title WRITE setTitle)
-    Q_PROPERTY(QIcon icon READ icon WRITE setIcon)
-    Q_PROPERTY(bool separatorsCollapsible READ separatorsCollapsible WRITE setSeparatorsCollapsible)
-
-public:
-    explicit QMenu(QWidget *parent = 0);
-    explicit QMenu(const QString &title, QWidget *parent = 0);
-    ~QMenu();
-
-#ifdef Q_NO_USING_KEYWORD
-    inline void addAction(QAction *action) { QWidget::addAction(action); }
-#else
-    using QWidget::addAction;
-#endif
-    QAction *addAction(const QString &text);
-    QAction *addAction(const QIcon &icon, const QString &text);
-    QAction *addAction(const QString &text, const QObject *receiver, const char* member, const QKeySequence &shortcut = 0);
-    QAction *addAction(const QIcon &icon, const QString &text, const QObject *receiver, const char* member, const QKeySequence &shortcut = 0);
-
-    QAction *addMenu(QMenu *menu);
-    QMenu *addMenu(const QString &title);
-    QMenu *addMenu(const QIcon &icon, const QString &title);
-
-    QAction *addSeparator();
-
-    QAction *insertMenu(QAction *before, QMenu *menu);
-    QAction *insertSeparator(QAction *before);
-
-    bool isEmpty() const;
-    void clear();
-
-    void setTearOffEnabled(bool);
-    bool isTearOffEnabled() const;
-
-    bool isTearOffMenuVisible() const;
-    void hideTearOffMenu();
-
-    void setDefaultAction(QAction *);
-    QAction *defaultAction() const;
-
-    void setActiveAction(QAction *act);
-    QAction *activeAction() const;
-
-    void popup(const QPoint &pos, QAction *at=0);
-    QAction *exec();
-    QAction *exec(const QPoint &pos, QAction *at=0);
-
-    // ### Qt 5: merge
-    static QAction *exec(QList<QAction*> actions, const QPoint &pos, QAction *at=0);
-    static QAction *exec(QList<QAction*> actions, const QPoint &pos, QAction *at, QWidget *parent);
-
-    QSize sizeHint() const;
-
-    QRect actionGeometry(QAction *) const;
-    QAction *actionAt(const QPoint &) const;
-
-    QAction *menuAction() const;
-
-    QString title() const;
-    void setTitle(const QString &title);
-
-    QIcon icon() const;
-    void setIcon(const QIcon &icon);
-
-    void setNoReplayFor(QWidget *widget);
-#ifdef Q_WS_MAC
-    OSMenuRef macMenu(OSMenuRef merge=0);
-#endif
-
-#ifdef Q_WS_WINCE
-    HMENU wceMenu(bool create = false);
-#endif
-
-    bool separatorsCollapsible() const;
-    void setSeparatorsCollapsible(bool collapse);
-
-Q_SIGNALS:
-    void aboutToShow();
-    void aboutToHide();
-    void triggered(QAction *action);
-    void hovered(QAction *action);
-
-protected:
-    int columnCount() const;
-
-    void changeEvent(QEvent *);
-    void keyPressEvent(QKeyEvent *);
-    void mouseReleaseEvent(QMouseEvent *);
-    void mousePressEvent(QMouseEvent *);
-    void mouseMoveEvent(QMouseEvent *);
-    void wheelEvent(QWheelEvent *);
-    void enterEvent(QEvent *);
-    void leaveEvent(QEvent *);
-    void hideEvent(QHideEvent *);
-    void paintEvent(QPaintEvent *);
-    void actionEvent(QActionEvent *);
-    void timerEvent(QTimerEvent *);
-    bool event(QEvent *);
-    bool focusNextPrevChild(bool next);
-    void initStyleOption(QStyleOptionMenuItem *option, const QAction *action) const;
-
-#ifdef Q_WS_WINCE
-    QAction* wceCommands(uint command);
-#endif
-
-private Q_SLOTS:
-    void internalSetSloppyAction();
-    void internalDelayedPopup();
-
-private:
-    Q_PRIVATE_SLOT(d_func(), void _q_actionTriggered())
-    Q_PRIVATE_SLOT(d_func(), void _q_actionHovered())
-    Q_PRIVATE_SLOT(d_func(), void _q_overrideMenuActionDestroyed())
-
-#ifdef QT3_SUPPORT
-public:
-    //menudata
-    inline QT3_SUPPORT uint count() const { return actions().count(); }
-    inline QT3_SUPPORT int insertItem(const QString &text, const QObject *receiver, const char* member,
-                                    const QKeySequence& shortcut = 0, int id = -1, int index = -1) {
-        return insertAny(0, &text, receiver, member, &shortcut, 0, id, index);
-    }
-    inline QT3_SUPPORT int insertItem(const QIcon& icon, const QString &text,
-                                    const QObject *receiver, const char* member,
-                                    const QKeySequence& shortcut = 0, int id = -1, int index = -1) {
-        return insertAny(&icon, &text, receiver, member, &shortcut, 0, id, index);
-    }
-    inline QT3_SUPPORT int insertItem(const QPixmap &pixmap, const QObject *receiver, const char* member,
-                                    const QKeySequence& shortcut = 0, int id = -1, int index = -1) {
-        QIcon icon(pixmap);
-        return insertAny(&icon, 0, receiver, member, &shortcut, 0, id, index);
-    }
-    inline QT3_SUPPORT int insertItem(const QString &text, int id=-1, int index=-1) {
-        return insertAny(0, &text, 0, 0, 0, 0, id, index);
-    }
-    inline QT3_SUPPORT int insertItem(const QIcon& icon, const QString &text, int id=-1, int index=-1) {
-        return insertAny(&icon, &text, 0, 0, 0, 0, id, index);
-    }
-    inline QT3_SUPPORT int insertItem(const QString &text, QMenu *popup, int id=-1, int index=-1) {
-        return insertAny(0, &text, 0, 0, 0, popup, id, index);
-    }
-    inline QT3_SUPPORT int insertItem(const QIcon& icon, const QString &text, QMenu *popup, int id=-1, int index=-1) {
-        return insertAny(&icon, &text, 0, 0, 0, popup, id, index);
-    }
-    inline QT3_SUPPORT int insertItem(const QPixmap &pixmap, int id=-1, int index=-1) {
-        QIcon icon(pixmap);
-        return insertAny(&icon, 0, 0, 0, 0, 0, id, index);
-    }
-    inline QT3_SUPPORT int insertItem(const QPixmap &pixmap, QMenu *popup, int id=-1, int index=-1) {
-        QIcon icon(pixmap);
-        return insertAny(&icon, 0, 0, 0, 0, popup, id, index);
-    }
-    QT3_SUPPORT int insertItem(QMenuItem *item, int id=-1, int index=-1);
-    int insertItem( QWidget* widget, int id=-1, int index=-1 );
-
-    QT3_SUPPORT int insertSeparator(int index=-1);
-    inline QT3_SUPPORT void removeItem(int id) {
-        if(QAction *act = findActionForId(id))
-            removeAction(act); }
-    inline QT3_SUPPORT void removeItemAt(int index) {
-        if(QAction *act = actions().value(index))
-            removeAction(act); }
-#ifndef QT_NO_SHORTCUT
-    inline QT3_SUPPORT QKeySequence accel(int id) const {
-        if(QAction *act = findActionForId(id))
-            return act->shortcut();
-        return QKeySequence(); }
-    inline QT3_SUPPORT void setAccel(const QKeySequence& key, int id) {
-        if(QAction *act = findActionForId(id))
-            act->setShortcut(key);
-    }
-#endif
-    inline QT3_SUPPORT QIcon iconSet(int id) const {
-        if(QAction *act = findActionForId(id))
-            return act->icon();
-        return QIcon(); }
-    inline QT3_SUPPORT QString text(int id) const {
-        if(QAction *act = findActionForId(id))
-            return act->text();
-        return QString(); }
-    inline QT3_SUPPORT QPixmap pixmap(int id) const {
-        if(QAction *act = findActionForId(id))
-            return act->icon().pixmap(QSize(22, 22));
-        return QPixmap(); }
-    inline QT3_SUPPORT void setWhatsThis(int id, const QString &w) {
-        if(QAction *act = findActionForId(id))
-            act->setWhatsThis(w); }
-    inline QT3_SUPPORT QString whatsThis(int id) const {
-        if(QAction *act = findActionForId(id))
-            return act->whatsThis();
-        return QString(); }
-
-    inline QT3_SUPPORT void changeItem(int id, const QString &text) {
-        if(QAction *act = findActionForId(id))
-            act->setText(text); }
-    inline QT3_SUPPORT void changeItem(int id, const QPixmap &pixmap) {
-        if(QAction *act = findActionForId(id))
-            act->setIcon(QIcon(pixmap)); }
-    inline QT3_SUPPORT void changeItem(int id, const QIcon &icon, const QString &text) {
-        if(QAction *act = findActionForId(id)) {
-            act->setIcon(icon);
-            act->setText(text);
-        }
-    }
-    inline QT3_SUPPORT void setActiveItem(int id) {
-        setActiveAction(findActionForId(id));
-    }
-    inline QT3_SUPPORT bool isItemActive(int id) const {
-        return findActionForId(id) == activeAction();
-    }
-    inline QT3_SUPPORT bool isItemEnabled(int id) const {
-        if(QAction *act = findActionForId(id))
-            return act->isEnabled();
-        return false; }
-    inline QT3_SUPPORT void setItemEnabled(int id, bool enable) {
-        if(QAction *act = findActionForId(id))
-            act->setEnabled(enable);
-    }
-    inline QT3_SUPPORT bool isItemChecked(int id) const {
-        if(QAction *act = findActionForId(id))
-            return act->isChecked();
-        return false;
-    }
-    inline QT3_SUPPORT void setItemChecked(int id, bool check) {
-        if(QAction *act = findActionForId(id)) {
-            act->setCheckable(true);
-            act->setChecked(check);
-        }
-    }
-    inline QT3_SUPPORT bool isItemVisible(int id) const {
-        if(QAction *act = findActionForId(id))
-            return act->isVisible();
-        return false;
-    }
-    inline QT3_SUPPORT void setItemVisible(int id, bool visible) {
-        if(QAction *act = findActionForId(id))
-            act->setVisible(visible);
-    }
-    inline QT3_SUPPORT QRect itemGeometry(int index) {
-        if(QAction *act = actions().value(index))
-            return actionGeometry(act);
-        return QRect();
-    }
-    inline QT3_SUPPORT QFont itemFont(int id) const {
-        if(QAction *act = findActionForId(id))
-            return act->font();
-        return QFont();
-    }
-    inline QT3_SUPPORT void setItemFont(int id, const QFont &font) {
-        if(QAction *act = findActionForId(id))
-            act->setFont(font);
-    }
-    inline QT3_SUPPORT int indexOf(int id) const {
-        return actions().indexOf(findActionForId(id));
-    }
-    inline QT3_SUPPORT int idAt(int index) const {
-        return findIdForAction(actions().value(index));
-    }
-    QT3_SUPPORT void setId (int index, int id);
-    inline QT3_SUPPORT void activateItemAt(int index) {
-        if(QAction *ret = actions().value(index))
-            ret->activate(QAction::Trigger);
-    }
-    inline QT3_SUPPORT bool connectItem(int id, const QObject *receiver, const char* member) {
-        if(QAction *act = findActionForId(id)) {
-            QObject::connect(act, SIGNAL(activated(int)), receiver, member);
-            return true;
-        }
-        return false;
-    }
-    inline QT3_SUPPORT bool disconnectItem(int id,const QObject *receiver, const char* member) {
-        if(QAction *act = findActionForId(id)) {
-            QObject::disconnect(act, SIGNAL(triggered()), receiver, member);
-            return true;
-        }
-        return false;
-    }
-    inline QT3_SUPPORT QMenuItem *findItem(int id) const {
-        return reinterpret_cast<QMenuItem*>(findActionForId(id));
-    }
-
-    inline QT3_SUPPORT void setCheckable(bool){}
-    inline QT3_SUPPORT bool isCheckable() const {return true;}
-
-    QT3_SUPPORT QMenuItem *findPopup( QMenu *popup, int *index );
-
-    QT3_SUPPORT bool setItemParameter(int id, int param);
-    QT3_SUPPORT int itemParameter(int id) const;
-
-    //frame
-    QT3_SUPPORT int frameWidth() const;
-
-    //popupmenu
-    inline QT3_SUPPORT void popup(const QPoint & pos, int indexAtPoint) { popup(pos, actions().value(indexAtPoint)); }
-    inline QT3_SUPPORT int insertTearOffHandle(int = 0, int = 0) {
-        setTearOffEnabled(true);
-        return -1;
-    }
-
-protected:
-    inline QT3_SUPPORT int itemAtPos(const QPoint &p, bool ignoreSeparator = true) {
-        QAction *ret = actionAt(p);
-        if(ignoreSeparator && ret && ret->isSeparator())
-            return -1;
-        return findIdForAction(ret);
-    }
-    inline QT3_SUPPORT int columns() const { return columnCount(); }
-    inline QT3_SUPPORT int itemHeight(int index) {
-        return actionGeometry(actions().value(index)).height();
-    }
-    inline QT3_SUPPORT int itemHeight(QMenuItem *mi) {
-        return actionGeometry(reinterpret_cast<QAction *>(mi)).height();
-    }
-
-Q_SIGNALS:
-    QT_MOC_COMPAT void activated(int itemId);
-    QT_MOC_COMPAT void highlighted(int itemId);
-
-private:
-    int insertAny(const QIcon *icon, const QString *text, const QObject *receiver, const char *member,
-                  const QKeySequence *shorcut, const QMenu *popup, int id, int index);
-    QAction *findActionForId(int id) const;
-    int findIdForAction(QAction*) const;
-#endif
-
-protected:
-    QMenu(QMenuPrivate &dd, QWidget* parent = 0);
-
-private:
-    Q_DISABLE_COPY(QMenu)
-
-    friend class QMenuBar;
-    friend class QMenuBarPrivate;
-    friend class QTornOffMenu;
-    friend class Q3PopupMenu;
-    friend class QComboBox;
-    friend class QAction;
-    friend class QToolButtonPrivate;
-
-#ifdef Q_WS_MAC
-    friend void qt_mac_trayicon_activate_action(QMenu *, QAction *action);
-    friend bool qt_mac_watchingAboutToShow(QMenu *);
-    friend OSStatus qt_mac_menu_event(EventHandlerCallRef, EventRef, void *);
-    friend bool qt_mac_activate_action(OSMenuRef, uint, QAction::ActionEvent, bool);
-    friend void qt_mac_emit_menuSignals(QMenu *, bool);
-#endif
-};
-
-#endif // QT_NO_MENU
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMENU_H
diff --git a/qtinterface/tqt4/Qt/qmenudata.h b/qtinterface/tqt4/Qt/qmenudata.h
deleted file mode 100644
index c66a365..0000000
--- a/qtinterface/tqt4/Qt/qmenudata.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 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$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMENUDATA_H
-#define QMENUDATA_H
-
-#include <QtCore/qglobal.h>
-
-#ifdef QT3_SUPPORT
-#include <QtGui/qaction.h>
-#include <Qt/q3popupmenu.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-class Q_GUI_EXPORT QMenuItem : public QAction
-{
-    Q_OBJECT
-
-public:
-    QMenuItem();
-
-    QT3_SUPPORT int id() const;
-    QT3_SUPPORT int signalValue() const;
-
-    Q3PopupMenu *popup() const;
-private:
-    friend class QMenu;
-    friend class QMenuBar;
-    void setId(int);
-    void setSignalValue(int);
-
-    Q_DISABLE_COPY(QMenuItem)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
-
-#endif // QMENUDATA_H
diff --git a/qtinterface/tqt4/Qt/qmetaobject.h b/qtinterface/tqt4/Qt/qmetaobject.h
deleted file mode 100644
index 9a662a5..0000000
--- a/qtinterface/tqt4/Qt/qmetaobject.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMETAOBJECT_H
-#define QMETAOBJECT_H
-
-#include <QtCore/qobjectdefs.h>
-#include <QtCore/qvariant.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Core)
-
-template <typename T> class QList;
-
-class Q_CORE_EXPORT QMetaMethod
-{
-public:
-    inline QMetaMethod() : mobj(0),handle(0) {}
-
-    const char *signature() const;
-    const char *typeName() const;
-    QList<QByteArray> parameterTypes() const;
-    QList<QByteArray> parameterNames() const;
-    const char *tag() const;
-    enum Access { Private, Protected, Public };
-    Access access() const;
-    enum MethodType { Method, Signal, Slot, Constructor };
-    MethodType methodType() const;
-    enum Attributes { Compatibility = 0x1, Cloned = 0x2, Scriptable = 0x4 };
-    int attributes() const;
-    int methodIndex() const;
-
-    inline const QMetaObject *enclosingMetaObject() const { return mobj; }
-
-    bool invoke(QObject *object,
-                Qt::ConnectionType connectionType,
-                QGenericReturnArgument returnValue,
-                QGenericArgument val0 = QGenericArgument(0),
-                QGenericArgument val1 = QGenericArgument(),
-                QGenericArgument val2 = QGenericArgument(),
-                QGenericArgument val3 = QGenericArgument(),
-                QGenericArgument val4 = QGenericArgument(),
-                QGenericArgument val5 = QGenericArgument(),
-                QGenericArgument val6 = QGenericArgument(),
-                QGenericArgument val7 = QGenericArgument(),
-                QGenericArgument val8 = QGenericArgument(),
-                QGenericArgument val9 = QGenericArgument()) const;
-    inline bool invoke(QObject *object,
-                       QGenericReturnArgument returnValue,
-                       QGenericArgument val0 = QGenericArgument(0),
-                       QGenericArgument val1 = QGenericArgument(),
-                       QGenericArgument val2 = QGenericArgument(),
-                       QGenericArgument val3 = QGenericArgument(),
-                       QGenericArgument val4 = QGenericArgument(),
-                       QGenericArgument val5 = QGenericArgument(),
-                       QGenericArgument val6 = QGenericArgument(),
-                       QGenericArgument val7 = QGenericArgument(),
-                       QGenericArgument val8 = QGenericArgument(),
-                       QGenericArgument val9 = QGenericArgument()) const
-    {
-        return invoke(object, Qt::AutoConnection, returnValue,
-                      val0, val1, val2, val3, val4, val5, val6, val7, val8, val9);
-    }
-    inline bool invoke(QObject *object,
-                       Qt::ConnectionType connectionType,
-                       QGenericArgument val0 = QGenericArgument(0),
-                       QGenericArgument val1 = QGenericArgument(),
-                       QGenericArgument val2 = QGenericArgument(),
-                       QGenericArgument val3 = QGenericArgument(),
-                       QGenericArgument val4 = QGenericArgument(),
-                       QGenericArgument val5 = QGenericArgument(),
-                       QGenericArgument val6 = QGenericArgument(),
-                       QGenericArgument val7 = QGenericArgument(),
-                       QGenericArgument val8 = QGenericArgument(),
-                       QGenericArgument val9 = QGenericArgument()) const
-    {
-        return invoke(object, connectionType, QGenericReturnArgument(),
-                      val0, val1, val2, val3, val4, val5, val6, val7, val8, val9);
-    }
-    inline bool invoke(QObject *object,
-                       QGenericArgument val0 = QGenericArgument(0),
-                       QGenericArgument val1 = QGenericArgument(),
-                       QGenericArgument val2 = QGenericArgument(),
-                       QGenericArgument val3 = QGenericArgument(),
-                       QGenericArgument val4 = QGenericArgument(),
-                       QGenericArgument val5 = QGenericArgument(),
-                       QGenericArgument val6 = QGenericArgument(),
-                       QGenericArgument val7 = QGenericArgument(),
-                       QGenericArgument val8 = QGenericArgument(),
-                       QGenericArgument val9 = QGenericArgument()) const
-    {
-        return invoke(object, Qt::AutoConnection, QGenericReturnArgument(),
-                      val0, val1, val2, val3, val4, val5, val6, val7, val8, val9);
-    }
-
-private:
-    const QMetaObject *mobj;
-    uint handle;
-    friend struct QMetaObject;
-};
-Q_DECLARE_TYPEINFO(QMetaMethod, Q_MOVABLE_TYPE);
-
-class Q_CORE_EXPORT QMetaEnum
-{
-public:
-    inline QMetaEnum() : mobj(0),handle(0) {}
-
-    const char *name() const;
-    bool isFlag() const;
-
-    int keyCount() const;
-    const char *key(int index) const;
-    int value(int index) const;
-
-    const char *scope() const;
-
-    int keyToValue(const char *key) const;
-    const char* valueToKey(int value) const;
-    int keysToValue(const char * keys) const;
-    QByteArray valueToKeys(int value) const;
-
-    inline const QMetaObject *enclosingMetaObject() const { return mobj; }
-
-    inline bool isValid() const { return name() != 0; }
-private:
-    const QMetaObject *mobj;
-    uint handle;
-    friend struct QMetaObject;
-};
-Q_DECLARE_TYPEINFO(QMetaEnum, Q_MOVABLE_TYPE);
-
-class Q_CORE_EXPORT QMetaProperty
-{
-public:
-    QMetaProperty();
-
-    const char *name() const;
-    const char *typeName() const;
-    QVariant::Type type() const;
-    int userType() const;
-    int propertyIndex() const;
-
-    bool isReadable() const;
-    bool isWritable() const;
-    bool isResettable() const;
-    bool isDesignable(const QObject *obj = 0) const;
-    bool isScriptable(const QObject *obj = 0) const;
-    bool isStored(const QObject *obj = 0) const;
-    bool isEditable(const QObject *obj = 0) const;
-    bool isUser(const QObject *obj = 0) const;
-    bool isConstant() const;
-    bool isFinal() const;
-
-    bool isFlagType() const;
-    bool isEnumType() const;
-    QMetaEnum enumerator() const;
-
-    bool hasNotifySignal() const;
-    QMetaMethod notifySignal() const;
-    int notifySignalIndex() const;
-
-    QVariant read(const QObject *obj) const;
-    bool write(QObject *obj, const QVariant &value) const;
-    bool reset(QObject *obj) const;
-
-    bool hasStdCppSet() const;
-    inline bool isValid() const { return isReadable(); }
-    inline const QMetaObject *enclosingMetaObject() const { return mobj; }
-
-private:
-    const QMetaObject *mobj;
-    uint handle;
-    int idx;
-    QMetaEnum menum;
-    friend struct QMetaObject;
-
-public:
-    bool writable() const;
-};
-
-class Q_CORE_EXPORT QMetaClassInfo
-{
-public:
-    inline QMetaClassInfo() : mobj(0),handle(0) {}
-    const char *name() const;
-    const char *value() const;
-    inline const QMetaObject *enclosingMetaObject() const { return mobj; }
-private:
-    const QMetaObject *mobj;
-    uint handle;
-    friend struct QMetaObject;
-};
-Q_DECLARE_TYPEINFO(QMetaClassInfo, Q_MOVABLE_TYPE);
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMETAOBJECT_H
diff --git a/qtinterface/tqt4/Qt/qmovie.h b/qtinterface/tqt4/Qt/qmovie.h
deleted file mode 100644
index e6a4297..0000000
--- a/qtinterface/tqt4/Qt/qmovie.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 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$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMOVIE_H
-#define QMOVIE_H
-
-#include <QtCore/qobject.h>
-
-#ifndef QT_NO_MOVIE
-
-#include <QtCore/qbytearray.h>
-#include <QtCore/qlist.h>
-#include <QtCore/qobject.h>
-#include <QtGui/qimagereader.h>
-
-#ifdef QT3_SUPPORT
-#include <QtGui/qimage.h>
-#include <QtGui/qpixmap.h>
-#endif
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-class QByteArray;
-class QColor;
-class QIODevice;
-class QImage;
-class QPixmap;
-class QRect;
-class QSize;
-
-class QMoviePrivate;
-class Q_GUI_EXPORT QMovie : public QObject
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QMovie)
-    Q_ENUMS(MovieState CacheMode)
-    Q_PROPERTY(int speed READ speed WRITE setSpeed)
-    Q_PROPERTY(CacheMode cacheMode READ cacheMode WRITE setCacheMode)
-public:
-    enum MovieState {
-        NotRunning,
-        Paused,
-        Running
-    };
-    enum CacheMode {
-        CacheNone,
-        CacheAll
-    };
-
-    QMovie(QObject *parent = 0);
-    explicit QMovie(QIODevice *device, const QByteArray &format = QByteArray(), QObject *parent = 0);
-    explicit QMovie(const QString &fileName, const QByteArray &format = QByteArray(), QObject *parent = 0);
-    ~QMovie();
-
-    static QList<QByteArray> supportedFormats();
-
-    void setDevice(QIODevice *device);
-    QIODevice *device() const;
-
-    void setFileName(const QString &fileName);
-    QString fileName() const;
-
-    void setFormat(const QByteArray &format);
-    QByteArray format() const;
-
-    void setBackgroundColor(const QColor &color);
-    QColor backgroundColor() const;
-
-    MovieState state() const;
-
-    QRect frameRect() const;
-    QImage currentImage() const;
-    QPixmap currentPixmap() const;
-
-    bool isValid() const;
-
-    bool jumpToFrame(int frameNumber);
-    int loopCount() const;
-    int frameCount() const;
-    int nextFrameDelay() const;
-    int currentFrameNumber() const;
-
-    int speed() const;
-
-    QSize scaledSize();
-    void setScaledSize(const QSize &size);
-
-    CacheMode cacheMode() const;
-    void setCacheMode(CacheMode mode);
-
-    CacheMode cacheMode(); // ### Qt 5: remove me
-
-Q_SIGNALS:
-    void started();
-    void resized(const QSize &size);
-    void updated(const QRect &rect);
-    void stateChanged(QMovie::MovieState state);
-    void error(QImageReader::ImageReaderError error);
-    void finished();
-    void frameChanged(int frameNumber);
-
-public Q_SLOTS:
-    void start();
-    bool jumpToNextFrame();
-    void setPaused(bool paused);
-    void stop();
-    void setSpeed(int percentSpeed);
-
-private:
-    Q_DISABLE_COPY(QMovie)
-    Q_PRIVATE_SLOT(d_func(), void _q_loadNextFrame())
-
-#ifdef QT3_SUPPORT
-public:
-    inline QT3_SUPPORT bool isNull() const { return isValid(); }
-    inline QT3_SUPPORT int frameNumber() const { return currentFrameNumber(); }
-    inline QT3_SUPPORT bool running() const { return state() == Running; }
-    inline QT3_SUPPORT bool paused() const { return state() == Paused; }
-    inline QT3_SUPPORT bool finished() const { return state() == NotRunning; }
-    inline QT3_SUPPORT void restart() { stop(); start(); }
-    inline QT3_SUPPORT QImage frameImage() const { return currentImage(); }
-    inline QT3_SUPPORT QPixmap framePixmap() const { return currentPixmap(); }
-    inline QT3_SUPPORT void step() { jumpToNextFrame(); }
-    inline QT3_SUPPORT void pause() { setPaused(true); }
-    inline QT3_SUPPORT void unpause() { setPaused(false); }
-#endif
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QT_NO_MOVIE
-
-#endif // QMOVIE_H
diff --git a/qtinterface/tqt4/Qt/qnamespace.h b/qtinterface/tqt4/Qt/qnamespace.h
deleted file mode 100644
index 00e8f94..0000000
--- a/qtinterface/tqt4/Qt/qnamespace.h
+++ /dev/null
@@ -1,1849 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QNAMESPACE_H
-#define QNAMESPACE_H
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Core)
-
-#ifndef Q_MOC_RUN
-namespace
-#else
-class Q_CORE_EXPORT
-#endif
-Qt {
-
-#if defined(Q_MOC_RUN)
-    Q_OBJECT
-#endif
-
-#if (defined(Q_MOC_RUN) || defined(QT_JAMBI_RUN))
-    // NOTE: Generally, do not add Q_ENUMS if a corresponding Q_FLAGS exists.
-    Q_ENUMS(ScrollBarPolicy FocusPolicy ContextMenuPolicy)
-    Q_ENUMS(ArrowType ToolButtonStyle PenStyle PenCapStyle PenJoinStyle BrushStyle)
-    Q_ENUMS(FillRule MaskMode BGMode ClipOperation SizeMode)
-    Q_ENUMS(BackgroundMode) // Qt3
-    Q_ENUMS(Axis Corner LayoutDirection SizeHint Orientation DropAction)
-    Q_FLAGS(Alignment Orientations DropActions)
-    Q_FLAGS(DockWidgetAreas ToolBarAreas)
-    Q_ENUMS(DockWidgetArea ToolBarArea)
-    Q_ENUMS(TextFormat)
-    Q_ENUMS(TextElideMode)
-    Q_ENUMS(DateFormat TimeSpec DayOfWeek)
-    Q_ENUMS(CursorShape GlobalColor)
-    Q_ENUMS(AspectRatioMode TransformationMode)
-    Q_FLAGS(ImageConversionFlags)
-    Q_ENUMS(Key ShortcutContext)
-    Q_ENUMS(TextInteractionFlag)
-    Q_FLAGS(TextInteractionFlags)
-    Q_ENUMS(ItemSelectionMode)
-    Q_FLAGS(ItemFlags)
-    Q_ENUMS(CheckState)
-    Q_ENUMS(SortOrder CaseSensitivity)
-    Q_FLAGS(MatchFlags)
-    Q_FLAGS(KeyboardModifiers MouseButtons)
-    Q_ENUMS(WindowType WindowState WindowModality WidgetAttribute ApplicationAttribute)
-    Q_ENUMS(InputMethodHint)
-    Q_FLAGS(WindowFlags WindowStates InputMethodHints)
-    Q_ENUMS(ConnectionType)
-#endif // (defined(Q_MOC_RUN) || defined(QT_JAMBI_RUN))
-
-#if defined(Q_MOC_RUN)
-public:
-#endif
-
-    enum RasterOp { // raster op mode
-	CopyROP,
-	OrROP,
-	XorROP,
-	NotAndROP, EraseROP=NotAndROP,
-	NotCopyROP,
-	NotOrROP,
-	NotXorROP,
-	AndROP,	NotEraseROP=AndROP,
-	NotROP,
-	ClearROP,
-	SetROP,
-	NopROP,
-	AndNotROP,
-	OrNotROP,
-	NandROP,
-	NorROP,	LastROP=NorROP
-    };
-
-    enum GlobalColor {
-        color0,
-        color1,
-        black,
-        white,
-        darkGray,
-        gray,
-        lightGray,
-        red,
-        green,
-        blue,
-        cyan,
-        magenta,
-        yellow,
-        darkRed,
-        darkGreen,
-        darkBlue,
-        darkCyan,
-        darkMagenta,
-        darkYellow,
-        transparent
-    };
-
-    enum KeyboardModifier {
-        NoModifier           = 0x00000000,
-        ShiftModifier        = 0x02000000,
-        ControlModifier      = 0x04000000,
-        AltModifier          = 0x08000000,
-        MetaModifier         = 0x10000000,
-        KeypadModifier       = 0x20000000,
-        GroupSwitchModifier  = 0x40000000,
-        // Do not extend the mask to include 0x01000000
-        KeyboardModifierMask = 0xfe000000
-    };
-    Q_DECLARE_FLAGS(KeyboardModifiers, KeyboardModifier)
-
-    //shorter names for shortcuts
-    enum Modifier {
-        META          = Qt::MetaModifier,
-        SHIFT         = Qt::ShiftModifier,
-        CTRL          = Qt::ControlModifier,
-        ALT           = Qt::AltModifier,
-        MODIFIER_MASK = KeyboardModifierMask,
-        UNICODE_ACCEL = 0x00000000
-    };
-
-    enum MouseButton {
-        NoButton         = 0x00000000,
-        LeftButton       = 0x00000001,
-        RightButton      = 0x00000002,
-        MidButton        = 0x00000004,
-        XButton1         = 0x00000008,
-        XButton2         = 0x00000010,
-        MouseButtonMask  = 0x000000ff
-    };
-    Q_DECLARE_FLAGS(MouseButtons, MouseButton)
-
-#ifdef QT3_SUPPORT
-    enum ButtonState_enum {
-        ShiftButton     = Qt::ShiftModifier,
-        ControlButton   = Qt::ControlModifier,
-        AltButton       = Qt::AltModifier,
-        MetaButton      = Qt::MetaModifier,
-        Keypad          = Qt::KeypadModifier,
-        KeyButtonMask   = Qt::KeyboardModifierMask
-    };
-    typedef int ButtonState;
-#endif
-
-    enum Orientation {
-        Horizontal = 0x1,
-        Vertical = 0x2
-    };
-
-    Q_DECLARE_FLAGS(Orientations, Orientation)
-
-    enum FocusPolicy {
-        NoFocus = 0,
-        TabFocus = 0x1,
-        ClickFocus = 0x2,
-        StrongFocus = TabFocus | ClickFocus | 0x8,
-        WheelFocus = StrongFocus | 0x4
-    };
-
-    enum SortOrder {
-        AscendingOrder,
-        DescendingOrder
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-        ,Ascending = AscendingOrder,
-        Descending = DescendingOrder
-#endif
-    };
-
-    enum TileRule {
-        StretchTile,
-        RepeatTile,
-        RoundTile
-    };
-
-    // Text formatting flags for QPainter::drawText and QLabel.
-    // The following two enums can be combined to one integer which
-    // is passed as 'flags' to drawText and qt_format_text.
-
-    enum AlignmentFlag {
-        AlignLeft = 0x0001,
-        AlignLeading = AlignLeft,
-        AlignRight = 0x0002,
-        AlignTrailing = AlignRight,
-        AlignHCenter = 0x0004,
-        AlignJustify = 0x0008,
-        AlignAbsolute = 0x0010,
-        AlignHorizontal_Mask = AlignLeft | AlignRight | AlignHCenter | AlignJustify | AlignAbsolute,
-
-        AlignTop = 0x0020,
-        AlignBottom = 0x0040,
-        AlignVCenter = 0x0080,
-        AlignVertical_Mask = AlignTop | AlignBottom | AlignVCenter,
-
-        AlignCenter = AlignVCenter | AlignHCenter
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-        , AlignAuto = AlignLeft
-#endif
-    };
-
-    Q_DECLARE_FLAGS(Alignment, AlignmentFlag)
-
-    enum TextFlag {
-        TextSingleLine = 0x0100,
-        TextDontClip = 0x0200,
-        TextExpandTabs = 0x0400,
-        TextShowMnemonic = 0x0800,
-        TextWordWrap = 0x1000,
-        TextWrapAnywhere = 0x2000,
-        TextDontPrint = 0x4000,
-        TextIncludeTrailingSpaces = 0x08000000,
-        TextHideMnemonic = 0x8000,
-        TextJustificationForced = 0x10000,
-        TextForceLeftToRight = 0x20000,
-        TextForceRightToLeft = 0x40000,
-        TextLongestVariant = 0x80000
-
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-        ,SingleLine = TextSingleLine,
-        DontClip = TextDontClip,
-        ExpandTabs = TextExpandTabs,
-        ShowPrefix = TextShowMnemonic,
-        WordBreak = TextWordWrap,
-        BreakAnywhere = TextWrapAnywhere,
-        DontPrint = TextDontPrint,
-        IncludeTrailingSpaces = TextIncludeTrailingSpaces,
-        NoAccel = TextHideMnemonic
-#endif
-    };
-#ifdef QT3_SUPPORT
-    typedef TextFlag TextFlags;
-#endif
-
-    enum TextElideMode {
-        ElideLeft,
-        ElideRight,
-        ElideMiddle,
-        ElideNone
-    };
-
-    enum WindowType {
-        Widget = 0x00000000,
-        Window = 0x00000001,
-        Dialog = 0x00000002 | Window,
-        Sheet = 0x00000004 | Window,
-        Drawer = 0x00000006 | Window,
-        Popup = 0x00000008 | Window,
-        Tool = 0x0000000a | Window,
-        ToolTip = 0x0000000c | Window,
-        SplashScreen = 0x0000000e | Window,
-        Desktop = 0x00000010 | Window,
-        SubWindow =  0x00000012,
-
-        WindowType_Mask = 0x000000ff,
-        MSWindowsFixedSizeDialogHint = 0x00000100,
-        MSWindowsOwnDC = 0x00000200,
-        X11BypassWindowManagerHint = 0x00000400,
-        FramelessWindowHint = 0x00000800,
-        WindowTitleHint = 0x00001000,
-        WindowSystemMenuHint = 0x00002000,
-        WindowMinimizeButtonHint = 0x00004000,
-        WindowMaximizeButtonHint = 0x00008000,
-        WindowMinMaxButtonsHint = WindowMinimizeButtonHint | WindowMaximizeButtonHint,
-        WindowContextHelpButtonHint = 0x00010000,
-        WindowShadeButtonHint = 0x00020000,
-        WindowStaysOnTopHint = 0x00040000,
-        // reserved for Qt3Support:
-        // WMouseNoMask = 0x00080000,
-        // WDestructiveClose = 0x00100000,
-        // WStaticContents = 0x00200000,
-        // WGroupLeader = 0x00400000,
-        // WShowModal = 0x00800000,
-        // WNoMousePropagation = 0x01000000,
-        CustomizeWindowHint = 0x02000000,
-        WindowStaysOnBottomHint = 0x04000000,
-        WindowCloseButtonHint = 0x08000000,
-        MacWindowToolBarButtonHint = 0x10000000,
-        BypassGraphicsProxyWidget = 0x20000000,
-        WindowOkButtonHint = 0x00080000,
-        WindowCancelButtonHint = 0x00100000
-
-#ifdef QT3_SUPPORT
-        ,
-        WMouseNoMask = 0x00080000,
-        WDestructiveClose = 0x00100000,
-        WStaticContents = 0x00200000,
-        WGroupLeader = 0x00400000,
-        WShowModal = 0x00800000,
-        WNoMousePropagation = 0x01000000,
-
-        WType_TopLevel = Window,
-        WType_Dialog = Dialog,
-        WType_Popup = Popup,
-        WType_Desktop = Desktop,
-        WType_Mask = WindowType_Mask,
-
-        WStyle_Customize = 0,
-        WStyle_NormalBorder = 0,
-        WStyle_DialogBorder = MSWindowsFixedSizeDialogHint,
-        WStyle_NoBorder = FramelessWindowHint,
-        WStyle_Title = WindowTitleHint,
-        WStyle_SysMenu = WindowSystemMenuHint,
-        WStyle_Minimize = WindowMinimizeButtonHint,
-        WStyle_Maximize = WindowMaximizeButtonHint,
-        WStyle_MinMax = WStyle_Minimize | WStyle_Maximize,
-        WStyle_Tool = Tool,
-        WStyle_StaysOnTop = WindowStaysOnTopHint,
-        WStyle_ContextHelp = WindowContextHelpButtonHint,
-
-        // misc flags
-        WPaintDesktop = 0,
-        WPaintClever = 0,
-
-        WX11BypassWM            = X11BypassWindowManagerHint,
-        WWinOwnDC               = MSWindowsOwnDC,
-        WMacSheet               = Sheet,
-        WMacDrawer              = Drawer,
-
-        WStyle_Splash           = SplashScreen,
-
-        WNoAutoErase           = 0,
-        WRepaintNoErase        = 0,
-        WNorthWestGravity      = WStaticContents,
-        WType_Modal            = Dialog | WShowModal,
-        WStyle_Dialog          = Dialog,
-        WStyle_NoBorderEx      = FramelessWindowHint,
-        WResizeNoErase = 0,
-        WMacNoSheet = 0
-#endif
-
-    };
-
-    Q_DECLARE_FLAGS(WindowFlags, WindowType)
-
-    enum WindowState {
-        WindowNoState    = 0x00000000,
-        WindowMinimized  = 0x00000001,
-        WindowMaximized  = 0x00000002,
-        WindowFullScreen = 0x00000004,
-        WindowActive     = 0x00000008
-    };
-
-    Q_DECLARE_FLAGS(WindowStates, WindowState)
-
-    enum WidgetAttribute {
-        WA_Disabled = 0,
-        WA_UnderMouse = 1,
-        WA_MouseTracking = 2,
-        WA_ContentsPropagated = 3, // ## deprecated
-        WA_OpaquePaintEvent = 4,
-        WA_NoBackground = WA_OpaquePaintEvent, // ## deprecated
-        WA_StaticContents = 5,
-        WA_LaidOut = 7,
-        WA_PaintOnScreen = 8,
-        WA_NoSystemBackground = 9,
-        WA_UpdatesDisabled = 10,
-        WA_Mapped = 11,
-        WA_MacNoClickThrough = 12, // Mac only
-        WA_PaintOutsidePaintEvent = 13,
-        WA_InputMethodEnabled = 14,
-        WA_WState_Visible = 15,
-        WA_WState_Hidden = 16,
-
-        WA_ForceDisabled = 32,
-        WA_KeyCompression = 33,
-        WA_PendingMoveEvent = 34,
-        WA_PendingResizeEvent = 35,
-        WA_SetPalette = 36,
-        WA_SetFont = 37,
-        WA_SetCursor = 38,
-        WA_NoChildEventsFromChildren = 39,
-        WA_WindowModified = 41,
-        WA_Resized = 42,
-        WA_Moved = 43,
-        WA_PendingUpdate = 44,
-        WA_InvalidSize = 45,
-        WA_MacBrushedMetal = 46, // Mac only
-        WA_MacMetalStyle = WA_MacBrushedMetal, // obsolete
-        WA_CustomWhatsThis = 47,
-        WA_LayoutOnEntireRect = 48,
-        WA_OutsideWSRange = 49,
-        WA_GrabbedShortcut = 50,
-        WA_TransparentForMouseEvents = 51,
-        WA_PaintUnclipped = 52,
-        WA_SetWindowIcon = 53,
-        WA_NoMouseReplay = 54,
-        WA_DeleteOnClose = 55,
-        WA_RightToLeft = 56,
-        WA_SetLayoutDirection = 57,
-        WA_NoChildEventsForParent = 58,
-        WA_ForceUpdatesDisabled = 59,
-
-        WA_WState_Created = 60,
-        WA_WState_CompressKeys = 61,
-        WA_WState_InPaintEvent = 62,
-        WA_WState_Reparented = 63,
-        WA_WState_ConfigPending = 64,
-        WA_WState_Polished = 66,
-        WA_WState_DND = 67, // ## deprecated
-        WA_WState_OwnSizePolicy = 68,
-        WA_WState_ExplicitShowHide = 69,
-
-        WA_ShowModal = 70, // ## deprecated
-        WA_MouseNoMask = 71,
-        WA_GroupLeader = 72, // ## deprecated
-        WA_NoMousePropagation = 73, // ## for now, might go away.
-        WA_Hover = 74,
-        WA_InputMethodTransparent = 75, // Don't reset IM when user clicks on this (for virtual keyboards on embedded)
-        WA_QuitOnClose = 76,
-
-        WA_KeyboardFocusChange = 77,
-
-        WA_AcceptDrops = 78,
-        WA_DropSiteRegistered = 79, // internal
-        WA_ForceAcceptDrops = WA_DropSiteRegistered, // ## deprecated
-
-        WA_WindowPropagation = 80,
-
-        WA_NoX11EventCompression = 81,
-        WA_TintedBackground = 82,
-        WA_X11OpenGLOverlay = 83,
-        WA_AlwaysShowToolTips = 84,
-        WA_MacOpaqueSizeGrip = 85,
-        WA_SetStyle = 86,
-
-        WA_SetLocale = 87,
-        WA_MacShowFocusRect = 88,
-
-        WA_MacNormalSize = 89,  // Mac only
-        WA_MacSmallSize = 90,   // Mac only
-        WA_MacMiniSize = 91,    // Mac only
-
-        WA_LayoutUsesWidgetRect = 92,
-        WA_StyledBackground = 93, // internal
-        WA_MSWindowsUseDirect3D = 94, // Win only
-        WA_CanHostQMdiSubWindowTitleBar = 95, // Internal
-
-        WA_MacAlwaysShowToolWindow = 96, // Mac only
-
-        WA_StyleSheet = 97, // internal
-
-        WA_ShowWithoutActivating = 98,
-
-        WA_X11BypassTransientForHint = 99,
-
-        WA_NativeWindow = 100,
-        WA_DontCreateNativeAncestors = 101,
-
-        WA_MacVariableSize = 102,    // Mac only
-
-        WA_DontShowOnScreen = 103,
-
-        // window types from http://standards.freedesktop.org/wm-spec/
-        WA_X11NetWmWindowTypeDesktop = 104,
-        WA_X11NetWmWindowTypeDock = 105,
-        WA_X11NetWmWindowTypeToolBar = 106,
-        WA_X11NetWmWindowTypeMenu = 107,
-        WA_X11NetWmWindowTypeUtility = 108,
-        WA_X11NetWmWindowTypeSplash = 109,
-        WA_X11NetWmWindowTypeDialog = 110,
-        WA_X11NetWmWindowTypeDropDownMenu = 111,
-        WA_X11NetWmWindowTypePopupMenu = 112,
-        WA_X11NetWmWindowTypeToolTip = 113,
-        WA_X11NetWmWindowTypeNotification = 114,
-        WA_X11NetWmWindowTypeCombo = 115,
-        WA_X11NetWmWindowTypeDND = 116,
-
-        WA_MacFrameworkScaled  = 117,
-
-        WA_SetWindowModality = 118,
-        WA_WState_WindowOpacitySet = 119, // internal
-        WA_TranslucentBackground = 120,
-
-        WA_AcceptTouchEvents = 121,
-        WA_WState_AcceptedTouchBeginEvent = 122,
-        WA_TouchPadAcceptSingleTouchEvents = 123,
-
-        WA_MergeSoftkeys =  124,
-        WA_MergeSoftkeysRecursively =  125,
-
-        // Add new attributes before this line
-        WA_AttributeCount
-    };
-
-    enum ApplicationAttribute
-    {
-        AA_ImmediateWidgetCreation = 0,
-        AA_MSWindowsUseDirect3DByDefault = 1, // Win only
-        AA_DontShowIconsInMenus = 2,
-        AA_NativeWindows = 3,
-        AA_DontCreateNativeWidgetSiblings = 4,
-        AA_MacPluginApplication = 5,
-        AA_DontUseNativeMenuBar = 6,
-        AA_MacDontSwapCtrlAndMeta = 7,
-        AA_S60DontConstructApplicationPanes = 8,
-
-        // Add new attributes before this line
-        AA_AttributeCount
-    };
-
-
-    // Image conversion flags.  The unusual ordering is caused by
-    // compatibility and default requirements.
-
-    enum ImageConversionFlag {
-        ColorMode_Mask          = 0x00000003,
-        AutoColor               = 0x00000000,
-        ColorOnly               = 0x00000003,
-        MonoOnly                = 0x00000002,
-        // Reserved             = 0x00000001,
-
-        AlphaDither_Mask        = 0x0000000c,
-        ThresholdAlphaDither    = 0x00000000,
-        OrderedAlphaDither      = 0x00000004,
-        DiffuseAlphaDither      = 0x00000008,
-        NoAlpha                 = 0x0000000c, // Not supported
-
-        Dither_Mask             = 0x00000030,
-        DiffuseDither           = 0x00000000,
-        OrderedDither           = 0x00000010,
-        ThresholdDither         = 0x00000020,
-        // ReservedDither       = 0x00000030,
-
-        DitherMode_Mask         = 0x000000c0,
-        AutoDither              = 0x00000000,
-        PreferDither            = 0x00000040,
-        AvoidDither             = 0x00000080,
-
-        NoOpaqueDetection       = 0x00000100
-    };
-    Q_DECLARE_FLAGS(ImageConversionFlags, ImageConversionFlag)
-
-    enum BGMode {
-        TransparentMode,
-        OpaqueMode
-    };
-
-#ifdef QT3_SUPPORT
-    enum PaintUnit {                                // paint unit
-        PixelUnit,
-        LoMetricUnit, // obsolete
-        HiMetricUnit, // obsolete
-        LoEnglishUnit, // obsolete
-        HiEnglishUnit, // obsolete
-        TwipsUnit // obsolete
-    };
-
-    enum GUIStyle {
-        MacStyle,
-        WindowsStyle,
-        Win3Style,
-        PMStyle,
-        MotifStyle
-    };
-#endif
-
-    enum Key {
-        Key_Escape = 0x01000000,                // misc keys
-        Key_Tab = 0x01000001,
-        Key_Backtab = 0x01000002,
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-        Key_BackTab = Key_Backtab,
-#endif
-        Key_Backspace = 0x01000003,
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-        Key_BackSpace = Key_Backspace,
-#endif
-        Key_Return = 0x01000004,
-        Key_Enter = 0x01000005,
-        Key_Insert = 0x01000006,
-        Key_Delete = 0x01000007,
-        Key_Pause = 0x01000008,
-        Key_Print = 0x01000009,
-        Key_SysReq = 0x0100000a,
-        Key_Clear = 0x0100000b,
-        Key_Home = 0x01000010,                // cursor movement
-        Key_End = 0x01000011,
-        Key_Left = 0x01000012,
-        Key_Up = 0x01000013,
-        Key_Right = 0x01000014,
-        Key_Down = 0x01000015,
-        Key_PageUp = 0x01000016,
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-        Key_Prior = Key_PageUp,
-#endif
-        Key_PageDown = 0x01000017,
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-        Key_Next = Key_PageDown,
-#endif
-        Key_Shift = 0x01000020,                // modifiers
-        Key_Control = 0x01000021,
-        Key_Meta = 0x01000022,
-        Key_Alt = 0x01000023,
-        Key_CapsLock = 0x01000024,
-        Key_NumLock = 0x01000025,
-        Key_ScrollLock = 0x01000026,
-        Key_F1 = 0x01000030,                // function keys
-        Key_F2 = 0x01000031,
-        Key_F3 = 0x01000032,
-        Key_F4 = 0x01000033,
-        Key_F5 = 0x01000034,
-        Key_F6 = 0x01000035,
-        Key_F7 = 0x01000036,
-        Key_F8 = 0x01000037,
-        Key_F9 = 0x01000038,
-        Key_F10 = 0x01000039,
-        Key_F11 = 0x0100003a,
-        Key_F12 = 0x0100003b,
-        Key_F13 = 0x0100003c,
-        Key_F14 = 0x0100003d,
-        Key_F15 = 0x0100003e,
-        Key_F16 = 0x0100003f,
-        Key_F17 = 0x01000040,
-        Key_F18 = 0x01000041,
-        Key_F19 = 0x01000042,
-        Key_F20 = 0x01000043,
-        Key_F21 = 0x01000044,
-        Key_F22 = 0x01000045,
-        Key_F23 = 0x01000046,
-        Key_F24 = 0x01000047,
-        Key_F25 = 0x01000048,                // F25 .. F35 only on X11
-        Key_F26 = 0x01000049,
-        Key_F27 = 0x0100004a,
-        Key_F28 = 0x0100004b,
-        Key_F29 = 0x0100004c,
-        Key_F30 = 0x0100004d,
-        Key_F31 = 0x0100004e,
-        Key_F32 = 0x0100004f,
-        Key_F33 = 0x01000050,
-        Key_F34 = 0x01000051,
-        Key_F35 = 0x01000052,
-        Key_Super_L = 0x01000053,                 // extra keys
-        Key_Super_R = 0x01000054,
-        Key_Menu = 0x01000055,
-        Key_Hyper_L = 0x01000056,
-        Key_Hyper_R = 0x01000057,
-        Key_Help = 0x01000058,
-        Key_Direction_L = 0x01000059,
-        Key_Direction_R = 0x01000060,
-        Key_Space = 0x20,                // 7 bit printable ASCII
-        Key_Any = Key_Space,
-        Key_Exclam = 0x21,
-        Key_QuoteDbl = 0x22,
-        Key_NumberSign = 0x23,
-        Key_Dollar = 0x24,
-        Key_Percent = 0x25,
-        Key_Ampersand = 0x26,
-        Key_Apostrophe = 0x27,
-        Key_ParenLeft = 0x28,
-        Key_ParenRight = 0x29,
-        Key_Asterisk = 0x2a,
-        Key_Plus = 0x2b,
-        Key_Comma = 0x2c,
-        Key_Minus = 0x2d,
-        Key_Period = 0x2e,
-        Key_Slash = 0x2f,
-        Key_0 = 0x30,
-        Key_1 = 0x31,
-        Key_2 = 0x32,
-        Key_3 = 0x33,
-        Key_4 = 0x34,
-        Key_5 = 0x35,
-        Key_6 = 0x36,
-        Key_7 = 0x37,
-        Key_8 = 0x38,
-        Key_9 = 0x39,
-        Key_Colon = 0x3a,
-        Key_Semicolon = 0x3b,
-        Key_Less = 0x3c,
-        Key_Equal = 0x3d,
-        Key_Greater = 0x3e,
-        Key_Question = 0x3f,
-        Key_At = 0x40,
-        Key_A = 0x41,
-        Key_B = 0x42,
-        Key_C = 0x43,
-        Key_D = 0x44,
-        Key_E = 0x45,
-        Key_F = 0x46,
-        Key_G = 0x47,
-        Key_H = 0x48,
-        Key_I = 0x49,
-        Key_J = 0x4a,
-        Key_K = 0x4b,
-        Key_L = 0x4c,
-        Key_M = 0x4d,
-        Key_N = 0x4e,
-        Key_O = 0x4f,
-        Key_P = 0x50,
-        Key_Q = 0x51,
-        Key_R = 0x52,
-        Key_S = 0x53,
-        Key_T = 0x54,
-        Key_U = 0x55,
-        Key_V = 0x56,
-        Key_W = 0x57,
-        Key_X = 0x58,
-        Key_Y = 0x59,
-        Key_Z = 0x5a,
-        Key_BracketLeft = 0x5b,
-        Key_Backslash = 0x5c,
-        Key_BracketRight = 0x5d,
-        Key_AsciiCircum = 0x5e,
-        Key_Underscore = 0x5f,
-        Key_QuoteLeft = 0x60,
-        Key_BraceLeft = 0x7b,
-        Key_Bar = 0x7c,
-        Key_BraceRight = 0x7d,
-        Key_AsciiTilde = 0x7e,
-
-        Key_nobreakspace = 0x0a0,
-        Key_exclamdown = 0x0a1,
-        Key_cent = 0x0a2,
-        Key_sterling = 0x0a3,
-        Key_currency = 0x0a4,
-        Key_yen = 0x0a5,
-        Key_brokenbar = 0x0a6,
-        Key_section = 0x0a7,
-        Key_diaeresis = 0x0a8,
-        Key_copyright = 0x0a9,
-        Key_ordfeminine = 0x0aa,
-        Key_guillemotleft = 0x0ab,        // left angle quotation mark
-        Key_notsign = 0x0ac,
-        Key_hyphen = 0x0ad,
-        Key_registered = 0x0ae,
-        Key_macron = 0x0af,
-        Key_degree = 0x0b0,
-        Key_plusminus = 0x0b1,
-        Key_twosuperior = 0x0b2,
-        Key_threesuperior = 0x0b3,
-        Key_acute = 0x0b4,
-        Key_mu = 0x0b5,
-        Key_paragraph = 0x0b6,
-        Key_periodcentered = 0x0b7,
-        Key_cedilla = 0x0b8,
-        Key_onesuperior = 0x0b9,
-        Key_masculine = 0x0ba,
-        Key_guillemotright = 0x0bb,        // right angle quotation mark
-        Key_onequarter = 0x0bc,
-        Key_onehalf = 0x0bd,
-        Key_threequarters = 0x0be,
-        Key_questiondown = 0x0bf,
-        Key_Agrave = 0x0c0,
-        Key_Aacute = 0x0c1,
-        Key_Acircumflex = 0x0c2,
-        Key_Atilde = 0x0c3,
-        Key_Adiaeresis = 0x0c4,
-        Key_Aring = 0x0c5,
-        Key_AE = 0x0c6,
-        Key_Ccedilla = 0x0c7,
-        Key_Egrave = 0x0c8,
-        Key_Eacute = 0x0c9,
-        Key_Ecircumflex = 0x0ca,
-        Key_Ediaeresis = 0x0cb,
-        Key_Igrave = 0x0cc,
-        Key_Iacute = 0x0cd,
-        Key_Icircumflex = 0x0ce,
-        Key_Idiaeresis = 0x0cf,
-        Key_ETH = 0x0d0,
-        Key_Ntilde = 0x0d1,
-        Key_Ograve = 0x0d2,
-        Key_Oacute = 0x0d3,
-        Key_Ocircumflex = 0x0d4,
-        Key_Otilde = 0x0d5,
-        Key_Odiaeresis = 0x0d6,
-        Key_multiply = 0x0d7,
-        Key_Ooblique = 0x0d8,
-        Key_Ugrave = 0x0d9,
-        Key_Uacute = 0x0da,
-        Key_Ucircumflex = 0x0db,
-        Key_Udiaeresis = 0x0dc,
-        Key_Yacute = 0x0dd,
-        Key_THORN = 0x0de,
-        Key_ssharp = 0x0df,
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-        Key_agrave = Key_Agrave,
-        Key_aacute = Key_Aacute,
-        Key_acircumflex = Key_Acircumflex,
-        Key_atilde = Key_Atilde,
-        Key_adiaeresis = Key_Adiaeresis,
-        Key_aring = Key_Aring,
-        Key_ae = Key_AE,
-        Key_ccedilla = Key_Ccedilla,
-        Key_egrave = Key_Egrave,
-        Key_eacute = Key_Eacute,
-        Key_ecircumflex = Key_Ecircumflex,
-        Key_ediaeresis = Key_Ediaeresis,
-        Key_igrave = Key_Igrave,
-        Key_iacute = Key_Iacute,
-        Key_icircumflex = Key_Icircumflex,
-        Key_idiaeresis = Key_Idiaeresis,
-        Key_eth = Key_ETH,
-        Key_ntilde = Key_Ntilde,
-        Key_ograve = Key_Ograve,
-        Key_oacute = Key_Oacute,
-        Key_ocircumflex = Key_Ocircumflex,
-        Key_otilde = Key_Otilde,
-        Key_odiaeresis = Key_Odiaeresis,
-#endif
-        Key_division = 0x0f7,
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-        Key_oslash = Key_Ooblique,
-        Key_ugrave = Key_Ugrave,
-        Key_uacute = Key_Uacute,
-        Key_ucircumflex = Key_Ucircumflex,
-        Key_udiaeresis = Key_Udiaeresis,
-        Key_yacute = Key_Yacute,
-        Key_thorn = Key_THORN,
-#endif
-        Key_ydiaeresis = 0x0ff,
-
-        // International input method support (X keycode - 0xEE00, the
-        // definition follows Qt/Embedded 2.3.7) Only interesting if
-        // you are writing your own input method
-
-        // International & multi-key character composition
-        Key_AltGr               = 0x01001103,
-        Key_Multi_key           = 0x01001120,  // Multi-key character compose
-        Key_Codeinput           = 0x01001137,
-        Key_SingleCandidate     = 0x0100113c,
-        Key_MultipleCandidate   = 0x0100113d,
-        Key_PreviousCandidate   = 0x0100113e,
-
-        // Misc Functions
-        Key_Mode_switch         = 0x0100117e,  // Character set switch
-        //Key_script_switch       = 0x0100117e,  // Alias for mode_switch
-
-        // Japanese keyboard support
-        Key_Kanji               = 0x01001121,  // Kanji, Kanji convert
-        Key_Muhenkan            = 0x01001122,  // Cancel Conversion
-        //Key_Henkan_Mode         = 0x01001123,  // Start/Stop Conversion
-        Key_Henkan              = 0x01001123,  // Alias for Henkan_Mode
-        Key_Romaji              = 0x01001124,  // to Romaji
-        Key_Hiragana            = 0x01001125,  // to Hiragana
-        Key_Katakana            = 0x01001126,  // to Katakana
-        Key_Hiragana_Katakana   = 0x01001127,  // Hiragana/Katakana toggle
-        Key_Zenkaku             = 0x01001128,  // to Zenkaku
-        Key_Hankaku             = 0x01001129,  // to Hankaku
-        Key_Zenkaku_Hankaku     = 0x0100112a,  // Zenkaku/Hankaku toggle
-        Key_Touroku             = 0x0100112b,  // Add to Dictionary
-        Key_Massyo              = 0x0100112c,  // Delete from Dictionary
-        Key_Kana_Lock           = 0x0100112d,  // Kana Lock
-        Key_Kana_Shift          = 0x0100112e,  // Kana Shift
-        Key_Eisu_Shift          = 0x0100112f,  // Alphanumeric Shift
-        Key_Eisu_toggle         = 0x01001130,  // Alphanumeric toggle
-        //Key_Kanji_Bangou        = 0x01001137,  // Codeinput
-        //Key_Zen_Koho            = 0x0100113d,  // Multiple/All Candidate(s)
-        //Key_Mae_Koho            = 0x0100113e,  // Previous Candidate
-
-        // Korean keyboard support
-        //
-        // In fact, many Korean users need only 2 keys, Key_Hangul and
-        // Key_Hangul_Hanja. But rest of the keys are good for future.
-
-        Key_Hangul              = 0x01001131,  // Hangul start/stop(toggle)
-        Key_Hangul_Start        = 0x01001132,  // Hangul start
-        Key_Hangul_End          = 0x01001133,  // Hangul end, English start
-        Key_Hangul_Hanja        = 0x01001134,  // Start Hangul->Hanja Conversion
-        Key_Hangul_Jamo         = 0x01001135,  // Hangul Jamo mode
-        Key_Hangul_Romaja       = 0x01001136,  // Hangul Romaja mode
-        //Key_Hangul_Codeinput    = 0x01001137,  // Hangul code input mode
-        Key_Hangul_Jeonja       = 0x01001138,  // Jeonja mode
-        Key_Hangul_Banja        = 0x01001139,  // Banja mode
-        Key_Hangul_PreHanja     = 0x0100113a,  // Pre Hanja conversion
-        Key_Hangul_PostHanja    = 0x0100113b,  // Post Hanja conversion
-        //Key_Hangul_SingleCandidate   = 0x0100113c,  // Single candidate
-        //Key_Hangul_MultipleCandidate = 0x0100113d,  // Multiple candidate
-        //Key_Hangul_PreviousCandidate = 0x0100113e,  // Previous candidate
-        Key_Hangul_Special      = 0x0100113f,  // Special symbols
-        //Key_Hangul_switch       = 0x0100117e,  // Alias for mode_switch
-
-        // dead keys (X keycode - 0xED00 to avoid the conflict)
-        Key_Dead_Grave          = 0x01001250,
-        Key_Dead_Acute          = 0x01001251,
-        Key_Dead_Circumflex     = 0x01001252,
-        Key_Dead_Tilde          = 0x01001253,
-        Key_Dead_Macron         = 0x01001254,
-        Key_Dead_Breve          = 0x01001255,
-        Key_Dead_Abovedot       = 0x01001256,
-        Key_Dead_Diaeresis      = 0x01001257,
-        Key_Dead_Abovering      = 0x01001258,
-        Key_Dead_Doubleacute    = 0x01001259,
-        Key_Dead_Caron          = 0x0100125a,
-        Key_Dead_Cedilla        = 0x0100125b,
-        Key_Dead_Ogonek         = 0x0100125c,
-        Key_Dead_Iota           = 0x0100125d,
-        Key_Dead_Voiced_Sound   = 0x0100125e,
-        Key_Dead_Semivoiced_Sound = 0x0100125f,
-        Key_Dead_Belowdot       = 0x01001260,
-        Key_Dead_Hook           = 0x01001261,
-        Key_Dead_Horn           = 0x01001262,
-
-        // multimedia/internet keys - ignored by default - see QKeyEvent c'tor
-        Key_Back  = 0x01000061,
-        Key_Forward  = 0x01000062,
-        Key_Stop  = 0x01000063,
-        Key_Refresh  = 0x01000064,
-        Key_VolumeDown = 0x01000070,
-        Key_VolumeMute  = 0x01000071,
-        Key_VolumeUp = 0x01000072,
-        Key_BassBoost = 0x01000073,
-        Key_BassUp = 0x01000074,
-        Key_BassDown = 0x01000075,
-        Key_TrebleUp = 0x01000076,
-        Key_TrebleDown = 0x01000077,
-        Key_MediaPlay  = 0x01000080,
-        Key_MediaStop  = 0x01000081,
-        Key_MediaPrevious  = 0x01000082,
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-        Key_MediaPrev  = Key_MediaPrevious,
-#endif
-        Key_MediaNext  = 0x01000083,
-        Key_MediaRecord = 0x01000084,
-        Key_HomePage  = 0x01000090,
-        Key_Favorites  = 0x01000091,
-        Key_Search  = 0x01000092,
-        Key_Standby = 0x01000093,
-        Key_OpenUrl = 0x01000094,
-        Key_LaunchMail  = 0x010000a0,
-        Key_LaunchMedia = 0x010000a1,
-        Key_Launch0  = 0x010000a2,
-        Key_Launch1  = 0x010000a3,
-        Key_Launch2  = 0x010000a4,
-        Key_Launch3  = 0x010000a5,
-        Key_Launch4  = 0x010000a6,
-        Key_Launch5  = 0x010000a7,
-        Key_Launch6  = 0x010000a8,
-        Key_Launch7  = 0x010000a9,
-        Key_Launch8  = 0x010000aa,
-        Key_Launch9  = 0x010000ab,
-        Key_LaunchA  = 0x010000ac,
-        Key_LaunchB  = 0x010000ad,
-        Key_LaunchC  = 0x010000ae,
-        Key_LaunchD  = 0x010000af,
-        Key_LaunchE  = 0x010000b0,
-        Key_LaunchF  = 0x010000b1,
-        Key_MonBrightnessUp = 0x010000b2,
-        Key_MonBrightnessDown = 0x010000b3,
-        Key_KeyboardLightOnOff = 0x010000b4,
-        Key_KeyboardBrightnessUp = 0x010000b5,
-        Key_KeyboardBrightnessDown = 0x010000b6,
-        Key_PowerOff = 0x010000b7,
-        Key_WakeUp = 0x010000b8,
-        Key_Eject = 0x010000b9,
-        Key_ScreenSaver = 0x010000ba,
-        Key_WWW = 0x010000bb,
-        Key_Memo = 0x010000bc,
-        Key_LightBulb = 0x010000bd,
-        Key_Shop = 0x010000be,
-        Key_History = 0x010000bf,
-        Key_AddFavorite = 0x010000c0,
-        Key_HotLinks = 0x010000c1,
-        Key_BrightnessAdjust = 0x010000c2,
-        Key_Finance = 0x010000c3,
-        Key_Community = 0x010000c4,
-        Key_AudioRewind = 0x010000c5,
-        Key_BackForward = 0x010000c6,
-        Key_ApplicationLeft = 0x010000c7,
-        Key_ApplicationRight = 0x010000c8,
-        Key_Book = 0x010000c9,
-        Key_CD = 0x010000ca,
-        Key_Calculator = 0x010000cb,
-        Key_ToDoList = 0x010000cc,
-        Key_ClearGrab = 0x010000cd,
-        Key_Close = 0x010000ce,
-        Key_Copy = 0x010000cf,
-        Key_Cut = 0x010000d0,
-        Key_Display = 0x010000d1,
-        Key_DOS = 0x010000d2,
-        Key_Documents = 0x010000d3,
-        Key_Excel = 0x010000d4,
-        Key_Explorer = 0x010000d5,
-        Key_Game = 0x010000d6,
-        Key_Go = 0x010000d7,
-        Key_iTouch = 0x010000d8,
-        Key_LogOff = 0x010000d9,
-        Key_Market = 0x010000da,
-        Key_Meeting = 0x010000db,
-        Key_MenuKB = 0x010000dc,
-        Key_MenuPB = 0x010000dd,
-        Key_MySites = 0x010000de,
-        Key_News = 0x010000df,
-        Key_OfficeHome = 0x010000e0,
-        Key_Option = 0x010000e1,
-        Key_Paste = 0x010000e2,
-        Key_Phone = 0x010000e3,
-        Key_Calendar = 0x010000e4,
-        Key_Reply = 0x010000e5,
-        Key_Reload = 0x010000e6,
-        Key_RotateWindows = 0x010000e7,
-        Key_RotationPB = 0x010000e8,
-        Key_RotationKB = 0x010000e9,
-        Key_Save = 0x010000ea,
-        Key_Send = 0x010000eb,
-        Key_Spell = 0x010000ec,
-        Key_SplitScreen = 0x010000ed,
-        Key_Support = 0x010000ee,
-        Key_TaskPane = 0x010000ef,
-        Key_Terminal = 0x010000f0,
-        Key_Tools = 0x010000f1,
-        Key_Travel = 0x010000f2,
-        Key_Video = 0x010000f3,
-        Key_Word = 0x010000f4,
-        Key_Xfer = 0x010000f5,
-        Key_ZoomIn = 0x010000f6,
-        Key_ZoomOut = 0x010000f7,
-        Key_Away = 0x010000f8,
-        Key_Messenger = 0x010000f9,
-        Key_WebCam = 0x010000fa,
-        Key_MailForward = 0x010000fb,
-        Key_Pictures = 0x010000fc,
-        Key_Music = 0x010000fd,
-        Key_Battery = 0x010000fe,
-        Key_Bluetooth = 0x010000ff,
-        Key_WLAN = 0x01000100,
-        Key_UWB = 0x01000101,
-        Key_AudioForward = 0x01000102,
-        Key_AudioRepeat = 0x01000103,
-        Key_AudioRandomPlay = 0x01000104,
-        Key_Subtitle = 0x01000105,
-        Key_AudioCycleTrack = 0x01000106,
-        Key_Time = 0x01000107,
-        Key_Hibernate = 0x01000108,
-        Key_View = 0x01000109,
-        Key_TopMenu = 0x0100010a,
-        Key_PowerDown = 0x0100010b,
-        Key_Suspend = 0x0100010c,
-        Key_ContrastAdjust = 0x0100010d,
-
-        Key_MediaLast = 0x0100ffff,
-
-        // Keypad navigation keys
-        Key_Select = 0x01010000,
-        Key_Yes = 0x01010001,
-        Key_No = 0x01010002,
-
-        // Newer misc keys
-        Key_Cancel  = 0x01020001,
-        Key_Printer = 0x01020002,
-        Key_Execute = 0x01020003,
-        Key_Sleep   = 0x01020004,
-        Key_Play    = 0x01020005, // Not the same as Key_MediaPlay
-        Key_Zoom    = 0x01020006,
-        //Key_Jisho   = 0x01020007, // IME: Dictionary key
-        //Key_Oyayubi_Left = 0x01020008, // IME: Left Oyayubi key
-        //Key_Oyayubi_Right = 0x01020009, // IME: Right Oyayubi key
-
-        // Device keys
-        Key_Context1 = 0x01100000,
-        Key_Context2 = 0x01100001,
-        Key_Context3 = 0x01100002,
-        Key_Context4 = 0x01100003,
-        Key_Call = 0x01100004,
-        Key_Hangup = 0x01100005,
-        Key_Flip = 0x01100006,
-
-        Key_unknown = 0x01ffffff
-    };
-
-    enum ArrowType {
-        NoArrow,
-        UpArrow,
-        DownArrow,
-        LeftArrow,
-        RightArrow
-    };
-
-    enum PenStyle { // pen style
-        NoPen,
-        SolidLine,
-        DashLine,
-        DotLine,
-        DashDotLine,
-        DashDotDotLine,
-        CustomDashLine
-#ifndef Q_MOC_RUN
-        , MPenStyle = 0x0f
-#endif
-    };
-
-    enum PenCapStyle { // line endcap style
-        FlatCap = 0x00,
-        SquareCap = 0x10,
-        RoundCap = 0x20,
-        MPenCapStyle = 0x30
-    };
-
-    enum PenJoinStyle { // line join style
-        MiterJoin = 0x00,
-        BevelJoin = 0x40,
-        RoundJoin = 0x80,
-        SvgMiterJoin = 0x100,
-        MPenJoinStyle = 0x1c0
-    };
-
-    enum BrushStyle { // brush style
-        NoBrush,
-        SolidPattern,
-        Dense1Pattern,
-        Dense2Pattern,
-        Dense3Pattern,
-        Dense4Pattern,
-        Dense5Pattern,
-        Dense6Pattern,
-        Dense7Pattern,
-        HorPattern,
-        VerPattern,
-        CrossPattern,
-        BDiagPattern,
-        FDiagPattern,
-        DiagCrossPattern,
-        LinearGradientPattern,
-        RadialGradientPattern,
-        ConicalGradientPattern,
-        TexturePattern = 24
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-        , CustomPattern = TexturePattern
-#endif
-    };
-
-    enum SizeMode {
-        AbsoluteSize,
-        RelativeSize
-    };
-
-#if defined(QT3_SUPPORT)
-#if defined(Q_OS_MAC)
-#ifndef qdoc
-    typedef int MacintoshVersion;
-
-    enum
-#else
-    enum MacintoshVersion
-#endif
-    {
-        //Unknown
-        MV_Unknown  = 0x0000,
-
-        //Version numbers
-        MV_9        = QSysInfo::MV_9,
-        MV_10_DOT_0 = QSysInfo::MV_10_0,
-        MV_10_DOT_1 = QSysInfo::MV_10_1,
-        MV_10_DOT_2 = QSysInfo::MV_10_2,
-        MV_10_DOT_3 = QSysInfo::MV_10_3,
-        MV_10_DOT_4 = QSysInfo::MV_10_4,
-
-        //Code names
-        MV_CHEETAH = QSysInfo::MV_CHEETAH,
-        MV_PUMA = QSysInfo::MV_PUMA,
-        MV_JAGUAR = QSysInfo::MV_JAGUAR,
-        MV_PANTHER = QSysInfo::MV_PANTHER,
-        MV_TIGER = QSysInfo::MV_TIGER
-    };
-#endif // Q_OS_MAC
-
-#if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN)
-#ifndef qdoc
-    typedef int WindowsVersion;
-
-    enum
-#else
-    enum WindowsVersion
-#endif
-    {
-        WV_32s = QSysInfo::WV_32s,
-        WV_95 = QSysInfo::WV_95,
-        WV_98 = QSysInfo::WV_98,
-        WV_Me = QSysInfo::WV_Me,
-        WV_DOS_based= QSysInfo::WV_DOS_based,
-
-        WV_NT = QSysInfo::WV_NT,
-        WV_2000 = QSysInfo::WV_2000,
-        WV_XP = QSysInfo::WV_XP,
-        WV_2003 = QSysInfo::WV_2003,
-        WV_NT_based = QSysInfo::WV_NT_based,
-
-        WV_CE = QSysInfo::WV_CE,
-        WV_CENET = QSysInfo::WV_CENET,
-        WV_CE_5 = QSysInfo::WV_CE_5,
-        WV_CE_6 = QSysInfo::WV_CE_6,
-        WV_CE_based = QSysInfo::WV_CE_based
-    };
-#endif // Q_OS_WIN
-#endif // QT3_SUPPORT
-
-    enum UIEffect {
-        UI_General,
-        UI_AnimateMenu,
-        UI_FadeMenu,
-        UI_AnimateCombo,
-        UI_AnimateTooltip,
-        UI_FadeTooltip,
-        UI_AnimateToolBox
-    };
-
-    enum CursorShape {
-        ArrowCursor,
-        UpArrowCursor,
-        CrossCursor,
-        WaitCursor,
-        IBeamCursor,
-        SizeVerCursor,
-        SizeHorCursor,
-        SizeBDiagCursor,
-        SizeFDiagCursor,
-        SizeAllCursor,
-        BlankCursor,
-        SplitVCursor,
-        SplitHCursor,
-        PointingHandCursor,
-        ForbiddenCursor,
-        WhatsThisCursor,
-        BusyCursor,
-        OpenHandCursor,
-        ClosedHandCursor,
-        LastCursor = ClosedHandCursor,
-        BitmapCursor = 24,
-        CustomCursor = 25
-
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-        ,
-        arrowCursor = ArrowCursor,
-        upArrowCursor = UpArrowCursor,
-        crossCursor = CrossCursor,
-        waitCursor = WaitCursor,
-        ibeamCursor = IBeamCursor,
-        sizeVerCursor = SizeVerCursor,
-        sizeHorCursor = SizeHorCursor,
-        sizeBDiagCursor = SizeBDiagCursor,
-        sizeFDiagCursor = SizeFDiagCursor,
-        sizeAllCursor = SizeAllCursor,
-        blankCursor = BlankCursor,
-        splitVCursor = SplitVCursor,
-        splitHCursor = SplitHCursor,
-        pointingHandCursor = PointingHandCursor,
-        forbiddenCursor = ForbiddenCursor,
-        whatsThisCursor = WhatsThisCursor
-#endif
-    };
-
-    enum TextFormat {
-        PlainText,
-        RichText,
-        AutoText,
-        LogText
-    };
-
-    enum AspectRatioMode {
-        IgnoreAspectRatio,
-        KeepAspectRatio,
-        KeepAspectRatioByExpanding
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-        , ScaleFree = IgnoreAspectRatio,
-        ScaleMin = KeepAspectRatio,
-        ScaleMax = KeepAspectRatioByExpanding
-#endif
-    };
-#ifdef QT3_SUPPORT
-    typedef AspectRatioMode ScaleMode;
-#endif
-
-    // This is for Q3TextEdit only, actually.
-    enum AnchorAttribute {
-        AnchorName,
-        AnchorHref
-    };
-
-    enum DockWidgetArea {
-        LeftDockWidgetArea = 0x1,
-        RightDockWidgetArea = 0x2,
-        TopDockWidgetArea = 0x4,
-        BottomDockWidgetArea = 0x8,
-
-        DockWidgetArea_Mask = 0xf,
-        AllDockWidgetAreas = DockWidgetArea_Mask,
-        NoDockWidgetArea = 0
-    };
-    enum DockWidgetAreaSizes {
-        NDockWidgetAreas = 4
-    };
-
-    Q_DECLARE_FLAGS(DockWidgetAreas, DockWidgetArea)
-
-    enum ToolBarArea {
-        LeftToolBarArea = 0x1,
-        RightToolBarArea = 0x2,
-        TopToolBarArea = 0x4,
-        BottomToolBarArea = 0x8,
-
-        ToolBarArea_Mask = 0xf,
-        AllToolBarAreas = ToolBarArea_Mask,
-        NoToolBarArea = 0
-    };
-
-    enum ToolBarAreaSizes {
-        NToolBarAreas = 4
-    };
-
-    Q_DECLARE_FLAGS(ToolBarAreas, ToolBarArea)
-
-#ifdef QT3_SUPPORT
-    enum Dock {
-        DockUnmanaged,
-        DockTornOff,
-        DockTop,
-        DockBottom,
-        DockRight,
-        DockLeft,
-        DockMinimized
-        ,
-        Unmanaged = DockUnmanaged,
-        TornOff = DockTornOff,
-        Top = DockTop,
-        Bottom = DockBottom,
-        Right = DockRight,
-        Left = DockLeft,
-        Minimized = DockMinimized
-    };
-    // compatibility
-    typedef Dock ToolBarDock;
-#endif
-
-    enum DateFormat {
-        TextDate,      // default Qt
-        ISODate,       // ISO 8601
-        SystemLocaleDate, // deprecated
-        LocalDate = SystemLocaleDate, // deprecated
-        LocaleDate,     // deprecated
-        SystemLocaleShortDate,
-        SystemLocaleLongDate,
-        DefaultLocaleShortDate,
-        DefaultLocaleLongDate
-    };
-
-    enum TimeSpec {
-        LocalTime,
-        UTC,
-        OffsetFromUTC
-    };
-
-    enum DayOfWeek {
-        Monday = 1,
-        Tuesday = 2,
-        Wednesday = 3,
-        Thursday = 4,
-        Friday = 5,
-        Saturday = 6,
-        Sunday = 7
-    };
-
-    enum ScrollBarPolicy {
-        ScrollBarAsNeeded,
-        ScrollBarAlwaysOff,
-        ScrollBarAlwaysOn
-    };
-
-#ifdef QT3_SUPPORT
-    enum BackgroundMode {
-        FixedColor,
-        FixedPixmap,
-        NoBackground,
-        PaletteForeground,
-        PaletteButton,
-        PaletteLight,
-        PaletteMidlight,
-        PaletteDark,
-        PaletteMid,
-        PaletteText,
-        PaletteBrightText,
-        PaletteBase,
-        PaletteBackground,
-        PaletteShadow,
-        PaletteHighlight,
-        PaletteHighlightedText,
-        PaletteButtonText,
-        PaletteLink,
-        PaletteLinkVisited,
-        X11ParentRelative
-    };
-#endif
-
-    enum CaseSensitivity {
-        CaseInsensitive,
-        CaseSensitive
-    };
-
-    enum Corner {
-        TopLeftCorner = 0x00000,
-        TopRightCorner = 0x00001,
-        BottomLeftCorner = 0x00002,
-        BottomRightCorner = 0x00003
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-        ,TopLeft = TopLeftCorner,
-        TopRight = TopRightCorner,
-        BottomLeft = BottomLeftCorner,
-        BottomRight = BottomRightCorner
-#endif
-    };
-
-    enum ConnectionType {
-        AutoConnection,
-        DirectConnection,
-        QueuedConnection,
-        AutoCompatConnection,
-        BlockingQueuedConnection,
-        UniqueConnection =  0x80
-    };
-
-    enum ShortcutContext {
-        WidgetShortcut,
-        WindowShortcut,
-        ApplicationShortcut,
-        WidgetWithChildrenShortcut
-    };
-
-    enum FillRule {
-        OddEvenFill,
-        WindingFill
-    };
-
-    enum MaskMode {
-        MaskInColor,
-        MaskOutColor
-    };
-
-    enum ClipOperation {
-        NoClip,
-        ReplaceClip,
-        IntersectClip,
-        UniteClip
-    };
-
-    // Shape = 0x1, BoundingRect = 0x2
-    enum ItemSelectionMode {
-        ContainsItemShape = 0x0,
-        IntersectsItemShape = 0x1,
-        ContainsItemBoundingRect = 0x2,
-        IntersectsItemBoundingRect = 0x3
-    };
-
-    enum TransformationMode {
-        FastTransformation,
-        SmoothTransformation
-    };
-
-    enum Axis {
-        XAxis,
-        YAxis,
-        ZAxis
-    };
-
-    enum FocusReason {
-        MouseFocusReason,
-        TabFocusReason,
-        BacktabFocusReason,
-        ActiveWindowFocusReason,
-        PopupFocusReason,
-        ShortcutFocusReason,
-        MenuBarFocusReason,
-        OtherFocusReason,
-        NoFocusReason
-    };
-
-    enum ContextMenuPolicy {
-        NoContextMenu,
-        DefaultContextMenu,
-        ActionsContextMenu,
-        CustomContextMenu,
-        PreventContextMenu
-    };
-
-    enum InputMethodQuery {
-        ImMicroFocus,
-        ImFont,
-        ImCursorPosition,
-        ImSurroundingText,
-        ImCurrentSelection,
-        ImMaximumTextLength,
-        ImAnchorPosition
-    };
-
-    enum InputMethodHint {
-        ImhNone = 0x0,
-        ImhHiddenText = 0x1,
-        ImhNoAutoUppercase = 0x2,
-        ImhPreferNumbers = 0x4,
-        ImhPreferUppercase = 0x8,
-        ImhPreferLowercase = 0x10,
-        ImhNoPredictiveText = 0x20,
-
-        ImhDigitsOnly = 0x10000,
-        ImhFormattedNumbersOnly = 0x20000,
-        ImhUppercaseOnly = 0x40000,
-        ImhLowercaseOnly = 0x80000,
-        ImhDialableCharactersOnly = 0x100000,
-        ImhEmailCharactersOnly = 0x200000,
-        ImhUrlCharactersOnly = 0x400000,
-
-        ImhExclusiveInputMask = 0xffff0000
-    };
-    Q_DECLARE_FLAGS(InputMethodHints, InputMethodHint)
-
-    enum ToolButtonStyle {
-        ToolButtonIconOnly,
-        ToolButtonTextOnly,
-        ToolButtonTextBesideIcon,
-        ToolButtonTextUnderIcon,
-        ToolButtonFollowStyle
-    };
-
-    enum LayoutDirection {
-        LeftToRight,
-        RightToLeft
-    };
-
-    enum AnchorPoint {
-        AnchorLeft = 0,
-        AnchorHorizontalCenter,
-        AnchorRight,
-        AnchorTop,
-        AnchorVerticalCenter,
-        AnchorBottom
-    };
-
-
-
-    enum DropAction {
-        CopyAction = 0x1,
-        MoveAction = 0x2,
-        LinkAction = 0x4,
-        ActionMask = 0xff,
-        TargetMoveAction = 0x8002,
-        IgnoreAction = 0x0
-    };
-    Q_DECLARE_FLAGS(DropActions, DropAction)
-
-    enum CheckState {
-        Unchecked,
-        PartiallyChecked,
-        Checked
-    };
-
-    enum ItemDataRole {
-        DisplayRole = 0,
-        DecorationRole = 1,
-        EditRole = 2,
-        ToolTipRole = 3,
-        StatusTipRole = 4,
-        WhatsThisRole = 5,
-        // Metadata
-        FontRole = 6,
-        TextAlignmentRole = 7,
-        BackgroundColorRole = 8,
-        BackgroundRole = 8,
-        TextColorRole = 9,
-        ForegroundRole = 9,
-        CheckStateRole = 10,
-        // Accessibility
-        AccessibleTextRole = 11,
-        AccessibleDescriptionRole = 12,
-        // More general purpose
-        SizeHintRole = 13,
-        // Internal UiLib roles. Start worrying when public roles go that high.
-        DisplayPropertyRole = 27,
-        DecorationPropertyRole = 28,
-        ToolTipPropertyRole = 29,
-        StatusTipPropertyRole = 30,
-        WhatsThisPropertyRole = 31,
-        // Reserved
-        UserRole = 32
-    };
-
-    enum ItemFlag {
-        NoItemFlags = 0,
-        ItemIsSelectable = 1,
-        ItemIsEditable = 2,
-        ItemIsDragEnabled = 4,
-        ItemIsDropEnabled = 8,
-        ItemIsUserCheckable = 16,
-        ItemIsEnabled = 32,
-        ItemIsTristate = 64
-    };
-    Q_DECLARE_FLAGS(ItemFlags, ItemFlag)
-
-    enum MatchFlag {
-        MatchExactly = 0,
-        MatchContains = 1,
-        MatchStartsWith = 2,
-        MatchEndsWith = 3,
-        MatchRegExp = 4,
-        MatchWildcard = 5,
-        MatchFixedString = 8,
-        MatchCaseSensitive = 16,
-        MatchWrap = 32,
-        MatchRecursive = 64
-    };
-    Q_DECLARE_FLAGS(MatchFlags, MatchFlag)
-
-#if defined(Q_WS_MAC)
-    typedef void * HANDLE;
-#elif defined(Q_WS_WIN)
-    typedef void *HANDLE;
-#elif defined(Q_WS_X11)
-    typedef unsigned long HANDLE;
-#elif defined(Q_WS_QWS)
-    typedef void * HANDLE;
-#elif defined(Q_OS_SYMBIAN)
-    typedef unsigned long int HANDLE; // equivalent to TUint32
-#endif
-    typedef WindowFlags WFlags;
-
-    enum WindowModality {
-        NonModal,
-        WindowModal,
-        ApplicationModal
-    };
-
-    enum TextInteractionFlag {
-        NoTextInteraction         = 0,
-        TextSelectableByMouse     = 1,
-        TextSelectableByKeyboard  = 2,
-        LinksAccessibleByMouse    = 4,
-        LinksAccessibleByKeyboard = 8,
-        TextEditable              = 16,
-
-        TextEditorInteraction     = TextSelectableByMouse | TextSelectableByKeyboard | TextEditable,
-        TextBrowserInteraction    = TextSelectableByMouse | LinksAccessibleByMouse | LinksAccessibleByKeyboard
-    };
-    Q_DECLARE_FLAGS(TextInteractionFlags, TextInteractionFlag)
-
-    enum EventPriority {
-        HighEventPriority = 1,
-        NormalEventPriority = 0,
-        LowEventPriority = -1
-    };
-
-    enum SizeHint {
-        MinimumSize,
-        PreferredSize,
-        MaximumSize,
-        MinimumDescent,
-        NSizeHints
-    };
-
-    enum WindowFrameSection {
-        NoSection,
-        LeftSection,           // For resize
-        TopLeftSection,
-        TopSection,
-        TopRightSection,
-        RightSection,
-        BottomRightSection,
-        BottomSection,
-        BottomLeftSection,
-        TitleBarArea    // For move
-    };
-
-    enum Initialization {
-        Uninitialized
-    };
-
-    enum CoordinateSystem {
-        DeviceCoordinates,
-        LogicalCoordinates
-    };
-
-    enum TouchPointState {
-        TouchPointPressed    = 0x01,
-        TouchPointMoved      = 0x02,
-        TouchPointStationary = 0x04,
-        TouchPointReleased   = 0x08,
-        TouchPointStateMask  = 0x0f,
-
-        TouchPointPrimary    = 0x10
-    };
-    Q_DECLARE_FLAGS(TouchPointStates, TouchPointState)
-
-    enum GestureState
-    {
-        NoGesture,
-        GestureStarted  = 1,
-        GestureUpdated  = 2,
-        GestureFinished = 3,
-        GestureCanceled = 4
-    };
-
-    enum GestureType
-    {
-        TapGesture        = 1,
-        TapAndHoldGesture = 2,
-        PanGesture        = 3,
-        PinchGesture      = 4,
-        SwipeGesture      = 5,
-
-        CustomGesture     = 0x0100,
-
-        LastGestureType   = ~0u
-    };
-
-    enum GestureFlag
-    {
-        DontStartGestureOnChildren = 0x01,
-        ReceivePartialGestures     = 0x02
-    };
-    Q_DECLARE_FLAGS(GestureFlags, GestureFlag)
-
-    enum NavigationMode
-    {
-        NavigationModeNone,
-        NavigationModeKeypadTabOrder,
-        NavigationModeKeypadDirectional,
-        NavigationModeCursorAuto,
-        NavigationModeCursorForceVisible
-    };
-}
-#ifdef Q_MOC_RUN
- ;
-#endif
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::MouseButtons)
-Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::Orientations)
-Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::KeyboardModifiers)
-Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::WindowFlags)
-Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::Alignment)
-Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::ImageConversionFlags)
-Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::DockWidgetAreas)
-Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::ToolBarAreas)
-Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::WindowStates)
-Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::DropActions)
-Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::ItemFlags)
-Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::MatchFlags)
-Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::TextInteractionFlags)
-Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::InputMethodHints)
-Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::TouchPointStates)
-Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::GestureFlags)
-
-typedef bool (*qInternalCallback)(void **);
-
-class Q_CORE_EXPORT QInternal {
-public:
-    enum PaintDeviceFlags {
-        UnknownDevice = 0x00,
-        Widget        = 0x01,
-        Pixmap        = 0x02,
-        Image         = 0x03,
-        Printer       = 0x04,
-        Picture       = 0x05,
-        Pbuffer       = 0x06,    // GL pbuffer
-        FramebufferObject = 0x07, // GL framebuffer object
-        CustomRaster  = 0x08,
-        MacQuartz     = 0x09,
-        PaintBuffer   = 0x0a,
-        OpenGL        = 0x0b
-    };
-    enum RelayoutType {
-        RelayoutNormal,
-        RelayoutDragging,
-        RelayoutDropped
-    };
-
-
-    enum Callback {
-        ConnectCallback,
-        DisconnectCallback,
-        AdoptCurrentThread,
-        EventNotifyCallback,
-        LastCallback
-    };
-
-    enum InternalFunction {
-        CreateThreadForAdoption,
-        RefAdoptedThread,
-        DerefAdoptedThread,
-        SetCurrentThreadToMainThread,
-        SetQObjectSender,
-        GetQObjectSender,
-        ResetQObjectSender,
-        LastInternalFunction
-    };
-
-    enum DockPosition {
-        LeftDock,
-        RightDock,
-        TopDock,
-        BottomDock,
-        DockCount
-    };
-
-    static bool registerCallback(Callback, qInternalCallback);
-    static bool unregisterCallback(Callback, qInternalCallback);
-
-    static bool activateCallbacks(Callback, void **);
-    static bool callFunction(InternalFunction func, void **);
-};
-
-#ifdef QT3_SUPPORT
-typedef qint32 QCOORD;                                // coordinate type
-enum {
-    QCOORD_MAX =  2147483647,
-    QCOORD_MIN = -QCOORD_MAX - 1
-};
-#endif
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QNAMESPACE_H
diff --git a/qtinterface/tqt4/Qt/qobject.h b/qtinterface/tqt4/Qt/qobject.h
deleted file mode 100644
index f240170..0000000
--- a/qtinterface/tqt4/Qt/qobject.h
+++ /dev/null
@@ -1,501 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOBJECT_H
-#define QOBJECT_H
-
-#ifndef QT_NO_QOBJECT
-
-#include <QtCore/qobjectdefs.h>
-#include <QtCore/qstring.h>
-#include <QtCore/qbytearray.h>
-#include <QtCore/qlist.h>
-#ifdef TQT_INCLUDE_COMPAT
-#include <QtCore/qcoreevent.h>
-#endif
-#include <QtCore/qscopedpointer.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Core)
-
-class QEvent;
-class QTimerEvent;
-class QChildEvent;
-struct QMetaObject;
-class QVariant;
-class QObjectPrivate;
-class QObject;
-class QThread;
-class QWidget;
-#ifndef QT_NO_REGEXP
-class QRegExp;
-#endif
-#ifndef QT_NO_USERDATA
-class QObjectUserData;
-#endif
-
-typedef QList<QObject*> QObjectList;
-
-#if defined Q_CC_MSVC && _MSC_VER < 1300
-template<typename T> inline T qFindChild(const QObject *o, const QString &name = QString(), T = 0);
-template<typename T> inline QList<T> qFindChildren(const QObject *o, const QString &name = QString(), T = 0);
-# ifndef QT_NO_REGEXP
-template<typename T> inline QList<T> qFindChildren(const QObject *o, const QRegExp &re, T = 0);
-# endif
-#else
-template<typename T> inline T qFindChild(const QObject *, const QString & = QString());
-template<typename T> inline QList<T> qFindChildren(const QObject *, const QString & = QString());
-# ifndef QT_NO_REGEXP
-template<typename T> inline QList<T> qFindChildren(const QObject *, const QRegExp &);
-# endif
-#endif
-
-class
-#if defined(__INTEL_COMPILER) && defined(Q_OS_WIN)
-Q_CORE_EXPORT
-#endif
-QObjectData {
-public:
-    virtual ~QObjectData() = 0;
-    QObject *q_ptr;
-    QObject *parent;
-    QObjectList children;
-
-    uint isWidget : 1;
-    uint pendTimer : 1;
-    uint blockSig : 1;
-    uint wasDeleted : 1;
-    uint ownObjectName : 1;
-    uint sendChildEvents : 1;
-    uint receiveChildEvents : 1;
-    uint inEventHandler : 1;
-    uint inThreadChangeEvent : 1;
-    uint hasGuards : 1; //true iff there is one or more QPointer attached to this object
-    uint unused : 22;
-    int postedEvents;
-    QMetaObject *metaObject; // assert dynamic
-};
-
-
-class Q_CORE_EXPORT QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString objectName READ objectName WRITE setObjectName)
-    Q_DECLARE_PRIVATE(QObject)
-
-public:
-    Q_INVOKABLE explicit QObject(QObject *parent=0);
-    virtual ~QObject();
-
-    virtual bool event(QEvent *);
-    virtual bool eventFilter(QObject *, QEvent *);
-
-#ifdef qdoc
-    static QString tr(const char *sourceText, const char *comment = 0, int n = -1);
-    static QString trUtf8(const char *sourceText, const char *comment = 0, int n = -1);
-    virtual const QMetaObject *metaObject() const;
-    static const QMetaObject staticMetaObject;
-#endif
-#ifdef TQT_NO_TRANSLATION
-    static QString tr(const char *sourceText, const char *, int)
-        { return QString::fromLatin1(sourceText); }
-    static QString tr(const char *sourceText, const char * = 0)
-        { return QString::fromLatin1(sourceText); }
-#ifndef QT_NO_TEXTCODEC
-    static QString trUtf8(const char *sourceText, const char *, int)
-        { return QString::fromUtf8(sourceText); }
-    static QString trUtf8(const char *sourceText, const char * = 0)
-        { return QString::fromUtf8(sourceText); }
-#endif
-#endif //TQT_NO_TRANSLATION
-
-    QString objectName() const;
-    void setObjectName(const QString &name);
-
-    inline bool isWidgetType() const { return d_ptr->isWidget; }
-
-    inline bool signalsBlocked() const { return d_ptr->blockSig; }
-    bool blockSignals(bool b);
-
-    QThread *thread() const;
-    void moveToThread(QThread *thread);
-
-    int startTimer(int interval);
-    void killTimer(int id);
-
-#ifndef QT_NO_MEMBER_TEMPLATES
-    template<typename T>
-    inline T findChild(const QString &aName = QString()) const
-    { return qFindChild<T>(this, aName); }
-
-    template<typename T>
-    inline QList<T> findChildren(const QString &aName = QString()) const
-    { return qFindChildren<T>(this, aName); }
-
-#ifndef QT_NO_REGEXP
-    template<typename T>
-    inline QList<T> findChildren(const QRegExp &re) const
-    { return qFindChildren<T>(this, re); }
-#endif
-#endif
-
-#ifdef QT3_SUPPORT
-    QT3_SUPPORT QObject *child(const char *objName, const char *inheritsClass = 0,
-                   bool recursiveSearch = true) const;
-    QT3_SUPPORT QObjectList queryList(const char *inheritsClass = 0,
-                          const char *objName = 0,
-                          bool regexpMatch = true,
-                          bool recursiveSearch = true) const;
-#endif
-    inline const QObjectList &children() const { return d_ptr->children; }
-    const QObjectList *ptrchildren() const;
-    static const QObjectList *objectTrees();
-    bool qt_invoke(int slot, QUObject *uo);
-
-    void setParent(QObject *);
-    void installEventFilter(QObject *);
-    void removeEventFilter(QObject *);
-
-
-    static bool connect(const QObject *sender, const char *signal,
-                        const QObject *receiver, const char *member, Qt::ConnectionType =
-#ifdef qdoc
-                        Qt::AutoConnection
-#else
-#ifdef QT3_SUPPORT
-                        Qt::AutoCompatConnection
-#else
-                        Qt::AutoConnection
-#endif
-#endif
-        );
-    inline bool connect(const QObject *sender, const char *signal,
-                        const char *member, Qt::ConnectionType type =
-#ifdef qdoc
-                        Qt::AutoConnection
-#else
-#ifdef QT3_SUPPORT
-                        Qt::AutoCompatConnection
-#else
-                        Qt::AutoConnection
-#endif
-#endif
-        ) const;
-
-    static bool disconnect(const QObject *sender, const char *signal,
-                           const QObject *receiver, const char *member);
-    inline bool disconnect(const char *signal = 0,
-                           const QObject *receiver = 0, const char *member = 0)
-        { return disconnect(this, signal, receiver, member); }
-    inline bool disconnect(const QObject *receiver, const char *member = 0)
-        { return disconnect(this, 0, receiver, member); }
-
-    void dumpObjectTree();
-    void dumpObjectInfo();
-
-#ifndef QT_NO_PROPERTIES
-    bool setProperty(const char *name, const QVariant &value);
-    QVariant property(const char *name) const;
-    QList<QByteArray> dynamicPropertyNames() const;
-#endif // QT_NO_PROPERTIES
-
-#ifndef QT_NO_USERDATA
-    static uint registerUserData();
-    void setUserData(uint id, QObjectUserData* data);
-    QObjectUserData* userData(uint id) const;
-#endif // QT_NO_USERDATA
-
-Q_SIGNALS:
-    void destroyed(QObject * = 0);
-
-public:
-    inline QObject *parent() const { return d_ptr->parent; }
-
-    inline bool inherits(const char *classname) const
-        { return const_cast<QObject *>(this)->qt_metacast(classname) != 0; }
-
-public Q_SLOTS:
-    void deleteLater();
-
-protected:
-    QObject *sender() const;
-    int receivers(const char* signal) const;
-
-    virtual void timerEvent(QTimerEvent *);
-    virtual void childEvent(QChildEvent *);
-    virtual void customEvent(QEvent *);
-
-    virtual void connectNotify(const char *signal);
-    virtual void disconnectNotify(const char *signal);
-
-#ifdef QT3_SUPPORT
-public:
-    QT3_SUPPORT_CONSTRUCTOR QObject(QObject *parent, const char *name);
-    inline QT3_SUPPORT void insertChild(QObject *o)
-        { if (o) o->setParent(this); }
-    inline QT3_SUPPORT void removeChild(QObject *o)
-        { if (o) o->setParent(0); }
-    inline QT3_SUPPORT bool isA(const char *classname) const
-        { return qstrcmp(classname, metaObject()->className()) == 0; }
-    inline QT3_SUPPORT const char *className() const { return metaObject()->className(); }
-    inline QT3_SUPPORT const char *name() const { return objectName().latin1_helper(); }
-    inline QT3_SUPPORT const char *name(const char *defaultName) const
-        { QString s = objectName(); return s.isEmpty()?defaultName:s.latin1_helper(); }
-    inline QT3_SUPPORT void setName(const char *aName) { setObjectName(QLatin1String(aName)); }
-protected:
-    inline QT3_SUPPORT bool checkConnectArgs(const char *signal,
-                                  const QObject *,
-                                  const char *member)
-        { return QMetaObject::checkConnectArgs(signal, member); }
-    static inline QT3_SUPPORT QByteArray normalizeSignalSlot(const char *signalSlot)
-        { return QMetaObject::normalizedSignature(signalSlot); }
-#endif
-
-protected:
-    QObject(QObjectPrivate &dd, QObject *parent = 0);
-
-public:
-    QScopedPointer<QObjectData> d_ptr;
-
-protected:
-    static const QMetaObject staticQtMetaObject;
-
-    friend struct QMetaObject;
-    friend class QApplication;
-    friend class QApplicationPrivate;
-    friend class QCoreApplication;
-    friend class QCoreApplicationPrivate;
-    friend class QWidget;
-    friend class QThreadData;
-
-private:
-    Q_DISABLE_COPY(QObject)
-    Q_PRIVATE_SLOT(d_func(), void _q_reregisterTimers(void *))
-};
-
-inline bool QObject::connect(const QObject *asender, const char *asignal,
-                             const char *amember, Qt::ConnectionType atype) const
-{ return connect(asender, asignal, this, amember, atype); }
-
-#ifndef QT_NO_USERDATA
-class Q_CORE_EXPORT QObjectUserData {
-public:
-    virtual ~QObjectUserData();
-};
-#endif
-
-Q_CORE_EXPORT void qt_qFindChildren_helper(const QObject *parent, const QString &name, const QRegExp *re,
-                                           const QMetaObject &mo, QList<void *> *list);
-Q_CORE_EXPORT QObject *qt_qFindChild_helper(const QObject *parent, const QString &name, const QMetaObject &mo);
-
-#if defined Q_CC_MSVC && _MSC_VER < 1300
-
-template<typename T>
-inline T qFindChild(const QObject *o, const QString &name, T)
-{ return static_cast<T>(qt_qFindChild_helper(o, name, ((T)0)->staticMetaObject)); }
-
-template<typename T>
-inline QList<T> qFindChildren(const QObject *o, const QString &name, T)
-{
-    QList<T> list;
-    union {
-        QList<T> *typedList;
-        QList<void *> *voidList;
-    } u;
-    u.typedList = &list;
-    qt_qFindChildren_helper(o, name, 0, ((T)0)->staticMetaObject, u.voidList);
-    return list;
-}
-
-template<typename T>
-inline T qFindChild(const QObject *o, const QString &name)
-{ return qFindChild<T>(o, name, T(0)); }
-
-template<typename T>
-inline T qFindChild(const QObject *o)
-{ return qFindChild<T>(o, QString(), T(0)); }
-
-template<typename T>
-inline QList<T> qFindChildren(const QObject *o, const QString &name)
-{ return qFindChildren<T>(o, name, T(0)); }
-
-template<typename T>
-inline QList<T> qFindChildren(const QObject *o)
-{ return qFindChildren<T>(o, QString(), T(0)); }
-
-#ifndef QT_NO_REGEXP
-template<typename T>
-inline QList<T> qFindChildren(const QObject *o, const QRegExp &re, T)
-{
-    QList<T> list;
-    union {
-        QList<T> *typedList;
-        QList<void *> *voidList;
-    } u;
-    u.typedList = &list;
-    qt_qFindChildren_helper(o, 0, &re, ((T)0)->staticMetaObject, u.voidList);
-    return list;
-}
-
-template<typename T>
-inline QList<T> qFindChildren(const QObject *o, const QRegExp &re)
-{ return qFindChildren<T>(o, re, T(0)); }
-
-#endif
-
-#ifdef Q_MOC_RUN
-# define Q_DECLARE_INTERFACE(IFace, IId) Q_DECLARE_INTERFACE(IFace, IId)
-#endif // Q_MOC_RUN
-
-
-template <class T> inline const char * qobject_interface_iid()
-{ return 0; }
-
-template <class T> inline T qobject_cast_helper(QObject *object, T)
-{ return static_cast<T>(((T)0)->staticMetaObject.cast(object)); }
-
-template <class T> inline T qobject_cast_helper(const QObject *object, T)
-{ return static_cast<T>(const_cast<const QObject *>(((T)0)->staticMetaObject.cast(const_cast<QObject *>(object)))); }
-
-template <class T>
-inline T qobject_cast(QObject *object)
-{ return qobject_cast_helper<T>(object, T(0)); }
-
-template <class T>
-inline T qobject_cast(const QObject *object)
-{ return qobject_cast_helper<T>(object, T(0)); }
-
-#ifndef Q_MOC_RUN
-#  define Q_DECLARE_INTERFACE(IFace, IId) \
-    template <> inline const char *qobject_interface_iid<IFace *>() \
-    { return IId; } \
-    template <> inline IFace *qobject_cast_helper<IFace *>(QObject *object, IFace *) \
-    { return (IFace *)(object ? object->qt_metacast(IId) : 0); } \
-    template <> inline IFace *qobject_cast_helper<IFace *>(const QObject *object, IFace *) \
-    { return (IFace *)(object ? const_cast<QObject *>(object)->qt_metacast(IId) : 0); }
-#endif // Q_MOC_RUN
-
-#else
-
-template<typename T>
-inline T qFindChild(const QObject *o, const QString &name)
-{ return static_cast<T>(qt_qFindChild_helper(o, name, reinterpret_cast<T>(0)->staticMetaObject)); }
-
-template<typename T>
-inline QList<T> qFindChildren(const QObject *o, const QString &name)
-{
-    QList<T> list;
-    union {
-        QList<T> *typedList;
-        QList<void *> *voidList;
-    } u;
-    u.typedList = &list;
-    qt_qFindChildren_helper(o, name, 0, reinterpret_cast<T>(0)->staticMetaObject, u.voidList);
-    return list;
-}
-
-#ifndef QT_NO_REGEXP
-template<typename T>
-inline QList<T> qFindChildren(const QObject *o, const QRegExp &re)
-{
-    QList<T> list;
-    union {
-        QList<T> *typedList;
-        QList<void *> *voidList;
-    } u;
-    u.typedList = &list;
-    qt_qFindChildren_helper(o, QString(), &re, reinterpret_cast<T>(0)->staticMetaObject, u.voidList);
-    return list;
-}
-#endif
-
-template <class T>
-inline T qobject_cast(QObject *object)
-{
-#if !defined(QT_NO_MEMBER_TEMPLATES) && !defined(QT_NO_QOBJECT_CHECK)
-    reinterpret_cast<T>(0)->qt_check_for_QOBJECT_macro(*reinterpret_cast<T>(object));
-#endif
-    return static_cast<T>(reinterpret_cast<T>(0)->staticMetaObject.cast(object));
-}
-
-template <class T>
-inline T qobject_cast(const QObject *object)
-{
-    // this will cause a compilation error if T is not const
-    register T ptr = static_cast<T>(object);
-    Q_UNUSED(ptr);
-
-#if !defined(QT_NO_MEMBER_TEMPLATES) && !defined(QT_NO_QOBJECT_CHECK)
-    reinterpret_cast<T>(0)->qt_check_for_QOBJECT_macro(*reinterpret_cast<T>(const_cast<QObject *>(object)));
-#endif
-    return static_cast<T>(const_cast<QObject *>(reinterpret_cast<T>(0)->staticMetaObject.cast(const_cast<QObject *>(object))));
-}
-
-
-template <class T> inline const char * qobject_interface_iid()
-{ return 0; }
-
-#ifndef Q_MOC_RUN
-#  define Q_DECLARE_INTERFACE(IFace, IId) \
-    template <> inline const char *qobject_interface_iid<IFace *>() \
-    { return IId; } \
-    template <> inline IFace *qobject_cast<IFace *>(QObject *object) \
-    { return reinterpret_cast<IFace *>((object ? object->qt_metacast(IId) : 0)); } \
-    template <> inline IFace *qobject_cast<IFace *>(const QObject *object) \
-    { return reinterpret_cast<IFace *>((object ? const_cast<QObject *>(object)->qt_metacast(IId) : 0)); }
-#endif // Q_MOC_RUN
-
-#endif
-
-#ifndef QT_NO_DEBUG_STREAM
-Q_CORE_EXPORT QDebug operator<<(QDebug, const QObject *);
-#endif
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
-
-#endif // QOBJECT_H
diff --git a/qtinterface/tqt4/Qt/qobjectdefs.h b/qtinterface/tqt4/Qt/qobjectdefs.h
deleted file mode 100644
index d2428aa..0000000
--- a/qtinterface/tqt4/Qt/qobjectdefs.h
+++ /dev/null
@@ -1,500 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOBJECTDEFS_H
-#define QOBJECTDEFS_H
-
-#include <QtCore/qnamespace.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Core)
-
-class QByteArray;
-
-class QString;
-class QStringList;
-
-#ifndef Q_MOC_OUTPUT_REVISION
-#define Q_MOC_OUTPUT_REVISION 62
-#endif
-
-// The following macros are our "extensions" to C++
-// They are used, strictly speaking, only by the moc.
-
-#ifndef Q_MOC_RUN
-# if defined(QT_NO_KEYWORDS)
-#  define QT_NO_EMIT
-# else
-#   define slots
-#   define signals protected
-# endif
-# define Q_SLOTS
-# define Q_SIGNALS protected
-# define Q_PRIVATE_SLOT(d, signature)
-# define Q_EMIT
-#ifndef QT_NO_EMIT
-# define emit
-#endif
-#define Q_CLASSINFO(name, value)
-#define Q_INTERFACES(x)
-#define Q_PROPERTY(text)
-#define Q_OVERRIDE(text)
-#define Q_ENUMS(x)
-#define Q_FLAGS(x)
-#ifdef QT3_SUPPORT
-# define Q_SETS(x)
-#endif
-#define Q_SCRIPTABLE
-#define Q_INVOKABLE
-#define Q_SIGNAL
-#define Q_SLOT
-
-#ifndef TQT_NO_TRANSLATION
-# ifndef QT_NO_TEXTCODEC
-// full set of tr functions
-// ### Qt 5: merge overloads
-#  define QT_TR_FUNCTIONS \
-    static inline QString tr(const char *s, const char *c = 0) \
-        { return staticMetaObject.tr(s, c); } \
-    static inline QString trUtf8(const char *s, const char *c = 0) \
-        { return staticMetaObject.trUtf8(s, c); } \
-    static inline QString tr(const char *s, const char *c, int n) \
-        { return staticMetaObject.tr(s, c, n); } \
-    static inline QString trUtf8(const char *s, const char *c, int n) \
-        { return staticMetaObject.trUtf8(s, c, n); }
-# else
-// no QTextCodec, no utf8
-// ### Qt 5: merge overloads
-#  define QT_TR_FUNCTIONS \
-    static inline QString tr(const char *s, const char *c = 0) \
-        { return staticMetaObject.tr(s, c); } \
-    static inline QString tr(const char *s, const char *c, int n) \
-        { return staticMetaObject.tr(s, c, n); }
-# endif
-#else
-// inherit the ones from QObject
-# define QT_TR_FUNCTIONS
-#endif
-
-#if defined(QT_NO_MEMBER_TEMPLATES) || defined(QT_NO_QOBJECT_CHECK)
-/* tmake ignore Q_OBJECT */
-#define Q_OBJECT_CHECK
-#else
-
-/* This is a compile time check that ensures that any class cast with qobject_cast
-   actually contains a Q_OBJECT macro. Note: qobject_cast will fail if a QObject
-   subclass doesn't contain Q_OBJECT.
-
-   In qt_check_for_QOBJECT_macro, we call a dummy templated function with two
-   parameters, the first being "this" and the other the target of the qobject
-   cast. If the types are not identical, we know that a Q_OBJECT macro is missing.
-
-   If you get a compiler error here, make sure that the class you are casting
-   to contains a Q_OBJECT macro.
-*/
-
-/* tmake ignore Q_OBJECT */
-#define Q_OBJECT_CHECK \
-    template <typename T> inline void qt_check_for_QOBJECT_macro(const T &_q_argument) const \
-    { int i = qYouForgotTheQ_OBJECT_Macro(this, &_q_argument); i = i; }
-
-template <typename T>
-inline int qYouForgotTheQ_OBJECT_Macro(T, T) { return 0; }
-
-template <typename T1, typename T2>
-inline void qYouForgotTheQ_OBJECT_Macro(T1, T2) {}
-#endif // QT_NO_MEMBER_TEMPLATES
-
-#ifdef Q_NO_DATA_RELOCATION
-#define Q_OBJECT_GETSTATICMETAOBJECT static const QMetaObject &getStaticMetaObject();
-#else
-#define Q_OBJECT_GETSTATICMETAOBJECT
-#endif
-
-/* tmake ignore Q_OBJECT */
-#define Q_OBJECT \
-public: \
-    Q_OBJECT_CHECK \
-    static const QMetaObject staticMetaObject; \
-    Q_OBJECT_GETSTATICMETAOBJECT \
-    virtual const QMetaObject *metaObject() const; \
-    virtual void *qt_metacast(const char *); \
-    QT_TR_FUNCTIONS \
-    virtual int qt_metacall(QMetaObject::Call, int, void **); \
-private:
-/* tmake ignore Q_OBJECT */
-#define Q_OBJECT_FAKE Q_OBJECT
-/* tmake ignore Q_GADGET */
-#define Q_GADGET \
-public: \
-    static const QMetaObject staticMetaObject; \
-    Q_OBJECT_GETSTATICMETAOBJECT \
-private:
-#else // Q_MOC_RUN
-#define slots slots
-#define signals signals
-#define Q_SLOTS Q_SLOTS
-#define Q_SIGNALS Q_SIGNALS
-#define Q_CLASSINFO(name, value) Q_CLASSINFO(name, value)
-#define Q_INTERFACES(x) Q_INTERFACES(x)
-#define Q_PROPERTY(text) Q_PROPERTY(text)
-#define Q_OVERRIDE(text) Q_OVERRIDE(text)
-#define Q_ENUMS(x) Q_ENUMS(x)
-#define Q_FLAGS(x) Q_FLAGS(x)
-#ifdef QT3_SUPPORT
-# define Q_SETS(x) Q_SETS(x)
-#endif
- /* tmake ignore Q_OBJECT */
-#define Q_OBJECT Q_OBJECT
- /* tmake ignore Q_OBJECT */
-#define Q_OBJECT_FAKE Q_OBJECT_FAKE
- /* tmake ignore Q_GADGET */
-#define Q_GADGET Q_GADGET
-#define Q_SCRIPTABLE Q_SCRIPTABLE
-#define Q_INVOKABLE Q_INVOKABLE
-#define Q_SIGNAL Q_SIGNAL
-#define Q_SLOT Q_SLOT
-#endif //Q_MOC_RUN
-
-// macro for onaming members
-#ifdef METHOD
-#undef METHOD
-#endif
-#ifdef SLOT
-#undef SLOT
-#endif
-#ifdef SIGNAL
-#undef SIGNAL
-#endif
-
-Q_CORE_EXPORT const char *qFlagLocation(const char *method);
-
-#define QTOSTRING_HELPER(s) #s
-#define QTOSTRING(s) QTOSTRING_HELPER(s)
-#ifndef QT_NO_DEBUG
-# define QLOCATION "\0"__FILE__":"QTOSTRING(__LINE__)
-# define METHOD(a)   qFlagLocation("0"#a QLOCATION)
-# define SLOT(a)     qFlagLocation("1"#a QLOCATION)
-# define SIGNAL(a)   qFlagLocation("2"#a QLOCATION)
-#else
-# define METHOD(a)   "0"#a
-# define SLOT(a)     "1"#a
-# define SIGNAL(a)   "2"#a
-#endif
-
-#ifdef QT3_SUPPORT
-#define METHOD_CODE   0                        // member type codes
-#define SLOT_CODE     1
-#define SIGNAL_CODE   2
-#endif
-
-#define QMETHOD_CODE  0                        // member type codes
-#define QSLOT_CODE    1
-#define QSIGNAL_CODE  2
-
-#define Q_ARG(type, data) QArgument<type >(#type, data)
-#define Q_RETURN_ARG(type, data) QReturnArgument<type >(#type, data)
-
-class QObject;
-class QMetaMethod;
-class QMetaEnum;
-class QMetaProperty;
-class QMetaClassInfo;
-
-
-class Q_CORE_EXPORT QGenericArgument
-{
-public:
-    inline QGenericArgument(const char *aName = 0, const void *aData = 0)
-        : _data(aData), _name(aName) {}
-    inline void *data() const { return const_cast<void *>(_data); }
-    inline const char *name() const { return _name; }
-
-private:
-    const void *_data;
-    const char *_name;
-};
-
-class Q_CORE_EXPORT QGenericReturnArgument: public QGenericArgument
-{
-public:
-    inline QGenericReturnArgument(const char *aName = 0, void *aData = 0)
-        : QGenericArgument(aName, aData)
-        {}
-};
-
-template <class T>
-class QArgument: public QGenericArgument
-{
-public:
-    inline QArgument(const char *aName, const T &aData)
-        : QGenericArgument(aName, static_cast<const void *>(&aData))
-        {}
-};
-
-
-template <typename T>
-class QReturnArgument: public QGenericReturnArgument
-{
-public:
-    inline QReturnArgument(const char *aName, T &aData)
-        : QGenericReturnArgument(aName, static_cast<void *>(&aData))
-        {}
-};
-
-struct Q_CORE_EXPORT QMetaObject
-{
-    const char *className() const;
-    const QMetaObject *superClass() const;
-
-    QObject *cast(QObject *obj) const;
-
-#ifndef TQT_NO_TRANSLATION
-    // ### Qt 4: Merge overloads
-    QString tr(const char *s, const char *c) const;
-    QString trUtf8(const char *s, const char *c) const;
-    QString tr(const char *s, const char *c, int n) const;
-    QString trUtf8(const char *s, const char *c, int n) const;
-#endif // TQT_NO_TRANSLATION
-
-    int methodOffset() const;
-    int enumeratorOffset() const;
-    int propertyOffset() const;
-    int classInfoOffset() const;
-
-    int constructorCount() const;
-    int methodCount() const;
-    int enumeratorCount() const;
-    int propertyCount() const;
-    int classInfoCount() const;
-
-    int indexOfConstructor(const char *constructor) const;
-    int indexOfMethod(const char *method) const;
-    int indexOfSignal(const char *signal) const;
-    int indexOfSlot(const char *slot) const;
-    int indexOfEnumerator(const char *name) const;
-    int indexOfProperty(const char *name) const;
-    int indexOfClassInfo(const char *name) const;
-
-    QMetaMethod constructor(int index) const;
-    QMetaMethod method(int index) const;
-    QMetaEnum enumerator(int index) const;
-    QMetaProperty property(int index) const;
-    QMetaClassInfo classInfo(int index) const;
-    QMetaProperty userProperty() const;
-
-    static bool checkConnectArgs(const char *signal, const char *method);
-    static QByteArray normalizedSignature(const char *method);
-    static QByteArray normalizedType(const char *type);
-
-    // internal index-based connect
-    static bool connect(const QObject *sender, int signal_index,
-                        const QObject *receiver, int method_index,
-                        int type = 0, int *types = 0);
-    // internal index-based disconnect
-    static bool disconnect(const QObject *sender, int signal_index,
-                           const QObject *receiver, int method_index);
-    static bool disconnectOne(const QObject *sender, int signal_index,
-                              const QObject *receiver, int method_index);
-    // internal slot-name based connect
-    static void connectSlotsByName(QObject *o);
-
-    // internal index-based signal activation
-    static void activate(QObject *sender, int signal_index, void **argv);  //obsolete
-    static void activate(QObject *sender, int from_signal_index, int to_signal_index, void **argv); //obsolete
-    static void activate(QObject *sender, const QMetaObject *, int local_signal_index, void **argv);
-    static void activate(QObject *sender, const QMetaObject *, int from_local_signal_index, int to_local_signal_index, void **argv); //obsolete
-
-    // internal guarded pointers
-    static void addGuard(QObject **ptr);
-    static void removeGuard(QObject **ptr);
-    static void changeGuard(QObject **ptr, QObject *o);
-
-    static bool invokeMethod(QObject *obj, const char *member,
-                             Qt::ConnectionType,
-                             QGenericReturnArgument ret,
-                             QGenericArgument val0 = QGenericArgument(0),
-                             QGenericArgument val1 = QGenericArgument(),
-                             QGenericArgument val2 = QGenericArgument(),
-                             QGenericArgument val3 = QGenericArgument(),
-                             QGenericArgument val4 = QGenericArgument(),
-                             QGenericArgument val5 = QGenericArgument(),
-                             QGenericArgument val6 = QGenericArgument(),
-                             QGenericArgument val7 = QGenericArgument(),
-                             QGenericArgument val8 = QGenericArgument(),
-                             QGenericArgument val9 = QGenericArgument());
-
-    static inline bool invokeMethod(QObject *obj, const char *member,
-                             QGenericReturnArgument ret,
-                             QGenericArgument val0 = QGenericArgument(0),
-                             QGenericArgument val1 = QGenericArgument(),
-                             QGenericArgument val2 = QGenericArgument(),
-                             QGenericArgument val3 = QGenericArgument(),
-                             QGenericArgument val4 = QGenericArgument(),
-                             QGenericArgument val5 = QGenericArgument(),
-                             QGenericArgument val6 = QGenericArgument(),
-                             QGenericArgument val7 = QGenericArgument(),
-                             QGenericArgument val8 = QGenericArgument(),
-                             QGenericArgument val9 = QGenericArgument())
-    {
-        return invokeMethod(obj, member, Qt::AutoConnection, ret, val0, val1, val2, val3,
-                val4, val5, val6, val7, val8, val9);
-    }
-
-    static inline bool invokeMethod(QObject *obj, const char *member,
-                             Qt::ConnectionType type,
-                             QGenericArgument val0 = QGenericArgument(0),
-                             QGenericArgument val1 = QGenericArgument(),
-                             QGenericArgument val2 = QGenericArgument(),
-                             QGenericArgument val3 = QGenericArgument(),
-                             QGenericArgument val4 = QGenericArgument(),
-                             QGenericArgument val5 = QGenericArgument(),
-                             QGenericArgument val6 = QGenericArgument(),
-                             QGenericArgument val7 = QGenericArgument(),
-                             QGenericArgument val8 = QGenericArgument(),
-                             QGenericArgument val9 = QGenericArgument())
-    {
-        return invokeMethod(obj, member, type, QGenericReturnArgument(), val0, val1, val2,
-                                 val3, val4, val5, val6, val7, val8, val9);
-    }
-
-    static inline bool invokeMethod(QObject *obj, const char *member,
-                             QGenericArgument val0 = QGenericArgument(0),
-                             QGenericArgument val1 = QGenericArgument(),
-                             QGenericArgument val2 = QGenericArgument(),
-                             QGenericArgument val3 = QGenericArgument(),
-                             QGenericArgument val4 = QGenericArgument(),
-                             QGenericArgument val5 = QGenericArgument(),
-                             QGenericArgument val6 = QGenericArgument(),
-                             QGenericArgument val7 = QGenericArgument(),
-                             QGenericArgument val8 = QGenericArgument(),
-                             QGenericArgument val9 = QGenericArgument())
-    {
-        return invokeMethod(obj, member, Qt::AutoConnection, QGenericReturnArgument(), val0,
-                val1, val2, val3, val4, val5, val6, val7, val8, val9);
-    }
-
-    QObject *newInstance(QGenericArgument val0 = QGenericArgument(0),
-                         QGenericArgument val1 = QGenericArgument(),
-                         QGenericArgument val2 = QGenericArgument(),
-                         QGenericArgument val3 = QGenericArgument(),
-                         QGenericArgument val4 = QGenericArgument(),
-                         QGenericArgument val5 = QGenericArgument(),
-                         QGenericArgument val6 = QGenericArgument(),
-                         QGenericArgument val7 = QGenericArgument(),
-                         QGenericArgument val8 = QGenericArgument(),
-                         QGenericArgument val9 = QGenericArgument()) const;
-
-    enum Call {
-        InvokeMetaMethod,
-        ReadProperty,
-        WriteProperty,
-        ResetProperty,
-        QueryPropertyDesignable,
-        QueryPropertyScriptable,
-        QueryPropertyStored,
-        QueryPropertyEditable,
-        QueryPropertyUser,
-        CreateInstance
-    };
-
-    int static_metacall(Call, int, void **) const;
-    static int metacall(QObject *, Call, int, void **);
-
-#ifdef QT3_SUPPORT
-    QT3_SUPPORT const char *superClassName() const;
-#endif
-
-    int		numSlots( bool super = FALSE ) const;
-    int		numSignals( bool super = FALSE ) const;
-    const QMetaMethod 	*slot( int index, bool super = FALSE ) const;
-    const QMetaMethod 	*signal( int index, bool super = FALSE ) const;
-    TQT_QT_STRING_LIST_TYPE	slotNames( bool super = FALSE ) const;
-    TQT_QT_STRING_LIST_TYPE	signalNames( bool super = FALSE ) const;
-    int		findSlot( const char *, bool super = FALSE ) const;
-    int		findSignal( const char *, bool super = FALSE ) const;
-#ifndef QT_NO_PROPERTIES
-    int		numProperties( bool super = FALSE ) const;
-    const QMetaProperty	*property( int index, bool super ) const;
-    TQT_QT_STRING_LIST_TYPE	propertyNames( bool super = FALSE ) const;
-    int 	findProperty( const char *name, bool super ) const;
-#endif
-
-    struct { // private data
-        const QMetaObject *superdata;
-        const char *stringdata;
-        const uint *data;
-        const void *extradata;
-    } d;
-
-};
-
-typedef const QMetaObject& (*QMetaObjectAccessor)();
-
-struct QMetaObjectExtraData
-{
-#ifdef Q_NO_DATA_RELOCATION
-    const QMetaObjectAccessor *objects;
-#else
-    const QMetaObject **objects;
-#endif
-    int (*static_metacall)(QMetaObject::Call, int, void **);
-};
-
-inline const char *QMetaObject::className() const
-{ return d.stringdata; }
-
-inline const QMetaObject *QMetaObject::superClass() const
-{ return d.superdata; }
-
-#ifdef QT3_SUPPORT
-inline const char *QMetaObject::superClassName() const
-{ return d.superdata ? d.superdata->className() : 0; }
-#endif
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QOBJECTDEFS_H
diff --git a/qtinterface/tqt4/Qt/qpaintdevice.h b/qtinterface/tqt4/Qt/qpaintdevice.h
deleted file mode 100644
index 98157db..0000000
--- a/qtinterface/tqt4/Qt/qpaintdevice.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 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$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QPAINTDEVICE_H
-#define QPAINTDEVICE_H
-
-#include <QtGui/qwindowdefs.h>
-#include <QtCore/qrect.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-#if defined(Q_WS_QWS)
-class QWSDisplay;
-#endif
-
-class QPaintEngine;
-
-class Q_GUI_EXPORT QPaintDevice                                // device for QPainter
-{
-public:
-    enum PaintDeviceMetric {
-        PdmWidth = 1,
-        PdmHeight,
-        PdmWidthMM,
-        PdmHeightMM,
-        PdmNumColors,
-        PdmDepth,
-        PdmDpiX,
-        PdmDpiY,
-        PdmPhysicalDpiX,
-        PdmPhysicalDpiY
-    };
-
-    virtual ~QPaintDevice();
-
-    virtual int devType() const;
-    bool paintingActive() const;
-    virtual QPaintEngine *paintEngine() const = 0;
-
-#if defined(Q_WS_QWS)
-    static QWSDisplay *qwsDisplay();
-#endif
-
-#ifdef Q_WS_WIN
-    virtual HDC getDC() const;
-    virtual void releaseDC(HDC hdc) const;
-#endif
-
-    // Windows:	  get device context
-    // X-Windows: get drawable
-#if defined(Q_WS_WIN)
-    virtual HDC		handle() const;
-#elif defined(Q_WS_X11)
-    virtual Qt::HANDLE	handle() const;
-    virtual Qt::HANDLE  x11RenderHandle() const;
-    static GC qt_xget_temp_gc( int scrn, bool monochrome );
-#elif defined(Q_WS_MAC)
-    virtual Qt::HANDLE      handle() const;
-#elif defined(Q_WS_QWS)
-    virtual Qt::HANDLE	handle() const;
-#endif
-
-    int width() const { return metric(PdmWidth); }
-    int height() const { return metric(PdmHeight); }
-    int widthMM() const { return metric(PdmWidthMM); }
-    int heightMM() const { return metric(PdmHeightMM); }
-    int logicalDpiX() const { return metric(PdmDpiX); }
-    int logicalDpiY() const { return metric(PdmDpiY); }
-    int physicalDpiX() const { return metric(PdmPhysicalDpiX); }
-    int physicalDpiY() const { return metric(PdmPhysicalDpiY); }
-#ifdef QT_DEPRECATED
-    QT_DEPRECATED int numColors() const { return metric(PdmNumColors); }
-#endif
-    int colorCount() const { return metric(PdmNumColors); }
-    int depth() const { return metric(PdmDepth); }
-
-protected:
-    QPaintDevice();
-    virtual int metric(PaintDeviceMetric metric) const;
-
-    ushort        painters;                        // refcount
-
-private:
-    Q_DISABLE_COPY(QPaintDevice)
-
-#if defined(Q_WS_X11) && defined(QT3_SUPPORT)
-public:
-    QT3_SUPPORT Display *x11Display() const;
-    QT3_SUPPORT int x11Screen() const;
-    QT3_SUPPORT int x11Depth() const;
-    QT3_SUPPORT int x11Cells() const;
-    QT3_SUPPORT Qt::HANDLE x11Colormap() const;
-    QT3_SUPPORT bool x11DefaultColormap() const;
-    QT3_SUPPORT void *x11Visual() const;
-    QT3_SUPPORT bool x11DefaultVisual() const;
-
-    static QT3_SUPPORT Display *x11AppDisplay();
-    static QT3_SUPPORT int x11AppScreen();
-    static QT3_SUPPORT int x11AppDepth(int screen = -1);
-    static QT3_SUPPORT int x11AppCells(int screen = -1);
-    static QT3_SUPPORT Qt::HANDLE x11AppRootWindow(int screen = -1);
-    static QT3_SUPPORT Qt::HANDLE x11AppColormap(int screen = -1);
-    static QT3_SUPPORT void *x11AppVisual(int screen = -1);
-    static QT3_SUPPORT bool x11AppDefaultColormap(int screen =-1);
-    static QT3_SUPPORT bool x11AppDefaultVisual(int screen =-1);
-    static QT3_SUPPORT int x11AppDpiX(int screen = -1);
-    static QT3_SUPPORT int x11AppDpiY(int screen = -1);
-    static QT3_SUPPORT void x11SetAppDpiX(int, int);
-    static QT3_SUPPORT void x11SetAppDpiY(int, int);
-#endif
-
-    friend class QPainter;
-    friend class QFontEngineMac;
-    friend class QX11PaintEngine;
-    friend Q_GUI_EXPORT int qt_paint_device_metric(const QPaintDevice *device, PaintDeviceMetric metric);
-};
-
-#ifdef QT3_SUPPORT
-QT3_SUPPORT Q_GUI_EXPORT
-void bitBlt(QPaintDevice *dst, int dx, int dy,
-             const QPaintDevice *src, int sx=0, int sy=0, int sw=-1, int sh=-1,
-             bool ignoreMask=false);
-
-QT3_SUPPORT Q_GUI_EXPORT
-void bitBlt(QPaintDevice *dst, int dx, int dy,
-             const QImage *src, int sx=0, int sy=0, int sw=-1, int sh=-1,
-             int conversion_flags=0);
-
-QT3_SUPPORT Q_GUI_EXPORT
-void bitBlt(QPaintDevice *dst, const QPoint &dp,
-            const QPaintDevice *src, const QRect &sr=QRect(0,0,-1,-1),
-            bool ignoreMask=false);
-#endif
-
-/*****************************************************************************
-  Inline functions
- *****************************************************************************/
-
-inline int QPaintDevice::devType() const
-{ return QInternal::UnknownDevice; }
-
-inline bool QPaintDevice::paintingActive() const
-{ return painters != 0; }
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QPAINTDEVICE_H
diff --git a/qtinterface/tqt4/Qt/qpixmap.h b/qtinterface/tqt4/Qt/qpixmap.h
deleted file mode 100644
index 79c69a3..0000000
--- a/qtinterface/tqt4/Qt/qpixmap.h
+++ /dev/null
@@ -1,340 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 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$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QPIXMAP_H
-#define QPIXMAP_H
-
-#include <QtGui/qpaintdevice.h>
-#include <QtGui/qcolor.h>
-#include <QtCore/qnamespace.h>
-#include <QtCore/qstring.h> // char*->QString conversion
-#include <QtCore/qsharedpointer.h>
-#include <QtGui/qimage.h>
-#include <QtGui/qtransform.h>
-
-QT_BEGIN_HEADER
-
-#if defined(Q_OS_SYMBIAN)
-class CFbsBitmap;
-class RSgImage;
-#endif
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-class QImageWriter;
-class QColor;
-class QVariant;
-class QX11Info;
-class QPixmapData;
-
-class Q_GUI_EXPORT QPixmap : public QPaintDevice
-{
-public:
-    QPixmap();
-    explicit QPixmap(QPixmapData *data);
-    QPixmap(int w, int h);
-    QPixmap(const QSize &);
-    QPixmap(const QString& fileName, const char *format = 0, Qt::ImageConversionFlags flags = Qt::AutoColor);
-#ifndef QT_NO_IMAGEFORMAT_XPM
-    QPixmap(const char * const xpm[]);
-#endif
-    QPixmap(const QPixmap &);
-    ~QPixmap();
-
-    QPixmap &operator=(const QPixmap &);
-    operator QVariant() const;
-
-    bool isNull() const; // ### Qt 5: make inline
-    int devType() const;
-
-    int width() const; // ### Qt 5: make inline
-    int height() const; // ### Qt 5: make inline
-    QSize size() const;
-    QRect rect() const;
-    int depth() const;
-
-    static int defaultDepth();
-
-    void fill(const QColor &fillColor = Qt::white);
-    void fill(const QWidget *widget, const QPoint &ofs);
-    inline void fill(const QWidget *widget, int xofs, int yofs) { fill(widget, QPoint(xofs, yofs)); }
-
-    QBitmap mask() const;
-    const QBitmap *ptrmask() const;
-    void setMask(const QBitmap &);
-
-    QPixmap alphaChannel() const;
-    void setAlphaChannel(const QPixmap &);
-
-    bool hasAlpha() const;
-    bool hasAlphaChannel() const;
-
-#ifndef QT_NO_IMAGE_HEURISTIC_MASK
-    QBitmap createHeuristicMask(bool clipTight = true) const;
-#endif
-    QBitmap createMaskFromColor(const QColor &maskColor) const; // ### Qt 5: remove
-    QBitmap createMaskFromColor(const QColor &maskColor, Qt::MaskMode mode) const;
-
-    static QPixmap grabWindow(WId, int x=0, int y=0, int w=-1, int h=-1);
-    static QPixmap grabWidget(QWidget *widget, const QRect &rect);
-    static inline QPixmap grabWidget(QWidget *widget, int x=0, int y=0, int w=-1, int h=-1)
-    { return grabWidget(widget, QRect(x, y, w, h)); }
-
-
-    inline QPixmap scaled(int w, int h, Qt::AspectRatioMode aspectMode = Qt::IgnoreAspectRatio,
-                          Qt::TransformationMode mode = Qt::FastTransformation) const
-        { return scaled(QSize(w, h), aspectMode, mode); }
-    QPixmap scaled(const QSize &s, Qt::AspectRatioMode aspectMode = Qt::IgnoreAspectRatio,
-                   Qt::TransformationMode mode = Qt::FastTransformation) const;
-    QPixmap scaledToWidth(int w, Qt::TransformationMode mode = Qt::FastTransformation) const;
-    QPixmap scaledToHeight(int h, Qt::TransformationMode mode = Qt::FastTransformation) const;
-    QPixmap transformed(const QMatrix &, Qt::TransformationMode mode = Qt::FastTransformation) const;
-    static QMatrix trueMatrix(const QMatrix &m, int w, int h);
-    QPixmap transformed(const QTransform &, Qt::TransformationMode mode = Qt::FastTransformation) const;
-    static QTransform trueMatrix(const QTransform &m, int w, int h);
-
-    QImage toImage() const;
-    static QPixmap fromImage(const QImage &image, Qt::ImageConversionFlags flags = Qt::AutoColor);
-
-    bool load(const QString& fileName, const char *format = 0, Qt::ImageConversionFlags flags = Qt::AutoColor);
-    bool loadFromData(const uchar *buf, uint len, const char* format = 0, Qt::ImageConversionFlags flags = Qt::AutoColor);
-    inline bool loadFromData(const QByteArray &data, const char* format = 0, Qt::ImageConversionFlags flags = Qt::AutoColor);
-    bool save(const QString& fileName, const char* format = 0, int quality = -1) const;
-    bool save(QIODevice* device, const char* format = 0, int quality = -1) const;
-
-#if defined(Q_WS_WIN)
-    enum HBitmapFormat {
-        NoAlpha,
-        PremultipliedAlpha,
-        Alpha
-    };
-
-    HBITMAP toWinHBITMAP(HBitmapFormat format = NoAlpha) const;
-    HICON toWinHICON() const;
-
-    static QPixmap fromWinHBITMAP(HBITMAP hbitmap, HBitmapFormat format = NoAlpha);
-    static QPixmap fromWinHICON(HICON hicon);
-#endif
-
-#if defined(Q_WS_MAC)
-    CGImageRef toMacCGImageRef() const;
-    static QPixmap fromMacCGImageRef(CGImageRef image);
-#endif
-
-#if defined(Q_OS_SYMBIAN)
-    CFbsBitmap *toSymbianCFbsBitmap() const;
-    static QPixmap fromSymbianCFbsBitmap(CFbsBitmap *bitmap);
-    RSgImage* toSymbianRSgImage() const;
-    static QPixmap fromSymbianRSgImage(RSgImage *sgImage);
-#endif
-
-    inline QPixmap copy(int x, int y, int width, int height) const;
-    QPixmap copy(const QRect &rect = QRect()) const;
-
-    inline void scroll(int dx, int dy, int x, int y, int width, int height, QRegion *exposed = 0);
-    void scroll(int dx, int dy, const QRect &rect, QRegion *exposed = 0);
-
-    int serialNumber() const;
-    qint64 cacheKey() const;
-
-    bool isDetached() const;
-    void detach();
-
-    bool isQBitmap() const;
-
-#if defined(Q_WS_QWS)
-    const uchar *qwsBits() const;
-    int qwsBytesPerLine() const;
-    QRgb *clut() const;
-#ifdef QT_DEPRECATED
-    QT_DEPRECATED int numCols() const;
-#endif
-    int colorCount() const;
-#elif defined(Q_WS_MAC)
-    Qt::HANDLE macQDHandle() const;
-    Qt::HANDLE macQDAlphaHandle() const;
-    Qt::HANDLE macCGHandle() const;
-#elif defined(Q_WS_X11)
-    enum ShareMode { ImplicitlyShared, ExplicitlyShared };
-
-    static QPixmap fromX11Pixmap(Qt::HANDLE pixmap, ShareMode mode = ImplicitlyShared);
-    static int x11SetDefaultScreen(int screen);
-    void x11SetScreen(int screen);
-    const QX11Info &x11Info() const;
-    Qt::HANDLE x11PictureHandle() const;
-#endif
-
-#if defined(Q_WS_X11) || defined(Q_WS_QWS)
-    Qt::HANDLE handle() const;
-#endif
-
-    QPaintEngine *paintEngine() const;
-
-    inline bool operator!() const { return isNull(); }
-
-protected:
-    int metric(PaintDeviceMetric) const;
-
-#ifdef QT3_SUPPORT
-public:
-    enum ColorMode { Auto, Color, Mono };
-    QT3_SUPPORT_CONSTRUCTOR QPixmap(const QString& fileName, const char *format, ColorMode mode);
-    QT3_SUPPORT bool load(const QString& fileName, const char *format, ColorMode mode);
-    QT3_SUPPORT bool loadFromData(const uchar *buf, uint len, const char* format, ColorMode mode);
-    QT3_SUPPORT_CONSTRUCTOR QPixmap(const QImage& image);
-    QT3_SUPPORT QPixmap &operator=(const QImage &);
-    inline QT3_SUPPORT QImage convertToImage() const { return toImage(); }
-    QT3_SUPPORT bool convertFromImage(const QImage &, ColorMode mode);
-    QT3_SUPPORT bool convertFromImage(const QImage &img, Qt::ImageConversionFlags flags = Qt::AutoColor)
-        { (*this) = fromImage(img, flags); return !isNull(); }
-    QT3_SUPPORT bool convertFromImage(const QImage &img, int flags);
-    inline QT3_SUPPORT operator QImage() const { return toImage(); }
-    inline QT3_SUPPORT QPixmap xForm(const QMatrix &matrix) const { return transformed(QTransform(matrix)); }
-    inline QT3_SUPPORT bool selfMask() const { return false; }
-private:
-    void resize_helper(const QSize &s);
-public:
-    inline QT3_SUPPORT void resize(const QSize &s) { resize_helper(s); }
-    inline QT3_SUPPORT void resize(int width, int height) { resize_helper(QSize(width, height)); }
-    enum Optimization { DefaultOptim, NoOptim, MemoryOptim=NoOptim,
-			NormalOptim, BestOptim };
-    QPixmap( int w, int h,  int depth, Optimization = DefaultOptim );
-    static Optimization defOptim;
-    Optimization	optimization() const;
-    void		setOptimization( Optimization );
-    static Optimization defaultOptimization();
-    static void		setDefaultOptimization( Optimization );
-    operator QPixmap *() const;
-#endif
-
-private:
-    QExplicitlySharedDataPointer<QPixmapData> data;
-
-    bool doImageIO(QImageWriter *io, int quality) const;
-
-    // ### Qt5: remove the following three lines
-    enum Type { PixmapType, BitmapType }; // must match QPixmapData::PixelType
-    QPixmap(const QSize &s, Type);
-    void init(int, int, Type = PixmapType);
-
-    QPixmap(const QSize &s, int type);
-    void init(int, int, int);
-    void deref();
-#if defined(Q_WS_WIN)
-    void initAlphaPixmap(uchar *bytes, int length, struct tagBITMAPINFO *bmi);
-#endif
-    Q_DUMMY_COMPARISON_OPERATOR(QPixmap)
-#ifdef Q_WS_MAC
-    friend CGContextRef qt_mac_cg_context(const QPaintDevice*);
-    friend CGImageRef qt_mac_create_imagemask(const QPixmap&, const QRectF&);
-    friend IconRef qt_mac_create_iconref(const QPixmap&);
-    friend quint32 *qt_mac_pixmap_get_base(const QPixmap*);
-    friend int qt_mac_pixmap_get_bytes_per_line(const QPixmap*);
-#endif
-    friend class QPixmapData;
-    friend class QX11PixmapData;
-    friend class QMacPixmapData;
-    friend class QS60PixmapData;
-    friend class QBitmap;
-    friend class QPaintDevice;
-    friend class QPainter;
-    friend class QGLWidget;
-    friend class QX11PaintEngine;
-    friend class QCoreGraphicsPaintEngine;
-    friend class QWidgetPrivate;
-    friend class QRasterPaintEngine;
-    friend class QRasterBuffer;
-    friend class QPixmapCacheEntry;
-#if !defined(QT_NO_DATASTREAM)
-    friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QPixmap &);
-#endif
-    friend Q_GUI_EXPORT qint64 qt_pixmap_id(const QPixmap &pixmap);
-
-public:
-    QPixmapData* pixmapData() const;
-
-public:
-    typedef QExplicitlySharedDataPointer<QPixmapData> DataPtr;
-    inline DataPtr &data_ptr() { return data; }
-};
-
-Q_DECLARE_SHARED(QPixmap)
-
-inline QPixmap QPixmap::copy(int ax, int ay, int awidth, int aheight) const
-{
-    return copy(QRect(ax, ay, awidth, aheight));
-}
-
-inline void QPixmap::scroll(int dx, int dy, int ax, int ay, int awidth, int aheight, QRegion *exposed)
-{
-    scroll(dx, dy, QRect(ax, ay, awidth, aheight), exposed);
-}
-
-inline bool QPixmap::loadFromData(const QByteArray &buf, const char *format,
-                                  Qt::ImageConversionFlags flags)
-{
-    return loadFromData(reinterpret_cast<const uchar *>(buf.constData()), buf.size(), format, flags);
-}
-
-/*****************************************************************************
- QPixmap stream functions
-*****************************************************************************/
-
-#if !defined(QT_NO_DATASTREAM)
-Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QPixmap &);
-Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QPixmap &);
-#endif
-
-/*****************************************************************************
- QPixmap (and QImage) helper functions
-*****************************************************************************/
-#ifdef QT3_SUPPORT
-QT3_SUPPORT Q_GUI_EXPORT void copyBlt(QPixmap *dst, int dx, int dy, const QPixmap *src,
-                                    int sx=0, int sy=0, int sw=-1, int sh=-1);
-#endif // QT3_SUPPORT
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QPIXMAP_H
diff --git a/qtinterface/tqt4/Qt/qscrollbar.h b/qtinterface/tqt4/Qt/qscrollbar.h
deleted file mode 100644
index 1734eef..0000000
--- a/qtinterface/tqt4/Qt/qscrollbar.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 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$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QSCROLLBAR_H
-#define QSCROLLBAR_H
-
-#include <QtGui/qwidget.h>
-#include <QtGui/qabstractslider.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-#ifndef QT_NO_SCROLLBAR
-
-class QScrollBarPrivate;
-class QStyleOptionSlider;
-
-class Q_GUI_EXPORT QScrollBar : public QAbstractSlider
-{
-    Q_OBJECT
-public:
-    explicit QScrollBar(QWidget *parent=0);
-    explicit QScrollBar(Qt::Orientation, QWidget *parent=0);
-    ~QScrollBar();
-
-    QSize sizeHint() const;
-    bool event(QEvent *event);
-    int sliderStart() const;
-
-protected:
-    void paintEvent(QPaintEvent *);
-    void mousePressEvent(QMouseEvent *);
-    void mouseReleaseEvent(QMouseEvent *);
-    void mouseMoveEvent(QMouseEvent *);
-    void hideEvent(QHideEvent*);
-    void sliderChange(SliderChange change);
-#ifndef QT_NO_CONTEXTMENU
-    void contextMenuEvent(QContextMenuEvent *);
-#endif
-    void initStyleOption(QStyleOptionSlider *option) const;
-
-#ifdef QT3_SUPPORT
-public:
-    QT3_SUPPORT_CONSTRUCTOR QScrollBar(QWidget *parent, const char* name);
-    QT3_SUPPORT_CONSTRUCTOR QScrollBar(Qt::Orientation, QWidget *parent, const char* name);
-    QT3_SUPPORT_CONSTRUCTOR QScrollBar(int minValue, int maxValue, int lineStep, int pageStep,
-                int value, Qt::Orientation, QWidget *parent=0, const char* name = 0);
-    inline QT3_SUPPORT bool draggingSlider() { return isSliderDown(); }
-#endif
-
-private:
-    friend Q_GUI_EXPORT QStyleOptionSlider qt_qscrollbarStyleOption(QScrollBar *scrollBar);
-
-    Q_DISABLE_COPY(QScrollBar)
-    Q_DECLARE_PRIVATE(QScrollBar)
-};
-
-#endif // QT_NO_SCROLLBAR
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QSCROLLBAR_H
diff --git a/qtinterface/tqt4/Qt/qslider.h b/qtinterface/tqt4/Qt/qslider.h
deleted file mode 100644
index cfd1932..0000000
--- a/qtinterface/tqt4/Qt/qslider.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 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$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QSLIDER_H
-#define QSLIDER_H
-
-#include <QtGui/qabstractslider.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-#ifndef QT_NO_SLIDER
-
-class QSliderPrivate;
-class QStyleOptionSlider;
-class Q_GUI_EXPORT QSlider : public QAbstractSlider
-{
-    Q_OBJECT
-
-    Q_ENUMS(TickPosition)
-    Q_PROPERTY(TickPosition tickPosition READ tickPosition WRITE setTickPosition)
-    Q_PROPERTY(int tickInterval READ tickInterval WRITE setTickInterval)
-
-public:
-    enum TickPosition {
-        NoTicks = 0,
-        TicksAbove = 1,
-        TicksLeft = TicksAbove,
-        TicksBelow = 2,
-        TicksRight = TicksBelow,
-        TicksBothSides = 3
-
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-        ,NoMarks = NoTicks,
-        Above = TicksAbove,
-        Left = TicksAbove,
-        Below = TicksBelow,
-        Right = TicksRight,
-        Both = TicksBothSides
-#endif
-    };
-
-    explicit QSlider(QWidget *parent = 0);
-    explicit QSlider(Qt::Orientation orientation, QWidget *parent = 0);
-
-    ~QSlider();
-
-    QSize sizeHint() const;
-    QSize minimumSizeHint() const;
-
-    void setTickPosition(TickPosition position);
-    TickPosition tickPosition() const;
-
-    void setTickInterval(int ti);
-    int tickInterval() const;
-
-    bool event(QEvent *event);
-
-protected:
-    void paintEvent(QPaintEvent *ev);
-    void mousePressEvent(QMouseEvent *ev);
-    void mouseReleaseEvent(QMouseEvent *ev);
-    void mouseMoveEvent(QMouseEvent *ev);
-    void initStyleOption(QStyleOptionSlider *option) const;
-
-#ifdef QT3_SUPPORT
-public:
-    QT3_SUPPORT_CONSTRUCTOR QSlider(QWidget *parent, const char *name);
-    QT3_SUPPORT_CONSTRUCTOR QSlider(Qt::Orientation, QWidget *parent, const char *name);
-    QT3_SUPPORT_CONSTRUCTOR QSlider(int minValue, int maxValue, int pageStep, int value,
-                                  Qt::Orientation orientation,
-                                  QWidget *parent = 0, const char *name = 0);
-    inline QT3_SUPPORT void setTickmarks(TickPosition position) { setTickPosition(position); }
-    inline QT3_SUPPORT TickPosition tickmarks() const { return tickPosition(); }
-public Q_SLOTS:
-    inline QT_MOC_COMPAT void addStep() { triggerAction(SliderSingleStepAdd); }
-    inline QT_MOC_COMPAT void subtractStep() { triggerAction(SliderSingleStepSub); }
-#endif
-
-private:
-    friend Q_GUI_EXPORT QStyleOptionSlider qt_qsliderStyleOption(QSlider *slider);
-
-    Q_DISABLE_COPY(QSlider)
-    Q_DECLARE_PRIVATE(QSlider)
-};
-
-#endif // QT_NO_SLIDER
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QSLIDER_H
diff --git a/qtinterface/tqt4/Qt/qstring.h b/qtinterface/tqt4/Qt/qstring.h
deleted file mode 100644
index 9b6d650..0000000
--- a/qtinterface/tqt4/Qt/qstring.h
+++ /dev/null
@@ -1,1247 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QSTRING_H
-#define QSTRING_H
-
-#include <QtCore/qchar.h>
-#include <QtCore/qbytearray.h>
-#include <QtCore/qatomic.h>
-#include <QtCore/qnamespace.h>
-#ifdef TQT_INCLUDE_COMPAT
-#include <Qt3Support/q3cstring.h>
-#endif
-
-#ifndef TQT_NO_STL
-#  if defined (Q_CC_MSVC_NET) && _MSC_VER < 1310 // Avoids nasty warning for xlocale, line 450
-#    pragma warning (push)
-#    pragma warning (disable : 4189)
-#    include <string>
-#    pragma warning (pop)
-#  else
-#    include <string>
-#  endif
-
-#  ifndef TQT_NO_STL_WCHAR
-// workaround for some headers not typedef'ing std::wstring
-typedef std::basic_string<wchar_t> QStdWString;
-#  endif // TQT_NO_STL_WCHAR
-
-#endif // TQT_NO_STL
-
-#include <stdarg.h>
-
-#ifdef truncate
-#error qstring.h must be included before any header file that defines truncate
-#endif
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Core)
-
-class QCharRef;
-class QRegExp;
-class QStringList;
-class QTextCodec;
-class QLatin1String;
-class QStringRef;
-template <typename T> class QVector;
-
-class Q_CORE_EXPORT QString
-{
-public:
-    inline QString();
-    QString(const QChar *unicode, int size);
-    QString(QChar c);
-    QString(int size, QChar c);
-    inline QString(const QLatin1String &latin1);
-    inline QString(const QString &);
-    inline ~QString();
-    QString &operator=(QChar c);
-    QString &operator=(const QString &);
-    inline QString &operator=(const QLatin1String &);
-
-    inline int size() const { return d->size; }
-    inline int count() const { return d->size; }
-    inline int length() const;
-    inline bool isEmpty() const;
-    void resize(int size);
-
-    QString &fill(QChar c, int size = -1);
-    void truncate(int pos);
-    void chop(int n);
-
-    operator bool () const;
-
-    int capacity() const;
-    inline void reserve(int size);
-    inline void squeeze() { if (d->size < d->alloc || d->ref != 1) realloc(); d->capacity = 0;}
-
-    inline const QChar *unicode() const;
-    inline QChar *data();
-    inline const QChar *data() const;
-    inline const QChar *constData() const;
-
-    inline void detach();
-    inline bool isDetached() const;
-    void clear();
-
-    inline const QChar at(int i) const;
-    const QChar operator[](int i) const;
-    QCharRef operator[](int i);
-    const QChar operator[](uint i) const;
-    QCharRef operator[](uint i);
-
-    QString arg(qlonglong a, int fieldwidth=0, int base=10,
-                const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
-    QString arg(qulonglong a, int fieldwidth=0, int base=10,
-                const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
-    QString arg(long a, int fieldwidth=0, int base=10,
-                const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
-    QString arg(ulong a, int fieldwidth=0, int base=10,
-                const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
-    QString arg(int a, int fieldWidth = 0, int base = 10,
-                const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
-    QString arg(uint a, int fieldWidth = 0, int base = 10,
-                const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
-    QString arg(short a, int fieldWidth = 0, int base = 10,
-                const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
-    QString arg(ushort a, int fieldWidth = 0, int base = 10,
-                const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
-    QString arg(double a, int fieldWidth = 0, char fmt = 'g', int prec = -1,
-                const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
-    QString arg(char a, int fieldWidth = 0,
-                const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
-    QString arg(QChar a, int fieldWidth = 0,
-                const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
-    QString arg(const QString &a, int fieldWidth = 0,
-                const QChar &fillChar = QLatin1Char(' ')) const Q_REQUIRED_RESULT;
-    QString arg(const QString &a1, const QString &a2) const Q_REQUIRED_RESULT;
-    QString arg(const QString &a1, const QString &a2, const QString &a3) const Q_REQUIRED_RESULT;
-    QString arg(const QString &a1, const QString &a2, const QString &a3,
-                const QString &a4) const Q_REQUIRED_RESULT;
-    QString arg(const QString &a1, const QString &a2, const QString &a3,
-                const QString &a4, const QString &a5) const Q_REQUIRED_RESULT;
-    QString arg(const QString &a1, const QString &a2, const QString &a3,
-                const QString &a4, const QString &a5, const QString &a6) const Q_REQUIRED_RESULT;
-    QString arg(const QString &a1, const QString &a2, const QString &a3,
-                const QString &a4, const QString &a5, const QString &a6,
-                const QString &a7) const Q_REQUIRED_RESULT;
-    QString arg(const QString &a1, const QString &a2, const QString &a3,
-                const QString &a4, const QString &a5, const QString &a6,
-                const QString &a7, const QString &a8) const Q_REQUIRED_RESULT;
-    QString arg(const QString &a1, const QString &a2, const QString &a3,
-                const QString &a4, const QString &a5, const QString &a6,
-                const QString &a7, const QString &a8, const QString &a9) const Q_REQUIRED_RESULT;
-
-    QString    &vsprintf(const char *format, va_list ap)
-#if defined(Q_CC_GNU) && !defined(__INSURE__)
-        __attribute__ ((format (printf, 2, 0)))
-#endif
-        ;
-    QString    &sprintf(const char *format, ...)
-#if defined(Q_CC_GNU) && !defined(__INSURE__)
-        __attribute__ ((format (printf, 2, 3)))
-#endif
-        ;
-
-    int indexOf(QChar c, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    int indexOf(const QString &s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    int indexOf(const QLatin1String &s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    int lastIndexOf(QChar c, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    int lastIndexOf(const QString &s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    int lastIndexOf(const QLatin1String &s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-
-    inline QBool contains(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    inline QBool contains(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    int count(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    int count(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-
-#ifndef QT_NO_REGEXP
-    int indexOf(const QRegExp &, int from = 0) const;
-    int lastIndexOf(const QRegExp &, int from = -1) const;
-    inline QBool contains(const QRegExp &rx) const { return QBool(indexOf(rx) != -1); }
-    int count(const QRegExp &) const;
-
-    int indexOf(QRegExp &, int from = 0) const;
-    int lastIndexOf(QRegExp &, int from = -1) const;
-    inline QBool contains(QRegExp &rx) const { return QBool(indexOf(rx) != -1); }
-#endif
-
-    enum SectionFlag {
-        SectionDefault             = 0x00,
-        SectionSkipEmpty           = 0x01,
-        SectionIncludeLeadingSep   = 0x02,
-        SectionIncludeTrailingSep  = 0x04,
-        SectionCaseInsensitiveSeps = 0x08
-    };
-    Q_DECLARE_FLAGS(SectionFlags, SectionFlag)
-
-    QString section(QChar sep, int start, int end = -1, SectionFlags flags = SectionDefault) const;
-    QString section(const QString &in_sep, int start, int end = -1, SectionFlags flags = SectionDefault) const;
-#ifndef QT_NO_REGEXP
-    QString section(const QRegExp &reg, int start, int end = -1, SectionFlags flags = SectionDefault) const;
-#endif
-
-    QString left(int n) const Q_REQUIRED_RESULT;
-    QString right(int n) const Q_REQUIRED_RESULT;
-    QString mid(int position, int n = -1) const Q_REQUIRED_RESULT;
-    QStringRef leftRef(int n) const Q_REQUIRED_RESULT;
-    QStringRef rightRef(int n) const Q_REQUIRED_RESULT;
-    QStringRef midRef(int position, int n = -1) const Q_REQUIRED_RESULT;
-
-    bool startsWith(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    bool startsWith(const QLatin1String &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    bool startsWith(const QChar &c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    bool endsWith(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    bool endsWith(const QLatin1String &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    bool endsWith(const QChar &c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-
-    QString leftJustified(int width, QChar fill = QLatin1Char(' '), bool trunc = false) const Q_REQUIRED_RESULT;
-    QString rightJustified(int width, QChar fill = QLatin1Char(' '), bool trunc = false) const Q_REQUIRED_RESULT;
-
-    QString toLower() const Q_REQUIRED_RESULT;
-    QString toUpper() const Q_REQUIRED_RESULT;
-    QString toCaseFolded() const Q_REQUIRED_RESULT;
-
-    QString trimmed() const Q_REQUIRED_RESULT;
-    QString simplified() const Q_REQUIRED_RESULT;
-
-    QString &insert(int i, QChar c);
-    QString &insert(int i, const QChar *uc, int len);
-    inline QString &insert(int i, const QString &s) { return insert(i, s.constData(), s.length()); }
-    QString &insert(int i, const QLatin1String &s);
-    QString &append(QChar c);
-    QString &append(const QString &s);
-    QString &append(const QStringRef &s);
-    QString &append(const QLatin1String &s);
-    inline QString &prepend(QChar c) { return insert(0, c); }
-    inline QString &prepend(const QString &s) { return insert(0, s); }
-    inline QString &prepend(const QLatin1String &s) { return insert(0, s); }
-
-    inline QString &operator+=(QChar c) {
-        if (d->ref != 1 || d->size + 1 > d->alloc)
-            realloc(grow(d->size + 1));
-        d->data[d->size++] = c.unicode();
-        d->data[d->size] = '\0';
-        return *this;
-    }
-
-    inline QString &operator+=(QChar::SpecialCharacter c) { return append(QChar(c)); }
-    inline QString &operator+=(const QString &s) { return append(s); }
-    inline QString &operator+=(const QStringRef &s) { return append(s); }
-    inline QString &operator+=(const QLatin1String &s) { return append(s); }
-
-    QString &remove(int i, int len);
-    QString &remove(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive);
-    QString &remove(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive);
-    QString &replace(int i, int len, QChar after);
-    QString &replace(int i, int len, const QChar *s, int slen);
-    QString &replace(int i, int len, const QString &after);
-    QString &replace(QChar before, QChar after, Qt::CaseSensitivity cs = Qt::CaseSensitive);
-    QString &replace(const QChar *before, int blen, const QChar *after, int alen, Qt::CaseSensitivity cs = Qt::CaseSensitive);
-    QString &replace(const QLatin1String &before, const QLatin1String &after, Qt::CaseSensitivity cs = Qt::CaseSensitive);
-    QString &replace(const QLatin1String &before, const QString &after, Qt::CaseSensitivity cs = Qt::CaseSensitive);
-    QString &replace(const QString &before, const QLatin1String &after, Qt::CaseSensitivity cs = Qt::CaseSensitive);
-    QString &replace(const QString &before, const QString &after,
-                     Qt::CaseSensitivity cs = Qt::CaseSensitive);
-    QString &replace(QChar c, const QString &after, Qt::CaseSensitivity cs = Qt::CaseSensitive);
-    QString &replace(QChar c, const QLatin1String &after, Qt::CaseSensitivity cs = Qt::CaseSensitive);
-#ifndef QT_NO_REGEXP
-    QString &replace(const QRegExp &rx, const QString &after);
-    inline QString &remove(const QRegExp &rx)
-    { return replace(rx, QString()); }
-#endif
-
-    enum SplitBehavior { KeepEmptyParts, SkipEmptyParts };
-
-    QStringList split(const QString &sep, SplitBehavior behavior = KeepEmptyParts,
-                      Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_REQUIRED_RESULT;
-    QStringList split(const QChar &sep, SplitBehavior behavior = KeepEmptyParts,
-                      Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_REQUIRED_RESULT;
-#ifndef QT_NO_REGEXP
-    QStringList split(const QRegExp &sep, SplitBehavior behavior = KeepEmptyParts) const Q_REQUIRED_RESULT;
-#endif
-
-    enum NormalizationForm {
-        NormalizationForm_D,
-        NormalizationForm_C,
-        NormalizationForm_KD,
-        NormalizationForm_KC
-    };
-    QString normalized(NormalizationForm mode) const Q_REQUIRED_RESULT;
-    QString normalized(NormalizationForm mode, QChar::UnicodeVersion version) const Q_REQUIRED_RESULT;
-
-    QString repeated(int times) const;
-
-    const ushort *utf16() const;
-
-    QByteArray toAscii() const Q_REQUIRED_RESULT;
-    QByteArray toLatin1() const Q_REQUIRED_RESULT;
-    QByteArray toUtf8() const Q_REQUIRED_RESULT;
-    QByteArray toLocal8Bit() const Q_REQUIRED_RESULT;
-    QVector<uint> toUcs4() const Q_REQUIRED_RESULT;
-
-    static QString fromAscii(const char *, int size = -1);
-    static QString fromLatin1(const char *, int size = -1);
-    static QString fromUtf8(const char *, int size = -1);
-    static QString fromLocal8Bit(const char *, int size = -1);
-    static QString fromUtf16(const ushort *, int size = -1);
-    static QString fromUcs4(const uint *, int size = -1);
-    static QString fromRawData(const QChar *, int size);
-
-    int toWCharArray(wchar_t *array) const;
-    static QString fromWCharArray(const wchar_t *, int size = -1);
-
-    QString &setUnicode(const QChar *unicode, int size);
-    inline QString &setUtf16(const ushort *utf16, int size);
-
-    // ### Qt 5: merge these two functions
-    int compare(const QString &s) const;
-    int compare(const QString &s, Qt::CaseSensitivity cs) const;
-
-    int compare(const QLatin1String &other, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-
-    // ### Qt 5: merge these two functions
-    static inline int compare(const QString &s1, const QString &s2)
-    { return s1.compare(s2); }
-    static inline int compare(const QString &s1, const QString &s2, Qt::CaseSensitivity cs)
-    { return s1.compare(s2, cs); }
-
-    static inline int compare(const QString& s1, const QLatin1String &s2,
-                              Qt::CaseSensitivity cs = Qt::CaseSensitive)
-    { return s1.compare(s2, cs); }
-    static inline int compare(const QLatin1String& s1, const QString &s2,
-                              Qt::CaseSensitivity cs = Qt::CaseSensitive)
-    { return -s2.compare(s1, cs); }
-
-    int compare(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    static int compare(const QString &s1, const QStringRef &s2,
-                       Qt::CaseSensitivity = Qt::CaseSensitive);
-
-    int localeAwareCompare(const QString& s) const;
-    static int localeAwareCompare(const QString& s1, const QString& s2)
-    { return s1.localeAwareCompare(s2); }
-
-    int localeAwareCompare(const QStringRef &s) const;
-    static int localeAwareCompare(const QString& s1, const QStringRef& s2);
-
-    short  toShort(bool *ok=0, int base=10) const;
-    ushort toUShort(bool *ok=0, int base=10) const;
-    int toInt(bool *ok=0, int base=10) const;
-    uint toUInt(bool *ok=0, int base=10) const;
-    long toLong(bool *ok=0, int base=10) const;
-    ulong toULong(bool *ok=0, int base=10) const;
-    qlonglong toLongLong(bool *ok=0, int base=10) const;
-    qulonglong toULongLong(bool *ok=0, int base=10) const;
-    float toFloat(bool *ok=0) const;
-    double toDouble(bool *ok=0) const;
-
-    QString &setNum(short, int base=10);
-    QString &setNum(ushort, int base=10);
-    QString &setNum(int, int base=10);
-    QString &setNum(uint, int base=10);
-    QString &setNum(long, int base=10);
-    QString &setNum(ulong, int base=10);
-    QString &setNum(qlonglong, int base=10);
-    QString &setNum(qulonglong, int base=10);
-    QString &setNum(float, char f='g', int prec=6);
-    QString &setNum(double, char f='g', int prec=6);
-
-    static QString number(int, int base=10);
-    static QString number(uint, int base=10);
-    static QString number(long, int base=10);
-    static QString number(ulong, int base=10);
-    static QString number(qlonglong, int base=10);
-    static QString number(qulonglong, int base=10);
-    static QString number(double, char f='g', int prec=6);
-
-    bool operator==(const QString &s) const;
-    bool operator<(const QString &s) const;
-    inline bool operator>(const QString &s) const { return s < *this; }
-    inline bool operator!=(const QString &s) const { return !operator==(s); }
-    inline bool operator<=(const QString &s) const { return !operator>(s); }
-    inline bool operator>=(const QString &s) const { return !operator<(s); }
-
-    bool operator==(const QLatin1String &s) const;
-    bool operator<(const QLatin1String &s) const;
-    bool operator>(const QLatin1String &s) const;
-    inline bool operator!=(const QLatin1String &s) const { return !operator==(s); }
-    inline bool operator<=(const QLatin1String &s) const { return !operator>(s); }
-    inline bool operator>=(const QLatin1String &s) const { return !operator<(s); }
-
-    // ASCII compatibility
-#ifndef QT_NO_CAST_FROM_ASCII
-    inline QT_ASCII_CAST_WARN_CONSTRUCTOR QString(const char *ch) : d(fromAscii_helper(ch))
-    {}
-    inline QT_ASCII_CAST_WARN_CONSTRUCTOR QString(const QByteArray &a)
-        : d(fromAscii_helper(a.constData(), qstrnlen(a.constData(), a.size())))
-    {}
-    inline QT_ASCII_CAST_WARN QString &operator=(const char *ch)
-    { return (*this = fromAscii(ch)); }
-    inline QT_ASCII_CAST_WARN QString &operator=(const QByteArray &a)
-    { return (*this = fromAscii(a.constData(), qstrnlen(a.constData(), a.size()))); }
-    inline QT_ASCII_CAST_WARN QString &operator=(char c)
-    { return (*this = QChar::fromAscii(c)); }
-
-    // these are needed, so it compiles with STL support enabled
-    inline QT_ASCII_CAST_WARN QString &prepend(const char *s)
-    { return prepend(QString::fromAscii(s)); }
-    inline QT_ASCII_CAST_WARN QString &prepend(const QByteArray &s)
-    { return prepend(QString::fromAscii(s.constData(), qstrnlen(s.constData(), s.size()))); }
-    inline QT_ASCII_CAST_WARN QString &append(const char *s)
-    { return append(QString::fromAscii(s)); }
-    inline QT_ASCII_CAST_WARN QString &append(const QByteArray &s)
-    { return append(QString::fromAscii(s.constData(), qstrnlen(s.constData(), s.size()))); }
-    inline QT_ASCII_CAST_WARN QString &operator+=(const char *s)
-    { return append(QString::fromAscii(s)); }
-    inline QT_ASCII_CAST_WARN QString &operator+=(const QByteArray &s)
-    { return append(QString::fromAscii(s.constData(), qstrnlen(s.constData(), s.size()))); }
-    inline QT_ASCII_CAST_WARN QString &operator+=(char c)
-    { return append(QChar::fromAscii(c)); }
-
-    inline QT_ASCII_CAST_WARN bool operator==(const char *s) const;
-    inline QT_ASCII_CAST_WARN bool operator!=(const char *s) const;
-    inline QT_ASCII_CAST_WARN bool operator<(const char *s) const;
-    inline QT_ASCII_CAST_WARN bool operator<=(const char *s2) const;
-    inline QT_ASCII_CAST_WARN bool operator>(const char *s2) const;
-    inline QT_ASCII_CAST_WARN bool operator>=(const char *s2) const;
-
-    inline QT_ASCII_CAST_WARN bool operator==(const QByteArray &s) const;
-    inline QT_ASCII_CAST_WARN bool operator!=(const QByteArray &s) const;
-    inline QT_ASCII_CAST_WARN bool operator<(const QByteArray &s) const
-    { return *this < QString::fromAscii(s.constData(), s.size()); }
-    inline QT_ASCII_CAST_WARN bool operator>(const QByteArray &s) const
-    { return *this > QString::fromAscii(s.constData(), s.size()); }
-    inline QT_ASCII_CAST_WARN bool operator<=(const QByteArray &s) const
-    { return *this <= QString::fromAscii(s.constData(), s.size()); }
-    inline QT_ASCII_CAST_WARN bool operator>=(const QByteArray &s) const
-    { return *this >= QString::fromAscii(s.constData(), s.size()); }
-#endif
-
-    typedef QChar *iterator;
-    typedef const QChar *const_iterator;
-    typedef iterator Iterator;
-    typedef const_iterator ConstIterator;
-    iterator begin();
-    const_iterator begin() const;
-    const_iterator constBegin() const;
-    iterator end();
-    const_iterator end() const;
-    const_iterator constEnd() const;
-
-    // STL compatibility
-    inline void push_back(QChar c) { append(c); }
-    inline void push_back(const QString &s) { append(s); }
-    inline void push_front(QChar c) { prepend(c); }
-    inline void push_front(const QString &s) { prepend(s); }
-
-#ifndef TQT_NO_STL
-    static inline QString fromStdString(const std::string &s);
-    inline std::string toStdString() const;
-# ifdef qdoc
-    static inline QString fromStdWString(const std::wstring &s);
-    inline std::wstring toStdWString() const;
-# else
-#  ifndef TQT_NO_STL_WCHAR
-    static inline QString fromStdWString(const QStdWString &s);
-    inline QStdWString toStdWString() const;
-#  endif // TQT_NO_STL_WCHAR
-# endif // qdoc
-#endif
-
-    // compatibility
-    struct Null { };
-    static const Null null;
-    inline QString(const Null &): d(&shared_null) { d->ref.ref(); }
-    inline QString &operator=(const Null &) { *this = QString(); return *this; }
-    inline bool isNull() const { return d == &shared_null; }
-
-#ifdef QT3_SUPPORT
-    inline QT3_SUPPORT const char *ascii() const { return ascii_helper(); }
-    inline QT3_SUPPORT const char *latin1() const { return latin1_helper(); }
-    inline QT3_SUPPORT QByteArray utf8() const { return toUtf8(); }
-    inline QT3_SUPPORT QByteArray local8Bit() const{ return toLocal8Bit(); }
-    inline QT3_SUPPORT void setLength(int nl) { resize(nl); }
-    inline QT3_SUPPORT QString copy() const { return *this; }
-    inline QT3_SUPPORT QString &remove(QChar c, bool cs)
-    { return remove(c, cs?Qt::CaseSensitive:Qt::CaseInsensitive); }
-    inline QT3_SUPPORT QString &remove(const QString  &s, bool cs)
-    { return remove(s, cs?Qt::CaseSensitive:Qt::CaseInsensitive); }
-    inline QT3_SUPPORT QString &replace(QChar c, const QString  &after, bool cs)
-    { return replace(c, after, cs?Qt::CaseSensitive:Qt::CaseInsensitive); }
-    inline QT3_SUPPORT QString &replace(const QString &before, const QString &after, bool cs)
-    { return replace(before, after, cs?Qt::CaseSensitive:Qt::CaseInsensitive); }
-#ifndef QT_NO_CAST_FROM_ASCII
-    inline QT3_SUPPORT QString &replace(char c, const QString &after, bool cs)
-    { return replace(QChar::fromAscii(c), after, cs ? Qt::CaseSensitive : Qt::CaseInsensitive); }
-    // strange overload, required to avoid GCC 3.3 error
-    inline QT3_SUPPORT QString &replace(char c, const QString &after, Qt::CaseSensitivity cs)
-    { return replace(QChar::fromAscii(c), after, cs ? Qt::CaseSensitive : Qt::CaseInsensitive); }
-#endif
-    inline QT3_SUPPORT int find(QChar c, int i = 0, bool cs = true) const
-    { return indexOf(c, i, cs?Qt::CaseSensitive:Qt::CaseInsensitive); }
-    inline QT3_SUPPORT int find(const QString &s, int i = 0, bool cs = true) const
-    { return indexOf(s, i, cs?Qt::CaseSensitive:Qt::CaseInsensitive); }
-    inline QT3_SUPPORT int findRev(QChar c, int i = -1, bool cs = true) const
-    { return lastIndexOf(c, i, cs?Qt::CaseSensitive:Qt::CaseInsensitive); }
-    inline QT3_SUPPORT int findRev(const QString &s, int i = -1, bool cs = true) const
-    { return lastIndexOf(s, i, cs?Qt::CaseSensitive:Qt::CaseInsensitive); }
-#ifndef QT_NO_REGEXP
-    inline QT3_SUPPORT int find(const QRegExp &rx, int i=0) const
-    { return indexOf(rx, i); }
-    inline QT3_SUPPORT int findRev(const QRegExp &rx, int i=-1) const
-    { return lastIndexOf(rx, i); }
-    inline QT3_SUPPORT int find(QRegExp &rx, int i=0) const
-    { return indexOf(rx, i); }
-    inline QT3_SUPPORT int findRev(QRegExp &rx, int i=-1) const
-    { return lastIndexOf(rx, i); }
-#endif
-    inline QT3_SUPPORT QBool contains(QChar c, bool cs) const
-    { return contains(c, cs?Qt::CaseSensitive:Qt::CaseInsensitive); }
-    inline QT3_SUPPORT QBool contains(const QString &s, bool cs) const
-    { return contains(s, cs?Qt::CaseSensitive:Qt::CaseInsensitive); }
-    inline QT3_SUPPORT bool startsWith(const QString &s, bool cs) const
-    { return startsWith(s, cs?Qt::CaseSensitive:Qt::CaseInsensitive); }
-    inline QT3_SUPPORT bool endsWith(const QString &s, bool cs) const
-    { return endsWith(s, cs?Qt::CaseSensitive:Qt::CaseInsensitive); }
-    inline QT3_SUPPORT QChar constref(uint i) const
-    { return at(i); }
-    QT3_SUPPORT QChar &ref(uint i);
-    inline QT3_SUPPORT QString leftJustify(int width, QChar aFill = QLatin1Char(' '), bool trunc=false) const
-    { return leftJustified(width, aFill, trunc); }
-    inline QT3_SUPPORT QString rightJustify(int width, QChar aFill = QLatin1Char(' '), bool trunc=false) const
-    { return rightJustified(width, aFill, trunc); }
-    inline QT3_SUPPORT QString lower() const { return toLower(); }
-    inline QT3_SUPPORT QString upper() const { return toUpper(); }
-    inline QT3_SUPPORT QString stripWhiteSpace() const { return trimmed(); }
-    inline QT3_SUPPORT QString simplifyWhiteSpace() const { return simplified(); }
-    inline QT3_SUPPORT QString &setUnicodeCodes(const ushort *unicode_as_ushorts, int aSize)
-    { return setUtf16(unicode_as_ushorts, aSize); }
-    inline QT3_SUPPORT const ushort *ucs2() const { return utf16(); }
-    inline static QT3_SUPPORT QString fromUcs2(const ushort *unicode, int size = -1)
-    { return fromUtf16(unicode, size); }
-    inline QT3_SUPPORT QString &setAscii(const char *str, int len = -1)
-    { *this = fromAscii(str, len); return *this; }
-    inline QT3_SUPPORT QString &setLatin1(const char *str, int len = -1)
-    { *this = fromLatin1(str, len); return *this; }
-protected:
-    friend class QObject;
-    const char *ascii_helper() const;
-    const char *latin1_helper() const;
-public:
-#ifndef QT_NO_CAST_TO_ASCII
-    inline QT3_SUPPORT operator const char *() const { return ascii_helper(); }
-//private:
-    QT3_SUPPORT operator QNoImplicitBoolCast() const;
-public:
-#endif
-#endif
-
-    bool isSimpleText() const { if (!d->clean) updateProperties(); return d->simpletext; }
-    bool isRightToLeft() const { if (!d->clean) updateProperties(); return d->righttoleft; }
-
-    QString(int size, Qt::Initialization);
-
-private:
-#if defined(QT_NO_CAST_FROM_ASCII) && !defined(Q_NO_DECLARED_NOT_DEFINED)
-    QString &operator+=(const char *s);
-    QString &operator+=(const QByteArray &s);
-    QString(const char *ch);
-    QString(const QByteArray &a);
-    QString &operator=(const char  *ch);
-    QString &operator=(const QByteArray &a);
-#endif
-
-    struct Data {
-        QBasicAtomicInt ref;
-        int alloc, size;
-        ushort *data;
-        ushort clean : 1;
-        ushort simpletext : 1;
-        ushort righttoleft : 1;
-        ushort asciiCache : 1;
-        ushort capacity : 1;
-        ushort reserved : 11;
-        ushort array[1];
-    };
-    static Data shared_null;
-    static Data shared_empty;
-    Data *d;
-    QString(Data *dd, int /*dummy*/) : d(dd) {}
-#ifndef QT_NO_TEXTCODEC
-    static QTextCodec *codecForCStrings;
-#endif
-    static int grow(int);
-    static void free(Data *);
-    void realloc();
-    void realloc(int alloc);
-    void expand(int i);
-    void updateProperties() const;
-    QString multiArg(int numArgs, const QString **args) const;
-    static int compare_helper(const QChar *data1, int length1,
-                              const QChar *data2, int length2,
-                              Qt::CaseSensitivity cs = Qt::CaseSensitive);
-    static int compare_helper(const QChar *data1, int length1,
-                              QLatin1String s2,
-                              Qt::CaseSensitivity cs = Qt::CaseSensitive);
-    static int localeAwareCompare_helper(const QChar *data1, int length1,
-                                         const QChar *data2, int length2);
-    static Data *fromLatin1_helper(const char *str, int size = -1);
-    static Data *fromAscii_helper(const char *str, int size = -1);
-    void replace_helper(uint *indices, int nIndices, int blen, const QChar *after, int alen);
-    friend class QCharRef;
-    friend class QTextCodec;
-    friend class QStringRef;
-    friend struct QAbstractConcatenable;
-    friend inline bool qStringComparisonHelper(const QString &s1, const char *s2);
-    friend inline bool qStringComparisonHelper(const QStringRef &s1, const char *s2);
-public:
-    typedef Data * DataPtr;
-    inline DataPtr &data_ptr() { return d; }
-};
-
-
-class Q_CORE_EXPORT QLatin1String
-{
-public:
-    inline explicit QLatin1String(const char *s) : chars(s) {}
-    inline QLatin1String &operator=(const QLatin1String &other)
-    { chars = other.chars; return *this; }
-
-    inline const char *latin1() const { return chars; }
-
-    inline bool operator==(const QString &s) const
-    { return s == *this; }
-    inline bool operator!=(const QString &s) const
-    { return s != *this; }
-    inline bool operator>(const QString &s) const
-    { return s < *this; }
-    inline bool operator<(const QString &s) const
-    { return s > *this; }
-    inline bool operator>=(const QString &s) const
-    { return s <= *this; }
-    inline bool operator<=(const QString &s) const
-    { return s >= *this; }
-
-    inline QT_ASCII_CAST_WARN bool operator==(const char *s) const
-        { return QString::fromAscii(s) == *this; }
-    inline QT_ASCII_CAST_WARN bool operator!=(const char *s) const
-        { return QString::fromAscii(s) != *this; }
-    inline QT_ASCII_CAST_WARN bool operator<(const char *s) const
-        { return QString::fromAscii(s) > *this; }
-    inline QT_ASCII_CAST_WARN bool operator>(const char *s) const
-        { return QString::fromAscii(s) < *this; }
-    inline QT_ASCII_CAST_WARN bool operator<=(const char *s) const
-        { return QString::fromAscii(s) >= *this; }
-    inline QT_ASCII_CAST_WARN bool operator>=(const char *s) const
-        { return QString::fromAscii(s) <= *this; }
-private:
-    const char *chars;
-};
-
-
-
-inline QString::QString(const QLatin1String &aLatin1) : d(fromLatin1_helper(aLatin1.latin1()))
-{ }
-inline int QString::length() const
-{ return d->size; }
-inline const QChar QString::at(int i) const
-{ Q_ASSERT(i >= 0 && i < size()); return d->data[i]; }
-inline const QChar QString::operator[](int i) const
-{ Q_ASSERT(i >= 0 && i < size()); return d->data[i]; }
-inline const QChar QString::operator[](uint i) const
-{ Q_ASSERT(i < uint(size())); return d->data[i]; }
-inline bool QString::isEmpty() const
-{ return d->size == 0; }
-inline const QChar *QString::unicode() const
-{ return reinterpret_cast<const QChar*>(d->data); }
-inline const QChar *QString::data() const
-{ return reinterpret_cast<const QChar*>(d->data); }
-inline QChar *QString::data()
-{ detach(); return reinterpret_cast<QChar*>(d->data); }
-inline const QChar *QString::constData() const
-{ return reinterpret_cast<const QChar*>(d->data); }
-inline void QString::detach()
-{ if (d->ref != 1 || d->data != d->array) realloc(); }
-inline bool QString::isDetached() const
-{ return d->ref == 1; }
-inline QString &QString::operator=(const QLatin1String &s)
-{
-    *this = fromLatin1(s.latin1());
-    return *this;
-}
-inline void QString::clear()
-{ if (!isNull()) *this = QString(); }
-inline QString::QString(const QString &other) : d(other.d)
-{ Q_ASSERT(&other != this); d->ref.ref(); }
-inline int QString::capacity() const
-{ return d->alloc; }
-inline QString &QString::setNum(short n, int base)
-{ return setNum(qlonglong(n), base); }
-inline QString &QString::setNum(ushort n, int base)
-{ return setNum(qulonglong(n), base); }
-inline QString &QString::setNum(int n, int base)
-{ return setNum(qlonglong(n), base); }
-inline QString &QString::setNum(uint n, int base)
-{ return setNum(qulonglong(n), base); }
-inline QString &QString::setNum(long n, int base)
-{ return setNum(qlonglong(n), base); }
-inline QString &QString::setNum(ulong n, int base)
-{ return setNum(qulonglong(n), base); }
-inline QString &QString::setNum(float n, char f, int prec)
-{ return setNum(double(n),f,prec); }
-inline QString QString::arg(int a, int fieldWidth, int base, const QChar &fillChar) const
-{ return arg(qlonglong(a), fieldWidth, base, fillChar); }
-inline QString QString::arg(uint a, int fieldWidth, int base, const QChar &fillChar) const
-{ return arg(qulonglong(a), fieldWidth, base, fillChar); }
-inline QString QString::arg(long a, int fieldWidth, int base, const QChar &fillChar) const
-{ return arg(qlonglong(a), fieldWidth, base, fillChar); }
-inline QString QString::arg(ulong a, int fieldWidth, int base, const QChar &fillChar) const
-{ return arg(qulonglong(a), fieldWidth, base, fillChar); }
-inline QString QString::arg(short a, int fieldWidth, int base, const QChar &fillChar) const
-{ return arg(qlonglong(a), fieldWidth, base, fillChar); }
-inline QString QString::arg(ushort a, int fieldWidth, int base, const QChar &fillChar) const
-{ return arg(qulonglong(a), fieldWidth, base, fillChar); }
-inline QString QString::arg(const QString &a1, const QString &a2) const
-{ const QString *args[2] = { &a1, &a2 }; return multiArg(2, args); }
-inline QString QString::arg(const QString &a1, const QString &a2, const QString &a3) const
-{ const QString *args[3] = { &a1, &a2, &a3 }; return multiArg(3, args); }
-inline QString QString::arg(const QString &a1, const QString &a2, const QString &a3,
-                            const QString &a4) const
-{ const QString *args[4] = { &a1, &a2, &a3, &a4 }; return multiArg(4, args); }
-inline QString QString::arg(const QString &a1, const QString &a2, const QString &a3,
-                            const QString &a4, const QString &a5) const
-{ const QString *args[5] = { &a1, &a2, &a3, &a4, &a5 }; return multiArg(5, args); }
-inline QString QString::arg(const QString &a1, const QString &a2, const QString &a3,
-                            const QString &a4, const QString &a5, const QString &a6) const
-{ const QString *args[6] = { &a1, &a2, &a3, &a4, &a5, &a6 }; return multiArg(6, args); }
-inline QString QString::arg(const QString &a1, const QString &a2, const QString &a3,
-                            const QString &a4, const QString &a5, const QString &a6,
-                            const QString &a7) const
-{ const QString *args[7] = { &a1, &a2, &a3, &a4, &a5, &a6,  &a7 }; return multiArg(7, args); }
-inline QString QString::arg(const QString &a1, const QString &a2, const QString &a3,
-                            const QString &a4, const QString &a5, const QString &a6,
-                            const QString &a7, const QString &a8) const
-{ const QString *args[8] = { &a1, &a2, &a3, &a4, &a5, &a6,  &a7, &a8 }; return multiArg(8, args); }
-inline QString QString::arg(const QString &a1, const QString &a2, const QString &a3,
-                            const QString &a4, const QString &a5, const QString &a6,
-                            const QString &a7, const QString &a8, const QString &a9) const
-{ const QString *args[9] = { &a1, &a2, &a3, &a4, &a5, &a6,  &a7, &a8, &a9 }; return multiArg(9, args); }
-
-inline QString QString::section(QChar asep, int astart, int aend, SectionFlags aflags) const
-{ return section(QString(asep), astart, aend, aflags); }
-
-
-class Q_CORE_EXPORT QCharRef {
-    QString &s;
-    int i;
-    inline QCharRef(QString &str, int idx)
-        : s(str),i(idx) {}
-    friend class QString;
-public:
-
-    // most QChar operations repeated here
-
-    // all this is not documented: We just say "like QChar" and let it be.
-    inline operator QChar() const
-        { return i < s.d->size ? s.d->data[i] : 0; }
-    inline QCharRef &operator=(const QChar &c)
-        { if (i >= s.d->size) s.expand(i); else s.detach();
-          s.d->data[i] = c.unicode();  return *this; }
-
-    // An operator= for each QChar cast constructors
-#ifndef QT_NO_CAST_FROM_ASCII
-    inline QT_ASCII_CAST_WARN QCharRef &operator=(char c)
-    { return operator=(QChar::fromAscii(c)); }
-    inline QT_ASCII_CAST_WARN QCharRef &operator=(uchar c)
-    { return operator=(QChar::fromAscii(c)); }
-#endif
-    inline QCharRef &operator=(const QCharRef &c) { return operator=(QChar(c)); }
-    inline QCharRef &operator=(ushort rc) { return operator=(QChar(rc)); }
-    inline QCharRef &operator=(short rc) { return operator=(QChar(rc)); }
-    inline QCharRef &operator=(uint rc) { return operator=(QChar(rc)); }
-    inline QCharRef &operator=(int rc) { return operator=(QChar(rc)); }
-
-    // each function...
-    inline bool isNull() const { return QChar(*this).isNull(); }
-    inline bool isPrint() const { return QChar(*this).isPrint(); }
-    inline bool isPunct() const { return QChar(*this).isPunct(); }
-    inline bool isSpace() const { return QChar(*this).isSpace(); }
-    inline bool isMark() const { return QChar(*this).isMark(); }
-    inline bool isLetter() const { return QChar(*this).isLetter(); }
-    inline bool isNumber() const { return QChar(*this).isNumber(); }
-    inline bool isLetterOrNumber() { return QChar(*this).isLetterOrNumber(); }
-    inline bool isDigit() const { return QChar(*this).isDigit(); }
-    inline bool isLower() const { return QChar(*this).isLower(); }
-    inline bool isUpper() const { return QChar(*this).isUpper(); }
-    inline bool isTitleCase() const { return QChar(*this).isTitleCase(); }
-
-    inline int digitValue() const { return QChar(*this).digitValue(); }
-    QChar toLower() const { return QChar(*this).toLower(); }
-    QChar toUpper() const { return QChar(*this).toUpper(); }
-    QChar toTitleCase () const { return QChar(*this).toTitleCase(); }
-
-    QChar::Category category() const { return QChar(*this).category(); }
-    QChar::Direction direction() const { return QChar(*this).direction(); }
-    QChar::Joining joining() const { return QChar(*this).joining(); }
-    bool hasMirrored() const { return QChar(*this).hasMirrored(); }
-    QChar mirroredChar() const { return QChar(*this).mirroredChar(); }
-    QString decomposition() const { return QChar(*this).decomposition(); }
-    QChar::Decomposition decompositionTag() const { return QChar(*this).decompositionTag(); }
-    uchar combiningClass() const { return QChar(*this).combiningClass(); }
-
-    QChar::UnicodeVersion unicodeVersion() const { return QChar(*this).unicodeVersion(); }
-
-    inline uchar cell() const { return QChar(*this).cell(); }
-    inline uchar row() const { return QChar(*this).row(); }
-    inline void setCell(uchar cell);
-    inline void setRow(uchar row);
-
-#ifdef Q_COMPILER_MANGLES_RETURN_TYPE
-    const char toAscii() const { return QChar(*this).toAscii(); }
-    const char toLatin1() const { return QChar(*this).toLatin1(); }
-    const ushort unicode() const { return QChar(*this).unicode(); }
-#else
-    char toAscii() const { return QChar(*this).toAscii(); }
-    char toLatin1() const { return QChar(*this).toLatin1(); }
-    ushort unicode() const { return QChar(*this).unicode(); }
-#endif
-    ushort& unicode() { return s.data()[i].unicode(); }
-
-#ifdef QT3_SUPPORT
-    inline QT3_SUPPORT bool mirrored() const { return hasMirrored(); }
-    inline QT3_SUPPORT QChar lower() const { return QChar(*this).toLower(); }
-    inline QT3_SUPPORT QChar upper() const { return QChar(*this).toUpper(); }
-#ifdef Q_COMPILER_MANGLES_RETURN_TYPE
-    const QT3_SUPPORT char latin1() const { return QChar(*this).toLatin1(); }
-    const QT3_SUPPORT char ascii() const { return QChar(*this).toAscii(); }
-#else
-    QT3_SUPPORT char latin1() const { return QChar(*this).toLatin1(); }
-    QT3_SUPPORT char ascii() const { return QChar(*this).toAscii(); }
-#endif
-#endif
-};
-
-inline void QCharRef::setRow(uchar arow) { QChar(*this).setRow(arow); }
-inline void QCharRef::setCell(uchar acell) { QChar(*this).setCell(acell); }
-
-
-inline QString::QString() : d(&shared_null) { d->ref.ref(); }
-inline QString::~QString() { if (!d->ref.deref()) free(d); }
-inline void QString::reserve(int asize) { if (d->ref != 1 || asize > d->alloc) realloc(asize); d->capacity = 1;}
-inline QString &QString::setUtf16(const ushort *autf16, int asize)
-{ return setUnicode(reinterpret_cast<const QChar *>(autf16), asize); }
-inline QCharRef QString::operator[](int i)
-{ Q_ASSERT(i >= 0); return QCharRef(*this, i); }
-inline QCharRef QString::operator[](uint i)
-{ return QCharRef(*this, i); }
-inline QString::iterator QString::begin()
-{ detach(); return reinterpret_cast<QChar*>(d->data); }
-inline QString::const_iterator QString::begin() const
-{ return reinterpret_cast<const QChar*>(d->data); }
-inline QString::const_iterator QString::constBegin() const
-{ return reinterpret_cast<const QChar*>(d->data); }
-inline QString::iterator QString::end()
-{ detach(); return reinterpret_cast<QChar*>(d->data + d->size); }
-inline QString::const_iterator QString::end() const
-{ return reinterpret_cast<const QChar*>(d->data + d->size); }
-inline QString::const_iterator QString::constEnd() const
-{ return reinterpret_cast<const QChar*>(d->data + d->size); }
-inline QBool QString::contains(const QString &s, Qt::CaseSensitivity cs) const
-{ return QBool(indexOf(s, 0, cs) != -1); }
-inline QBool QString::contains(QChar c, Qt::CaseSensitivity cs) const
-{ return QBool(indexOf(c, 0, cs) != -1); }
-
-
-inline bool operator==(QString::Null, QString::Null) { return true; }
-inline bool operator==(QString::Null, const QString &s) { return s.isNull(); }
-inline bool operator==(const QString &s, QString::Null) { return s.isNull(); }
-inline bool operator!=(QString::Null, QString::Null) { return false; }
-inline bool operator!=(QString::Null, const QString &s) { return !s.isNull(); }
-inline bool operator!=(const QString &s, QString::Null) { return !s.isNull(); }
-
-#ifndef QT_NO_CAST_FROM_ASCII
-inline bool qStringComparisonHelper(const QString &s1, const char *s2)
-{
-#  ifndef QT_NO_TEXTCODEC
-    if (QString::codecForCStrings) return (s1 == QString::fromAscii(s2));
-#  endif
-    return (s1 == QLatin1String(s2));
-}
-inline bool QString::operator==(const char *s) const
-{ return qStringComparisonHelper(*this, s); }
-inline bool QString::operator!=(const char *s) const
-{ return !qStringComparisonHelper(*this, s); }
-inline bool QString::operator<(const char *s) const
-{ return *this < QString::fromAscii(s); }
-inline bool QString::operator>(const char *s) const
-{ return *this > QString::fromAscii(s); }
-inline bool QString::operator<=(const char *s) const
-{ return *this <= QString::fromAscii(s); }
-inline bool QString::operator>=(const char *s) const
-{ return *this >= QString::fromAscii(s); }
-
-inline QT_ASCII_CAST_WARN bool operator==(const char *s1, const QString &s2)
-{ return qStringComparisonHelper(s2, s1); }
-inline QT_ASCII_CAST_WARN bool operator!=(const char *s1, const QString &s2)
-{ return !qStringComparisonHelper(s2, s1); }
-inline QT_ASCII_CAST_WARN bool operator<(const char *s1, const QString &s2)
-{ return (QString::fromAscii(s1) < s2); }
-inline QT_ASCII_CAST_WARN bool operator>(const char *s1, const QString &s2)
-{ return (QString::fromAscii(s1) > s2); }
-inline QT_ASCII_CAST_WARN bool operator<=(const char *s1, const QString &s2)
-{ return (QString::fromAscii(s1) <= s2); }
-inline QT_ASCII_CAST_WARN bool operator>=(const char *s1, const QString &s2)
-{ return (QString::fromAscii(s1) >= s2); }
-
-inline QT_ASCII_CAST_WARN bool operator==(const char *s1, const QLatin1String &s2)
-{ return QString::fromAscii(s1) == s2; }
-inline QT_ASCII_CAST_WARN bool operator!=(const char *s1, const QLatin1String &s2)
-{ return QString::fromAscii(s1) != s2; }
-inline QT_ASCII_CAST_WARN bool operator<(const char *s1, const QLatin1String &s2)
-{ return (QString::fromAscii(s1) < s2); }
-inline QT_ASCII_CAST_WARN bool operator>(const char *s1, const QLatin1String &s2)
-{ return (QString::fromAscii(s1) > s2); }
-inline QT_ASCII_CAST_WARN bool operator<=(const char *s1, const QLatin1String &s2)
-{ return (QString::fromAscii(s1) <= s2); }
-inline QT_ASCII_CAST_WARN bool operator>=(const char *s1, const QLatin1String &s2)
-{ return (QString::fromAscii(s1) >= s2); }
-
-inline bool operator==(const QLatin1String &s1, const QLatin1String &s2)
-{ return (qstrcmp(s1.latin1(), s2.latin1()) == 0); }
-inline bool operator!=(const QLatin1String &s1, const QLatin1String &s2)
-{ return (qstrcmp(s1.latin1(), s2.latin1()) != 0); }
-inline bool operator<(const QLatin1String &s1, const QLatin1String &s2)
-{ return (qstrcmp(s1.latin1(), s2.latin1()) < 0); }
-inline bool operator<=(const QLatin1String &s1, const QLatin1String &s2)
-{ return (qstrcmp(s1.latin1(), s2.latin1()) <= 0); }
-inline bool operator>(const QLatin1String &s1, const QLatin1String &s2)
-{ return (qstrcmp(s1.latin1(), s2.latin1()) > 0); }
-inline bool operator>=(const QLatin1String &s1, const QLatin1String &s2)
-{ return (qstrcmp(s1.latin1(), s2.latin1()) >= 0); }
-
-
-inline bool QString::operator==(const QByteArray &s) const
-{ return qStringComparisonHelper(*this, s.constData()); }
-inline bool QString::operator!=(const QByteArray &s) const
-{ return !qStringComparisonHelper(*this, s.constData()); }
-
-inline bool QByteArray::operator==(const QString &s) const
-{ return qStringComparisonHelper(s, constData()); }
-inline bool QByteArray::operator!=(const QString &s) const
-{ return !qStringComparisonHelper(s, constData()); }
-inline bool QByteArray::operator<(const QString &s) const
-{ return QString::fromAscii(constData(), size()) < s; }
-inline bool QByteArray::operator>(const QString &s) const
-{ return QString::fromAscii(constData(), size()) > s; }
-inline bool QByteArray::operator<=(const QString &s) const
-{ return QString::fromAscii(constData(), size()) <= s; }
-inline bool QByteArray::operator>=(const QString &s) const
-{ return QString::fromAscii(constData(), size()) >= s; }
-#endif   // QT_NO_CAST_FROM_ASCII
-
-#ifndef QT_NO_CAST_TO_ASCII
-inline QByteArray &QByteArray::append(const QString &s)
-{ return append(s.toAscii()); }
-inline QByteArray &QByteArray::insert(int i, const QString &s)
-{ return insert(i, s.toAscii()); }
-inline QByteArray &QByteArray::replace(char c, const QString &after)
-{ return replace(c, after.toAscii()); }
-inline QByteArray &QByteArray::replace(const QString &before, const char *after)
-{ return replace(before.toAscii(), after); }
-inline QByteArray &QByteArray::replace(const QString &before, const QByteArray &after)
-{ return replace(before.toAscii(), after); }
-inline QByteArray &QByteArray::operator+=(const QString &s)
-{ return operator+=(s.toAscii()); }
-inline int QByteArray::indexOf(const QString &s, int from) const
-{ return indexOf(s.toAscii(), from); }
-inline int QByteArray::lastIndexOf(const QString &s, int from) const
-{ return lastIndexOf(s.toAscii(), from); }
-#  ifdef QT3_SUPPORT
-inline int QByteArray::find(const QString &s, int from) const
-{ return indexOf(s.toAscii(), from); }
-inline int QByteArray::findRev(const QString &s, int from) const
-{ return lastIndexOf(s.toAscii(), from); }
-#  endif // QT3_SUPPORT
-#endif // QT_NO_CAST_TO_ASCII
-
-#ifndef QT_USE_FAST_OPERATOR_PLUS
-# ifndef QT_USE_FAST_CONCATENATION
-inline const QString operator+(const QString &s1, const QString &s2)
-{ QString t(s1); t += s2; return t; }
-inline const QString operator+(const QString &s1, QChar s2)
-{ QString t(s1); t += s2; return t; }
-inline const QString operator+(QChar s1, const QString &s2)
-{ QString t(s1); t += s2; return t; }
-#  ifndef QT_NO_CAST_FROM_ASCII
-inline QT_ASCII_CAST_WARN const QString operator+(const QString &s1, const char *s2)
-{ QString t(s1); t += QString::fromAscii(s2); return t; }
-inline QT_ASCII_CAST_WARN const QString operator+(const char *s1, const QString &s2)
-{ QString t = QString::fromAscii(s1); t += s2; return t; }
-inline QT_ASCII_CAST_WARN const QString operator+(char c, const QString &s)
-{ QString t = s; t.prepend(QChar::fromAscii(c)); return t; }
-inline QT_ASCII_CAST_WARN const QString operator+(const QString &s, char c)
-{ QString t = s; t += QChar::fromAscii(c); return t; }
-inline QT_ASCII_CAST_WARN const QString operator+(const QByteArray &ba, const QString &s)
-{ QString t = QString::fromAscii(ba.constData(), qstrnlen(ba.constData(), ba.size())); t += s; return t; }
-inline QT_ASCII_CAST_WARN const QString operator+(const QString &s, const QByteArray &ba)
-{ QString t(s); t += QString::fromAscii(ba.constData(), qstrnlen(ba.constData(), ba.size())); return t; }
-#  endif // QT_NO_CAST_FROM_ASCII
-# endif // QT_USE_FAST_CONCATENATION
-#endif // QT_USE_FAST_OPERATOR_PLUS
-
-#ifndef TQT_NO_STL
-inline std::string QString::toStdString() const
-{ const QByteArray asc = toAscii(); return std::string(asc.constData(), asc.length()); }
-
-inline QString QString::fromStdString(const std::string &s)
-{ return fromAscii(s.data(), int(s.size())); }
-
-# ifndef TQT_NO_STL_WCHAR
-inline QStdWString QString::toStdWString() const
-{
-    QStdWString str;
-    str.resize(length());
-
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-    // VS2005 crashes if the string is empty
-    if (!length())
-        return str;
-#endif
-
-    str.resize(toWCharArray(&(*str.begin())));
-    return str;
-}
-inline QString QString::fromStdWString(const QStdWString &s)
-{ return fromWCharArray(s.data(), int(s.size())); }
-# endif
-#endif
-
-#ifdef QT3_SUPPORT
-inline QChar &QString::ref(uint i)
-{
-    if (int(i) > d->size || d->ref != 1)
-        resize(qMax(int(i), d->size));
-    return reinterpret_cast<QChar&>(d->data[i]);
-}
-#endif
-
-#if !defined(QT_NO_DATASTREAM) || (defined(QT_BOOTSTRAPPED) && !defined(QT_BUILD_QMAKE))
-Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QString &);
-Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QString &);
-#endif
-
-#ifdef QT3_SUPPORT
-class QConstString : public QString
-{
-public:
-    inline QT3_SUPPORT_CONSTRUCTOR QConstString(const QChar *aUnicode, int aSize)
-        :QString(aUnicode, aSize){} // cannot use fromRawData() due to changed semantics
-    inline QT3_SUPPORT const QString &string() const { return *this; }
-};
-#endif
-
-Q_DECLARE_TYPEINFO(QString, Q_MOVABLE_TYPE);
-Q_DECLARE_SHARED(QString)
-Q_DECLARE_OPERATORS_FOR_FLAGS(QString::SectionFlags)
-
-#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
-extern Q_CORE_EXPORT QByteArray qt_winQString2MB(const QString& s, int len=-1);
-extern Q_CORE_EXPORT QByteArray qt_winQString2MB(const QChar *ch, int len);
-extern Q_CORE_EXPORT QString qt_winMB2QString(const char* mb, int len=-1);
-#endif
-
-
-class Q_CORE_EXPORT QStringRef {
-    const QString *m_string;
-    int m_position;
-    int m_size;
-public:
-    inline QStringRef():m_string(0), m_position(0), m_size(0){}
-    inline QStringRef(const QString *string, int position, int size);
-    inline QStringRef(const QString *string);
-    inline QStringRef(const QStringRef &other)
-        :m_string(other.m_string), m_position(other.m_position), m_size(other.m_size)
-        {}
-
-    inline ~QStringRef(){}
-    inline const QString *string() const { return m_string; }
-    inline int position() const { return m_position; }
-    inline int size() const { return m_size; }
-    inline int count() const { return m_size; }
-    inline int length() const { return m_size; }
-
-    inline QStringRef &operator=(const QStringRef &other) {
-        m_string = other.m_string; m_position = other.m_position;
-        m_size = other.m_size; return *this;
-    }
-
-    inline QStringRef &operator=(const QString *string);
-
-    inline const QChar *unicode() const {
-        if (!m_string)
-            return reinterpret_cast<const QChar *>(QString::shared_null.data);
-        return m_string->unicode() + m_position;
-    }
-    inline const QChar *data() const { return unicode(); }
-    inline const QChar *constData() const {  return unicode(); }
-
-    inline void clear() { m_string = 0; m_position = m_size = 0; }
-    QString toString() const;
-    inline bool isEmpty() const { return m_size == 0; }
-    inline bool isNull() const { return m_string == 0 || m_string->isNull(); }
-
-    QStringRef appendTo(QString *string) const;
-
-    inline const QChar at(int i) const
-        { Q_ASSERT(i >= 0 && i < size()); return m_string->at(i + m_position); }
-
-    int compare(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    int compare(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    int compare(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    static int compare(const QStringRef &s1, const QString &s2,
-                       Qt::CaseSensitivity = Qt::CaseSensitive);
-    static int compare(const QStringRef &s1, const QStringRef &s2,
-                       Qt::CaseSensitivity = Qt::CaseSensitive);
-    static int compare(const QStringRef &s1, QLatin1String s2,
-                       Qt::CaseSensitivity cs = Qt::CaseSensitive);
-
-    int localeAwareCompare(const QString &s) const;
-    int localeAwareCompare(const QStringRef &s) const;
-    static int localeAwareCompare(const QStringRef &s1, const QString &s2);
-    static int localeAwareCompare(const QStringRef &s1, const QStringRef &s2);
-};
-
-inline QStringRef &QStringRef::operator=(const QString *aString)
-{ m_string = aString; m_position = 0; m_size = aString?aString->size():0; return *this; }
-
-inline QStringRef::QStringRef(const QString *aString, int aPosition, int aSize)
-        :m_string(aString), m_position(aPosition), m_size(aSize){}
-
-inline QStringRef::QStringRef(const QString *aString)
-    :m_string(aString), m_position(0), m_size(aString?aString->size() : 0){}
-
-Q_CORE_EXPORT bool operator==(const QStringRef &s1,const QStringRef &s2);
-inline bool operator!=(const QStringRef &s1,const QStringRef &s2)
-{ return !(s1 == s2); }
-Q_CORE_EXPORT bool operator==(const QString &s1,const QStringRef &s2);
-inline bool operator!=(const QString &s1,const QStringRef &s2)
-{ return !(s1 == s2); }
-inline bool operator==(const QStringRef &s1,const QString &s2)
-{ return s2 == s1; }
-inline bool operator!=(const QStringRef &s1,const QString &s2)
-{ return s2 != s1; }
-Q_CORE_EXPORT bool operator==(const QLatin1String &s1, const QStringRef &s2);
-inline bool operator!=(const QLatin1String &s1,const QStringRef &s2)
-{ return !(s1 == s2); }
-inline bool operator==(const QStringRef &s1,const QLatin1String &s2)
-{ return s2 == s1; }
-inline bool operator!=(const QStringRef &s1,const QLatin1String &s2)
-{ return s2 != s1; }
-
-Q_CORE_EXPORT bool operator<(const QStringRef &s1,const QStringRef &s2);
-inline bool operator>(const QStringRef &s1, const QStringRef &s2)
-{ return s2 < s1; }
-inline bool operator<=(const QStringRef &s1, const QStringRef &s2)
-{ return !(s1 > s2); }
-inline bool operator>=(const QStringRef &s1, const QStringRef &s2)
-{ return !(s1 < s2); }
-
-inline bool qStringComparisonHelper(const QStringRef &s1, const char *s2)
-{
-#  ifndef QT_NO_TEXTCODEC
-    if (QString::codecForCStrings) return (s1 == QString::fromAscii(s2));
-#  endif
-    return (s1 == QLatin1String(s2));
-}
-
-inline QT_ASCII_CAST_WARN bool operator==(const char *s1, const QStringRef &s2)
-{ return qStringComparisonHelper(s2, s1); }
-inline QT_ASCII_CAST_WARN bool operator==(const QStringRef &s1, const char *s2)
-{ return qStringComparisonHelper(s1, s2); }
-inline QT_ASCII_CAST_WARN bool operator!=(const char *s1, const QStringRef &s2)
-{ return !qStringComparisonHelper(s2, s1); }
-inline QT_ASCII_CAST_WARN bool operator!=(const QStringRef &s1, const char *s2)
-{ return !qStringComparisonHelper(s1, s2); }
-
-inline int QString::compare(const QStringRef &s, Qt::CaseSensitivity cs) const
-{ return QString::compare_helper(constData(), length(), s.constData(), s.length(), cs); }
-inline int QString::compare(const QString &s1, const QStringRef &s2, Qt::CaseSensitivity cs)
-{ return QString::compare_helper(s1.constData(), s1.length(), s2.constData(), s2.length(), cs); }
-inline int QStringRef::compare(const QString &s, Qt::CaseSensitivity cs) const
-{ return QString::compare_helper(constData(), length(), s.constData(), s.length(), cs); }
-inline int QStringRef::compare(const QStringRef &s, Qt::CaseSensitivity cs) const
-{ return QString::compare_helper(constData(), length(), s.constData(), s.length(), cs); }
-inline int QStringRef::compare(QLatin1String s, Qt::CaseSensitivity cs) const
-{ return QString::compare_helper(constData(), length(), s, cs); }
-inline int QStringRef::compare(const QStringRef &s1, const QString &s2, Qt::CaseSensitivity cs)
-{ return QString::compare_helper(s1.constData(), s1.length(), s2.constData(), s2.length(), cs); }
-inline int QStringRef::compare(const QStringRef &s1, const QStringRef &s2, Qt::CaseSensitivity cs)
-{ return QString::compare_helper(s1.constData(), s1.length(), s2.constData(), s2.length(), cs); }
-inline int QStringRef::compare(const QStringRef &s1, QLatin1String s2, Qt::CaseSensitivity cs)
-{ return QString::compare_helper(s1.constData(), s1.length(), s2, cs); }
-
-inline int QString::localeAwareCompare(const QStringRef &s) const
-{ return localeAwareCompare_helper(constData(), length(), s.constData(), s.length()); }
-inline int QString::localeAwareCompare(const QString& s1, const QStringRef& s2)
-{ return localeAwareCompare_helper(s1.constData(), s1.length(), s2.constData(), s2.length()); }
-inline int QStringRef::localeAwareCompare(const QString &s) const
-{ return QString::localeAwareCompare_helper(constData(), length(), s.constData(), s.length()); }
-inline int QStringRef::localeAwareCompare(const QStringRef &s) const
-{ return QString::localeAwareCompare_helper(constData(), length(), s.constData(), s.length()); }
-inline int QStringRef::localeAwareCompare(const QStringRef &s1, const QString &s2)
-{ return QString::localeAwareCompare_helper(s1.constData(), s1.length(), s2.constData(), s2.length()); }
-inline int QStringRef::localeAwareCompare(const QStringRef &s1, const QStringRef &s2)
-{ return QString::localeAwareCompare_helper(s1.constData(), s1.length(), s2.constData(), s2.length()); }
-
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#ifdef QT_USE_FAST_CONCATENATION
-#include <QtCore/qstringbuilder.h>
-#endif
-
-#endif // QSTRING_H
diff --git a/qtinterface/tqt4/Qt/qstyle.h b/qtinterface/tqt4/Qt/qstyle.h
deleted file mode 100644
index d454c7e..0000000
--- a/qtinterface/tqt4/Qt/qstyle.h
+++ /dev/null
@@ -1,894 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 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$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QSTYLE_H
-#define QSTYLE_H
-
-#include <QtCore/qobject.h>
-#include <QtCore/qrect.h>
-#include <QtCore/qsize.h>
-#include <QtGui/qicon.h>
-#include <QtGui/qpixmap.h>
-#include <QtGui/qpalette.h>
-#include <QtGui/qsizepolicy.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-class QAction;
-class QDebug;
-class QTab;
-class QFontMetrics;
-class QStyleHintReturn;
-class QStyleOption;
-class QStyleOptionComplex;
-class QStylePrivate;
-
-class Q_GUI_EXPORT QStyle : public QObject
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QStyle)
-
-protected:
-    QStyle(QStylePrivate &dd);
-
-private:
-    bool def;
-
-public:
-    QStyle();
-    virtual ~QStyle();
-
-    virtual void polish(QWidget *);
-    virtual void unpolish(QWidget *);
-
-    virtual void polish(QApplication *);
-    virtual void unpolish(QApplication *);
-
-    virtual void polish(QPalette &);
-
-    virtual QRect itemTextRect(const QFontMetrics &fm, const QRect &r,
-                           int flags, bool enabled,
-                           const QString &text) const;
-
-    virtual QRect itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap) const;
-
-    virtual void drawItemText(QPainter *painter, const QRect &rect,
-                              int flags, const QPalette &pal, bool enabled,
-                              const QString &text, QPalette::ColorRole textRole = QPalette::NoRole) const;
-
-    virtual void drawItemPixmap(QPainter *painter, const QRect &rect,
-                                int alignment, const QPixmap &pixmap) const;
-
-    virtual QPalette standardPalette() const;
-
-    enum StateFlag {
-        State_None =                0x00000000,
-#ifdef QT3_SUPPORT
-        State_Default =             State_None,
-#endif
-        State_Enabled =             0x00000001,
-        State_Raised =              0x00000002,
-        State_Sunken =              0x00000004,
-        State_Off =                 0x00000008,
-        State_NoChange =            0x00000010,
-        State_On =                  0x00000020,
-        State_DownArrow =           0x00000040,
-        State_Horizontal =          0x00000080,
-        State_HasFocus =            0x00000100,
-        State_Top =                 0x00000200,
-        State_Bottom =              0x00000400,
-        State_FocusAtBorder =       0x00000800,
-        State_AutoRaise =           0x00001000,
-        State_MouseOver =           0x00002000,
-        State_UpArrow =             0x00004000,
-        State_Selected =            0x00008000,
-        State_Active =              0x00010000,
-        State_Window =              0x00020000,
-        State_Open =                0x00040000,
-        State_Children =            0x00080000,
-        State_Item =                0x00100000,
-        State_Sibling =             0x00200000,
-        State_Editing =             0x00400000,
-        State_KeyboardFocusChange = 0x00800000,
-#ifdef QT_KEYPAD_NAVIGATION
-        State_HasEditFocus =        0x01000000,
-#endif
-        State_ReadOnly =            0x02000000,
-        State_Small =               0x04000000,
-        State_Mini =                0x08000000
-    };
-    Q_DECLARE_FLAGS(State, StateFlag)
-
-#ifdef QT3_SUPPORT
-    typedef State SFlags;
-#endif
-
-    typedef StateFlag StyleFlags;
-    typedef StateFlag StateFlags;
-    bool isDefault() const;
-
-    enum PrimitiveElement {
-        PE_Q3CheckListController,
-        PE_Q3CheckListExclusiveIndicator,
-        PE_Q3CheckListIndicator,
-        PE_Q3DockWindowSeparator,
-        PE_Q3Separator,
-
-        PE_Frame,
-        PE_FrameDefaultButton,
-        PE_FrameDockWidget,
-        PE_FrameFocusRect,
-        PE_FrameGroupBox,
-        PE_FrameLineEdit,
-        PE_FrameMenu,
-        PE_FrameStatusBar, // obsolete
-        PE_FrameStatusBarItem = PE_FrameStatusBar,
-        PE_FrameTabWidget,
-        PE_FrameWindow,
-        PE_FrameButtonBevel,
-        PE_FrameButtonTool,
-        PE_FrameTabBarBase,
-
-        PE_PanelButtonCommand,
-        PE_PanelButtonBevel,
-        PE_PanelButtonTool,
-        PE_PanelMenuBar,
-        PE_PanelToolBar,
-        PE_PanelLineEdit,
-
-        PE_IndicatorArrowDown,
-        PE_IndicatorArrowLeft,
-        PE_IndicatorArrowRight,
-        PE_IndicatorArrowUp,
-        PE_IndicatorBranch,
-        PE_IndicatorButtonDropDown,
-        PE_IndicatorViewItemCheck,
-        PE_IndicatorItemViewItemCheck = PE_IndicatorViewItemCheck,
-        PE_IndicatorCheckBox,
-        PE_IndicatorDockWidgetResizeHandle,
-        PE_IndicatorHeaderArrow,
-        PE_IndicatorMenuCheckMark,
-        PE_IndicatorProgressChunk,
-        PE_IndicatorRadioButton,
-        PE_IndicatorSpinDown,
-        PE_IndicatorSpinMinus,
-        PE_IndicatorSpinPlus,
-        PE_IndicatorSpinUp,
-        PE_IndicatorToolBarHandle,
-        PE_IndicatorToolBarSeparator,
-        PE_PanelTipLabel,
-        PE_IndicatorTabTear,
-        PE_PanelScrollAreaCorner,
-
-        PE_Widget,
-
-        PE_IndicatorColumnViewArrow,
-        PE_IndicatorItemViewItemDrop,
-
-        PE_PanelItemViewItem,
-        PE_PanelItemViewRow, // ### Qt 5: remove
-
-        PE_PanelStatusBar,
-
-        PE_IndicatorTabClose,
-        PE_PanelMenu,
-
-        // do not add any values below/greater this
-        PE_CustomBase = 0xf000000
-    };
-
-    virtual void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p,
-                               const QWidget *w = 0) const = 0;
-    enum ControlElement {
-        CE_PushButton,
-        CE_PushButtonBevel,
-        CE_PushButtonLabel,
-
-        CE_CheckBox,
-        CE_CheckBoxLabel,
-
-        CE_RadioButton,
-        CE_RadioButtonLabel,
-
-        CE_TabBarTab,
-        CE_TabBarTabShape,
-        CE_TabBarTabLabel,
-
-        CE_ProgressBar,
-        CE_ProgressBarGroove,
-        CE_ProgressBarContents,
-        CE_ProgressBarLabel,
-
-        CE_MenuItem,
-        CE_MenuScroller,
-        CE_MenuVMargin,
-        CE_MenuHMargin,
-        CE_MenuTearoff,
-        CE_MenuEmptyArea,
-
-        CE_MenuBarItem,
-        CE_MenuBarEmptyArea,
-
-        CE_ToolButtonLabel,
-
-        CE_Header,
-        CE_HeaderSection,
-        CE_HeaderLabel,
-
-        CE_Q3DockWindowEmptyArea,
-        CE_ToolBoxTab,
-        CE_SizeGrip,
-        CE_Splitter,
-        CE_RubberBand,
-        CE_DockWidgetTitle,
-
-        CE_ScrollBarAddLine,
-        CE_ScrollBarSubLine,
-        CE_ScrollBarAddPage,
-        CE_ScrollBarSubPage,
-        CE_ScrollBarSlider,
-        CE_ScrollBarFirst,
-        CE_ScrollBarLast,
-
-        CE_FocusFrame,
-        CE_ComboBoxLabel,
-
-        CE_ToolBar,
-        CE_ToolBoxTabShape,
-        CE_ToolBoxTabLabel,
-        CE_HeaderEmptyArea,
-
-        CE_ColumnViewGrip,
-
-        CE_ItemViewItem,
-
-        CE_ShapedFrame,
-
-        // do not add any values below/greater than this
-        CE_CustomBase = 0xf0000000
-    };
-
-    virtual void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p,
-                             const QWidget *w = 0) const = 0;
-
-    enum SubElement {
-        SE_PushButtonContents,
-        SE_PushButtonFocusRect,
-
-        SE_CheckBoxIndicator,
-        SE_CheckBoxContents,
-        SE_CheckBoxFocusRect,
-        SE_CheckBoxClickRect,
-
-        SE_RadioButtonIndicator,
-        SE_RadioButtonContents,
-        SE_RadioButtonFocusRect,
-        SE_RadioButtonClickRect,
-
-        SE_ComboBoxFocusRect,
-
-        SE_SliderFocusRect,
-
-        SE_Q3DockWindowHandleRect,
-
-        SE_ProgressBarGroove,
-        SE_ProgressBarContents,
-        SE_ProgressBarLabel,
-
-        // ### Qt 5: These values are unused; eliminate them
-        SE_DialogButtonAccept,
-        SE_DialogButtonReject,
-        SE_DialogButtonApply,
-        SE_DialogButtonHelp,
-        SE_DialogButtonAll,
-        SE_DialogButtonAbort,
-        SE_DialogButtonIgnore,
-        SE_DialogButtonRetry,
-        SE_DialogButtonCustom,
-
-        SE_ToolBoxTabContents,
-
-        SE_HeaderLabel,
-        SE_HeaderArrow,
-
-        SE_TabWidgetTabBar,
-        SE_TabWidgetTabPane,
-        SE_TabWidgetTabContents,
-        SE_TabWidgetLeftCorner,
-        SE_TabWidgetRightCorner,
-
-        SE_ViewItemCheckIndicator,
-        SE_ItemViewItemCheckIndicator = SE_ViewItemCheckIndicator,
-
-        SE_TabBarTearIndicator,
-
-        SE_TreeViewDisclosureItem,
-
-        SE_LineEditContents,
-        SE_FrameContents,
-
-        SE_DockWidgetCloseButton,
-        SE_DockWidgetFloatButton,
-        SE_DockWidgetTitleBarText,
-        SE_DockWidgetIcon,
-
-        SE_CheckBoxLayoutItem,
-        SE_ComboBoxLayoutItem,
-        SE_DateTimeEditLayoutItem,
-        SE_DialogButtonBoxLayoutItem, // ### remove
-        SE_LabelLayoutItem,
-        SE_ProgressBarLayoutItem,
-        SE_PushButtonLayoutItem,
-        SE_RadioButtonLayoutItem,
-        SE_SliderLayoutItem,
-        SE_SpinBoxLayoutItem,
-        SE_ToolButtonLayoutItem,
-
-        SE_FrameLayoutItem,
-        SE_GroupBoxLayoutItem,
-        SE_TabWidgetLayoutItem,
-
-        SE_ItemViewItemDecoration,
-        SE_ItemViewItemText,
-        SE_ItemViewItemFocusRect,
-
-        SE_TabBarTabLeftButton,
-        SE_TabBarTabRightButton,
-        SE_TabBarTabText,
-
-        SE_ShapedFrameContents,
-
-        SE_ToolBarHandle,
-
-        // do not add any values below/greater than this
-        SE_CustomBase = 0xf0000000
-    };
-
-    virtual QRect subElementRect(SubElement subElement, const QStyleOption *option,
-                                 const QWidget *widget = 0) const = 0;
-
-
-    enum ComplexControl {
-        CC_SpinBox,
-        CC_ComboBox,
-        CC_ScrollBar,
-        CC_Slider,
-        CC_ToolButton,
-        CC_TitleBar,
-        CC_Q3ListView,
-        CC_Dial,
-        CC_GroupBox,
-        CC_MdiControls,
-
-        // do not add any values below/greater than this
-        CC_CustomBase = 0xf0000000
-    };
-
-    enum SubControl {
-        SC_None =                  0x00000000,
-
-        SC_ScrollBarAddLine =      0x00000001,
-        SC_ScrollBarSubLine =      0x00000002,
-        SC_ScrollBarAddPage =      0x00000004,
-        SC_ScrollBarSubPage =      0x00000008,
-        SC_ScrollBarFirst =        0x00000010,
-        SC_ScrollBarLast =         0x00000020,
-        SC_ScrollBarSlider =       0x00000040,
-        SC_ScrollBarGroove =       0x00000080,
-
-        SC_SpinBoxUp =             0x00000001,
-        SC_SpinBoxDown =           0x00000002,
-        SC_SpinBoxFrame =          0x00000004,
-        SC_SpinBoxEditField =      0x00000008,
-
-        SC_ComboBoxFrame =         0x00000001,
-        SC_ComboBoxEditField =     0x00000002,
-        SC_ComboBoxArrow =         0x00000004,
-        SC_ComboBoxListBoxPopup =  0x00000008,
-
-        SC_SliderGroove =          0x00000001,
-        SC_SliderHandle =          0x00000002,
-        SC_SliderTickmarks =       0x00000004,
-
-        SC_ToolButton =            0x00000001,
-        SC_ToolButtonMenu =        0x00000002,
-
-        SC_TitleBarSysMenu =       0x00000001,
-        SC_TitleBarMinButton =     0x00000002,
-        SC_TitleBarMaxButton =     0x00000004,
-        SC_TitleBarCloseButton =   0x00000008,
-        SC_TitleBarNormalButton =  0x00000010,
-        SC_TitleBarShadeButton =   0x00000020,
-        SC_TitleBarUnshadeButton = 0x00000040,
-        SC_TitleBarContextHelpButton = 0x00000080,
-        SC_TitleBarLabel =         0x00000100,
-
-        SC_Q3ListView =            0x00000001,
-        SC_Q3ListViewBranch =      0x00000002,
-        SC_Q3ListViewExpand =      0x00000004,
-
-        SC_DialGroove =            0x00000001,
-        SC_DialHandle =            0x00000002,
-        SC_DialTickmarks =         0x00000004,
-
-        SC_GroupBoxCheckBox =      0x00000001,
-        SC_GroupBoxLabel =         0x00000002,
-        SC_GroupBoxContents =      0x00000004,
-        SC_GroupBoxFrame =         0x00000008,
-
-        SC_MdiMinButton     =      0x00000001,
-        SC_MdiNormalButton  =      0x00000002,
-        SC_MdiCloseButton   =      0x00000004,
-
-        SC_CustomBase =            0xf0000000,
-        SC_All =                   0xffffffff
-    };
-    Q_DECLARE_FLAGS(SubControls, SubControl)
-
-#ifdef QT3_SUPPORT
-    typedef SubControls SCFlags;
-#endif
-
-    virtual void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p,
-                                    const QWidget *widget = 0) const = 0;
-    virtual SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt,
-                                             const QPoint &pt, const QWidget *widget = 0) const = 0;
-    virtual QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
-                                 SubControl sc, const QWidget *widget = 0) const = 0;
-
-    enum PixelMetric {
-        PM_ButtonMargin,
-        PM_ButtonDefaultIndicator,
-        PM_MenuButtonIndicator,
-        PM_ButtonShiftHorizontal,
-        PM_ButtonShiftVertical,
-
-        PM_DefaultFrameWidth,
-        PM_SpinBoxFrameWidth,
-        PM_ComboBoxFrameWidth,
-
-        PM_MaximumDragDistance,
-
-        PM_ScrollBarExtent,
-        PM_ScrollBarSliderMin,
-
-        PM_SliderThickness,             // total slider thickness
-        PM_SliderControlThickness,      // thickness of the business part
-        PM_SliderLength,                // total length of slider
-        PM_SliderTickmarkOffset,        //
-        PM_SliderSpaceAvailable,        // available space for slider to move
-
-        PM_DockWidgetSeparatorExtent,
-        PM_DockWidgetHandleExtent,
-        PM_DockWidgetFrameWidth,
-
-        PM_TabBarTabOverlap,
-        PM_TabBarTabHSpace,
-        PM_TabBarTabVSpace,
-        PM_TabBarBaseHeight,
-        PM_TabBarBaseOverlap,
-
-        PM_ProgressBarChunkWidth,
-
-        PM_SplitterWidth,
-        PM_TitleBarHeight,
-
-        PM_MenuScrollerHeight,
-        PM_MenuHMargin,
-        PM_MenuVMargin,
-        PM_MenuPanelWidth,
-        PM_MenuTearoffHeight,
-        PM_MenuDesktopFrameWidth,
-
-        PM_MenuBarPanelWidth,
-        PM_MenuBarItemSpacing,
-        PM_MenuBarVMargin,
-        PM_MenuBarHMargin,
-
-        PM_IndicatorWidth,
-        PM_IndicatorHeight,
-        PM_ExclusiveIndicatorWidth,
-        PM_ExclusiveIndicatorHeight,
-        PM_CheckListButtonSize,
-        PM_CheckListControllerSize,
-
-        PM_DialogButtonsSeparator,
-        PM_DialogButtonsButtonWidth,
-        PM_DialogButtonsButtonHeight,
-
-        PM_MdiSubWindowFrameWidth,
-        PM_MDIFrameWidth = PM_MdiSubWindowFrameWidth,            //obsolete
-        PM_MdiSubWindowMinimizedWidth,
-        PM_MDIMinimizedWidth = PM_MdiSubWindowMinimizedWidth,    //obsolete
-
-        PM_HeaderMargin,
-        PM_HeaderMarkSize,
-        PM_HeaderGripMargin,
-        PM_TabBarTabShiftHorizontal,
-        PM_TabBarTabShiftVertical,
-        PM_TabBarScrollButtonWidth,
-
-        PM_ToolBarFrameWidth,
-        PM_ToolBarHandleExtent,
-        PM_ToolBarItemSpacing,
-        PM_ToolBarItemMargin,
-        PM_ToolBarSeparatorExtent,
-        PM_ToolBarExtensionExtent,
-
-        PM_SpinBoxSliderHeight,
-
-        PM_DefaultTopLevelMargin,
-        PM_DefaultChildMargin,
-        PM_DefaultLayoutSpacing,
-
-        PM_ToolBarIconSize,
-        PM_ListViewIconSize,
-        PM_IconViewIconSize,
-        PM_SmallIconSize,
-        PM_LargeIconSize,
-
-        PM_FocusFrameVMargin,
-        PM_FocusFrameHMargin,
-
-        PM_ToolTipLabelFrameWidth,
-        PM_CheckBoxLabelSpacing,
-        PM_TabBarIconSize,
-        PM_SizeGripSize,
-        PM_DockWidgetTitleMargin,
-        PM_MessageBoxIconSize,
-        PM_ButtonIconSize,
-
-        PM_DockWidgetTitleBarButtonMargin,
-
-        PM_RadioButtonLabelSpacing,
-        PM_LayoutLeftMargin,
-        PM_LayoutTopMargin,
-        PM_LayoutRightMargin,
-        PM_LayoutBottomMargin,
-        PM_LayoutHorizontalSpacing,
-        PM_LayoutVerticalSpacing,
-        PM_TabBar_ScrollButtonOverlap,
-
-        PM_TextCursorWidth,
-
-        PM_TabCloseIndicatorWidth,
-        PM_TabCloseIndicatorHeight,
-
-        PM_ScrollView_ScrollBarSpacing,
-        PM_SubMenuOverlap,
-
-        // do not add any values below/greater than this
-        PM_CustomBase = 0xf0000000
-    };
-
-    virtual int pixelMetric(PixelMetric metric, const QStyleOption *option = 0,
-                            const QWidget *widget = 0) const = 0;
-
-    enum ContentsType {
-        CT_PushButton,
-        CT_CheckBox,
-        CT_RadioButton,
-        CT_ToolButton,
-        CT_ComboBox,
-        CT_Splitter,
-        CT_Q3DockWindow,
-        CT_ProgressBar,
-        CT_MenuItem,
-        CT_MenuBarItem,
-        CT_MenuBar,
-        CT_Menu,
-        CT_TabBarTab,
-        CT_Slider,
-        CT_ScrollBar,
-        CT_Q3Header,
-        CT_LineEdit,
-        CT_SpinBox,
-        CT_SizeGrip,
-        CT_TabWidget,
-        CT_DialogButtons,
-        CT_HeaderSection,
-        CT_GroupBox,
-        CT_MdiControls,
-        CT_ItemViewItem,
-        // do not add any values below/greater than this
-        CT_CustomBase = 0xf0000000
-    };
-
-    virtual QSize sizeFromContents(ContentsType ct, const QStyleOption *opt,
-                                   const QSize &contentsSize, const QWidget *w = 0) const = 0;
-
-    enum RequestSoftwareInputPanel {
-        RSIP_OnMouseClickAndAlreadyFocused,
-        RSIP_OnMouseClick
-    };
-
-    enum StyleHint {
-        SH_EtchDisabledText,
-        SH_DitherDisabledText,
-        SH_ScrollBar_MiddleClickAbsolutePosition,
-        SH_ScrollBar_ScrollWhenPointerLeavesControl,
-        SH_TabBar_SelectMouseType,
-        SH_TabBar_Alignment,
-        SH_Header_ArrowAlignment,
-        SH_Slider_SnapToValue,
-        SH_Slider_SloppyKeyEvents,
-        SH_ProgressDialog_CenterCancelButton,
-        SH_ProgressDialog_TextLabelAlignment,
-        SH_PrintDialog_RightAlignButtons,
-        SH_MainWindow_SpaceBelowMenuBar,
-        SH_FontDialog_SelectAssociatedText,
-        SH_Menu_AllowActiveAndDisabled,
-        SH_Menu_SpaceActivatesItem,
-        SH_Menu_SubMenuPopupDelay,
-        SH_ScrollView_FrameOnlyAroundContents,
-        SH_MenuBar_AltKeyNavigation,
-        SH_ComboBox_ListMouseTracking,
-        SH_Menu_MouseTracking,
-        SH_MenuBar_MouseTracking,
-        SH_ItemView_ChangeHighlightOnFocus,
-        SH_Widget_ShareActivation,
-        SH_Workspace_FillSpaceOnMaximize,
-        SH_ComboBox_Popup,
-        SH_TitleBar_NoBorder,
-        SH_Slider_StopMouseOverSlider,
-        SH_ScrollBar_StopMouseOverSlider = SH_Slider_StopMouseOverSlider, // obsolete
-        SH_BlinkCursorWhenTextSelected,
-        SH_RichText_FullWidthSelection,
-        SH_Menu_Scrollable,
-        SH_GroupBox_TextLabelVerticalAlignment,
-        SH_GroupBox_TextLabelColor,
-        SH_Menu_SloppySubMenus,
-        SH_Table_GridLineColor,
-        SH_LineEdit_PasswordCharacter,
-        SH_DialogButtons_DefaultButton,
-        SH_ToolBox_SelectedPageTitleBold,
-        SH_TabBar_PreferNoArrows,
-        SH_ScrollBar_LeftClickAbsolutePosition,
-        SH_Q3ListViewExpand_SelectMouseType,
-        SH_UnderlineShortcut,
-        SH_SpinBox_AnimateButton,
-        SH_SpinBox_KeyPressAutoRepeatRate,
-        SH_SpinBox_ClickAutoRepeatRate,
-        SH_Menu_FillScreenWithScroll,
-        SH_ToolTipLabel_Opacity,
-        SH_DrawMenuBarSeparator,
-        SH_TitleBar_ModifyNotification,
-        SH_Button_FocusPolicy,
-        SH_MenuBar_DismissOnSecondClick,
-        SH_MessageBox_UseBorderForButtonSpacing,
-        SH_TitleBar_AutoRaise,
-        SH_ToolButton_PopupDelay,
-        SH_FocusFrame_Mask,
-        SH_RubberBand_Mask,
-        SH_WindowFrame_Mask,
-        SH_SpinControls_DisableOnBounds,
-        SH_Dial_BackgroundRole,
-        SH_ComboBox_LayoutDirection,
-        SH_ItemView_EllipsisLocation,
-        SH_ItemView_ShowDecorationSelected,
-        SH_ItemView_ActivateItemOnSingleClick,
-        SH_ScrollBar_ContextMenu,
-        SH_ScrollBar_RollBetweenButtons,
-        SH_Slider_AbsoluteSetButtons,
-        SH_Slider_PageSetButtons,
-        SH_Menu_KeyboardSearch,
-        SH_TabBar_ElideMode,
-        SH_DialogButtonLayout,
-        SH_ComboBox_PopupFrameStyle,
-        SH_MessageBox_TextInteractionFlags,
-        SH_DialogButtonBox_ButtonsHaveIcons,
-        SH_SpellCheckUnderlineStyle,
-        SH_MessageBox_CenterButtons,
-        SH_Menu_SelectionWrap,
-        SH_ItemView_MovementWithoutUpdatingSelection,
-        SH_ToolTip_Mask,
-        SH_FocusFrame_AboveWidget,
-        SH_TextControl_FocusIndicatorTextCharFormat,
-        SH_WizardStyle,
-        SH_ItemView_ArrowKeysNavigateIntoChildren,
-        SH_Menu_Mask,
-        SH_Menu_FlashTriggeredItem,
-        SH_Menu_FadeOutOnHide,
-        SH_SpinBox_ClickAutoRepeatThreshold,
-        SH_ItemView_PaintAlternatingRowColorsForEmptyArea,
-	    SH_FormLayoutWrapPolicy,
-        SH_TabWidget_DefaultTabPosition,
-        SH_ToolBar_Movable,
-        SH_FormLayoutFieldGrowthPolicy,
-        SH_FormLayoutFormAlignment,
-        SH_FormLayoutLabelAlignment,
-        SH_ItemView_DrawDelegateFrame,
-        SH_TabBar_CloseButtonPosition,
-        SH_DockWidget_ButtonsHaveFrame,
-        SH_ToolButtonStyle,
-        SH_RequestSoftwareInputPanel,
-        // Add new style hint values here
-
-#ifdef QT3_SUPPORT
-        SH_GUIStyle = 0x00000100,
-        SH_ScrollBar_BackgroundMode,
-        // Add other compat values here
-
-        SH_UnderlineAccelerator = SH_UnderlineShortcut,
-#endif
-        SH_CustomBase = 0xf0000000
-    };
-
-    virtual int styleHint(StyleHint stylehint, const QStyleOption *opt = 0,
-                          const QWidget *widget = 0, QStyleHintReturn* returnData = 0) const = 0;
-
-    enum StandardPixmap {
-        SP_TitleBarMenuButton,
-        SP_TitleBarMinButton,
-        SP_TitleBarMaxButton,
-        SP_TitleBarCloseButton,
-        SP_TitleBarNormalButton,
-        SP_TitleBarShadeButton,
-        SP_TitleBarUnshadeButton,
-        SP_TitleBarContextHelpButton,
-        SP_DockWidgetCloseButton,
-        SP_MessageBoxInformation,
-        SP_MessageBoxWarning,
-        SP_MessageBoxCritical,
-        SP_MessageBoxQuestion,
-        SP_DesktopIcon,
-        SP_TrashIcon,
-        SP_ComputerIcon,
-        SP_DriveFDIcon,
-        SP_DriveHDIcon,
-        SP_DriveCDIcon,
-        SP_DriveDVDIcon,
-        SP_DriveNetIcon,
-        SP_DirOpenIcon,
-        SP_DirClosedIcon,
-        SP_DirLinkIcon,
-        SP_FileIcon,
-        SP_FileLinkIcon,
-        SP_ToolBarHorizontalExtensionButton,
-        SP_ToolBarVerticalExtensionButton,
-        SP_FileDialogStart,
-        SP_FileDialogEnd,
-        SP_FileDialogToParent,
-        SP_FileDialogNewFolder,
-        SP_FileDialogDetailedView,
-        SP_FileDialogInfoView,
-        SP_FileDialogContentsView,
-        SP_FileDialogListView,
-        SP_FileDialogBack,
-        SP_DirIcon,
-        SP_DialogOkButton,
-        SP_DialogCancelButton,
-        SP_DialogHelpButton,
-        SP_DialogOpenButton,
-        SP_DialogSaveButton,
-        SP_DialogCloseButton,
-        SP_DialogApplyButton,
-        SP_DialogResetButton,
-        SP_DialogDiscardButton,
-        SP_DialogYesButton,
-        SP_DialogNoButton,
-        SP_ArrowUp,
-        SP_ArrowDown,
-        SP_ArrowLeft,
-        SP_ArrowRight,
-        SP_ArrowBack,
-        SP_ArrowForward,
-        SP_DirHomeIcon,
-        SP_CommandLink,
-        SP_VistaShield,
-        SP_BrowserReload,
-        SP_BrowserStop,
-        SP_MediaPlay,
-        SP_MediaStop,
-        SP_MediaPause,
-        SP_MediaSkipForward,
-        SP_MediaSkipBackward,
-        SP_MediaSeekForward,
-        SP_MediaSeekBackward,
-        SP_MediaVolume,
-        SP_MediaVolumeMuted,
-        // do not add any values below/greater than this
-        SP_CustomBase = 0xf0000000
-    };
-
-    virtual QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt = 0,
-                                   const QWidget *widget = 0) const = 0;
-
-    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0,
-                       const QWidget *widget = 0) const;
-
-    virtual QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap,
-                                        const QStyleOption *opt) const = 0;
-
-    static QRect visualRect(Qt::LayoutDirection direction, const QRect &boundingRect,
-                            const QRect &logicalRect);
-    static QPoint visualPos(Qt::LayoutDirection direction, const QRect &boundingRect,
-                            const QPoint &logicalPos);
-    static int sliderPositionFromValue(int min, int max, int val, int space,
-                                       bool upsideDown = false);
-    static int sliderValueFromPosition(int min, int max, int pos, int space,
-                                       bool upsideDown = false);
-    static Qt::Alignment visualAlignment(Qt::LayoutDirection direction, Qt::Alignment alignment);
-    static QRect alignedRect(Qt::LayoutDirection direction, Qt::Alignment alignment,
-                             const QSize &size, const QRect &rectangle);
-
-    int layoutSpacing(QSizePolicy::ControlType control1,
-                      QSizePolicy::ControlType control2, Qt::Orientation orientation,
-                      const QStyleOption *option = 0, const QWidget *widget = 0) const;
-    int combinedLayoutSpacing(QSizePolicy::ControlTypes controls1,
-                              QSizePolicy::ControlTypes controls2, Qt::Orientation orientation,
-                              QStyleOption *option = 0, QWidget *widget = 0) const;
-
-    const QStyle * proxy() const;
-
-protected Q_SLOTS:
-    QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt = 0,
-                                     const QWidget *widget = 0) const;
-    int layoutSpacingImplementation(QSizePolicy::ControlType control1,
-                                    QSizePolicy::ControlType control2,
-                                    Qt::Orientation orientation,
-                                    const QStyleOption *option = 0,
-                                    const QWidget *widget = 0) const;
-
-private:
-    Q_DISABLE_COPY(QStyle)
-    friend class QWidget;
-    friend class QWidgetPrivate;
-    friend class QApplication;
-    friend class QProxyStyle;
-    friend class QProxyStylePrivate;
-    void setProxy(QStyle *style);
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QStyle::State)
-Q_DECLARE_OPERATORS_FOR_FLAGS(QStyle::SubControls)
-
-Q_GUI_EXPORT QDebug operator<<(QDebug debug, QStyle::State state);
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QSTYLE_H
diff --git a/qtinterface/tqt4/Qt/qstyleoption.h b/qtinterface/tqt4/Qt/qstyleoption.h
deleted file mode 100644
index bf8712b..0000000
--- a/qtinterface/tqt4/Qt/qstyleoption.h
+++ /dev/null
@@ -1,975 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 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$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QSTYLEOPTION_H
-#define QSTYLEOPTION_H
-
-#include <QtCore/qvariant.h>
-#include <QtGui/qabstractspinbox.h>
-#include <QtGui/qicon.h>
-#include <QtGui/qmatrix.h>
-#include <QtGui/qslider.h>
-#include <QtGui/qstyle.h>
-#include <QtGui/qtabbar.h>
-#include <QtGui/qtabwidget.h>
-#include <QtGui/qrubberband.h>
-#include <QtGui/qframe.h>
-#ifndef QT_NO_ITEMVIEWS
-#   include <QtCore/qabstractitemmodel.h>
-#endif
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-class QDebug;
-class Q3ListViewItem;
-
-class Q_GUI_EXPORT QStyleOption
-{
-public:
-    enum OptionType {
-                      SO_Default, SO_FocusRect, SO_Button, SO_Tab, SO_MenuItem,
-                      SO_Frame, SO_ProgressBar, SO_ToolBox, SO_Header, SO_Q3DockWindow,
-                      SO_DockWidget, SO_Q3ListViewItem, SO_ViewItem, SO_TabWidgetFrame,
-                      SO_TabBarBase, SO_RubberBand, SO_ToolBar, SO_GraphicsItem,
-
-                      SO_Complex = 0xf0000, SO_Slider, SO_SpinBox, SO_ToolButton, SO_ComboBox,
-                      SO_Q3ListView, SO_TitleBar, SO_GroupBox, SO_SizeGrip,
-
-                      SO_CustomBase = 0xf00,
-                      SO_ComplexCustomBase = 0xf000000
-                    };
-
-    enum StyleOptionType { Type = SO_Default };
-    enum StyleOptionVersion { Version = 1 };
-
-    int version;
-    int type;
-    QStyle::State state;
-    Qt::LayoutDirection direction;
-    QRect rect;
-    QFontMetrics fontMetrics;
-    QPalette palette;
-
-    Q3ListViewItem* listViewItem() const;
-
-    QStyleOption(int version = QStyleOption::Version, int type = SO_Default);
-    QStyleOption(const QStyleOption &other);
-    ~QStyleOption();
-
-    void init(const QWidget *w);
-    inline void initFrom(const QWidget *w) { init(w); }
-    QStyleOption &operator=(const QStyleOption &other);
-
-    bool isDefault() const;
-private:
-    bool def;
-};
-
-class Q_GUI_EXPORT QStyleOptionFocusRect : public QStyleOption
-{
-public:
-    enum StyleOptionType { Type = SO_FocusRect };
-    enum StyleOptionVersion { Version = 1 };
-
-    QColor backgroundColor;
-
-    QStyleOptionFocusRect();
-    QStyleOptionFocusRect(const QStyleOptionFocusRect &other) : QStyleOption(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionFocusRect(int version);
-};
-
-class Q_GUI_EXPORT QStyleOptionFrame : public QStyleOption
-{
-public:
-    enum StyleOptionType { Type = SO_Frame };
-    enum StyleOptionVersion { Version = 1 };
-
-    int lineWidth;
-    int midLineWidth;
-
-    QStyleOptionFrame();
-    QStyleOptionFrame(const QStyleOptionFrame &other) : QStyleOption(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionFrame(int version);
-};
-
-class Q_GUI_EXPORT QStyleOptionFrameV2 : public QStyleOptionFrame
-{
-public:
-    enum StyleOptionVersion { Version = 2 };
-    enum FrameFeature {
-        None = 0x00,
-        Flat = 0x01
-    };
-    Q_DECLARE_FLAGS(FrameFeatures, FrameFeature)
-    FrameFeatures features;
-
-    QStyleOptionFrameV2();
-    QStyleOptionFrameV2(const QStyleOptionFrameV2 &other) : QStyleOptionFrame(Version) { *this = other; }
-    QStyleOptionFrameV2(const QStyleOptionFrame &other);
-    QStyleOptionFrameV2 &operator=(const QStyleOptionFrame &other);
-
-protected:
-    QStyleOptionFrameV2(int version);
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionFrameV2::FrameFeatures)
-
-
-class Q_GUI_EXPORT QStyleOptionFrameV3 : public QStyleOptionFrameV2
-{
-public:
-    enum StyleOptionVersion { Version = 3 };
-    QFrame::Shape frameShape : 4;
-    uint unused : 28;
-
-    QStyleOptionFrameV3();
-    QStyleOptionFrameV3(const QStyleOptionFrameV3 &other) : QStyleOptionFrameV2(Version) { *this = other; }
-    QStyleOptionFrameV3(const QStyleOptionFrame &other);
-    QStyleOptionFrameV3 &operator=(const QStyleOptionFrame &other);
-
-protected:
-    QStyleOptionFrameV3(int version);
-};
-
-
-#ifndef QT_NO_TABWIDGET
-class Q_GUI_EXPORT QStyleOptionTabWidgetFrame : public QStyleOption
-{
-public:
-    enum StyleOptionType { Type = SO_TabWidgetFrame };
-    enum StyleOptionVersion { Version = 1 };
-
-    int lineWidth;
-    int midLineWidth;
-    QTabBar::Shape shape;
-    QSize tabBarSize;
-    QSize rightCornerWidgetSize;
-    QSize leftCornerWidgetSize;
-
-    QStyleOptionTabWidgetFrame();
-    inline QStyleOptionTabWidgetFrame(const QStyleOptionTabWidgetFrame &other)
-        : QStyleOption(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionTabWidgetFrame(int version);
-};
-
-class Q_GUI_EXPORT QStyleOptionTabWidgetFrameV2 : public QStyleOptionTabWidgetFrame
-{
-public:
-    enum StyleOptionVersion { Version = 2 };
-
-    QRect tabBarRect;
-    QRect selectedTabRect;
-
-    QStyleOptionTabWidgetFrameV2();
-    QStyleOptionTabWidgetFrameV2(const QStyleOptionTabWidgetFrameV2 &other) :
-            QStyleOptionTabWidgetFrame(Version) { *this = other; }
-    QStyleOptionTabWidgetFrameV2(const QStyleOptionTabWidgetFrame &other);
-    QStyleOptionTabWidgetFrameV2 &operator=(const QStyleOptionTabWidgetFrame &other);
-
-protected:
-    QStyleOptionTabWidgetFrameV2(int version);
-};
-
-#endif
-
-
-#ifndef QT_NO_TABBAR
-class Q_GUI_EXPORT QStyleOptionTabBarBase : public QStyleOption
-{
-public:
-    enum StyleOptionType { Type = SO_TabBarBase };
-    enum StyleOptionVersion { Version = 1 };
-
-    QTabBar::Shape shape;
-    QRect tabBarRect;
-    QRect selectedTabRect;
-
-    QStyleOptionTabBarBase();
-    QStyleOptionTabBarBase(const QStyleOptionTabBarBase &other) : QStyleOption(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionTabBarBase(int version);
-};
-
-class Q_GUI_EXPORT QStyleOptionTabBarBaseV2 : public QStyleOptionTabBarBase
-{
-public:
-    enum StyleOptionVersion { Version = 2 };
-    bool documentMode;
-    QStyleOptionTabBarBaseV2();
-    QStyleOptionTabBarBaseV2(const QStyleOptionTabBarBaseV2 &other) : QStyleOptionTabBarBase(Version) { *this = other; }
-    QStyleOptionTabBarBaseV2(const QStyleOptionTabBarBase &other);
-    QStyleOptionTabBarBaseV2 &operator=(const QStyleOptionTabBarBase &other);
-
-protected:
-    QStyleOptionTabBarBaseV2(int version);
-};
-
-#endif
-
-class Q_GUI_EXPORT QStyleOptionHeader : public QStyleOption
-{
-public:
-    enum StyleOptionType { Type = SO_Header };
-    enum StyleOptionVersion { Version = 1 };
-
-    enum SectionPosition { Beginning, Middle, End, OnlyOneSection };
-    enum SelectedPosition { NotAdjacent, NextIsSelected, PreviousIsSelected,
-                            NextAndPreviousAreSelected };
-    enum SortIndicator { None, SortUp, SortDown };
-
-    int section;
-    QString text;
-    Qt::Alignment textAlignment;
-    QIcon icon;
-    Qt::Alignment iconAlignment;
-    SectionPosition position;
-    SelectedPosition selectedPosition;
-    SortIndicator sortIndicator;
-    Qt::Orientation orientation;
-
-    QStyleOptionHeader();
-    QStyleOptionHeader(const QStyleOptionHeader &other) : QStyleOption(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionHeader(int version);
-};
-
-class Q_GUI_EXPORT QStyleOptionButton : public QStyleOption
-{
-public:
-    enum StyleOptionType { Type = SO_Button };
-    enum StyleOptionVersion { Version = 1 };
-
-    enum ButtonFeature { None = 0x00, Flat = 0x01, HasMenu = 0x02, DefaultButton = 0x04,
-                         AutoDefaultButton = 0x08, CommandLinkButton = 0x10  };
-    Q_DECLARE_FLAGS(ButtonFeatures, ButtonFeature)
-
-    ButtonFeatures features;
-    QString text;
-    QIcon icon;
-    QSize iconSize;
-
-    QStyleOptionButton();
-    QStyleOptionButton(const QStyleOptionButton &other) : QStyleOption(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionButton(int version);
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionButton::ButtonFeatures)
-
-#ifndef QT_NO_TABBAR
-class Q_GUI_EXPORT QStyleOptionTab : public QStyleOption
-{
-public:
-    enum StyleOptionType { Type = SO_Tab };
-    enum StyleOptionVersion { Version = 1 };
-
-    enum TabPosition { Beginning, Middle, End, OnlyOneTab };
-    enum SelectedPosition { NotAdjacent, NextIsSelected, PreviousIsSelected };
-    enum CornerWidget { NoCornerWidgets = 0x00, LeftCornerWidget = 0x01,
-                        RightCornerWidget = 0x02 };
-    Q_DECLARE_FLAGS(CornerWidgets, CornerWidget)
-
-    QTabBar::Shape shape;
-    QString text;
-    QIcon icon;
-    int row;
-    TabPosition position;
-    SelectedPosition selectedPosition;
-    CornerWidgets cornerWidgets;
-
-    QStyleOptionTab();
-    QStyleOptionTab(const QStyleOptionTab &other) : QStyleOption(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionTab(int version);
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionTab::CornerWidgets)
-
-class Q_GUI_EXPORT QStyleOptionTabV2 : public QStyleOptionTab
-{
-public:
-    enum StyleOptionVersion { Version = 2 };
-    QSize iconSize;
-    QStyleOptionTabV2();
-    QStyleOptionTabV2(const QStyleOptionTabV2 &other) : QStyleOptionTab(Version) { *this = other; }
-    QStyleOptionTabV2(const QStyleOptionTab &other);
-    QStyleOptionTabV2 &operator=(const QStyleOptionTab &other);
-
-protected:
-    QStyleOptionTabV2(int version);
-};
-
-class Q_GUI_EXPORT QStyleOptionTabV3 : public QStyleOptionTabV2
-{
-public:
-    enum StyleOptionVersion { Version = 3 };
-    bool documentMode;
-    QSize leftButtonSize;
-    QSize rightButtonSize;
-    QStyleOptionTabV3();
-    QStyleOptionTabV3(const QStyleOptionTabV3 &other) : QStyleOptionTabV2(Version) { *this = other; }
-    QStyleOptionTabV3(const QStyleOptionTabV2 &other) : QStyleOptionTabV2(Version) { *this = other; }
-    QStyleOptionTabV3(const QStyleOptionTab &other);
-    QStyleOptionTabV3 &operator=(const QStyleOptionTab &other);
-
-protected:
-    QStyleOptionTabV3(int version);
-};
-
-#endif
-
-
-#ifndef QT_NO_TOOLBAR
-
-class Q_GUI_EXPORT QStyleOptionToolBar : public QStyleOption
-{
-public:
-    enum StyleOptionType { Type = SO_ToolBar };
-    enum StyleOptionVersion { Version = 1 };
-    enum ToolBarPosition { Beginning, Middle, End, OnlyOne };
-    enum ToolBarFeature { None = 0x0, Movable = 0x1 };
-    Q_DECLARE_FLAGS(ToolBarFeatures, ToolBarFeature)
-    ToolBarPosition positionOfLine; // The toolbar line position
-    ToolBarPosition positionWithinLine; // The position within a toolbar
-    Qt::ToolBarArea toolBarArea; // The toolbar docking area
-    ToolBarFeatures features;
-    int lineWidth;
-    int midLineWidth;
-    QStyleOptionToolBar();
-    QStyleOptionToolBar(const QStyleOptionToolBar &other) : QStyleOption(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionToolBar(int version);
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionToolBar::ToolBarFeatures)
-
-#endif
-
-
-
-class Q_GUI_EXPORT QStyleOptionProgressBar : public QStyleOption
-{
-public:
-    enum StyleOptionType { Type = SO_ProgressBar };
-    enum StyleOptionVersion { Version = 1 };
-
-    int minimum;
-    int maximum;
-    int progress;
-    QString text;
-    Qt::Alignment textAlignment;
-    bool textVisible;
-
-    QStyleOptionProgressBar();
-    QStyleOptionProgressBar(const QStyleOptionProgressBar &other) : QStyleOption(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionProgressBar(int version);
-};
-
-// Adds style info for vertical progress bars
-class Q_GUI_EXPORT QStyleOptionProgressBarV2 : public QStyleOptionProgressBar
-{
-public:
-    enum StyleOptionType { Type = SO_ProgressBar };
-    enum StyleOptionVersion { Version = 2 };
-    Qt::Orientation orientation;
-    bool invertedAppearance;
-    bool bottomToTop;
-
-    QStyleOptionProgressBarV2();
-    QStyleOptionProgressBarV2(const QStyleOptionProgressBar &other);
-    QStyleOptionProgressBarV2(const QStyleOptionProgressBarV2 &other);
-    QStyleOptionProgressBarV2 &operator=(const QStyleOptionProgressBar &other);
-
-protected:
-    QStyleOptionProgressBarV2(int version);
-};
-
-class Q_GUI_EXPORT QStyleOptionMenuItem : public QStyleOption
-{
-public:
-    enum StyleOptionType { Type = SO_MenuItem };
-    enum StyleOptionVersion { Version = 1 };
-
-    enum MenuItemType { Normal, DefaultItem, Separator, SubMenu, Scroller, TearOff, Margin,
-                        EmptyArea };
-    enum CheckType { NotCheckable, Exclusive, NonExclusive };
-
-    MenuItemType menuItemType;
-    CheckType checkType;
-    bool checked;
-    bool menuHasCheckableItems;
-    QRect menuRect;
-    QString text;
-    QIcon icon;
-    int maxIconWidth;
-    int tabWidth;
-    QFont font;
-
-    QStyleOptionMenuItem();
-    QStyleOptionMenuItem(const QStyleOptionMenuItem &other) : QStyleOption(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionMenuItem(int version);
-};
-
-class Q_GUI_EXPORT QStyleOptionQ3ListViewItem : public QStyleOption
-{
-public:
-    enum StyleOptionType { Type = SO_Q3ListViewItem };
-    enum StyleOptionVersion { Version = 1 };
-
-    enum Q3ListViewItemFeature { None = 0x00, Expandable = 0x01, MultiLine = 0x02, Visible = 0x04,
-                                 ParentControl = 0x08 };
-    Q_DECLARE_FLAGS(Q3ListViewItemFeatures, Q3ListViewItemFeature)
-
-    Q3ListViewItemFeatures features;
-    int height;
-    int totalHeight;
-    int itemY;
-    int childCount;
-
-    QStyleOptionQ3ListViewItem();
-    QStyleOptionQ3ListViewItem(const QStyleOptionQ3ListViewItem &other) : QStyleOption(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionQ3ListViewItem(int version);
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionQ3ListViewItem::Q3ListViewItemFeatures)
-
-class Q_GUI_EXPORT QStyleOptionQ3DockWindow : public QStyleOption
-{
-public:
-    enum StyleOptionType { Type = SO_Q3DockWindow };
-    enum StyleOptionVersion { Version = 1 };
-
-    bool docked;
-    bool closeEnabled;
-
-    QStyleOptionQ3DockWindow();
-    QStyleOptionQ3DockWindow(const QStyleOptionQ3DockWindow &other) : QStyleOption(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionQ3DockWindow(int version);
-};
-
-class Q_GUI_EXPORT QStyleOptionDockWidget : public QStyleOption
-{
-public:
-    enum StyleOptionType { Type = SO_DockWidget };
-    enum StyleOptionVersion { Version = 1 };
-
-    QString title;
-    bool closable;
-    bool movable;
-    bool floatable;
-
-    QStyleOptionDockWidget();
-    QStyleOptionDockWidget(const QStyleOptionDockWidget &other) : QStyleOption(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionDockWidget(int version);
-};
-
-class Q_GUI_EXPORT QStyleOptionDockWidgetV2 : public QStyleOptionDockWidget
-{
-public:
-    enum StyleOptionVersion { Version = 2 };
-
-    bool verticalTitleBar;
-
-    QStyleOptionDockWidgetV2();
-    QStyleOptionDockWidgetV2(const QStyleOptionDockWidgetV2 &other)
-        : QStyleOptionDockWidget(Version) { *this = other; }
-    QStyleOptionDockWidgetV2(const QStyleOptionDockWidget &other);
-    QStyleOptionDockWidgetV2 &operator = (const QStyleOptionDockWidget &other);
-
-protected:
-    QStyleOptionDockWidgetV2(int version);
-};
-
-class Q_GUI_EXPORT QStyleOptionViewItem : public QStyleOption
-{
-public:
-    enum StyleOptionType { Type = SO_ViewItem };
-    enum StyleOptionVersion { Version = 1 };
-
-    enum Position { Left, Right, Top, Bottom };
-
-    Qt::Alignment displayAlignment;
-    Qt::Alignment decorationAlignment;
-    Qt::TextElideMode textElideMode;
-    Position decorationPosition;
-    QSize decorationSize;
-    QFont font;
-    bool showDecorationSelected;
-
-    QStyleOptionViewItem();
-    QStyleOptionViewItem(const QStyleOptionViewItem &other) : QStyleOption(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionViewItem(int version);
-};
-
-class Q_GUI_EXPORT QStyleOptionViewItemV2 : public QStyleOptionViewItem
-{
-public:
-    enum StyleOptionVersion { Version = 2 };
-
-    enum ViewItemFeature {
-        None = 0x00,
-        WrapText = 0x01,
-        Alternate = 0x02,
-        HasCheckIndicator = 0x04,
-        HasDisplay = 0x08,
-        HasDecoration = 0x10
-    };
-    Q_DECLARE_FLAGS(ViewItemFeatures, ViewItemFeature)
-
-    ViewItemFeatures features;
-
-    QStyleOptionViewItemV2();
-    QStyleOptionViewItemV2(const QStyleOptionViewItemV2 &other) : QStyleOptionViewItem(Version) { *this = other; }
-    QStyleOptionViewItemV2(const QStyleOptionViewItem &other);
-    QStyleOptionViewItemV2 &operator=(const QStyleOptionViewItem &other);
-
-protected:
-    QStyleOptionViewItemV2(int version);
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionViewItemV2::ViewItemFeatures)
-
-class Q_GUI_EXPORT QStyleOptionViewItemV3 : public QStyleOptionViewItemV2
-{
-public:
-    enum StyleOptionVersion { Version = 3 };
-
-    QLocale locale;
-    const QWidget *widget;
-
-    QStyleOptionViewItemV3();
-    QStyleOptionViewItemV3(const QStyleOptionViewItemV3 &other)
-        : QStyleOptionViewItemV2(Version) { *this = other; }
-    QStyleOptionViewItemV3(const QStyleOptionViewItem &other);
-    QStyleOptionViewItemV3 &operator = (const QStyleOptionViewItem &other);
-
-protected:
-    QStyleOptionViewItemV3(int version);
-};
-
-#ifndef QT_NO_ITEMVIEWS
-class Q_GUI_EXPORT QStyleOptionViewItemV4 : public QStyleOptionViewItemV3
-{
-public:
-    enum StyleOptionVersion { Version = 4 };
-    enum ViewItemPosition { Invalid, Beginning, Middle, End, OnlyOne };
-
-    QModelIndex index;
-    Qt::CheckState checkState;
-    QIcon icon;
-    QString text;
-    ViewItemPosition viewItemPosition;
-    QBrush backgroundBrush;
-
-    QStyleOptionViewItemV4();
-    QStyleOptionViewItemV4(const QStyleOptionViewItemV4 &other)
-        : QStyleOptionViewItemV3(Version) { *this = other; }
-    QStyleOptionViewItemV4(const QStyleOptionViewItem &other);
-    QStyleOptionViewItemV4 &operator = (const QStyleOptionViewItem &other);
-
-protected:
-    QStyleOptionViewItemV4(int version);
-};
-#endif
-
-class Q_GUI_EXPORT QStyleOptionToolBox : public QStyleOption
-{
-public:
-    enum StyleOptionType { Type = SO_ToolBox };
-    enum StyleOptionVersion { Version = 1 };
-
-    QString text;
-    QIcon icon;
-
-    QStyleOptionToolBox();
-    QStyleOptionToolBox(const QStyleOptionToolBox &other) : QStyleOption(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionToolBox(int version);
-};
-
-class Q_GUI_EXPORT QStyleOptionToolBoxV2 : public QStyleOptionToolBox
-{
-public:
-    enum StyleOptionVersion { Version = 2 };
-    enum TabPosition { Beginning, Middle, End, OnlyOneTab };
-    enum SelectedPosition { NotAdjacent, NextIsSelected, PreviousIsSelected };
-
-    TabPosition position;
-    SelectedPosition selectedPosition;
-
-    QStyleOptionToolBoxV2();
-    QStyleOptionToolBoxV2(const QStyleOptionToolBoxV2 &other) : QStyleOptionToolBox(Version) { *this = other; }
-    QStyleOptionToolBoxV2(const QStyleOptionToolBox &other);
-    QStyleOptionToolBoxV2 &operator=(const QStyleOptionToolBox &other);
-
-protected:
-    QStyleOptionToolBoxV2(int version);
-};
-
-#ifndef QT_NO_RUBBERBAND
-class Q_GUI_EXPORT QStyleOptionRubberBand : public QStyleOption
-{
-public:
-    enum StyleOptionType { Type = SO_RubberBand };
-    enum StyleOptionVersion { Version = 1 };
-
-    QRubberBand::Shape shape;
-    bool opaque;
-
-    QStyleOptionRubberBand();
-    QStyleOptionRubberBand(const QStyleOptionRubberBand &other) : QStyleOption(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionRubberBand(int version);
-};
-#endif // QT_NO_RUBBERBAND
-
-// -------------------------- Complex style options -------------------------------
-class Q_GUI_EXPORT QStyleOptionComplex : public QStyleOption
-{
-public:
-    enum StyleOptionType { Type = SO_Complex };
-    enum StyleOptionVersion { Version = 1 };
-
-    QStyle::SubControls subControls;
-    QStyle::SubControls activeSubControls;
-
-    QStyleOptionComplex(int version = QStyleOptionComplex::Version, int type = SO_Complex);
-    QStyleOptionComplex(const QStyleOptionComplex &other) : QStyleOption(Version, Type) { *this = other; }
-};
-
-#ifndef QT_NO_SLIDER
-class Q_GUI_EXPORT QStyleOptionSlider : public QStyleOptionComplex
-{
-public:
-    enum StyleOptionType { Type = SO_Slider };
-    enum StyleOptionVersion { Version = 1 };
-
-    Qt::Orientation orientation;
-    int minimum;
-    int maximum;
-    QSlider::TickPosition tickPosition;
-    int tickInterval;
-    bool upsideDown;
-    int sliderPosition;
-    int sliderValue;
-    int singleStep;
-    int pageStep;
-    qreal notchTarget;
-    bool dialWrapping;
-
-    QStyleOptionSlider();
-    QStyleOptionSlider(const QStyleOptionSlider &other) : QStyleOptionComplex(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionSlider(int version);
-};
-#endif // QT_NO_SLIDER
-
-#ifndef QT_NO_SPINBOX
-class Q_GUI_EXPORT QStyleOptionSpinBox : public QStyleOptionComplex
-{
-public:
-    enum StyleOptionType { Type = SO_SpinBox };
-    enum StyleOptionVersion { Version = 1 };
-
-    QAbstractSpinBox::ButtonSymbols buttonSymbols;
-    QAbstractSpinBox::StepEnabled stepEnabled;
-    bool frame;
-
-    QStyleOptionSpinBox();
-    QStyleOptionSpinBox(const QStyleOptionSpinBox &other) : QStyleOptionComplex(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionSpinBox(int version);
-};
-#endif // QT_NO_SPINBOX
-
-class Q_GUI_EXPORT QStyleOptionQ3ListView : public QStyleOptionComplex
-{
-public:
-    enum StyleOptionType { Type = SO_Q3ListView };
-    enum StyleOptionVersion { Version = 1 };
-
-    QList<QStyleOptionQ3ListViewItem> items;
-    QPalette viewportPalette;
-    QPalette::ColorRole viewportBGRole;
-    int sortColumn;
-    int itemMargin;
-    int treeStepSize;
-    bool rootIsDecorated;
-
-    QStyleOptionQ3ListView();
-    QStyleOptionQ3ListView(const QStyleOptionQ3ListView &other) : QStyleOptionComplex(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionQ3ListView(int version);
-};
-
-class Q_GUI_EXPORT QStyleOptionToolButton : public QStyleOptionComplex
-{
-public:
-    enum StyleOptionType { Type = SO_ToolButton };
-    enum StyleOptionVersion { Version = 1 };
-
-    enum ToolButtonFeature { None = 0x00, Arrow = 0x01, Menu = 0x04, MenuButtonPopup = Menu, PopupDelay = 0x08,
-                             HasMenu = 0x10 };
-    Q_DECLARE_FLAGS(ToolButtonFeatures, ToolButtonFeature)
-
-    ToolButtonFeatures features;
-    QIcon icon;
-    QSize iconSize;
-    QString text;
-    Qt::ArrowType arrowType;
-    Qt::ToolButtonStyle toolButtonStyle;
-    QPoint pos;
-    QFont font;
-
-    QStyleOptionToolButton();
-    QStyleOptionToolButton(const QStyleOptionToolButton &other) : QStyleOptionComplex(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionToolButton(int version);
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionToolButton::ToolButtonFeatures)
-
-class Q_GUI_EXPORT QStyleOptionComboBox : public QStyleOptionComplex
-{
-public:
-    enum StyleOptionType { Type = SO_ComboBox };
-    enum StyleOptionVersion { Version = 1 };
-
-    bool editable;
-    QRect popupRect;
-    bool frame;
-    QString currentText;
-    QIcon currentIcon;
-    QSize iconSize;
-
-    QStyleOptionComboBox();
-    QStyleOptionComboBox(const QStyleOptionComboBox &other) : QStyleOptionComplex(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionComboBox(int version);
-};
-
-class Q_GUI_EXPORT QStyleOptionTitleBar : public QStyleOptionComplex
-{
-public:
-    enum StyleOptionType { Type = SO_TitleBar };
-    enum StyleOptionVersion { Version = 1 };
-
-    QString text;
-    QIcon icon;
-    int titleBarState;
-    Qt::WindowFlags titleBarFlags;
-
-    QStyleOptionTitleBar();
-    QStyleOptionTitleBar(const QStyleOptionTitleBar &other) : QStyleOptionComplex(Version, Type) { *this = other; }
-
-protected:
-    QStyleOptionTitleBar(int version);
-};
-
-class Q_GUI_EXPORT QStyleOptionGroupBox : public QStyleOptionComplex
-{
-public:
-    enum StyleOptionType { Type = SO_GroupBox };
-    enum StyleOptionVersion { Version = 1 };
-
-    QStyleOptionFrameV2::FrameFeatures features;
-    QString text;
-    Qt::Alignment textAlignment;
-    QColor textColor;
-    int lineWidth;
-    int midLineWidth;
-
-    QStyleOptionGroupBox();
-    QStyleOptionGroupBox(const QStyleOptionGroupBox &other) : QStyleOptionComplex(Version, Type) { *this = other; }
-protected:
-    QStyleOptionGroupBox(int version);
-};
-
-class Q_GUI_EXPORT QStyleOptionSizeGrip : public QStyleOptionComplex
-{
-public:
-    enum StyleOptionType { Type = SO_SizeGrip };
-    enum StyleOptionVersion { Version = 1 };
-
-    Qt::Corner corner;
-
-    QStyleOptionSizeGrip();
-    QStyleOptionSizeGrip(const QStyleOptionSizeGrip &other) : QStyleOptionComplex(Version, Type) { *this = other; }
-protected:
-    QStyleOptionSizeGrip(int version);
-};
-
-class Q_GUI_EXPORT QStyleOptionGraphicsItem : public QStyleOption
-{
-public:
-    enum StyleOptionType { Type = SO_GraphicsItem };
-    enum StyleOptionVersion { Version = 1 };
-
-    QRectF exposedRect;
-    QMatrix matrix;
-    qreal levelOfDetail;
-
-    QStyleOptionGraphicsItem();
-    QStyleOptionGraphicsItem(const QStyleOptionGraphicsItem &other) : QStyleOption(Version, Type) { *this = other; }
-    static qreal levelOfDetailFromTransform(const QTransform &worldTransform);
-protected:
-    QStyleOptionGraphicsItem(int version);
-};
-
-template <typename T>
-T qstyleoption_cast(const QStyleOption *opt)
-{
-    if (opt && opt->version >= static_cast<T>(0)->Version && (opt->type == static_cast<T>(0)->Type
-        || int(static_cast<T>(0)->Type) == QStyleOption::SO_Default
-        || (int(static_cast<T>(0)->Type) == QStyleOption::SO_Complex
-            && opt->type > QStyleOption::SO_Complex)))
-        return static_cast<T>(opt);
-    return 0;
-}
-
-template <typename T>
-T qstyleoption_cast(QStyleOption *opt)
-{
-    if (opt && opt->version >= static_cast<T>(0)->Version && (opt->type == static_cast<T>(0)->Type
-        || int(static_cast<T>(0)->Type) == QStyleOption::SO_Default
-        || (int(static_cast<T>(0)->Type) == QStyleOption::SO_Complex
-            && opt->type > QStyleOption::SO_Complex)))
-        return static_cast<T>(opt);
-    return 0;
-}
-
-// -------------------------- QStyleHintReturn -------------------------------
-class Q_GUI_EXPORT QStyleHintReturn {
-public:
-    enum HintReturnType {
-        SH_Default=0xf000, SH_Mask, SH_Variant
-    };
-
-    enum StyleOptionType { Type = SH_Default };
-    enum StyleOptionVersion { Version = 1 };
-
-    QStyleHintReturn(int version = QStyleOption::Version, int type = SH_Default);
-    ~QStyleHintReturn();
-
-    int version;
-    int type;
-};
-
-class Q_GUI_EXPORT QStyleHintReturnMask : public QStyleHintReturn {
-public:
-    enum StyleOptionType { Type = SH_Mask };
-    enum StyleOptionVersion { Version = 1 };
-
-    QStyleHintReturnMask();
-
-    QRegion region;
-};
-
-class Q_GUI_EXPORT QStyleHintReturnVariant : public QStyleHintReturn {
-public:
-    enum StyleOptionType { Type = SH_Variant };
-    enum StyleOptionVersion { Version = 1 };
-
-    QStyleHintReturnVariant();
-
-    QVariant variant;
-};
-
-template <typename T>
-T qstyleoption_cast(const QStyleHintReturn *hint)
-{
-    if (hint && hint->version <= static_cast<T>(0)->Version &&
-        (hint->type == static_cast<T>(0)->Type || int(static_cast<T>(0)->Type) == QStyleHintReturn::SH_Default))
-        return static_cast<T>(hint);
-    return 0;
-}
-
-template <typename T>
-T qstyleoption_cast(QStyleHintReturn *hint)
-{
-    if (hint && hint->version <= static_cast<T>(0)->Version &&
-        (hint->type == static_cast<T>(0)->Type || int(static_cast<T>(0)->Type) == QStyleHintReturn::SH_Default))
-        return static_cast<T>(hint);
-    return 0;
-}
-
-Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QStyleOption::OptionType &optionType);
-Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QStyleOption &option);
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QSTYLEOPTION_H
diff --git a/qtinterface/tqt4/Qt/qtabbar.h b/qtinterface/tqt4/Qt/qtabbar.h
deleted file mode 100644
index 216f8c9..0000000
--- a/qtinterface/tqt4/Qt/qtabbar.h
+++ /dev/null
@@ -1,228 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 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$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTABBAR_H
-#define QTABBAR_H
-
-#include <QtGui/qwidget.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-#ifndef QT_NO_TABBAR
-
-class QIcon;
-class QTabBarPrivate;
-class QStyleOptionTab;
-
-class Q_GUI_EXPORT QTabBar: public QWidget
-{
-    Q_OBJECT
-
-    Q_ENUMS(Shape)
-    Q_PROPERTY(Shape shape READ shape WRITE setShape)
-    Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentChanged)
-    Q_PROPERTY(int count READ count)
-    Q_PROPERTY(bool drawBase READ drawBase WRITE setDrawBase)
-    Q_PROPERTY(QSize iconSize READ iconSize WRITE setIconSize)
-    Q_PROPERTY(Qt::TextElideMode elideMode READ elideMode WRITE setElideMode)
-    Q_PROPERTY(bool usesScrollButtons READ usesScrollButtons WRITE setUsesScrollButtons)
-    Q_PROPERTY(bool tabsClosable READ tabsClosable WRITE setTabsClosable)
-    Q_PROPERTY(SelectionBehavior selectionBehaviorOnRemove READ selectionBehaviorOnRemove WRITE setSelectionBehaviorOnRemove)
-    Q_PROPERTY(bool expanding READ expanding WRITE setExpanding)
-    Q_PROPERTY(bool movable READ isMovable WRITE setMovable)
-    Q_PROPERTY(bool documentMode READ documentMode WRITE setDocumentMode)
-
-public:
-    explicit QTabBar(QWidget* parent=0);
-    ~QTabBar();
-
-    enum Shape { RoundedNorth, RoundedSouth, RoundedWest, RoundedEast,
-                 TriangularNorth, TriangularSouth, TriangularWest, TriangularEast
-#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-                , RoundedAbove = RoundedNorth, RoundedBelow = RoundedSouth,
-                TriangularAbove = TriangularNorth, TriangularBelow = TriangularSouth
-#endif
-    };
-
-    enum ButtonPosition {
-        LeftSide,
-        RightSide
-    };
-
-    enum SelectionBehavior {
-        SelectLeftTab,
-        SelectRightTab,
-        SelectPreviousTab
-    };
-
-    Shape shape() const;
-    void setShape(Shape shape);
-
-    int addTab(const QString &text);
-    int addTab(const QIcon &icon, const QString &text);
-
-    int insertTab(int index, const QString &text);
-    int insertTab(int index, const QIcon&icon, const QString &text);
-
-    void removeTab(int index);
-    void moveTab(int from, int to);
-
-    bool isTabEnabled(int index) const;
-    void setTabEnabled(int index, bool);
-
-    QString tabText(int index) const;
-    void setTabText(int index, const QString &text);
-
-    QColor tabTextColor(int index) const;
-    void setTabTextColor(int index, const QColor &color);
-
-    QIcon tabIcon(int index) const;
-    void setTabIcon(int index, const QIcon &icon);
-
-    Qt::TextElideMode elideMode() const;
-    void setElideMode(Qt::TextElideMode);
-
-#ifndef QT_NO_TOOLTIP
-    void setTabToolTip(int index, const QString &tip);
-    QString tabToolTip(int index) const;
-#endif
-
-#ifndef QT_NO_WHATSTHIS
-    void setTabWhatsThis(int index, const QString &text);
-    QString tabWhatsThis(int index) const;
-#endif
-
-    void setTabData(int index, const QVariant &data);
-    QVariant tabData(int index) const;
-
-    QRect tabRect(int index) const;
-    int tabAt(const QPoint &pos) const;
-    int tabAt(const int &pos) const;
-//    QTab * tabAt( int ) const;
-
-    int currentIndex() const;
-    int count() const;
-
-    QSize sizeHint() const;
-    QSize minimumSizeHint() const;
-
-    void setDrawBase(bool drawTheBase);
-    bool drawBase() const;
-
-    QSize iconSize() const;
-    void setIconSize(const QSize &size);
-
-    bool usesScrollButtons() const;
-    void setUsesScrollButtons(bool useButtons);
-
-    bool tabsClosable() const;
-    void setTabsClosable(bool closable);
-
-    void setTabButton(int index, ButtonPosition position, QWidget *widget);
-    QWidget *tabButton(int index, ButtonPosition position) const;
-
-    SelectionBehavior selectionBehaviorOnRemove() const;
-    void setSelectionBehaviorOnRemove(SelectionBehavior behavior);
-
-    bool expanding() const;
-    void setExpanding(bool enabled);
-
-    bool isMovable() const;
-    void setMovable(bool movable);
-
-    bool documentMode() const;
-    void setDocumentMode(bool set);
-
-public Q_SLOTS:
-    void setCurrentIndex(int index);
-
-Q_SIGNALS:
-    void currentChanged(int index);
-    void tabCloseRequested(int index);
-    void tabMoved(int from, int to);
-
-protected:
-    virtual QSize tabSizeHint(int index) const;
-    virtual void tabInserted(int index);
-    virtual void tabRemoved(int index);
-    virtual void tabLayoutChange();
-
-    bool event(QEvent *);
-    void resizeEvent(QResizeEvent *);
-    void showEvent(QShowEvent *);
-    void hideEvent(QHideEvent *);
-    void paintEvent(QPaintEvent *);
-    void mousePressEvent (QMouseEvent *);
-    void mouseMoveEvent (QMouseEvent *);
-    void mouseReleaseEvent (QMouseEvent *);
-#ifndef QT_NO_WHEELEVENT
-    void wheelEvent(QWheelEvent *event);
-#endif
-    void keyPressEvent(QKeyEvent *);
-    void changeEvent(QEvent *);
-    void initStyleOption(QStyleOptionTab *option, int tabIndex) const;
-
-#ifdef QT3_SUPPORT
-public Q_SLOTS:
-    QT_MOC_COMPAT void setCurrentTab(int index) { setCurrentIndex(index); }
-Q_SIGNALS:
-    QT_MOC_COMPAT void selected(int);
-#endif
-
-    friend class QAccessibleTabBar;
-private:
-    Q_DISABLE_COPY(QTabBar)
-    Q_DECLARE_PRIVATE(QTabBar)
-    Q_PRIVATE_SLOT(d_func(), void _q_scrollTabs())
-    Q_PRIVATE_SLOT(d_func(), void _q_closeTab())
-};
-
-#endif // QT_NO_TABBAR
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QTABBAR_H
diff --git a/qtinterface/tqt4/Qt/qtextcodec.h b/qtinterface/tqt4/Qt/qtextcodec.h
deleted file mode 100644
index 100b50c..0000000
--- a/qtinterface/tqt4/Qt/qtextcodec.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTEXTCODEC_H
-#define QTEXTCODEC_H
-
-#include <QtCore/qstring.h>
-#include <QtCore/qlist.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Core)
-
-#ifndef QT_NO_TEXTCODEC
-
-class QTextCodec;
-class QIODevice;
-
-class QTextDecoder;
-class QTextEncoder;
-
-class Q_CORE_EXPORT QTextCodec
-{
-    Q_DISABLE_COPY(QTextCodec)
-public:
-    static QTextCodec* codecForName(const QByteArray &name);
-    static QTextCodec* codecForName(const char *name) { return codecForName(QByteArray(name)); }
-    static QTextCodec* codecForMib(int mib);
-
-    static QList<QByteArray> availableCodecs();
-    static QList<int> availableMibs();
-
-    static QTextCodec* codecForLocale();
-    static void setCodecForLocale(QTextCodec *c);
-
-    static QTextCodec* codecForTr();
-    static void setCodecForTr(QTextCodec *c);
-
-    static QTextCodec* codecForCStrings();
-    static void setCodecForCStrings(QTextCodec *c);
-
-    static QTextCodec *codecForHtml(const QByteArray &ba);
-    static QTextCodec *codecForHtml(const QByteArray &ba, QTextCodec *defaultCodec);
-
-    static QTextCodec *codecForUtfText(const QByteArray &ba);
-    static QTextCodec *codecForUtfText(const QByteArray &ba, QTextCodec *defaultCodec);
-
-    QTextDecoder* makeDecoder() const;
-    QTextEncoder* makeEncoder() const;
-
-    bool canEncode(QChar) const;
-    bool canEncode(const QString&) const;
-
-    QString toUnicode(const QByteArray&) const;
-    QString toUnicode(const char* chars) const;
-    QByteArray fromUnicode(const QString& uc) const;
-    enum ConversionFlag {
-        DefaultConversion,
-        ConvertInvalidToNull = 0x80000000,
-        IgnoreHeader = 0x1,
-        FreeFunction = 0x2
-    };
-    Q_DECLARE_FLAGS(ConversionFlags, ConversionFlag)
-
-    struct Q_CORE_EXPORT ConverterState {
-        ConverterState(ConversionFlags f = DefaultConversion)
-            : flags(f), remainingChars(0), invalidChars(0), d(0) { state_data[0] = state_data[1] = state_data[2] = 0; }
-        ~ConverterState();
-        ConversionFlags flags;
-        int remainingChars;
-        int invalidChars;
-        uint state_data[3];
-        void *d;
-    private:
-        Q_DISABLE_COPY(ConverterState)
-    };
-
-    QString toUnicode(const char *in, int length, ConverterState *state = 0) const
-        { return convertToUnicode(in, length, state); }
-    QByteArray fromUnicode(const QChar *in, int length, ConverterState *state = 0) const
-        { return convertFromUnicode(in, length, state); }
-
-    virtual QByteArray name() const = 0;
-    virtual QList<QByteArray> aliases() const;
-    virtual int mibEnum() const = 0;
-    virtual int heuristicNameMatch(const char* hint) const;
-
-#ifndef QT_NO_CODECS
-    static QTextCodec* loadCharmap(QIODevice*);
-    static QTextCodec* loadCharmapFile(QString filename);
-#endif //QT_NO_CODECS
-
-protected:
-    virtual QString convertToUnicode(const char *in, int length, ConverterState *state) const = 0;
-    virtual QByteArray convertFromUnicode(const QChar *in, int length, ConverterState *state) const = 0;
-
-    static int simpleHeuristicNameMatch(const char* name, const char* hint);
-
-    QTextCodec();
-    virtual ~QTextCodec();
-
-public:
-#ifdef QT3_SUPPORT
-    static QT3_SUPPORT QTextCodec* codecForContent(const char*, int) { return 0; }
-    static QT3_SUPPORT const char* locale();
-    static QT3_SUPPORT QTextCodec* codecForName(const char* hint, int) { return codecForName(QByteArray(hint)); }
-    QT3_SUPPORT QByteArray fromUnicode(const QString& uc, int& lenInOut) const;
-    QT3_SUPPORT QString toUnicode(const QByteArray&, int len) const;
-    QT3_SUPPORT QByteArray mimeName() const { return name(); }
-    static QT3_SUPPORT QTextCodec *codecForIndex(int i) { return codecForName(availableCodecs().value(i)); }
-#endif
-
-private:
-    friend class QTextCodecCleanup;
-    static QTextCodec *cftr;
-};
-Q_DECLARE_OPERATORS_FOR_FLAGS(QTextCodec::ConversionFlags)
-
-inline QTextCodec* QTextCodec::codecForTr() { return cftr; }
-inline void QTextCodec::setCodecForTr(QTextCodec *c) { cftr = c; }
-inline QTextCodec* QTextCodec::codecForCStrings() { return QString::codecForCStrings; }
-inline void QTextCodec::setCodecForCStrings(QTextCodec *c) { QString::codecForCStrings = c; }
-
-class Q_CORE_EXPORT QTextEncoder {
-    Q_DISABLE_COPY(QTextEncoder)
-public:
-    explicit QTextEncoder(const QTextCodec *codec) : c(codec), state() {}
-    ~QTextEncoder();
-    QByteArray fromUnicode(const QString& str);
-    QByteArray fromUnicode(const QChar *uc, int len);
-#ifdef QT3_SUPPORT
-    QT3_SUPPORT QByteArray fromUnicode(const QString& uc, int& lenInOut);
-#endif
-    bool hasFailure() const;
-private:
-    const QTextCodec *c;
-    QTextCodec::ConverterState state;
-
-    friend class QXmlStreamWriter;
-    friend class QXmlStreamWriterPrivate;
-    friend class QCoreXmlStreamWriter;
-    friend class QCoreXmlStreamWriterPrivate;
-};
-
-class Q_CORE_EXPORT QTextDecoder {
-    Q_DISABLE_COPY(QTextDecoder)
-public:
-    explicit QTextDecoder(const QTextCodec *codec) : c(codec), state() {}
-    ~QTextDecoder();
-    QString toUnicode(const char* chars, int len);
-    QString toUnicode(const QByteArray &ba);
-    void toUnicode(QString *target, const char *chars, int len);
-    bool hasFailure() const;
-private:
-    const QTextCodec *c;
-    QTextCodec::ConverterState state;
-};
-
-#endif // QT_NO_TEXTCODEC
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QTEXTCODEC_H
diff --git a/qtinterface/tqt4/Qt/qtooltip.h b/qtinterface/tqt4/Qt/qtooltip.h
deleted file mode 100644
index 260d8c3..0000000
--- a/qtinterface/tqt4/Qt/qtooltip.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 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$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTOOLTIP_H
-#define QTOOLTIP_H
-
-#include <QtGui/qwidget.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-#ifndef QT_NO_TOOLTIP
-
-class Q_GUI_EXPORT QToolTip
-{
-    QToolTip();
-public:
-    static void showText(const QPoint &pos, const QString &text, QWidget *w = 0);
-    static void showText(const QPoint &pos, const QString &text, QWidget *w, const QRect &rect);
-    static inline void hideText() { showText(QPoint(), QString()); }
-
-    static bool isVisible();
-    static QString text();
-
-    static QPalette palette();
-    static void setPalette(const QPalette &);
-    static QFont font();
-    static void setFont(const QFont &);
-#ifdef QT3_SUPPORT
-    static inline QT3_SUPPORT void add(QWidget *w, const QString &s) { w->setToolTip(s); }
-    static inline QT3_SUPPORT void add(QWidget *w, const QRect &, const QString &s)
-    { w->setToolTip(s); }
-    static inline QT3_SUPPORT void remove(QWidget *w) { w->setToolTip(QString()); }
-#endif
-
-    static void setGloballyEnabled( bool );
-    static bool isGloballyEnabled();
-};
-
-#endif // QT_NO_TOOLTIP
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QTOOLTIP_H
diff --git a/qtinterface/tqt4/Qt/qvariant.h b/qtinterface/tqt4/Qt/qvariant.h
deleted file mode 100644
index 2d7dfd4..0000000
--- a/qtinterface/tqt4/Qt/qvariant.h
+++ /dev/null
@@ -1,642 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QVARIANT_H
-#define QVARIANT_H
-
-#include <QtCore/qatomic.h>
-#include <QtCore/qbytearray.h>
-#include <QtCore/qlist.h>
-#include <QtCore/qmetatype.h>
-#include <QtCore/qmap.h>
-#include <QtCore/qhash.h>
-#include <QtCore/qstring.h>
-
-#ifndef QICON_H
-typedef QIcon QIconSet;
-#endif // QICON_H
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Core)
-
-class Q3PointArray;
-class QBitArray;
-class QDataStream;
-class QDate;
-class QDateTime;
-class QLine;
-class QLineF;
-class QLocale;
-class QMatrix;
-class QTransform;
-class QStringList;
-class QTime;
-class QPoint;
-class QPointF;
-class QSize;
-class QSizeF;
-class QRect;
-class QRectF;
-#ifndef QT_NO_REGEXP
-class QRegExp;
-#endif
-class QTextFormat;
-class QTextLength;
-class QUrl;
-class QVariant;
-class QVariantComparisonHelper;
-
-#ifndef QT_NO_MEMBER_TEMPLATES
-template <typename T>
-inline QVariant qVariantFromValue(const T &);
-
-template <typename T>
-inline void qVariantSetValue(QVariant &, const T &);
-
-template<typename T>
-inline T qVariantValue(const QVariant &);
-
-template<typename T>
-inline bool qVariantCanConvert(const QVariant &);
-#endif
-
-class Q_CORE_EXPORT QVariant
-{
- public:
-    enum Type {
-        Invalid = 0,
-
-        Bool = 1,
-        Int = 2,
-        UInt = 3,
-        LongLong = 4,
-        ULongLong = 5,
-        Double = 6,
-        Char = 7,
-        Map = 8,
-        List = 9,
-        String = 10,
-        StringList = 11,
-        ByteArray = 12,
-        BitArray = 13,
-        Date = 14,
-        Time = 15,
-        DateTime = 16,
-        Url = 17,
-        Locale = 18,
-        Rect = 19,
-        RectF = 20,
-        Size = 21,
-        SizeF = 22,
-        Line = 23,
-        LineF = 24,
-        Point = 25,
-        PointF = 26,
-	RegExp = 27,
-        Hash = 28,
-        LastCoreType = Hash,
-
-        // value 62 is internally reserved
-#ifdef QT3_SUPPORT
-        ColorGroup = 63,
-#endif
-        Font = 64,
-        Pixmap = 65,
-        Brush = 66,
-        Color = 67,
-        Palette = 68,
-        Icon = 69,
-        Image = 70,
-        Polygon = 71,
-        Region = 72,
-        Bitmap = 73,
-        Cursor = 74,
-        SizePolicy = 75,
-        KeySequence = 76,
-        Pen = 77,
-        TextLength = 78,
-        TextFormat = 79,
-        Matrix = 80,
-        Transform = 81,
-        Matrix4x4 = 82,
-        Vector2D = 83,
-        Vector3D = 84,
-        Vector4D = 85,
-        Quaternion = 86,
-        LastGuiType = Quaternion,
-
-        UserType = 127,
-#ifdef QT3_SUPPORT
-        IconSet = Icon,
-        CString = ByteArray,
-        PointArray = Polygon,
-#endif
-        LastType = 0xffffffff // need this so that gcc >= 3.4 allocates 32 bits for Type
-    };
-
-    inline QVariant();
-    ~QVariant();
-    QVariant(Type type);
-    QVariant(int typeOrUserType, const void *copy);
-    QVariant(int typeOrUserType, const void *copy, uint flags);
-    QVariant(const QVariant &other);
-
-#ifndef QT_NO_DATASTREAM
-    QVariant(QDataStream &s);
-#endif
-
-    QVariant(int i);
-    QVariant(uint ui);
-    QVariant(qlonglong ll);
-    QVariant(qulonglong ull);
-    QVariant(bool b);
-    QVariant(double d);
-    QVariant(float f) { d.is_null = false; d.type = QMetaType::Float; d.data.f = f; }
-#ifndef QT_NO_CAST_FROM_ASCII
-    QT_ASCII_CAST_WARN_CONSTRUCTOR QVariant(const char *str);
-#endif
-
-    QVariant(const QByteArray &bytearray);
-    QVariant(const QBitArray &bitarray);
-    QVariant(const QString &string);
-    QVariant(const QLatin1String &string);
-    QVariant(const QStringList &stringlist);
-    QVariant(const QChar &qchar);
-    QVariant(const QDate &date);
-    QVariant(const QTime &time);
-    QVariant(const QDateTime &datetime);
-    QVariant(const QList<QVariant> &list);
-    QVariant(const QMap<QString,QVariant> &map);
-    QVariant(const QHash<QString,QVariant> &hash);
-#ifndef QT_NO_GEOM_VARIANT
-    QVariant(const QSize &size);
-    QVariant(const QSizeF &size);
-    QVariant(const QPoint &pt);
-    QVariant(const QPointF &pt);
-    QVariant(const QLine &line);
-    QVariant(const QLineF &line);
-    QVariant(const QRect &rect);
-    QVariant(const QRectF &rect);
-#endif
-    QVariant(const QUrl &url);
-    QVariant(const QLocale &locale);
-#ifndef QT_NO_REGEXP
-    QVariant(const QRegExp &regExp);
-#endif
-    QVariant(Qt::GlobalColor color);
-
-    QVariant(const QBitmap &bitmap);
-    QVariant(const Q3PointArray &pa);
-    QVariant(const QPixmap &pixmap);
-
-    QVariant& operator=(const QVariant &other);
-
-    Type type() const;
-    int userType() const;
-    const char *typeName() const;
-
-    bool canConvert(Type t) const;
-    bool convert(Type t);
-
-#ifdef QT3_SUPPORT
-    inline QT3_SUPPORT bool canCast(Type t) const
-    { return canConvert(t); }
-    inline QT3_SUPPORT bool cast(Type t)
-    { return convert(t); }
-#endif
-
-    inline bool isValid() const;
-    bool isNull() const;
-
-    void clear();
-
-    void detach();
-    inline bool isDetached() const;
-
-    int toInt(bool *ok = 0) const;
-    uint toUInt(bool *ok = 0) const;
-    qlonglong toLongLong(bool *ok = 0) const;
-    qulonglong toULongLong(bool *ok = 0) const;
-    bool toBool() const;
-    double toDouble(bool *ok = 0) const;
-    float toFloat(bool *ok = 0) const;
-    qreal toReal(bool *ok = 0) const;
-    QByteArray toByteArray() const;
-    QBitArray toBitArray() const;
-    QString toString() const;
-    QStringList toStringList() const;
-    QChar toChar() const;
-    QDate toDate() const;
-    QTime toTime() const;
-    QDateTime toDateTime() const;
-    QList<QVariant> toList() const;
-    QMap<QString, QVariant> toMap() const;
-    QHash<QString, QVariant> toHash() const;
-
-#ifndef QT_NO_GEOM_VARIANT
-    QPoint toPoint() const;
-    QPointF toPointF() const;
-    QRect toRect() const;
-    QSize toSize() const;
-    QSizeF toSizeF() const;
-    QLine toLine() const;
-    QLineF toLineF() const;
-    QRectF toRectF() const;
-#endif
-    QUrl toUrl() const;
-    QLocale toLocale() const;
-#ifndef QT_NO_REGEXP
-    QRegExp toRegExp() const;
-#endif
-
-#ifdef QT3_SUPPORT
-    inline QT3_SUPPORT int &asInt();
-    inline QT3_SUPPORT uint &asUInt();
-    inline QT3_SUPPORT qlonglong &asLongLong();
-    inline QT3_SUPPORT qulonglong &asULongLong();
-    inline QT3_SUPPORT bool &asBool();
-    inline QT3_SUPPORT double &asDouble();
-    inline QT3_SUPPORT QByteArray &asByteArray();
-    inline QT3_SUPPORT QBitArray &asBitArray();
-    inline QT3_SUPPORT QString &asString();
-    inline QT3_SUPPORT QStringList &asStringList();
-    inline QT3_SUPPORT QDate &asDate();
-    inline QT3_SUPPORT QTime &asTime();
-    inline QT3_SUPPORT QDateTime &asDateTime();
-    inline QT3_SUPPORT QList<QVariant> &asList();
-    inline QT3_SUPPORT QMap<QString,QVariant> &asMap();
-    inline QT3_SUPPORT QPoint &asPoint();
-    inline QT3_SUPPORT QRect &asRect();
-    inline QT3_SUPPORT QSize &asSize();
-#endif //QT3_SUPPORT
-
-    QFont toFont() const;
-    QColor toColor() const;
-    QCursor toCursor() const;
-    QBitmap toBitmap() const;
-    Q3PointArray toPointArray() const;
-    QRegion toRegion() const;
-    QPixmap toPixmap() const;
-    QImage toImage() const;
-    QBrush toBrush() const;
-    QPalette toPalette() const;
-    QColorGroup toColorGroup() const;
-    QIconSet toIconSet() const;
-
-    QFont asFont();
-    QColor asColor();
-
-#ifndef QT_NO_DATASTREAM
-    void load(QDataStream &ds);
-    void save(QDataStream &ds) const;
-#endif
-    static const char *typeToName(Type type);
-    static Type nameToType(const char *name);
-
-#ifdef QT3_SUPPORT
-    inline QT3_SUPPORT_CONSTRUCTOR QVariant(bool val, int) { create(Bool, &val); }
-    inline QT3_SUPPORT const QByteArray toCString() const { return toByteArray(); }
-    inline QT3_SUPPORT QByteArray &asCString() { return *reinterpret_cast<QByteArray *>(castOrDetach(ByteArray)); }
-#endif
-
-    void *data();
-    const void *constData() const;
-    inline const void *data() const { return constData(); }
-
-#ifndef QT_NO_MEMBER_TEMPLATES
-    template<typename T>
-    inline void setValue(const T &value);
-
-    template<typename T>
-    inline T value() const
-    { return qVariantValue<T>(*this); }
-
-    template<typename T>
-    static inline QVariant fromValue(const T &value)
-    { return qVariantFromValue(value); }
-
-    template<typename T>
-    bool canConvert() const
-    { return qVariantCanConvert<T>(*this); }
-#endif
-
- public:
-#ifndef qdoc
-    struct PrivateShared
-    {
-        inline PrivateShared(void *v) : ptr(v), ref(1) { }
-        void *ptr;
-        QAtomicInt ref;
-    };
-    struct Private
-    {
-        inline Private(): type(Invalid), is_shared(false), is_null(true) { data.ptr = 0; }
-        inline Private(const Private &other)
-            : data(other.data), type(other.type),
-              is_shared(other.is_shared), is_null(other.is_null)
-        {}
-        union Data
-        {
-            char c;
-            int i;
-            uint u;
-            bool b;
-            double d;
-            float f;
-            qreal real;
-            qlonglong ll;
-            qulonglong ull;
-            QObject *o;
-            void *ptr;
-            PrivateShared *shared;
-        } data;
-        uint type : 30;
-        uint is_shared : 1;
-        uint is_null : 1;
-    };
- public:
-    typedef void (*f_construct)(Private *, const void *);
-    typedef void (*f_clear)(Private *);
-    typedef bool (*f_null)(const Private *);
-#ifndef QT_NO_DATASTREAM
-    typedef void (*f_load)(Private *, QDataStream &);
-    typedef void (*f_save)(const Private *, QDataStream &);
-#endif
-    typedef bool (*f_compare)(const Private *, const Private *);
-    typedef bool (*f_convert)(const QVariant::Private *d, Type t, void *, bool *);
-    typedef bool (*f_canConvert)(const QVariant::Private *d, Type t);
-    typedef void (*f_debugStream)(QDebug, const QVariant &);
-    struct Handler {
-        f_construct construct;
-        f_clear clear;
-        f_null isNull;
-#ifndef QT_NO_DATASTREAM
-        f_load load;
-        f_save save;
-#endif
-        f_compare compare;
-        f_convert convert;
-        f_canConvert canConvert;
-        f_debugStream debugStream;
-    };
-#endif
-
-    inline bool operator==(const QVariant &v) const
-    { return cmp(v); }
-    inline bool operator!=(const QVariant &v) const
-    { return !cmp(v); }
-
-protected:
-    friend inline bool qvariant_cast_helper(const QVariant &, QVariant::Type, void *);
-    friend int qRegisterGuiVariant();
-    friend int qUnregisterGuiVariant();
-    friend inline bool operator==(const QVariant &, const QVariantComparisonHelper &);
-#ifndef QT_NO_DEBUG_STREAM
-    friend Q_CORE_EXPORT QDebug operator<<(QDebug, const QVariant &);
-#endif
-    Private d;
-
-    static const Handler *handler;
-
-    void create(int type, const void *copy);
-#ifdef QT3_SUPPORT
-    void *castOrDetach(Type t);
-#endif
-    bool cmp(const QVariant &other) const;
-
-private:
-    // force compile error, prevent QVariant(bool) to be called
-    inline QVariant(void *) { Q_ASSERT(false); }
-#ifdef QT_NO_CAST_FROM_ASCII
-    // force compile error when implicit conversion is not wanted
-    inline QVariant(const char *) { Q_ASSERT(false); }
-#endif
-#ifndef QT3_SUPPORT
-    // force compile error, prevent QVariant(QVariant::Type, int) to be called
-    inline QVariant(bool, int) { Q_ASSERT(false); }
-#endif
-public:
-    typedef Private DataPtr;
-    inline DataPtr &data_ptr() { return d; }
-};
-
-typedef QList<QVariant> QVariantList;
-typedef QMap<QString, QVariant> QVariantMap;
-typedef QHash<QString, QVariant> QVariantHash;
-
-inline bool qvariant_cast_helper(const QVariant &v, QVariant::Type tp, void *ptr)
-{ return QVariant::handler->convert(&v.d, tp, ptr, 0); }
-
-template <typename T>
-inline QVariant qVariantFromValue(const T &t)
-{
-    return QVariant(qMetaTypeId<T>(reinterpret_cast<T *>(0)), &t, QTypeInfo<T>::isPointer);
-}
-
-template <>
-inline QVariant qVariantFromValue(const QVariant &t) { return t; }
-
-template <typename T>
-inline void qVariantSetValue(QVariant &v, const T &t)
-{
-    //if possible we reuse the current QVariant private
-    const uint type = qMetaTypeId<T>(reinterpret_cast<T *>(0));
-    QVariant::Private &d = v.data_ptr();
-    if (v.isDetached() && (type == d.type || (type <= uint(QVariant::Char) && d.type <= uint(QVariant::Char)))) {
-        d.type = type;
-        d.is_null = false;
-        T *old = reinterpret_cast<T*>(d.is_shared ? d.data.shared->ptr : &d.data.ptr);
-        if (QTypeInfo<T>::isComplex)
-            old->~T();
-        new (old) T(t); //call the copy constructor
-    } else {
-        v = QVariant(type, &t, QTypeInfo<T>::isPointer);
-    }
-}
-
-template <>
-inline void qVariantSetValue<QVariant>(QVariant &v, const QVariant &t)
-{
-    v = t;
-}
-
-
-inline QVariant::QVariant() {}
-inline bool QVariant::isValid() const { return d.type != Invalid; }
-
-#ifdef QT3_SUPPORT
-inline int &QVariant::asInt()
-{ return *reinterpret_cast<int *>(castOrDetach(Int)); }
-inline uint &QVariant::asUInt()
-{ return *reinterpret_cast<uint *>(castOrDetach(UInt)); }
-inline qlonglong &QVariant::asLongLong()
-{ return *reinterpret_cast<qlonglong *>(castOrDetach(LongLong)); }
-inline qulonglong &QVariant::asULongLong()
-{ return *reinterpret_cast<qulonglong *>(castOrDetach(ULongLong)); }
-inline bool &QVariant::asBool()
-{ return *reinterpret_cast<bool *>(castOrDetach(Bool)); }
-inline double &QVariant::asDouble()
-{ return *reinterpret_cast<double *>(castOrDetach(Double)); }
-inline QByteArray& QVariant::asByteArray()
-{ return *reinterpret_cast<QByteArray *>(castOrDetach(ByteArray)); }
-inline QBitArray& QVariant::asBitArray()
-{ return *reinterpret_cast<QBitArray *>(castOrDetach(BitArray)); }
-inline QString& QVariant::asString()
-{ return *reinterpret_cast<QString *>(castOrDetach(String)); }
-inline QStringList& QVariant::asStringList()
-{ return *reinterpret_cast<QStringList *>(castOrDetach(StringList)); }
-inline QDate& QVariant::asDate()
-{ return *reinterpret_cast<QDate *>(castOrDetach(Date)); }
-inline QTime& QVariant::asTime()
-{ return *reinterpret_cast<QTime *>(castOrDetach(Time)); }
-inline QDateTime& QVariant::asDateTime()
-{ return *reinterpret_cast<QDateTime *>(castOrDetach(DateTime)); }
-inline QList<QVariant>& QVariant::asList()
-{ return *reinterpret_cast<QList<QVariant> *>(castOrDetach(List)); }
-inline QMap<QString, QVariant>& QVariant::asMap()
-{ return *reinterpret_cast<QMap<QString, QVariant> *>(castOrDetach(Map)); }
-inline QPoint &QVariant::asPoint()
-{ return *reinterpret_cast<QPoint *>(castOrDetach(Point)); }
-inline QRect &QVariant::asRect()
-{ return *reinterpret_cast<QRect *>(castOrDetach(Rect)); }
-inline QSize &QVariant::asSize()
-{ return *reinterpret_cast<QSize *>(castOrDetach(Size)); }
-#endif //QT3_SUPPORT
-
-#ifndef QT_NO_MEMBER_TEMPLATES
-template<typename T>
-inline void QVariant::setValue(const T &avalue)
-{ qVariantSetValue(*this, avalue); }
-#endif
-
-#ifndef QT_NO_DATASTREAM
-Q_CORE_EXPORT QDataStream& operator>> (QDataStream& s, QVariant& p);
-Q_CORE_EXPORT QDataStream& operator<< (QDataStream& s, const QVariant& p);
-Q_CORE_EXPORT QDataStream& operator>> (QDataStream& s, QVariant::Type& p);
-Q_CORE_EXPORT QDataStream& operator<< (QDataStream& s, const QVariant::Type p);
-#endif
-
-inline bool QVariant::isDetached() const
-{ return !d.is_shared || d.data.shared->ref == 1; }
-
-
-#ifdef qdoc
-    inline bool operator==(const QVariant &v1, const QVariant &v2);
-    inline bool operator!=(const QVariant &v1, const QVariant &v2);
-#else
-
-/* Helper class to add one more level of indirection to prevent
-   implicit casts.
-*/
-class QVariantComparisonHelper
-{
-public:
-    inline QVariantComparisonHelper(const QVariant &var)
-        : v(&var) {}
-private:
-    friend inline bool operator==(const QVariant &, const QVariantComparisonHelper &);
-    const QVariant *v;
-};
-
-inline bool operator==(const QVariant &v1, const QVariantComparisonHelper &v2)
-{
-    return v1.cmp(*v2.v);
-}
-
-inline bool operator!=(const QVariant &v1, const QVariantComparisonHelper &v2)
-{
-    return !operator==(v1, v2);
-}
-#endif
-
-#ifndef QT_MOC
-template<typename T> inline T qvariant_cast(const QVariant &v)
-{
-    const int vid = qMetaTypeId<T>(static_cast<T *>(0));
-    if (vid == v.userType())
-        return *reinterpret_cast<const T *>(v.constData());
-    if (vid < int(QMetaType::User)) {
-        T t;
-        if (qvariant_cast_helper(v, QVariant::Type(vid), &t))
-            return t;
-    }
-    return T();
-}
-
-template<> inline QVariant qvariant_cast<QVariant>(const QVariant &v)
-{
-    static const int vid = qRegisterMetaType<QVariant>("QVariant");
-    if (vid == v.userType())
-        return *reinterpret_cast<const QVariant *>(v.constData());
-    return v;
-}
-
-template<typename T>
-inline T qVariantValue(const QVariant &variant)
-{ return qvariant_cast<T>(variant); }
-
-template<typename T>
-inline bool qVariantCanConvert(const QVariant &variant)
-{
-    return variant.canConvert(static_cast<QVariant::Type>(
-                qMetaTypeId<T>(static_cast<T *>(0))));
-}
-#endif
-Q_DECLARE_SHARED(QVariant)
-Q_DECLARE_TYPEINFO(QVariant, Q_MOVABLE_TYPE);
-
-#ifndef QT_NO_DEBUG_STREAM
-Q_CORE_EXPORT QDebug operator<<(QDebug, const QVariant &);
-Q_CORE_EXPORT QDebug operator<<(QDebug, const QVariant::Type);
-#endif
-
-QT_END_NAMESPACE
-
-Q_DECLARE_BUILTIN_METATYPE(QVariantList, QVariantList)
-Q_DECLARE_BUILTIN_METATYPE(QVariantMap, QVariantMap)
-Q_DECLARE_BUILTIN_METATYPE(QVariantHash, QVariantHash)
-
-QT_END_HEADER
-
-#endif // QVARIANT_H
diff --git a/qtinterface/tqt4/Qt/qvector.h b/qtinterface/tqt4/Qt/qvector.h
deleted file mode 100644
index fb76d75..0000000
--- a/qtinterface/tqt4/Qt/qvector.h
+++ /dev/null
@@ -1,802 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QVECTOR_H
-#define QVECTOR_H
-
-#include <QtCore/qiterator.h>
-#include <QtCore/qatomic.h>
-#include <QtCore/qalgorithms.h>
-#include <QtCore/qlist.h>
-
-#ifndef TQT_NO_STL
-#include <iterator>
-#include <vector>
-#endif
-#include <stdlib.h>
-#include <string.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Core)
-
-struct Q_CORE_EXPORT QVectorData
-{
-    QBasicAtomicInt ref;
-    int alloc;
-    int size;
-#if defined(QT_ARCH_SPARC) && defined(Q_CC_GNU) && defined(__LP64__) && defined(QT_BOOTSTRAPPED)
-    // workaround for bug in gcc 3.4.2
-    uint sharable;
-    uint capacity;
-    uint reserved;
-#else
-    uint sharable : 1;
-    uint capacity : 1;
-    uint reserved : 30;
-#endif
-
-    static QVectorData shared_null;
-    // ### Qt 5: rename to 'allocate()'. The current name causes problems for
-    // some debugges when the QVector is member of a class within an unnamed namespace.
-    // ### Qt 5: can be removed completely. (Ralf)
-    static QVectorData *malloc(int sizeofTypedData, int size, int sizeofT, QVectorData *init);
-    static QVectorData *allocate(int size, int alignment);
-    static QVectorData *reallocate(QVectorData *old, int newsize, int oldsize, int alignment);
-    static void free(QVectorData *data, int alignment);
-    static int grow(int sizeofTypedData, int size, int sizeofT, bool excessive);
-};
-
-template <typename T>
-struct QVectorTypedData : private QVectorData
-{ // private inheritance as we must not access QVectorData member thought QVectorTypedData
-  // as this would break strict aliasing rules. (in the case of shared_null)
-    T array[1];
-
-    static inline void free(QVectorTypedData<T> *x, int alignment) { QVectorData::free(static_cast<QVectorData *>(x), alignment); }
-};
-
-class QRegion;
-
-template <typename T>
-class QVector
-{
-    typedef QVectorTypedData<T> Data;
-    union {
-        QVectorData *d;
-#if defined(Q_CC_SUN) && (__SUNPRO_CC <= 0x550)
-        QVectorTypedData<T> *p;
-#else
-        Data *p;
-#endif
-    };
-
-public:
-    inline QVector() : d(&QVectorData::shared_null) { d->ref.ref(); }
-    explicit QVector(int size);
-    QVector(int size, const T &t);
-    inline QVector(const QVector<T> &v) : d(v.d) { d->ref.ref(); if (!d->sharable) detach_helper(); }
-    inline ~QVector() { if (!d) return; if (!d->ref.deref()) free(p); }
-    QVector<T> &operator=(const QVector<T> &v);
-    bool operator==(const QVector<T> &v) const;
-    inline bool operator!=(const QVector<T> &v) const { return !(*this == v); }
-
-    inline int size() const { return d->size; }
-
-    inline bool isEmpty() const { return d->size == 0; }
-
-    void resize(int size);
-
-    inline int capacity() const { return d->alloc; }
-    void reserve(int size);
-    inline void squeeze() { realloc(d->size, d->size); d->capacity = 0; }
-
-    inline void detach() { if (d->ref != 1) detach_helper(); }
-    inline bool isDetached() const { return d->ref == 1; }
-    inline void setSharable(bool sharable) { if (!sharable) detach(); d->sharable = sharable; }
-
-    inline T *data() { detach(); return p->array; }
-    inline const T *data() const { return p->array; }
-    inline const T *constData() const { return p->array; }
-    void clear();
-
-    inline operator unsigned int *() const { return p->array; }
-
-    const T &at(int i) const;
-    T &operator[](int i);
-    const T &operator[](int i) const;
-    void append(const T &t);
-    void prepend(const T &t);
-    void insert(int i, const T &t);
-    void insert(int i, int n, const T &t);
-    void replace(int i, const T &t);
-    void remove(int i);
-    void remove(int i, int n);
-
-    QVector<T> &fill(const T &t, int size = -1);
-
-    int indexOf(const T &t, int from = 0) const;
-    int lastIndexOf(const T &t, int from = -1) const;
-    bool contains(const T &t) const;
-    int count(const T &t) const;
-
-#ifdef QT_STRICT_ITERATORS
-    class iterator {
-    public:
-        T *i;
-        typedef std::random_access_iterator_tag  iterator_category;
-        typedef ptrdiff_t difference_type;
-        typedef T value_type;
-        typedef T *pointer;
-        typedef T &reference;
-
-        inline iterator() : i(0) {}
-        inline iterator(T *n) : i(n) {}
-        inline iterator(const iterator &o): i(o.i){}
-        inline T &operator*() const { return *i; }
-        inline T *operator->() const { return i; }
-        inline T &operator[](int j) const { return *(i + j); }
-        inline bool operator==(const iterator &o) const { return i == o.i; }
-        inline bool operator!=(const iterator &o) const { return i != o.i; }
-        inline bool operator<(const iterator& other) const { return i < other.i; }
-        inline bool operator<=(const iterator& other) const { return i <= other.i; }
-        inline bool operator>(const iterator& other) const { return i > other.i; }
-        inline bool operator>=(const iterator& other) const { return i >= other.i; }
-        inline iterator &operator++() { ++i; return *this; }
-        inline iterator operator++(int) { T *n = i; ++i; return n; }
-        inline iterator &operator--() { i--; return *this; }
-        inline iterator operator--(int) { T *n = i; i--; return n; }
-        inline iterator &operator+=(int j) { i+=j; return *this; }
-        inline iterator &operator-=(int j) { i-=j; return *this; }
-        inline iterator operator+(int j) const { return iterator(i+j); }
-        inline iterator operator-(int j) const { return iterator(i-j); }
-        inline int operator-(iterator j) const { return i - j.i; }
-    };
-    friend class iterator;
-
-    class const_iterator {
-    public:
-        T *i;
-        typedef std::random_access_iterator_tag  iterator_category;
-        typedef ptrdiff_t difference_type;
-        typedef T value_type;
-        typedef const T *pointer;
-        typedef const T &reference;
-
-        inline const_iterator() : i(0) {}
-        inline const_iterator(T *n) : i(n) {}
-        inline const_iterator(const const_iterator &o): i(o.i) {}
-        inline explicit const_iterator(const iterator &o): i(o.i) {}
-        inline const T &operator*() const { return *i; }
-        inline const T *operator->() const { return i; }
-        inline const T &operator[](int j) const { return *(i + j); }
-        inline bool operator==(const const_iterator &o) const { return i == o.i; }
-        inline bool operator!=(const const_iterator &o) const { return i != o.i; }
-        inline bool operator<(const const_iterator& other) const { return i < other.i; }
-        inline bool operator<=(const const_iterator& other) const { return i <= other.i; }
-        inline bool operator>(const const_iterator& other) const { return i > other.i; }
-        inline bool operator>=(const const_iterator& other) const { return i >= other.i; }
-        inline const_iterator &operator++() { ++i; return *this; }
-        inline const_iterator operator++(int) { T *n = i; ++i; return n; }
-        inline const_iterator &operator--() { i--; return *this; }
-        inline const_iterator operator--(int) { T *n = i; i--; return n; }
-        inline const_iterator &operator+=(int j) { i+=j; return *this; }
-        inline const_iterator &operator-=(int j) { i-=j; return *this; }
-        inline const_iterator operator+(int j) const { return const_iterator(i+j); }
-        inline const_iterator operator-(int j) const { return const_iterator(i-j); }
-        inline int operator-(const_iterator j) const { return i - j.i; }
-    };
-    friend class const_iterator;
-#else
-    // STL-style
-    typedef T* iterator;
-    typedef const T* const_iterator;
-#endif
-    inline iterator begin() { detach(); return p->array; }
-    inline const_iterator begin() const { return p->array; }
-    inline const_iterator constBegin() const { return p->array; }
-    inline iterator end() { detach(); return p->array + d->size; }
-    inline const_iterator end() const { return p->array + d->size; }
-    inline const_iterator constEnd() const { return p->array + d->size; }
-    iterator insert(iterator before, int n, const T &x);
-    inline iterator insert(iterator before, const T &x) { return insert(before, 1, x); }
-    iterator erase(iterator begin, iterator end);
-    inline iterator erase(iterator pos) { return erase(pos, pos+1); }
-
-    // more Qt
-    inline int count() const { return d->size; }
-    inline T& first() { Q_ASSERT(!isEmpty()); return *begin(); }
-    inline const T &first() const { Q_ASSERT(!isEmpty()); return *begin(); }
-    inline T& last() { Q_ASSERT(!isEmpty()); return *(end()-1); }
-    inline const T &last() const { Q_ASSERT(!isEmpty()); return *(end()-1); }
-    inline bool startsWith(const T &t) const { return !isEmpty() && first() == t; }
-    inline bool endsWith(const T &t) const { return !isEmpty() && last() == t; }
-    QVector<T> mid(int pos, int length = -1) const;
-
-    T value(int i) const;
-    T value(int i, const T &defaultValue) const;
-
-    // STL compatibility
-    typedef T value_type;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef ptrdiff_t difference_type;
-    typedef iterator Iterator;
-    typedef const_iterator ConstIterator;
-    typedef int size_type;
-    inline void push_back(const T &t) { append(t); }
-    inline void push_front(const T &t) { prepend(t); }
-    void pop_back() { Q_ASSERT(!isEmpty()); erase(end()-1); }
-    void pop_front() { Q_ASSERT(!isEmpty()); erase(begin()); }
-    inline bool empty() const
-    { return d->size == 0; }
-    inline T& front() { return first(); }
-    inline const_reference front() const { return first(); }
-    inline reference back() { return last(); }
-    inline const_reference back() const { return last(); }
-
-    // comfort
-    QVector<T> &operator+=(const QVector<T> &l);
-    inline QVector<T> operator+(const QVector<T> &l) const
-    { QVector n = *this; n += l; return n; }
-    inline QVector<T> &operator+=(const T &t)
-    { append(t); return *this; }
-    inline QVector<T> &operator<< (const T &t)
-    { append(t); return *this; }
-    inline QVector<T> &operator<<(const QVector<T> &l)
-    { *this += l; return *this; }
-
-    QList<T> toList() const;
-
-    static QVector<T> fromList(const QList<T> &list);
-
-#ifndef TQT_NO_STL
-    static inline QVector<T> fromStdVector(const std::vector<T> &vector)
-    { QVector<T> tmp; qCopy(vector.begin(), vector.end(), std::back_inserter(tmp)); return tmp; }
-    inline std::vector<T> toStdVector() const
-    { std::vector<T> tmp; qCopy(constBegin(), constEnd(), std::back_inserter(tmp)); return tmp; }
-#endif
-
-private:
-    friend class QRegion; // Optimization for QRegion::rects()
-
-    void detach_helper();
-    QVectorData *malloc(int alloc);
-    void realloc(int size, int alloc);
-    void free(Data *d);
-    int sizeOfTypedData() {
-        // this is more or less the same as sizeof(Data), except that it doesn't
-        // count the padding at the end
-        return reinterpret_cast<const char *>(&(reinterpret_cast<const Data *>(this))->array[1]) - reinterpret_cast<const char *>(this);
-    }
-    inline int alignOfTypedData() const
-    {
-#ifdef Q_ALIGNOF
-        return qMax<int>(sizeof(void*), Q_ALIGNOF(Data));
-#else
-        return 0;
-#endif
-    }
-};
-
-template <typename T>
-void QVector<T>::detach_helper()
-{ realloc(d->size, d->alloc); }
-template <typename T>
-void QVector<T>::reserve(int asize)
-{ if (asize > d->alloc) realloc(d->size, asize); if (d->ref == 1) d->capacity = 1; }
-template <typename T>
-void QVector<T>::resize(int asize)
-{ realloc(asize, (asize > d->alloc || (!d->capacity && asize < d->size && asize < (d->alloc >> 1))) ?
-          QVectorData::grow(sizeOfTypedData(), asize, sizeof(T), QTypeInfo<T>::isStatic)
-          : d->alloc); }
-template <typename T>
-inline void QVector<T>::clear()
-{ *this = QVector<T>(); }
-template <typename T>
-inline const T &QVector<T>::at(int i) const
-{ Q_ASSERT_X(i >= 0 && i < d->size, "QVector<T>::at", "index out of range");
-  return p->array[i]; }
-template <typename T>
-inline const T &QVector<T>::operator[](int i) const
-{ Q_ASSERT_X(i >= 0 && i < d->size, "QVector<T>::operator[]", "index out of range");
-  return p->array[i]; }
-template <typename T>
-inline T &QVector<T>::operator[](int i)
-{ Q_ASSERT_X(i >= 0 && i < d->size, "QVector<T>::operator[]", "index out of range");
-  return data()[i]; }
-template <typename T>
-inline void QVector<T>::insert(int i, const T &t)
-{ Q_ASSERT_X(i >= 0 && i <= d->size, "QVector<T>::insert", "index out of range");
-  insert(begin() + i, 1, t); }
-template <typename T>
-inline void QVector<T>::insert(int i, int n, const T &t)
-{ Q_ASSERT_X(i >= 0 && i <= d->size, "QVector<T>::insert", "index out of range");
-  insert(begin() + i, n, t); }
-template <typename T>
-inline void QVector<T>::remove(int i, int n)
-{ Q_ASSERT_X(i >= 0 && n >= 0 && i + n <= d->size, "QVector<T>::remove", "index out of range");
-  erase(begin() + i, begin() + i + n); }
-template <typename T>
-inline void QVector<T>::remove(int i)
-{ Q_ASSERT_X(i >= 0 && i < d->size, "QVector<T>::remove", "index out of range");
-  erase(begin() + i, begin() + i + 1); }
-template <typename T>
-inline void QVector<T>::prepend(const T &t)
-{ insert(begin(), 1, t); }
-
-template <typename T>
-inline void QVector<T>::replace(int i, const T &t)
-{
-    Q_ASSERT_X(i >= 0 && i < d->size, "QVector<T>::replace", "index out of range");
-    const T copy(t);
-    data()[i] = copy;
-}
-
-template <typename T>
-QVector<T> &QVector<T>::operator=(const QVector<T> &v)
-{
-    v.d->ref.ref();
-    if (!d->ref.deref())
-        free(p);
-    d = v.d;
-    if (!d->sharable)
-        detach_helper();
-    return *this;
-}
-
-template <typename T>
-inline QVectorData *QVector<T>::malloc(int aalloc)
-{
-    QVectorData *vectordata = QVectorData::allocate(sizeOfTypedData() + (aalloc - 1) * sizeof(T), alignOfTypedData());
-    Q_CHECK_PTR(vectordata);
-    return vectordata;
-}
-
-template <typename T>
-QVector<T>::QVector(int asize)
-{
-    d = malloc(asize);
-    d->ref = 1;
-    d->alloc = d->size = asize;
-    d->sharable = true;
-    d->capacity = false;
-    if (QTypeInfo<T>::isComplex) {
-        T* b = p->array;
-        T* i = p->array + d->size;
-        while (i != b)
-            new (--i) T;
-    } else {
-        qMemSet(p->array, 0, asize * sizeof(T));
-    }
-}
-
-template <typename T>
-QVector<T>::QVector(int asize, const T &t)
-{
-    d = malloc(asize);
-    d->ref = 1;
-    d->alloc = d->size = asize;
-    d->sharable = true;
-    d->capacity = false;
-    T* i = p->array + d->size;
-    while (i != p->array)
-        new (--i) T(t);
-}
-
-template <typename T>
-void QVector<T>::free(Data *x)
-{
-    if (QTypeInfo<T>::isComplex) {
-        T* b = x->array;
-        union { QVectorData *d; Data *p; } u;
-        u.p = x;
-        T* i = b + u.d->size;
-        while (i-- != b)
-             i->~T();
-    }
-    x->free(x, alignOfTypedData());
-}
-
-template <typename T>
-void QVector<T>::realloc(int asize, int aalloc)
-{
-    Q_ASSERT(asize <= aalloc);
-    T *pOld;
-    T *pNew;
-    union { QVectorData *d; Data *p; } x;
-    x.d = d;
-
-    if (QTypeInfo<T>::isComplex && asize < d->size && d->ref == 1 ) {
-        // call the destructor on all objects that need to be
-        // destroyed when shrinking
-        pOld = p->array + d->size;
-        pNew = p->array + asize;
-        while (asize < d->size) {
-            (--pOld)->~T();
-            d->size--;
-        }
-    }
-
-    if (aalloc != d->alloc || d->ref != 1) {
-        // (re)allocate memory
-        if (QTypeInfo<T>::isStatic) {
-            x.d = malloc(aalloc);
-            Q_CHECK_PTR(x.p);
-            x.d->size = 0;
-        } else if (d->ref != 1) {
-            x.d = malloc(aalloc);
-            Q_CHECK_PTR(x.p);
-            if (QTypeInfo<T>::isComplex) {
-                x.d->size = 0;
-            } else {
-                ::memcpy(x.p, p, sizeOfTypedData() + (qMin(aalloc, d->alloc) - 1) * sizeof(T));
-                x.d->size = d->size;
-            }
-        } else {
-            QT_TRY {
-                QVectorData *mem = QVectorData::reallocate(d, sizeOfTypedData() + (aalloc - 1) * sizeof(T),
-                                                           sizeOfTypedData() + (d->alloc - 1) * sizeof(T), alignOfTypedData());
-                Q_CHECK_PTR(mem);
-                x.d = d = mem;
-                x.d->size = d->size;
-            } QT_CATCH (const std::bad_alloc &) {
-                if (aalloc > d->alloc) // ignore the error in case we are just shrinking.
-                    QT_RETHROW;
-            }
-        }
-        x.d->ref = 1;
-        x.d->alloc = aalloc;
-        x.d->sharable = true;
-        x.d->capacity = d->capacity;
-        x.d->reserved = 0;
-    }
-
-    if (QTypeInfo<T>::isComplex) {
-        QT_TRY {
-            pOld = p->array + x.d->size;
-            pNew = x.p->array + x.d->size;
-            // copy objects from the old array into the new array
-            const int toMove = qMin(asize, d->size);
-            while (x.d->size < toMove) {
-                new (pNew++) T(*pOld++);
-                x.d->size++;
-            }
-            // construct all new objects when growing
-            while (x.d->size < asize) {
-                new (pNew++) T;
-                x.d->size++;
-            }
-        } QT_CATCH (...) {
-            free(x.p);
-            QT_RETHROW;
-        }
-
-    } else if (asize > x.d->size) {
-        // initialize newly allocated memory to 0
-        qMemSet(x.p->array + x.d->size, 0, (asize - x.d->size) * sizeof(T));
-    }
-    x.d->size = asize;
-
-    if (d != x.d) {
-        if (!d->ref.deref())
-            free(p);
-        d = x.d;
-    }
-}
-
-template<typename T>
-Q_OUTOFLINE_TEMPLATE T QVector<T>::value(int i) const
-{
-    if (i < 0 || i >= d->size) {
-        return T();
-    }
-    return p->array[i];
-}
-template<typename T>
-Q_OUTOFLINE_TEMPLATE T QVector<T>::value(int i, const T &defaultValue) const
-{
-    return ((i < 0 || i >= d->size) ? defaultValue : p->array[i]);
-}
-
-template <typename T>
-void QVector<T>::append(const T &t)
-{
-    if (d->ref != 1 || d->size + 1 > d->alloc) {
-        const T copy(t);
-        realloc(d->size, QVectorData::grow(sizeOfTypedData(), d->size + 1, sizeof(T),
-                                           QTypeInfo<T>::isStatic));
-        if (QTypeInfo<T>::isComplex)
-            new (p->array + d->size) T(copy);
-        else
-            p->array[d->size] = copy;
-    } else {
-        if (QTypeInfo<T>::isComplex)
-            new (p->array + d->size) T(t);
-        else
-            p->array[d->size] = t;
-    }
-    ++d->size;
-}
-
-template <typename T>
-Q_TYPENAME QVector<T>::iterator QVector<T>::insert(iterator before, size_type n, const T &t)
-{
-    int offset = int(before - p->array);
-    if (n != 0) {
-        const T copy(t);
-        if (d->ref != 1 || d->size + n > d->alloc)
-            realloc(d->size, QVectorData::grow(sizeOfTypedData(), d->size + n, sizeof(T),
-                                               QTypeInfo<T>::isStatic));
-        if (QTypeInfo<T>::isStatic) {
-            T *b = p->array + d->size;
-            T *i = p->array + d->size + n;
-            while (i != b)
-                new (--i) T;
-            i = p->array + d->size;
-            T *j = i + n;
-            b = p->array + offset;
-            while (i != b)
-                *--j = *--i;
-            i = b+n;
-            while (i != b)
-                *--i = copy;
-        } else {
-            T *b = p->array + offset;
-            T *i = b + n;
-            memmove(i, b, (d->size - offset) * sizeof(T));
-            while (i != b)
-                new (--i) T(copy);
-        }
-        d->size += n;
-    }
-    return p->array + offset;
-}
-
-template <typename T>
-Q_TYPENAME QVector<T>::iterator QVector<T>::erase(iterator abegin, iterator aend)
-{
-    int f = int(abegin - p->array);
-    int l = int(aend - p->array);
-    int n = l - f;
-    detach();
-    if (QTypeInfo<T>::isComplex) {
-        qCopy(p->array+l, p->array+d->size, p->array+f);
-        T *i = p->array+d->size;
-        T* b = p->array+d->size-n;
-        while (i != b) {
-            --i;
-            i->~T();
-        }
-    } else {
-        memmove(p->array + f, p->array + l, (d->size-l)*sizeof(T));
-    }
-    d->size -= n;
-    return p->array + f;
-}
-
-template <typename T>
-bool QVector<T>::operator==(const QVector<T> &v) const
-{
-    if (d->size != v.d->size)
-        return false;
-    if (d == v.d)
-        return true;
-    T* b = p->array;
-    T* i = b + d->size;
-    T* j = v.p->array + d->size;
-    while (i != b)
-        if (!(*--i == *--j))
-            return false;
-    return true;
-}
-
-template <typename T>
-QVector<T> &QVector<T>::fill(const T &from, int asize)
-{
-    const T copy(from);
-    resize(asize < 0 ? d->size : asize);
-    if (d->size) {
-        T *i = p->array + d->size;
-        T *b = p->array;
-        while (i != b)
-            *--i = copy;
-    }
-    return *this;
-}
-
-template <typename T>
-QVector<T> &QVector<T>::operator+=(const QVector &l)
-{
-    int newSize = d->size + l.d->size;
-    realloc(d->size, newSize);
-
-    T *w = p->array + newSize;
-    T *i = l.p->array + l.d->size;
-    T *b = l.p->array;
-    while (i != b) {
-        if (QTypeInfo<T>::isComplex)
-            new (--w) T(*--i);
-        else
-            *--w = *--i;
-    }
-    d->size = newSize;
-    return *this;
-}
-
-template <typename T>
-int QVector<T>::indexOf(const T &t, int from) const
-{
-    if (from < 0)
-        from = qMax(from + d->size, 0);
-    if (from < d->size) {
-        T* n = p->array + from - 1;
-        T* e = p->array + d->size;
-        while (++n != e)
-            if (*n == t)
-                return n - p->array;
-    }
-    return -1;
-}
-
-template <typename T>
-int QVector<T>::lastIndexOf(const T &t, int from) const
-{
-    if (from < 0)
-        from += d->size;
-    else if (from >= d->size)
-        from = d->size-1;
-    if (from >= 0) {
-        T* b = p->array;
-        T* n = p->array + from + 1;
-        while (n != b) {
-            if (*--n == t)
-                return n - b;
-        }
-    }
-    return -1;
-}
-
-template <typename T>
-bool QVector<T>::contains(const T &t) const
-{
-    T* b = p->array;
-    T* i = p->array + d->size;
-    while (i != b)
-        if (*--i == t)
-            return true;
-    return false;
-}
-
-template <typename T>
-int QVector<T>::count(const T &t) const
-{
-    int c = 0;
-    T* b = p->array;
-    T* i = p->array + d->size;
-    while (i != b)
-        if (*--i == t)
-            ++c;
-    return c;
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE QVector<T> QVector<T>::mid(int pos, int length) const
-{
-    if (length < 0)
-        length = size() - pos;
-    if (pos == 0 && length == size())
-        return *this;
-    QVector<T> copy;
-    if (pos + length > size())
-        length = size() - pos;
-    for (int i = pos; i < pos + length; ++i)
-        copy += at(i);
-    return copy;
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE QList<T> QVector<T>::toList() const
-{
-    QList<T> result;
-    for (int i = 0; i < size(); ++i)
-        result.append(at(i));
-    return result;
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE QVector<T> QList<T>::toVector() const
-{
-    QVector<T> result(size());
-    for (int i = 0; i < size(); ++i)
-        result[i] = at(i);
-    return result;
-}
-
-template <typename T>
-QVector<T> QVector<T>::fromList(const QList<T> &list)
-{
-    return list.toVector();
-}
-
-template <typename T>
-QList<T> QList<T>::fromVector(const QVector<T> &vector)
-{
-    return vector.toList();
-}
-
-Q_DECLARE_SEQUENTIAL_ITERATOR(Vector)
-Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(Vector)
-
-/*
-   ### Qt 5:
-   ### This needs to be removed for next releases of Qt. It is a workaround for vc++ because
-   ### Qt exports QPolygon and QPolygonF that inherit QVector<QPoint> and
-   ### QVector<QPointF> respectively.
-*/
-
-#ifdef Q_CC_MSVC
-QT_BEGIN_INCLUDE_NAMESPACE
-#include <QtCore/QPointF>
-#include <QtCore/QPoint>
-QT_END_INCLUDE_NAMESPACE
-
-#if defined(QT_BUILD_CORE_LIB)
-#define Q_TEMPLATE_EXTERN
-#else
-#define Q_TEMPLATE_EXTERN extern
-#endif
-# pragma warning(push)          /* MSVC 6.0 doesn't care about the disabling in qglobal.h (why?), so do it here */
-# pragma warning(disable: 4231) /* nonstandard extension used : 'extern' before template explicit instantiation */
-Q_TEMPLATE_EXTERN template class Q_CORE_EXPORT QVector<QPointF>;
-Q_TEMPLATE_EXTERN template class Q_CORE_EXPORT QVector<QPoint>;
-# pragma warning(pop)
-#endif
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QVECTOR_H
diff --git a/qtinterface/tqt4/Qt/qwidget.h b/qtinterface/tqt4/Qt/qwidget.h
deleted file mode 100644
index 20c5f42..0000000
--- a/qtinterface/tqt4/Qt/qwidget.h
+++ /dev/null
@@ -1,1077 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 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$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QWIDGET_H
-#define QWIDGET_H
-
-#include <QtGui/qwindowdefs.h>
-#include <QtCore/qobject.h>
-#include <QtCore/qmargins.h>
-#include <QtGui/qpaintdevice.h>
-#include <QtGui/qpalette.h>
-#include <QtGui/qfont.h>
-#include <QtGui/qfontmetrics.h>
-#include <QtGui/qfontinfo.h>
-#include <QtGui/qsizepolicy.h>
-#include <QtGui/qregion.h>
-#include <QtGui/qbrush.h>
-#include <QtGui/qcursor.h>
-#include <QtGui/qkeysequence.h>
-
-#ifdef TQT_INCLUDE_COMPAT
-#include <QtGui/qevent.h>
-#endif
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-class QLayout;
-class QWSRegionManager;
-class QStyle;
-class QAction;
-class QVariant;
-
-class QActionEvent;
-class QMouseEvent;
-class QWheelEvent;
-class QHoverEvent;
-class QKeyEvent;
-class QFocusEvent;
-class QPaintEvent;
-class QMoveEvent;
-class QResizeEvent;
-class QCloseEvent;
-class QContextMenuEvent;
-class QInputMethodEvent;
-class QTabletEvent;
-class QDragEnterEvent;
-class QDragMoveEvent;
-class QDragLeaveEvent;
-class QDropEvent;
-class QShowEvent;
-class QHideEvent;
-class QInputContext;
-class QIcon;
-class QWindowSurface;
-class QLocale;
-class QGraphicsProxyWidget;
-class QGraphicsEffect;
-#if defined(Q_WS_X11)
-class QX11Info;
-#endif
-
-class QWidgetData
-{
-public:
-    WId winid;
-    uint widget_attributes;
-    Qt::WindowFlags window_flags;
-    uint window_state : 4;
-    uint focus_policy : 4;
-    uint sizehint_forced :1;
-    uint is_closing :1;
-    uint in_show : 1;
-    uint in_set_window_state : 1;
-    mutable uint fstrut_dirty : 1;
-    uint context_menu_policy : 3;
-    uint window_modality : 2;
-    uint in_destructor : 1;
-    uint unused : 13;
-    QRect crect;
-    mutable QPalette pal;
-    QFont fnt;
-#if defined(Q_WS_QWS)
-//    QRegion req_region;                 // Requested region
-//     mutable QRegion paintable_region;   // Paintable region
-//     mutable bool paintable_region_dirty;// needs to be recalculated
-//     mutable QRegion alloc_region;       // Allocated region
-//     mutable bool alloc_region_dirty;    // needs to be recalculated
-//     mutable int overlapping_children;   // Handle overlapping children
-
-    int alloc_region_index;
-//    int alloc_region_revision;
-#endif
-    QRect wrect;
-};
-
-class QWidgetPrivate;
-
-class Q_GUI_EXPORT QWidget : public QObject, public QPaintDevice
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QWidget)
-
-    Q_PROPERTY(bool modal READ isModal)
-    Q_PROPERTY(Qt::WindowModality windowModality READ windowModality WRITE setWindowModality)
-    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled)
-    Q_PROPERTY(QRect geometry READ geometry WRITE setGeometry)
-    Q_PROPERTY(QRect frameGeometry READ frameGeometry)
-    Q_PROPERTY(QRect normalGeometry READ normalGeometry)
-    Q_PROPERTY(int x READ x)
-    Q_PROPERTY(int y READ y)
-    Q_PROPERTY(QPoint pos READ pos WRITE move DESIGNABLE false STORED false)
-    Q_PROPERTY(QSize frameSize READ frameSize)
-    Q_PROPERTY(QSize size READ size WRITE resize DESIGNABLE false STORED false)
-    Q_PROPERTY(int width READ width)
-    Q_PROPERTY(int height READ height)
-    Q_PROPERTY(QRect rect READ rect)
-    Q_PROPERTY(QRect childrenRect READ childrenRect)
-    Q_PROPERTY(QRegion childrenRegion READ childrenRegion)
-    Q_PROPERTY(QSizePolicy sizePolicy READ sizePolicy WRITE setSizePolicy)
-    Q_PROPERTY(QSize minimumSize READ minimumSize WRITE setMinimumSize)
-    Q_PROPERTY(QSize maximumSize READ maximumSize WRITE setMaximumSize)
-    Q_PROPERTY(int minimumWidth READ minimumWidth WRITE setMinimumWidth STORED false DESIGNABLE false)
-    Q_PROPERTY(int minimumHeight READ minimumHeight WRITE setMinimumHeight STORED false DESIGNABLE false)
-    Q_PROPERTY(int maximumWidth READ maximumWidth WRITE setMaximumWidth STORED false DESIGNABLE false)
-    Q_PROPERTY(int maximumHeight READ maximumHeight WRITE setMaximumHeight STORED false DESIGNABLE false)
-    Q_PROPERTY(QSize sizeIncrement READ sizeIncrement WRITE setSizeIncrement)
-    Q_PROPERTY(QSize baseSize READ baseSize WRITE setBaseSize)
-    Q_PROPERTY(QPalette palette READ palette WRITE setPalette)
-    Q_PROPERTY(QFont font READ font WRITE setFont)
-#ifndef QT_NO_CURSOR
-    Q_PROPERTY(QCursor cursor READ cursor WRITE setCursor RESET unsetCursor)
-#endif
-    Q_PROPERTY(bool mouseTracking READ hasMouseTracking WRITE setMouseTracking)
-    Q_PROPERTY(bool isActiveWindow READ isActiveWindow)
-    Q_PROPERTY(Qt::FocusPolicy focusPolicy READ focusPolicy WRITE setFocusPolicy)
-    Q_PROPERTY(bool focus READ hasFocus)
-    Q_PROPERTY(Qt::ContextMenuPolicy contextMenuPolicy READ contextMenuPolicy WRITE setContextMenuPolicy)
-    Q_PROPERTY(bool updatesEnabled READ updatesEnabled WRITE setUpdatesEnabled DESIGNABLE false)
-    Q_PROPERTY(bool visible READ isVisible WRITE setVisible DESIGNABLE false)
-    Q_PROPERTY(bool minimized READ isMinimized)
-    Q_PROPERTY(bool maximized READ isMaximized)
-    Q_PROPERTY(bool fullScreen READ isFullScreen)
-    Q_PROPERTY(QSize sizeHint READ sizeHint)
-    Q_PROPERTY(QSize minimumSizeHint READ minimumSizeHint)
-    Q_PROPERTY(bool acceptDrops READ acceptDrops WRITE setAcceptDrops)
-    Q_PROPERTY(QString windowTitle READ windowTitle WRITE setWindowTitle DESIGNABLE isWindow)
-    Q_PROPERTY(QIcon windowIcon READ windowIcon WRITE setWindowIcon DESIGNABLE isWindow)
-    Q_PROPERTY(QString windowIconText READ windowIconText WRITE setWindowIconText DESIGNABLE isWindow)
-    Q_PROPERTY(double windowOpacity READ windowOpacity WRITE setWindowOpacity DESIGNABLE isWindow)
-    Q_PROPERTY(bool windowModified READ isWindowModified WRITE setWindowModified DESIGNABLE isWindow)
-#ifndef QT_NO_TOOLTIP
-    Q_PROPERTY(QString toolTip READ toolTip WRITE setToolTip)
-#endif
-#ifndef QT_NO_STATUSTIP
-    Q_PROPERTY(QString statusTip READ statusTip WRITE setStatusTip)
-#endif
-#ifndef QT_NO_WHATSTHIS
-    Q_PROPERTY(QString whatsThis READ whatsThis WRITE setWhatsThis)
-#endif
-#ifndef QT_NO_ACCESSIBILITY
-    Q_PROPERTY(QString accessibleName READ accessibleName WRITE setAccessibleName)
-    Q_PROPERTY(QString accessibleDescription READ accessibleDescription WRITE setAccessibleDescription)
-#endif
-    Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection RESET unsetLayoutDirection)
-    QDOC_PROPERTY(Qt::WindowFlags windowFlags READ windowFlags WRITE setWindowFlags)
-    Q_PROPERTY(bool autoFillBackground READ autoFillBackground WRITE setAutoFillBackground)
-#ifndef QT_NO_STYLE_STYLESHEET
-    Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
-#endif
-    Q_PROPERTY(QLocale locale READ locale WRITE setLocale RESET unsetLocale)
-    Q_PROPERTY(QString windowFilePath READ windowFilePath WRITE setWindowFilePath DESIGNABLE isWindow)
-    Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints)
-
-public:
-    enum RenderFlag {
-        DrawWindowBackground = 0x1,
-        DrawChildren = 0x2,
-        IgnoreMask = 0x4
-    };
-    Q_DECLARE_FLAGS(RenderFlags, RenderFlag)
-
-    explicit QWidget(QWidget* parent = 0, Qt::WindowFlags f = 0);
-#ifdef QT3_SUPPORT
-    QT3_SUPPORT_CONSTRUCTOR QWidget(QWidget* parent, const char *name, Qt::WindowFlags f = 0);
-#endif
-    ~QWidget();
-
-    int devType() const;
-
-    WId winId() const;
-    void createWinId(); // internal, going away
-    inline WId internalWinId() const { return data->winid; }
-    WId effectiveWinId() const;
-
-    // GUI style setting
-    QStyle *style() const;
-    void setStyle(QStyle *);
-    // Widget types and states
-
-    bool isTopLevel() const;
-    bool isWindow() const;
-
-    bool isModal() const;
-    Qt::WindowModality windowModality() const;
-    void setWindowModality(Qt::WindowModality windowModality);
-
-    bool isEnabled() const;
-    bool isEnabledTo(QWidget*) const;
-    bool isEnabledToTLW() const;
-
-    Qt::WidgetAttribute testWState( Qt::WidgetAttribute s ) const;
-    Qt::WindowFlags testWFlags( Qt::WindowFlags f ) const;
-
-public Q_SLOTS:
-    void setEnabled(bool);
-    void setDisabled(bool);
-    void setWindowModified(bool);
-
-    // Widget coordinates
-
-public:
-    QRect frameGeometry() const;
-    const QRect &geometry() const;
-    QRect normalGeometry() const;
-
-    int x() const;
-    int y() const;
-    QPoint pos() const;
-    QSize frameSize() const;
-    QSize size() const;
-    inline int width() const;
-    inline int height() const;
-    inline QRect rect() const;
-    QRect childrenRect() const;
-    QRegion childrenRegion() const;
-
-    QSize minimumSize() const;
-    QSize maximumSize() const;
-    int minimumWidth() const;
-    int minimumHeight() const;
-    int maximumWidth() const;
-    int maximumHeight() const;
-    void setMinimumSize(const QSize &);
-    void setMinimumSize(int minw, int minh);
-    void setMaximumSize(const QSize &);
-    void setMaximumSize(int maxw, int maxh);
-    void setMinimumWidth(int minw);
-    void setMinimumHeight(int minh);
-    void setMaximumWidth(int maxw);
-    void setMaximumHeight(int maxh);
-
-#ifdef Q_QDOC
-    void setupUi(QWidget *widget);
-#endif
-
-    QSize sizeIncrement() const;
-    void setSizeIncrement(const QSize &);
-    void setSizeIncrement(int w, int h);
-    QSize baseSize() const;
-    void setBaseSize(const QSize &);
-    void setBaseSize(int basew, int baseh);
-
-    void setFixedSize(const QSize &);
-    void setFixedSize(int w, int h);
-    void setFixedWidth(int w);
-    void setFixedHeight(int h);
-
-    // Widget coordinate mapping
-
-    QPoint mapToGlobal(const QPoint &) const;
-    QPoint mapFromGlobal(const QPoint &) const;
-    QPoint mapToParent(const QPoint &) const;
-    QPoint mapFromParent(const QPoint &) const;
-    QPoint mapTo(QWidget *, const QPoint &) const;
-    QPoint mapFrom(QWidget *, const QPoint &) const;
-
-    QWidget *window() const;
-    QWidget *nativeParentWidget() const;
-    inline QWidget *topLevelWidget() const { return window(); }
-
-    // Widget appearance functions
-    const QPalette &palette() const;
-    void setPalette(const QPalette &);
-
-    void setBackgroundRole(QPalette::ColorRole);
-    QPalette::ColorRole backgroundRole() const;
-
-    void setForegroundRole(QPalette::ColorRole);
-    QPalette::ColorRole foregroundRole() const;
-
-    const QFont &font() const;
-    void setFont(const QFont &);
-    QFontMetrics fontMetrics() const;
-    QFontInfo fontInfo() const;
-
-#ifndef QT_NO_CURSOR
-    QCursor cursor() const;
-    void setCursor(const QCursor &);
-    void unsetCursor();
-#endif
-
-    void setMouseTracking(bool enable);
-    bool hasMouseTracking() const;
-    bool underMouse() const;
-
-    void setMask(const QBitmap &);
-    void setMask(const QRegion &);
-    QRegion mask() const;
-    void clearMask();
-
-    void render(QPaintDevice *target, const QPoint &targetOffset = QPoint(),
-                const QRegion &sourceRegion = QRegion(),
-                RenderFlags renderFlags = RenderFlags(DrawWindowBackground | DrawChildren));
-
-    void render(QPainter *painter, const QPoint &targetOffset = QPoint(),
-                const QRegion &sourceRegion = QRegion(),
-                RenderFlags renderFlags = RenderFlags(DrawWindowBackground | DrawChildren));
-
-#ifndef QT_NO_GRAPHICSEFFECT
-    QGraphicsEffect *graphicsEffect() const;
-    void setGraphicsEffect(QGraphicsEffect *effect);
-#endif //QT_NO_GRAPHICSEFFECT
-
-    void grabGesture(Qt::GestureType type, Qt::GestureFlags flags = Qt::GestureFlags());
-    void ungrabGesture(Qt::GestureType type);
-
-public Q_SLOTS:
-    void setWindowTitle(const QString &);
-#ifndef QT_NO_STYLE_STYLESHEET
-    void setStyleSheet(const QString& styleSheet);
-#endif
-public:
-#ifndef QT_NO_STYLE_STYLESHEET
-    QString styleSheet() const;
-#endif
-    QString windowTitle() const;
-    void setWindowIcon(const QIcon &icon);
-    QIcon windowIcon() const;
-    void setWindowIconText(const QString &);
-    QString windowIconText() const;
-    void setWindowRole(const QString &);
-    QString windowRole() const;
-    void setWindowFilePath(const QString &filePath);
-    QString windowFilePath() const;
-
-    void setWindowOpacity(qreal level);
-    qreal windowOpacity() const;
-
-    bool isWindowModified() const;
-#ifndef QT_NO_TOOLTIP
-    void setToolTip(const QString &);
-    QString toolTip() const;
-#endif
-#ifndef QT_NO_STATUSTIP
-    void setStatusTip(const QString &);
-    QString statusTip() const;
-#endif
-#ifndef QT_NO_WHATSTHIS
-    void setWhatsThis(const QString &);
-    QString whatsThis() const;
-#endif
-#ifndef QT_NO_ACCESSIBILITY
-    QString accessibleName() const;
-    void setAccessibleName(const QString &name);
-    QString accessibleDescription() const;
-    void setAccessibleDescription(const QString &description);
-#endif
-
-    void setLayoutDirection(Qt::LayoutDirection direction);
-    Qt::LayoutDirection layoutDirection() const;
-    void unsetLayoutDirection();
-
-    void setLocale(const QLocale &locale);
-    QLocale locale() const;
-    void unsetLocale();
-
-    inline bool isRightToLeft() const { return layoutDirection() == Qt::RightToLeft; }
-    inline bool isLeftToRight() const { return layoutDirection() == Qt::LeftToRight; }
-
-public Q_SLOTS:
-    inline void setFocus() { setFocus(Qt::OtherFocusReason); }
-
-public:
-    bool isActiveWindow() const;
-    void activateWindow();
-    void clearFocus();
-
-    void setFocus(Qt::FocusReason reason);
-    Qt::FocusPolicy focusPolicy() const;
-    void setFocusPolicy(Qt::FocusPolicy policy);
-    bool hasFocus() const;
-    static void setTabOrder(QWidget *, QWidget *);
-    void setFocusProxy(QWidget *);
-    QWidget *focusProxy() const;
-    Qt::ContextMenuPolicy contextMenuPolicy() const;
-    void setContextMenuPolicy(Qt::ContextMenuPolicy policy);
-
-    // Grab functions
-    void grabMouse();
-#ifndef QT_NO_CURSOR
-    void grabMouse(const QCursor &);
-#endif
-    void releaseMouse();
-    void grabKeyboard();
-    void releaseKeyboard();
-#ifndef QT_NO_SHORTCUT
-    int grabShortcut(const QKeySequence &key, Qt::ShortcutContext context = Qt::WindowShortcut);
-    void releaseShortcut(int id);
-    void setShortcutEnabled(int id, bool enable = true);
-    void setShortcutAutoRepeat(int id, bool enable = true);
-#endif
-    static QWidget *mouseGrabber();
-    static QWidget *keyboardGrabber();
-
-    // Update/refresh functions
-    inline bool updatesEnabled() const;
-    void setUpdatesEnabled(bool enable);
-
-#if 0 //def Q_WS_QWS
-    void repaintUnclipped(const QRegion &, bool erase = true);
-#endif
-
-#ifndef QT_NO_GRAPHICSVIEW
-    QGraphicsProxyWidget *graphicsProxyWidget() const;
-#endif
-
-public Q_SLOTS:
-    void update();
-    void repaint();
-
-public:
-    inline void update(int x, int y, int w, int h);
-    void update(const QRect&);
-    void update(const QRegion&);
-
-    void repaint(int x, int y, int w, int h);
-    void repaint(const QRect &);
-    void repaint(const QRegion &);
-
-public Q_SLOTS:
-    // Widget management functions
-
-    virtual void setVisible(bool visible);
-    inline void setHidden(bool hidden) { setVisible(!hidden); }
-#ifndef Q_WS_WINCE
-    inline void show() { setVisible(true); }
-#else
-    void show();
-#endif
-    inline void hide() { setVisible(false); }
-    inline QT_MOC_COMPAT void setShown(bool shown) { setVisible(shown); }
-
-    void showMinimized();
-    void showMaximized();
-    void showFullScreen();
-    void showNormal();
-
-    bool close();
-    void raise();
-    void lower();
-
-public:
-    void stackUnder(QWidget*);
-    void move(int x, int y);
-    void move(const QPoint &);
-    void resize(int w, int h);
-    void resize(const QSize &);
-    inline void setGeometry(int x, int y, int w, int h);
-    void setGeometry(const QRect &);
-    QByteArray saveGeometry() const;
-    bool restoreGeometry(const QByteArray &geometry);
-    void adjustSize();
-    bool isVisible() const;
-    bool isVisibleTo(QWidget*) const;
-    // ### Qt 5: bool isVisibleTo(_const_ QWidget *) const
-    inline bool isHidden() const;
-
-    bool isMinimized() const;
-    bool isMaximized() const;
-    bool isFullScreen() const;
-
-    Qt::WindowStates windowState() const;
-    void setWindowState(Qt::WindowStates state);
-    void overrideWindowState(Qt::WindowStates state);
-
-    virtual QSize sizeHint() const;
-    virtual QSize minimumSizeHint() const;
-
-    QSizePolicy sizePolicy() const;
-    void setSizePolicy(QSizePolicy);
-    inline void setSizePolicy(QSizePolicy::Policy horizontal, QSizePolicy::Policy vertical);
-    virtual int heightForWidth(int) const;
-
-    QRegion visibleRegion() const;
-
-    void setContentsMargins(int left, int top, int right, int bottom);
-    void setContentsMargins(const QMargins &margins);
-    void getContentsMargins(int *left, int *top, int *right, int *bottom) const;
-    QMargins contentsMargins() const;
-
-    QRect contentsRect() const;
-
-public:
-    QLayout *layout() const;
-    void setLayout(QLayout *);
-    void updateGeometry();
-
-    void setParent(QWidget *parent);
-    void setParent(QWidget *parent, Qt::WindowFlags f);
-
-    void scroll(int dx, int dy);
-    void scroll(int dx, int dy, const QRect&);
-
-    // Misc. functions
-
-    QWidget *focusWidget() const;
-    QWidget *nextInFocusChain() const;
-    QWidget *previousInFocusChain() const;
-
-    // drag and drop
-    bool acceptDrops() const;
-    void setAcceptDrops(bool on);
-
-#ifndef QT_NO_ACTION
-    //actions
-    void addAction(QAction *action);
-    void addActions(QList<QAction*> actions);
-    void insertAction(QAction *before, QAction *action);
-    void insertActions(QAction *before, QList<QAction*> actions);
-    void removeAction(QAction *action);
-    QList<QAction*> actions() const;
-#endif
-
-    QWidget *parentWidget() const;
-
-    void setWindowFlags(Qt::WindowFlags type);
-    inline Qt::WindowFlags windowFlags() const;
-    void overrideWindowFlags(Qt::WindowFlags type);
-
-    inline Qt::WindowType windowType() const;
-
-    static QWidget *find(WId);
-#ifdef QT3_SUPPORT
-    static QT3_SUPPORT QWidgetMapper *wmapper();
-#endif
-    inline QWidget *childAt(int x, int y) const;
-    QWidget *childAt(const QPoint &p) const;
-
-#if defined(Q_WS_X11)
-    const QX11Info &x11Info() const;
-    Qt::HANDLE x11PictureHandle() const;
-#endif
-
-#if defined(Q_WS_MAC)
-    Qt::HANDLE macQDHandle() const;
-    Qt::HANDLE macCGHandle() const;
-#endif
-
-#if defined(Q_WS_WIN)
-    HDC getDC() const;
-    void releaseDC(HDC) const;
-#else
-    Qt::HANDLE handle() const;
-#endif
-
-    void setAttribute(Qt::WidgetAttribute, bool on = true);
-    inline bool testAttribute(Qt::WidgetAttribute) const;
-
-    QPaintEngine *paintEngine() const;
-
-    void ensurePolished() const;
-
-    QInputContext *inputContext();
-    void setInputContext(QInputContext *);
-
-    bool isAncestorOf(const QWidget *child) const;
-
-#ifdef QT_KEYPAD_NAVIGATION
-    bool hasEditFocus() const;
-    void setEditFocus(bool on);
-#endif
-
-    bool autoFillBackground() const;
-    void setAutoFillBackground(bool enabled);
-
-    void setWindowSurface(QWindowSurface *surface);
-    QWindowSurface *windowSurface() const;
-
-Q_SIGNALS:
-    void customContextMenuRequested(const QPoint &pos);
-
-protected:
-    // Event handlers
-    bool event(QEvent *);
-    virtual void mousePressEvent(QMouseEvent *);
-    virtual void mouseReleaseEvent(QMouseEvent *);
-    virtual void mouseDoubleClickEvent(QMouseEvent *);
-    virtual void mouseMoveEvent(QMouseEvent *);
-#ifndef QT_NO_WHEELEVENT
-    virtual void wheelEvent(QWheelEvent *);
-#endif
-    virtual void keyPressEvent(QKeyEvent *);
-    virtual void keyReleaseEvent(QKeyEvent *);
-    virtual void focusInEvent(QFocusEvent *);
-    virtual void focusOutEvent(QFocusEvent *);
-    virtual void enterEvent(QEvent *);
-    virtual void leaveEvent(QEvent *);
-    virtual void paintEvent(QPaintEvent *);
-    virtual void moveEvent(QMoveEvent *);
-    virtual void resizeEvent(QResizeEvent *);
-    virtual void closeEvent(QCloseEvent *);
-#ifndef QT_NO_CONTEXTMENU
-    virtual void contextMenuEvent(QContextMenuEvent *);
-#endif
-#ifndef QT_NO_TABLETEVENT
-    virtual void tabletEvent(QTabletEvent *);
-#endif
-#ifndef QT_NO_ACTION
-    virtual void actionEvent(QActionEvent *);
-#endif
-
-#ifndef QT_NO_DRAGANDDROP
-    virtual void dragEnterEvent(QDragEnterEvent *);
-    virtual void dragMoveEvent(QDragMoveEvent *);
-    virtual void dragLeaveEvent(QDragLeaveEvent *);
-    virtual void dropEvent(QDropEvent *);
-#endif
-
-    virtual void showEvent(QShowEvent *);
-    virtual void hideEvent(QHideEvent *);
-
-#if defined(Q_WS_MAC)
-    virtual bool macEvent(EventHandlerCallRef, EventRef);
-#endif
-#if defined(Q_WS_WIN)
-    virtual bool winEvent(MSG *message, long *result);
-#endif
-#if defined(Q_WS_X11)
-    virtual bool x11Event(XEvent *);
-#endif
-#if defined(Q_WS_QWS)
-    virtual bool qwsEvent(QWSEvent *);
-#endif
-
-    // Misc. protected functions
-    virtual void changeEvent(QEvent *);
-
-    int metric(PaintDeviceMetric) const;
-
-    virtual void inputMethodEvent(QInputMethodEvent *);
-public:
-    virtual QVariant inputMethodQuery(Qt::InputMethodQuery) const;
-
-    Qt::InputMethodHints inputMethodHints() const;
-    void setInputMethodHints(Qt::InputMethodHints hints);
-
-protected:
-    void resetInputContext();
-protected Q_SLOTS:
-    void updateMicroFocus();
-protected:
-
-    void create(WId = 0, bool initializeWindow = true,
-                         bool destroyOldWindow = true);
-    void destroy(bool destroyWindow = true,
-                 bool destroySubWindows = true);
-
-    virtual bool focusNextPrevChild(bool next);
-    inline bool focusNextChild() { return focusNextPrevChild(true); }
-    inline bool focusPreviousChild() { return focusNextPrevChild(false); }
-
-protected:
-    QWidget(QWidgetPrivate &d, QWidget* parent, Qt::WindowFlags f);
-private:
-
-    bool testAttribute_helper(Qt::WidgetAttribute) const;
-
-    QLayout *takeLayout();
-
-    friend class QBackingStoreDevice;
-    friend class QWidgetBackingStore;
-    friend class QApplication;
-    friend class QApplicationPrivate;
-    friend class QBaseApplication;
-    friend class QPainter;
-    friend class QPainterPrivate;
-    friend class QPixmap; // for QPixmap::fill()
-    friend class QFontMetrics;
-    friend class QFontInfo;
-    friend class QETWidget;
-    friend class QLayout;
-    friend class QWidgetItem;
-    friend class QWidgetItemV2;
-    friend class QGLContext;
-    friend class QGLWidget;
-    friend class QGLWindowSurface;
-    friend class QX11PaintEngine;
-    friend class QWin32PaintEngine;
-    friend class QShortcutPrivate;
-    friend class QShortcutMap;
-    friend class QWindowSurface;
-    friend class QGraphicsProxyWidget;
-    friend class QGraphicsProxyWidgetPrivate;
-    friend class QStyleSheetStyle;
-    friend struct QWidgetExceptionCleaner;
-    friend class QGestureManager;
-    friend class QWinNativePanGestureRecognizer;
-    friend class QWidgetEffectSourcePrivate;
-
-#ifdef Q_WS_MAC
-    friend class QCoreGraphicsPaintEnginePrivate;
-    friend QPoint qt_mac_posInWindow(const QWidget *w);
-    friend OSWindowRef qt_mac_window_for(const QWidget *w);
-    friend bool qt_mac_is_metal(const QWidget *w);
-    friend OSViewRef qt_mac_nativeview_for(const QWidget *w);
-    friend void qt_event_request_window_change(QWidget *widget);
-    friend bool qt_mac_sendMacEventToWidget(QWidget *widget, EventRef ref);
-#endif
-#ifdef Q_WS_QWS
-    friend class QWSBackingStore;
-    friend class QWSManager;
-    friend class QWSManagerPrivate;
-    friend class QDecoration;
-    friend class QWSWindowSurface;
-    friend class QScreen;
-    friend class QVNCScreen;
-    friend bool isWidgetOpaque(const QWidget *);
-    friend class QGLWidgetPrivate;
-#endif
-#ifdef Q_OS_SYMBIAN
-    friend class QSymbianControl;
-    friend class QS60WindowSurface;
-#endif
-#ifdef Q_WS_X11
-    friend void qt_net_update_user_time(QWidget *tlw, unsigned long timestamp);
-    friend void qt_net_remove_user_time(QWidget *tlw);
-#endif
-
-    friend Q_GUI_EXPORT QWidgetData *qt_qwidget_data(QWidget *widget);
-    friend Q_GUI_EXPORT QWidgetPrivate *qt_widget_private(QWidget *widget);
-
-private:
-    Q_DISABLE_COPY(QWidget)
-    Q_PRIVATE_SLOT(d_func(), void _q_showIfNotHidden())
-#ifdef Q_OS_SYMBIAN
-    Q_PRIVATE_SLOT(d_func(), void _q_delayedDestroy(WId winId))
-#endif
-
-    QWidgetData *data;
-
-#ifdef QT3_SUPPORT
-public:
-    inline QT3_SUPPORT bool isUpdatesEnabled() const { return updatesEnabled(); }
-    QT3_SUPPORT QStyle *setStyle(const QString&);
-    inline QT3_SUPPORT bool isVisibleToTLW() const;
-    QT3_SUPPORT QRect visibleRect() const;
-    inline QT3_SUPPORT void iconify() { showMinimized(); }
-    inline QT3_SUPPORT void constPolish() const { ensurePolished(); }
-    inline QT3_SUPPORT void polish() { ensurePolished(); }
-    inline QT3_SUPPORT void reparent(QWidget *parent, Qt::WindowFlags f, const QPoint &p, bool showIt=false)
-    { setParent(parent, f); setGeometry(p.x(),p.y(),width(),height()); if (showIt) show(); }
-    inline QT3_SUPPORT void reparent(QWidget *parent, const QPoint &p, bool showIt=false)
-    { setParent(parent, windowFlags() & ~Qt::WindowType_Mask); setGeometry(p.x(),p.y(),width(),height()); if (showIt) show(); }
-    inline QT3_SUPPORT void recreate(QWidget *parent, Qt::WindowFlags f, const QPoint & p, bool showIt=false)
-    { setParent(parent, f); setGeometry(p.x(),p.y(),width(),height()); if (showIt) show(); }
-    inline QT3_SUPPORT void setSizePolicy(QSizePolicy::Policy hor, QSizePolicy::Policy ver, bool hfw)
-    { QSizePolicy sp(hor, ver); sp.setHeightForWidth(hfw); setSizePolicy(sp);}
-    inline QT3_SUPPORT bool hasMouse() const { return testAttribute(Qt::WA_UnderMouse); }
-#ifndef QT_NO_CURSOR
-    inline QT3_SUPPORT bool ownCursor() const { return testAttribute(Qt::WA_SetCursor); }
-#endif
-    inline QT3_SUPPORT bool ownFont() const { return testAttribute(Qt::WA_SetFont); }
-    inline QT3_SUPPORT void unsetFont() { setFont(QFont()); }
-    inline QT3_SUPPORT bool ownPalette() const { return testAttribute(Qt::WA_SetPalette); }
-    inline QT3_SUPPORT void unsetPalette() { setPalette(QPalette()); }
-    Qt::BackgroundMode QT3_SUPPORT backgroundMode() const;
-    void QT3_SUPPORT setBackgroundMode(Qt::BackgroundMode, Qt::BackgroundMode = Qt::PaletteBackground);
-    const QT3_SUPPORT QColor &eraseColor() const;
-    void QT3_SUPPORT setEraseColor(const QColor &);
-    const QT3_SUPPORT QColor &foregroundColor() const;
-    const QT3_SUPPORT QPixmap *erasePixmap() const;
-    void QT3_SUPPORT setErasePixmap(const QPixmap &);
-    const QT3_SUPPORT QColor &paletteForegroundColor() const;
-    void QT3_SUPPORT setPaletteForegroundColor(const QColor &);
-    const QT3_SUPPORT QColor &paletteBackgroundColor() const;
-    void QT3_SUPPORT setPaletteBackgroundColor(const QColor &);
-    const QT3_SUPPORT QPixmap *paletteBackgroundPixmap() const;
-    void QT3_SUPPORT setPaletteBackgroundPixmap(const QPixmap &);
-    const QT3_SUPPORT QBrush& backgroundBrush() const;
-    const QT3_SUPPORT QColor &backgroundColor() const;
-    const QT3_SUPPORT QPixmap *backgroundPixmap() const;
-    void QT3_SUPPORT setBackgroundPixmap(const QPixmap &);
-    QT3_SUPPORT void setBackgroundColor(const QColor &);
-    QT3_SUPPORT QColorGroup colorGroup() const;
-    QT3_SUPPORT QWidget *parentWidget(bool sameWindow) const;
-    inline QT3_SUPPORT void setKeyCompression(bool b) { setAttribute(Qt::WA_KeyCompression, b); }
-    inline QT3_SUPPORT void setFont(const QFont &f, bool) { setFont(f); }
-    inline QT3_SUPPORT void setPalette(const QPalette &p, bool) { setPalette(p); }
-    enum BackgroundOrigin { WidgetOrigin, ParentOrigin, WindowOrigin, AncestorOrigin };
-    inline QT3_SUPPORT void setBackgroundOrigin(BackgroundOrigin) {}
-    inline QT3_SUPPORT BackgroundOrigin backgroundOrigin() const { return WindowOrigin; }
-    inline QT3_SUPPORT QPoint backgroundOffset() const { return QPoint(); }
-    inline QT3_SUPPORT void repaint(bool) { repaint(); }
-    inline QT3_SUPPORT void repaint(int x, int y, int w, int h, bool) { repaint(x,y,w,h); }
-    inline QT3_SUPPORT void repaint(const QRect &r, bool) { repaint(r); }
-    inline QT3_SUPPORT void repaint(const QRegion &rgn, bool) { repaint(rgn); }
-    QT3_SUPPORT void erase();
-    inline QT3_SUPPORT void erase(int x, int y, int w, int h) { erase_helper(x, y, w, h); }
-    QT3_SUPPORT void erase(const QRect &);
-    QT3_SUPPORT void erase(const QRegion &);
-    QT3_SUPPORT void drawText(const QPoint &p, const QString &s)
-    { drawText_helper(p.x(), p.y(), s); }
-    inline QT3_SUPPORT void drawText(int x, int y, const QString &s)
-    { drawText_helper(x, y, s); }
-    QT3_SUPPORT bool close(bool);
-    inline QT3_SUPPORT QWidget *childAt(int x, int y, bool includeThis) const
-    {
-        QWidget *w = childAt(x, y);
-        return w ? w : ((includeThis && rect().contains(x,y))?const_cast<QWidget*>(this):0);
-    }
-    inline QT3_SUPPORT QWidget *childAt(const QPoint &p, bool includeThis) const
-    {
-        QWidget *w = childAt(p);
-        return w ? w : ((includeThis && rect().contains(p))?const_cast<QWidget*>(this):0);
-    }
-    inline QT3_SUPPORT void setCaption(const QString &c)   { setWindowTitle(c); }
-    QT3_SUPPORT void setIcon(const QPixmap &i);
-    inline QT3_SUPPORT void setIconText(const QString &it) { setWindowIconText(it); }
-    inline QT3_SUPPORT QString caption() const             { return windowTitle(); }
-    QT3_SUPPORT const QPixmap *icon() const;
-    inline QT3_SUPPORT QString iconText() const            { return windowIconText(); }
-    inline QT3_SUPPORT void setInputMethodEnabled(bool b) { setAttribute(Qt::WA_InputMethodEnabled, b); }
-    inline QT3_SUPPORT bool isInputMethodEnabled() const { return testAttribute(Qt::WA_InputMethodEnabled); }
-    inline QT3_SUPPORT void setActiveWindow() { activateWindow(); }
-    inline QT3_SUPPORT bool isShown() const { return !isHidden(); }
-    inline QT3_SUPPORT bool isDialog() const { return windowType() == Qt::Dialog; }
-    inline QT3_SUPPORT bool isPopup() const { return windowType() == Qt::Popup; }
-    inline QT3_SUPPORT bool isDesktop() const { return windowType() == Qt::Desktop; }
-
-
-private:
-    void drawText_helper(int x, int y, const QString &);
-    void erase_helper(int x, int y, int w, int h);
-#endif // QT3_SUPPORT
-
-protected:
-    virtual void styleChange(QStyle&); // compat
-    virtual void enabledChange(bool);  // compat
-    virtual void paletteChange(const QPalette &);  // compat
-    virtual void fontChange(const QFont &); // compat
-    virtual void windowActivationChange(bool);  // compat
-    virtual void languageChange();  // compat
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QWidget::RenderFlags)
-
-#if defined Q_CC_MSVC && _MSC_VER < 1300
-template <> inline QWidget *qobject_cast_helper<QWidget*>(QObject *o, QWidget *)
-{
-    if (!o || !o->isWidgetType()) return 0;
-    return (QWidget*)(o);
-}
-#else
-template <> inline QWidget *qobject_cast<QWidget*>(QObject *o)
-{
-    if (!o || !o->isWidgetType()) return 0;
-    return static_cast<QWidget*>(o);
-}
-template <> inline const QWidget *qobject_cast<const QWidget*>(const QObject *o)
-{
-    if (!o || !o->isWidgetType()) return 0;
-    return static_cast<const QWidget*>(o);
-}
-#endif
-
-inline QWidget *QWidget::childAt(int ax, int ay) const
-{ return childAt(QPoint(ax, ay)); }
-
-inline Qt::WindowType QWidget::windowType() const
-{ return static_cast<Qt::WindowType>(int(data->window_flags & Qt::WindowType_Mask)); }
-inline Qt::WindowFlags QWidget::windowFlags() const
-{ return data->window_flags; }
-
-inline bool QWidget::isTopLevel() const
-{ return (windowType() & Qt::Window); }
-
-inline bool QWidget::isWindow() const
-{ return (windowType() & Qt::Window); }
-
-inline bool QWidget::isEnabled() const
-{ return !testAttribute(Qt::WA_Disabled); }
-
-inline bool QWidget::isModal() const
-{ return data->window_modality != Qt::NonModal; }
-
-inline bool QWidget::isEnabledToTLW() const
-{ return isEnabled(); }
-
-inline int QWidget::minimumWidth() const
-{ return minimumSize().width(); }
-
-inline int QWidget::minimumHeight() const
-{ return minimumSize().height(); }
-
-inline int QWidget::maximumWidth() const
-{ return maximumSize().width(); }
-
-inline int QWidget::maximumHeight() const
-{ return maximumSize().height(); }
-
-inline void QWidget::setMinimumSize(const QSize &s)
-{ setMinimumSize(s.width(),s.height()); }
-
-inline void QWidget::setMaximumSize(const QSize &s)
-{ setMaximumSize(s.width(),s.height()); }
-
-inline void QWidget::setSizeIncrement(const QSize &s)
-{ setSizeIncrement(s.width(),s.height()); }
-
-inline void QWidget::setBaseSize(const QSize &s)
-{ setBaseSize(s.width(),s.height()); }
-
-inline const QFont &QWidget::font() const
-{ return data->fnt; }
-
-inline QFontMetrics QWidget::fontMetrics() const
-{ return QFontMetrics(data->fnt); }
-
-inline QFontInfo QWidget::fontInfo() const
-{ return QFontInfo(data->fnt); }
-
-inline void QWidget::setMouseTracking(bool enable)
-{ setAttribute(Qt::WA_MouseTracking, enable); }
-
-inline bool QWidget::hasMouseTracking() const
-{ return testAttribute(Qt::WA_MouseTracking); }
-
-inline bool QWidget::underMouse() const
-{ return testAttribute(Qt::WA_UnderMouse); }
-
-inline bool QWidget::updatesEnabled() const
-{ return !testAttribute(Qt::WA_UpdatesDisabled); }
-
-inline void QWidget::update(int ax, int ay, int aw, int ah)
-{ update(QRect(ax, ay, aw, ah)); }
-
-inline bool QWidget::isVisible() const
-{ return testAttribute(Qt::WA_WState_Visible); }
-
-inline bool QWidget::isHidden() const
-{ return testAttribute(Qt::WA_WState_Hidden); }
-
-inline void QWidget::move(int ax, int ay)
-{ move(QPoint(ax, ay)); }
-
-inline void QWidget::resize(int w, int h)
-{ resize(QSize(w, h)); }
-
-inline void QWidget::setGeometry(int ax, int ay, int aw, int ah)
-{ setGeometry(QRect(ax, ay, aw, ah)); }
-
-inline QRect QWidget::rect() const
-{ return QRect(0,0,data->crect.width(),data->crect.height()); }
-
-inline const QRect &QWidget::geometry() const
-{ return data->crect; }
-
-inline QSize QWidget::size() const
-{ return data->crect.size(); }
-
-inline int QWidget::width() const
-{ return data->crect.width(); }
-
-inline int QWidget::height() const
-{ return data->crect.height(); }
-
-inline QWidget *QWidget::parentWidget() const
-{ return static_cast<QWidget *>(QObject::parent()); }
-
-inline void QWidget::setSizePolicy(QSizePolicy::Policy hor, QSizePolicy::Policy ver)
-{ setSizePolicy(QSizePolicy(hor, ver)); }
-
-inline bool QWidget::testAttribute(Qt::WidgetAttribute attribute) const
-{
-    if (attribute < int(8*sizeof(uint)))
-        return data->widget_attributes & (1<<attribute);
-    return testAttribute_helper(attribute);
-}
-
-#ifdef QT3_SUPPORT
-inline bool QWidget::isVisibleToTLW() const
-{ return isVisible(); }
-inline QWidget *QWidget::parentWidget(bool sameWindow) const
-{
-    if (sameWindow && isWindow())
-        return 0;
-    return static_cast<QWidget *>(QObject::parent());
-}
-inline QColorGroup QWidget::colorGroup() const
-{ return QColorGroup(palette()); }
-inline void QWidget::setPaletteForegroundColor(const QColor &c)
-{ QPalette p = palette(); p.setColor(foregroundRole(), c); setPalette(p); }
-inline const QBrush& QWidget::backgroundBrush() const { return palette().brush(backgroundRole()); }
-inline void QWidget::setBackgroundPixmap(const QPixmap &pm)
-{ QPalette p = palette(); p.setBrush(backgroundRole(), QBrush(pm)); setPalette(p); }
-inline const QPixmap *QWidget::backgroundPixmap() const { return 0; }
-inline void QWidget::setBackgroundColor(const QColor &c)
-{ QPalette p = palette(); p.setColor(backgroundRole(), c); setPalette(p); }
-inline const QColor & QWidget::backgroundColor() const { return palette().color(backgroundRole()); }
-inline const QColor &QWidget::foregroundColor() const { return palette().color(foregroundRole());}
-inline const QColor &QWidget::eraseColor() const { return palette().color(backgroundRole()); }
-inline void QWidget::setEraseColor(const QColor &c)
-{ QPalette p = palette(); p.setColor(backgroundRole(), c); setPalette(p); }
-inline const QPixmap *QWidget::erasePixmap() const { return 0; }
-inline void QWidget::setErasePixmap(const QPixmap &pm)
-{ QPalette p = palette(); p.setBrush(backgroundRole(), QBrush(pm)); setPalette(p); }
-inline const QColor &QWidget::paletteForegroundColor() const { return palette().color(foregroundRole());}
-inline const QColor &QWidget::paletteBackgroundColor() const { return palette().color(backgroundRole()); }
-inline void QWidget::setPaletteBackgroundColor(const QColor &c)
-{ QPalette p = palette(); p.setColor(backgroundRole(), c); setPalette(p); }
-inline const QPixmap *QWidget::paletteBackgroundPixmap() const
-{ return 0; }
-inline void QWidget::setPaletteBackgroundPixmap(const QPixmap &pm)
-{ QPalette p = palette(); p.setBrush(backgroundRole(), QBrush(pm)); setPalette(p); }
-inline QT3_SUPPORT void QWidget::erase() { erase_helper(0, 0, data->crect.width(), data->crect.height()); }
-inline QT3_SUPPORT void QWidget::erase(const QRect &r) { erase_helper(r.x(), r.y(), r.width(), r.height()); }
-#endif
-
-#define QWIDGETSIZE_MAX ((1<<24)-1)
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QWIDGET_H