diff -r 000000000000 -r 1918ee327afb src/tools/uic3/subclassing.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/tools/uic3/subclassing.cpp	Mon Jan 11 14:00:40 2010 +0000
@@ -0,0 +1,362 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "ui3reader.h"
+#include "parser.h"
+#include "domtool.h"
+#include "globaldefs.h"
+#include <QFile>
+#include <QStringList>
+#include <QDateTime>
+#include <QRegExp>
+#include <stdio.h>
+#include <stdlib.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+  Creates a declaration ( headerfile ) for a subclass \a subClass
+  of the form given in \a e
+
+  \sa createSubImpl()
+ */
+void Ui3Reader::createSubDecl( const QDomElement &e, const QString& subClass )
+{
+    QDomElement n;
+    QDomNodeList nl;
+    int i;
+
+    QString objClass = getClassName( e );
+    if ( objClass.isEmpty() )
+        return;
+
+    out << "class " << subClass << " : public " << nameOfClass << endl;
+    out << '{' << endl;
+
+/* tmake ignore Q_OBJECT */
+    out << "    Q_OBJECT" << endl;
+    out << endl;
+    out << "public:" << endl;
+
+    // constructor
+    if ( objClass == QLatin1String("QDialog") || objClass == QLatin1String("QWizard") ) {
+        out << "    " << subClass << "( QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WindowFlags fl = 0 );" << endl;
+    } else { // standard QWidget
+        out << "    " << subClass << "( QWidget* parent = 0, const char* name = 0, Qt::WindowFlags fl = 0 );" << endl;
+    }
+
+    // destructor
+    out << "    ~" << subClass << "();" << endl;
+    out << endl;
+
+    // find additional functions
+    QStringList publicSlots, protectedSlots, privateSlots;
+    QStringList publicSlotTypes, protectedSlotTypes, privateSlotTypes;
+    QStringList publicSlotSpecifier, protectedSlotSpecifier, privateSlotSpecifier;
+    QStringList publicFuncts, protectedFuncts, privateFuncts;
+    QStringList publicFunctRetTyp, protectedFunctRetTyp, privateFunctRetTyp;
+    QStringList publicFunctSpec, protectedFunctSpec, privateFunctSpec;
+
+    nl = e.parentNode().toElement().elementsByTagName(QLatin1String("slot"));
+    for ( i = 0; i < (int) nl.length(); i++ ) {
+        n = nl.item(i).toElement();
+        if ( n.parentNode().toElement().tagName() != QLatin1String("slots")
+             && n.parentNode().toElement().tagName() != QLatin1String("connections") )
+            continue;
+        if ( n.attribute(QLatin1String("language"), QLatin1String("C++")) != QLatin1String("C++") )
+            continue;
+        QString returnType = n.attribute(QLatin1String("returnType"), QLatin1String("void"));
+        QString functionName = n.firstChild().toText().data().trimmed();
+        if ( functionName.endsWith(QLatin1Char(';')))
+            functionName.chop(1);
+        QString specifier = n.attribute(QLatin1String("specifier"));
+        QString access = n.attribute(QLatin1String("access"));
+        if ( access == QLatin1String("protected") ) {
+            protectedSlots += functionName;
+            protectedSlotTypes += returnType;
+            protectedSlotSpecifier += specifier;
+        } else if ( access == QLatin1String("private") ) {
+            privateSlots += functionName;
+            privateSlotTypes += returnType;
+            privateSlotSpecifier += specifier;
+        } else {
+            publicSlots += functionName;
+            publicSlotTypes += returnType;
+            publicSlotSpecifier += specifier;
+        }
+    }
+
+    nl = e.parentNode().toElement().elementsByTagName(QLatin1String("function"));
+    for ( i = 0; i < (int) nl.length(); i++ ) {
+        n = nl.item(i).toElement();
+        if ( n.parentNode().toElement().tagName() != QLatin1String("functions") )
+            continue;
+        if ( n.attribute(QLatin1String("language"), QLatin1String("C++")) != QLatin1String("C++") )
+            continue;
+        QString returnType = n.attribute(QLatin1String("returnType"), QLatin1String("void"));
+        QString functionName = n.firstChild().toText().data().trimmed();
+        if ( functionName.endsWith(QLatin1Char(';')) )
+            functionName.chop(1);
+        QString specifier = n.attribute(QLatin1String("specifier"));
+        QString access = n.attribute(QLatin1String("access"));
+        if ( access == QLatin1String("protected") ) {
+            protectedFuncts += functionName;
+            protectedFunctRetTyp += returnType;
+            protectedFunctSpec += specifier;
+        } else if ( access == QLatin1String("private") ) {
+            privateFuncts += functionName;
+            privateFunctRetTyp += returnType;
+            privateFunctSpec += specifier;
+        } else {
+            publicFuncts += functionName;
+            publicFunctRetTyp += returnType;
+            publicFunctSpec += specifier;
+        }
+    }
+
+    if ( !publicFuncts.isEmpty() )
+        writeFunctionsSubDecl( publicFuncts, publicFunctRetTyp, publicFunctSpec );
+
+    // create public additional slots
+    if ( !publicSlots.isEmpty() ) {
+        out << "public slots:" << endl;
+        writeFunctionsSubDecl( publicSlots, publicSlotTypes, publicSlotSpecifier );
+    }
+
+    if ( !protectedFuncts.isEmpty() ) {
+        out << "protected:" << endl;
+        writeFunctionsSubDecl( protectedFuncts, protectedFunctRetTyp, protectedFunctSpec );
+    }
+
+    // create protected additional slots
+    if ( !protectedSlots.isEmpty() ) {
+        out << "protected slots:" << endl;
+        writeFunctionsSubDecl( protectedSlots, protectedSlotTypes, protectedSlotSpecifier );
+    }
+
+    if ( !privateFuncts.isEmpty() ) {
+        out << "private:" << endl;
+        writeFunctionsSubDecl( privateFuncts, privateFunctRetTyp, privateFunctSpec );
+    }
+
+    // create private additional slots
+    if ( !privateSlots.isEmpty() ) {
+        out << "private slots:" << endl;
+        writeFunctionsSubDecl( privateSlots, privateSlotTypes, privateSlotSpecifier );
+    }
+    out << "};" << endl;
+}
+
+void Ui3Reader::writeFunctionsSubDecl( const QStringList &fuLst, const QStringList &typLst, const QStringList &specLst )
+{
+    QStringList::ConstIterator it, it2, it3;
+    for ( it = fuLst.begin(), it2 = typLst.begin(), it3 = specLst.begin();
+          it != fuLst.end(); ++it, ++it2, ++it3 ) {
+        QString type = fixDeclaration(*it2);
+        if ( type.isEmpty() )
+            type = QLatin1String("void");
+        if ( *it3 == QLatin1String("non virtual") )
+            continue;
+        out << "    " << type << ' ' << fixDeclaration(*it) << ';' << endl;
+    }
+    out << endl;
+}
+
+/*!
+  Creates an implementation for a subclass \a subClass of the form
+  given in \a e
+
+  \sa createSubDecl()
+ */
+void Ui3Reader::createSubImpl( const QDomElement &e, const QString& subClass )
+{
+    QDomElement n;
+    QDomNodeList nl;
+    int i;
+
+    QString objClass = getClassName( e );
+    if ( objClass.isEmpty() )
+        return;
+
+    // constructor
+    if ( objClass == QLatin1String("QDialog") || objClass == QLatin1String("QWizard") ) {
+        out << "/* " << endl;
+        out << " *  Constructs a " << subClass << " which is a child of 'parent', with the " << endl;
+        out << " *  name 'name' and widget flags set to 'f' " << endl;
+        out << " *" << endl;
+        out << " *  The " << objClass.mid(1).toLower() << " will by default be modeless, unless you set 'modal' to" << endl;
+        out << " *  true to construct a modal " << objClass.mid(1).toLower() << '.' << endl;
+        out << " */" << endl;
+        out << subClass << "::" << subClass << "( QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl )" << endl;
+        out << "    : " << nameOfClass << "( parent, name, modal, fl )" << endl;
+    } else { // standard QWidget
+        out << "/* " << endl;
+        out << " *  Constructs a " << subClass << " which is a child of 'parent', with the " << endl;
+        out << " *  name 'name' and widget flags set to 'f' " << endl;
+        out << " */" << endl;
+        out << subClass << "::" << subClass << "( QWidget* parent, const char* name, Qt::WindowFlags fl )" << endl;
+        out << "    : " << nameOfClass << "( parent, name, fl )" << endl;
+    }
+    out << '{' << endl;
+    out << '}' << endl;
+    out << endl;
+
+    // destructor
+    out << "/*  " << endl;
+    out << " *  Destroys the object and frees any allocated resources" << endl;
+    out << " */" << endl;
+    out << subClass << "::~" << subClass << "()" << endl;
+    out << '{' << endl;
+    out << "    // no need to delete child widgets, Qt does it all for us" << endl;
+    out << '}' << endl;
+    out << endl;
+
+
+    // find additional functions
+    QStringList publicSlots, protectedSlots, privateSlots;
+    QStringList publicSlotTypes, protectedSlotTypes, privateSlotTypes;
+    QStringList publicSlotSpecifier, protectedSlotSpecifier, privateSlotSpecifier;
+    QStringList publicFuncts, protectedFuncts, privateFuncts;
+    QStringList publicFunctRetTyp, protectedFunctRetTyp, privateFunctRetTyp;
+    QStringList publicFunctSpec, protectedFunctSpec, privateFunctSpec;
+
+    nl = e.parentNode().toElement().elementsByTagName(QLatin1String("slot"));
+    for ( i = 0; i < (int) nl.length(); i++ ) {
+        n = nl.item(i).toElement();
+        if ( n.parentNode().toElement().tagName() != QLatin1String("slots")
+             && n.parentNode().toElement().tagName() != QLatin1String("connections") )
+            continue;
+        if ( n.attribute(QLatin1String("language"), QLatin1String("C++")) != QLatin1String("C++") )
+            continue;
+        QString returnType = n.attribute(QLatin1String("returnType"), QLatin1String("void"));
+        QString functionName = n.firstChild().toText().data().trimmed();
+        if ( functionName.endsWith(QLatin1Char(';')) )
+            functionName.chop(1);
+        QString specifier = n.attribute(QLatin1String("specifier"));
+        QString access = n.attribute(QLatin1String("access"));
+        if ( access == QLatin1String("protected") ) {
+            protectedSlots += functionName;
+            protectedSlotTypes += returnType;
+            protectedSlotSpecifier += specifier;
+        } else if ( access == QLatin1String("private") ) {
+            privateSlots += functionName;
+            privateSlotTypes += returnType;
+            privateSlotSpecifier += specifier;
+        } else {
+            publicSlots += functionName;
+            publicSlotTypes += returnType;
+            publicSlotSpecifier += specifier;
+        }
+    }
+
+    nl = e.parentNode().toElement().elementsByTagName(QLatin1String("function"));
+    for ( i = 0; i < (int) nl.length(); i++ ) {
+        n = nl.item(i).toElement();
+        if ( n.parentNode().toElement().tagName() != QLatin1String("functions") )
+            continue;
+        if ( n.attribute(QLatin1String("language"), QLatin1String("C++")) != QLatin1String("C++") )
+            continue;
+        QString returnType = n.attribute(QLatin1String("returnType"), QLatin1String("void"));
+        QString functionName = n.firstChild().toText().data().trimmed();
+        if ( functionName.endsWith(QLatin1Char(';')) )
+            functionName.chop(1);
+        QString specifier = n.attribute(QLatin1String("specifier"));
+        QString access = n.attribute(QLatin1String("access"));
+        if ( access == QLatin1String("protected") ) {
+            protectedFuncts += functionName;
+            protectedFunctRetTyp += returnType;
+            protectedFunctSpec += specifier;
+        } else if ( access == QLatin1String("private") ) {
+            privateFuncts += functionName;
+            privateFunctRetTyp += returnType;
+            privateFunctSpec += specifier;
+        } else {
+            publicFuncts += functionName;
+            publicFunctRetTyp += returnType;
+            publicFunctSpec += specifier;
+        }
+    }
+
+    if ( !publicFuncts.isEmpty() )
+        writeFunctionsSubImpl( publicFuncts, publicFunctRetTyp, publicFunctSpec, subClass, QLatin1String("public function"));
+
+    // create stubs for public additional slots
+    if ( !publicSlots.isEmpty() )
+        writeFunctionsSubImpl( publicSlots, publicSlotTypes, publicSlotSpecifier, subClass, QLatin1String("public slot"));
+
+    if ( !protectedFuncts.isEmpty() )
+        writeFunctionsSubImpl( protectedFuncts, protectedFunctRetTyp, protectedFunctSpec, subClass, QLatin1String("protected function"));
+
+    // create stubs for protected additional slots
+    if ( !protectedSlots.isEmpty() )
+        writeFunctionsSubImpl( protectedSlots, protectedSlotTypes, protectedSlotSpecifier, subClass, QLatin1String("protected slot"));
+
+    if ( !privateFuncts.isEmpty() )
+        writeFunctionsSubImpl( privateFuncts, privateFunctRetTyp, privateFunctSpec, subClass, QLatin1String("private function"));
+
+    // create stubs for private additional slots
+    if ( !privateSlots.isEmpty() )
+        writeFunctionsSubImpl( privateSlots, privateSlotTypes, privateSlotSpecifier, subClass, QLatin1String("private slot"));
+}
+
+void Ui3Reader::writeFunctionsSubImpl( const QStringList &fuLst, const QStringList &typLst, const QStringList &specLst,
+                                 const QString &subClass, const QString &descr )
+{
+    QStringList::ConstIterator it, it2, it3;
+    for ( it = fuLst.begin(), it2 = typLst.begin(), it3 = specLst.begin();
+          it != fuLst.end(); ++it, ++it2, ++it3 ) {
+        QString type = fixDeclaration(*it2);
+        if ( type.isEmpty() )
+            type = QLatin1String("void");
+        if ( *it3 == QLatin1String("non virtual") )
+            continue;
+        out << "/*" << endl;
+        out << " * " << descr << endl;
+        out << " */" << endl;
+        out << type << ' ' << subClass << "::" << fixDeclaration(*it) << endl;
+        out << '{' << endl;
+        out << "    qWarning( \"" << subClass << "::" << fixDeclaration(*it) << " not yet implemented!\" );" << endl;
+        out << '}' << endl << endl;
+    }
+    out << endl;
+}
+
+QT_END_NAMESPACE