Changeset 651 for trunk/src/tools


Ignore:
Timestamp:
Mar 8, 2010, 12:52:58 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.2 sources.

Location:
trunk
Files:
77 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/tools/idc/main.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/moc/generator.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/moc/generator.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/moc/keywords.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/moc/main.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/moc/moc.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/moc/moc.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/moc/mwerks_mac.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/moc/mwerks_mac.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/moc/outputrevision.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/moc/parser.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/moc/parser.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/moc/ppkeywords.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/moc/preprocessor.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/moc/preprocessor.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/moc/symbols.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/moc/token.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/moc/token.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/moc/util/generate.sh

    r561 r651  
    22#############################################################################
    33##
    4 ## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     4## Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    55## All rights reserved.
    66## Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/moc/util/generate_keywords.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/moc/util/licenseheader.txt

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/moc/utils.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/rcc/main.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/rcc/rcc.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/rcc/rcc.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/cpp/cppextractimages.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/cpp/cppextractimages.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/cpp/cppwritedeclaration.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/cpp/cppwritedeclaration.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/cpp/cppwriteicondata.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/cpp/cppwriteicondata.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/cpp/cppwriteicondeclaration.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/cpp/cppwriteicondeclaration.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/cpp/cppwriteiconinitialization.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/cpp/cppwriteiconinitialization.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/cpp/cppwriteincludes.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/cpp/cppwriteincludes.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/cpp/cppwriteinitialization.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
    … …  
    722722        } else if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QStatusBar"))) {
    723723            m_output << m_indent << parentWidget << "->setStatusBar(" << varName << ");\n";
    724         } else {
    725             m_output << m_indent << parentWidget << "->setCentralWidget(" << varName << ");\n";
     724        } else if (!m_uic->customWidgetsInfo()->extends(className, QLatin1String("Q3DockWindow"))
     725                   && !m_uic->customWidgetsInfo()->extends(className, QLatin1String("Q3ToolBar"))) {
     726                m_output << m_indent << parentWidget << "->setCentralWidget(" << varName << ");\n";
    726727        }
    727728    }
    … …  
    12221223            m_output << m_indent << varName << "->resize(" << r->elementWidth() << ", " << r->elementHeight() << ");\n";
    12231224            continue;
    1224         } else if (propertyName == QLatin1String("buttonGroupId") && buttonGroupWidget) { // Q3ButtonGroup support
    1225             m_output << m_indent << m_driver->findOrInsertWidget(buttonGroupWidget) << "->insert("
    1226                    << varName << ", " << p->elementNumber() << ");\n";
     1225        } else if (propertyName == QLatin1String("buttonGroupId")) { // Q3ButtonGroup support
     1226            if (buttonGroupWidget)
     1227                m_output << m_indent << m_driver->findOrInsertWidget(buttonGroupWidget) << "->insert("
     1228                         << varName << ", " << p->elementNumber() << ");\n";
    12271229            continue;
    12281230        } else if (propertyName == QLatin1String("currentRow") // QListWidget::currentRow

  • trunk/src/tools/uic/cpp/cppwriteinitialization.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/customwidgetsinfo.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/customwidgetsinfo.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/databaseinfo.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/databaseinfo.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/driver.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/driver.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/globaldefs.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/main.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/option.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/treewalker.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/treewalker.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/ui4.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/ui4.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/uic.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/uic.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/utils.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/validator.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic/validator.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic3/converter.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
    … …  
    122122}
    123123
    124 DomUI *Ui3Reader::generateUi4(const QDomElement &widget, bool implicitIncludes)
     124DomUI *Ui3Reader::generateUi4(const QDomElement &widget)
    125125{
    126126    QDomNodeList nl;
    … …  
    475475        // Magic header generation feature for legacy KDE forms
    476476        // (for example, filesharing/advanced/kcm_sambaconf/share.ui)
    477         if (implicitIncludes && isKDEClass(customClass)) {
     477        if ( && isKDEClass(customClass)) {
    478478            QString header = customClass.toLower();
    479479            header += QLatin1String(".h");
    … …  
    711711        } else if (t == QLatin1String("property")) {
    712712            // skip the property it is already handled by createProperties
    713 
    714             QString name = e.attribute(QLatin1String("name"));  // change the varname this widget
    715             if (name == QLatin1String("name"))
    716                 ui_widget->setAttributeName(DomTool::readProperty(w, QLatin1String("name"), QVariant()).toString());
     713            const QString name = e.attribute(QLatin1String("name"));  // change the varname this widget
     714            if (name == QLatin1String("name")) {
     715                // Do not name QLayoutWidget if layout names are to be used.
     716                const bool applyName = !(m_options & PreserveLayoutNames) || className != QLatin1String("QLayoutWidget");
     717                if (applyName)
     718                    ui_widget->setAttributeName(DomTool::readProperty(w, QLatin1String("name"), QVariant()).toString());
     719            }
    717720        } else if (t == QLatin1String("row")) {
    718721            DomRow *row = new DomRow();
    … …  
    798801    createProperties(w, &ui_property_list, className);
    799802    createAttributes(w, &ui_attribute_list, className);
     803
     804
     805
     806
     807
    800808
    801809    QDomElement e = w.firstChild().toElement();

  • trunk/src/tools/uic3/deps.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic3/domtool.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic3/domtool.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic3/embed.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic3/form.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
    … …  
    101101  \sa createFormImpl()
    102102*/
    103 void Ui3Reader::createFormDecl(const QDomElement &e, bool implicitIncludes)
     103void Ui3Reader::createFormDecl(const QDomElement &e)
    104104{
    105105    QDomElement body = e;
    … …  
    139139                        if (tagName == QLatin1String("class")) {
    140140                            cl = n3.firstChild().toText().data();
    141                             if (!nofwd)
     141                            if ()
    142142                                forwardDecl << cl;
    143143                            customWidgets.insert(cl, 0);
    … …  
    258258    d.option().extractImages = m_extractImages;
    259259    d.option().qrcOutputFile = m_qrcOutputFile;
    260     d.option().implicitIncludes = implicitIncludes;
     260    d.option().implicitIncludes = ;
    261261    if (trmacro.size())
    262262        d.option().translateFunction = trmacro;
    263     DomUI *ui = generateUi4(e, implicitIncludes);
     263    DomUI *ui = generateUi4(e);
    264264    d.uic(fileName, ui, &out);
    265265    delete ui;

  • trunk/src/tools/uic3/main.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
    … …  
    7979    const char* projectName = 0;
    8080    const char* trmacro = 0;
    81     bool nofwd = false;
    8281    bool fix = false;
    8382    bool deps = false;
    84     bool implicitIncludes = true;
     83    ;
    8584    QByteArray pchFile;
    86 
    8785
    8886    QApplication app(argc, argv, false);
    … …  
    147145                deps = true;
    148146            } else if (opt == "no-implicit-includes") {
    149                 implicitIncludes = false;
     147                ;
    150148            } else if (opt == "nofwd") {
    151                 nofwd = true;
     149                readerOptions &= ~Ui3Reader::CustomWidgetForwardDeclarations;
     150            } else if (opt == "layout-names") {
     151                readerOptions |= Ui3Reader::PreserveLayoutNames;
    152152            } else if (opt == "nounload") {
    153153                // skip
    … …  
    254254                 "\t-pch file          Add #include \"file\" as the first statement in implementation\n"
    255255                 "\t-nofwd             Omit forward declarations of custom classes\n"
     256
    256257                 "\t-no-implicit-includes Do not generate #include-directives for custom classes\n"
    257258                 "\t-nounload          Do not unload plugins after processing\n"
    … …  
    290291    QTextStream out(&fileOut);
    291292
    292     Ui3Reader ui3(out);
     293    Ui3Reader ui3(out);
    293294    ui3.setExtractImages(extract, qrcOutputFile);
    294 
    295295    if (projectName && imagecollection) {
    296296        out.setEncoding(QTextStream::Latin1);
    … …  
    350350        return 0;
    351351    } else if (convert) {
    352         ui3.generateUi4(QFile::decodeName(fileName), QFile::decodeName(outputFile), doc, implicitIncludes);
     352        ui3.generateUi4(QFile::decodeName(fileName), QFile::decodeName(outputFile), doc);
    353353        return 0;
    354354    }
    … …  
    389389        QString::fromUtf8(trmacro),
    390390        QString::fromUtf8(className),
    391         nofwd,
    392         implicitIncludes,
    393391        convertedUi);
    394392

  • trunk/src/tools/uic3/object.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic3/parser.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic3/parser.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic3/qt3to4.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic3/qt3to4.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic3/subclassing.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic3/ui3reader.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
    … …  
    177177    outputFileName.clear();
    178178    trmacro.clear();
    179     nofwd = false;
    180179
    181180    fileName.clear();
    … …  
    242241}
    243242
    244 Ui3Reader::Ui3Reader(QTextStream &outStream)
    245    : out(outStream), trout(&languageChangeBody)
    246 {
    247     m_porting = new Porting();
    248     m_extractImages = false;
     243Ui3Reader::Ui3Reader(QTextStream &outStream, unsigned options) :
     244    m_options(options), out(outStream), trout(&languageChangeBody),
     245    m_porting(new Porting), m_extractImages(false)
     246{
    249247}
    250248
    … …  
    256254void Ui3Reader::generate(const QString &fn, const QString &outputFn,
    257255          QDomDocument doc, bool decl, bool subcl, const QString &trm,
    258           const QString& subClass, bool omitForwardDecls, bool implicitIncludes, const QString &convertedUiFile)
     256          const QString& subClass, const QString &convertedUiFile)
    259257{
    260258    init();
    … …  
    263261    outputFileName = outputFn;
    264262    trmacro = trm;
    265     nofwd = omitForwardDecls;
    266263
    267264    QDomElement e = parse(doc);
    … …  
    282279    } else {
    283280        if (decl)
    284             createFormDecl(e, implicitIncludes);
     281            createFormDecl(e);
    285282        else
    286283            createFormImpl(e);
    … …  
    289286}
    290287
    291 void Ui3Reader::generateUi4(const QString &fn, const QString &outputFn, QDomDocument doc, bool implicitIncludes)
     288void Ui3Reader::generateUi4(const QString &fn, const QString &outputFn, QDomDocument doc)
    292289{
    293290    init();
    … …  
    296293    outputFileName = outputFn;
    297294
    298     DomUI *ui = generateUi4(parse(doc), implicitIncludes);
     295    DomUI *ui = generateUi4(parse(doc));
    299296    if (!ui)
    300297        return;
    … …  
    316313{
    317314    this->trmacro = trmacro;
    318 }
    319 
    320 void Ui3Reader::setForwardDeclarationsEnabled(bool b)
    321 {
    322     nofwd = !b;
    323315}
    324316

  • trunk/src/tools/uic3/ui3reader.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
    … …  
    6969{
    7070public:
    71     Ui3Reader(QTextStream &stream);
     71    enum Options { CustomWidgetForwardDeclarations = 0x1, ImplicitIncludes = 0x2, PreserveLayoutNames = 0x4 };
     72
     73    explicit Ui3Reader(QTextStream &stream, unsigned options);
    7274    ~Ui3Reader();
    7375
    7476    void computeDeps(const QDomElement &e, QStringList &globalIncludes, QStringList &localIncludes, bool impl = false);
    75     void generateUi4(const QString &fn, const QString &outputFn, QDomDocument doc, bool implicitIncludes);
     77    void generateUi4(const QString &fn, const QString &outputFn, QDomDocument doc);
    7678
    7779    void generate(const QString &fn, const QString &outputFn,
    7880         QDomDocument doc, bool decl, bool subcl, const QString &trm,
    79          const QString& subclname, bool omitForwardDecls, bool implicitIncludes, const QString &convertedUiFile);
     81         const QString& subclname, const QString &convertedUiFile);
    8082
    8183    void embed(const char *project, const QStringList &images);
    8284
    8385    void setTrMacro(const QString &trmacro);
    84     void setForwardDeclarationsEnabled(bool b);
    8586    void setOutputFileName(const QString &fileName);
    8687
    87     void createFormDecl(const QDomElement &e, bool implicitIncludes);
     88    void createFormDecl(const QDomElement &e);
    8889    void createFormImpl(const QDomElement &e);
    8990
    … …  
    126127                          int line, int col);
    127128
    128     DomUI *generateUi4(const QDomElement &e, bool implicitIncludes);
     129    DomUI *generateUi4(const QDomElement &e);
    129130    DomWidget *createWidget(const QDomElement &w, const QString &widgetClass = QString());
    130131    void createProperties(const QDomElement &e, QList<DomProperty*> *properties, const QString &className);
    … …  
    145146
    146147    void fixLayoutMargin(DomLayout *ui_layout);
     148
     149
    147150
    148151    QTextStream &out;
    … …  
    158161    QString lastItem;
    159162    QString trmacro;
    160     bool nofwd;
    161163
    162164    struct Buddy

  • trunk/src/tools/uic3/uic.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic3/uic.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic3/widgetinfo.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/tools/uic3/widgetinfo.h

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
Note: See TracChangeset for help on using the changeset viewer.