Changeset 561 for trunk/src/tools/uic3


Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (16 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk

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

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    989989
    990990    bool wordWrapFound = false;
     991    bool wordWrapPropertyFound = false;
    991992
    992993    for (QDomElement e=n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement()) {
    … …  
    11001101            name = prop->attributeName(); // sync the name
    11011102
    1102             if (className == QLatin1String("QLabel") && name == QLatin1String("alignment")) {
    1103                 QString v = prop->elementSet();
    1104 
    1105                 if (v.contains(QRegExp(QLatin1String("\\bWordBreak\\b"))))
    1106                     wordWrapFound = true;
    1107             }
    1108 
     1103            if (className == QLatin1String("QLabel")) {
     1104                if (name == QLatin1String("alignment")) {
     1105                    const QString v = prop->elementSet();
     1106                    if (v.contains(QRegExp(QLatin1String("\\bWordBreak\\b"))))
     1107                        wordWrapFound = true;
     1108                } else if (name == QLatin1String("wordWrap")) {
     1109                    wordWrapPropertyFound = true;
     1110                }
     1111            }
    11091112
    11101113            // resolve the flags and enumerator
    … …  
    11651168        }
    11661169    }
    1167     if (className == QLatin1String("QLabel")) {
     1170    if (className == QLatin1String("QLabel") && !wordWrapPropertyFound) {
    11681171        DomProperty *wordWrap = new DomProperty();
    11691172        wordWrap->setAttributeName(QLatin1String("wordWrap"));

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

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

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

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

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

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

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

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    178178        e->height = img.height();
    179179        e->depth = img.depth();
    180         e->numColors = img.numColors();
     180        e->numColors = img.colorCount();
    181181        e->colorTable = new QRgb[e->numColors];
    182182        e->alpha = img.hasAlphaBuffer();
    … …  
    196196        e->compressed =
    197197#endif
    198             embedData( out, img.bits(), img.numBytes() );
     198            embedData( out, img.bits(), img.byteCount() );
    199199        out << "\n};\n\n";
    200200        if ( e->numColors ) {
    … …  
    239239            else
    240240                out << "false, ";
    241             out << "\"" << e->name << "\" },\n";
     241            out << '\"' << e->name << "\" },\n";
    242242            delete e;
    243243        }

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

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    186186        if (!(*it).isEmpty()) {
    187187            QString header = fixHeaderName(*it);
    188             out << "#include <" << header << ">" << endl;
     188            out << "#include <" << header << '>' << endl;
    189189        }
    190190    }
    … …  
    193193        if (!(*it).isEmpty()) {
    194194            QString header = fixHeaderName(*it);
    195             out << "#include \"" << header << "\"" << endl;
     195            out << "#include \"" << header << '\"' << endl;
    196196        }
    197197    }
    … …  
    217217    for (it = typeDefs.constBegin(); it != typeDefs.constEnd(); ++it) {
    218218        if (!(*it).isEmpty())
    219             out << "typedef " << *it << ";" << endl;
     219            out << "typedef " << *it << ';' << endl;
    220220    }
    221221
    … …  
    237237                ++ns;
    238238            }
    239             out << "class " << forwardName << ";" << endl;
     239            out << "class " << forwardName << ';' << endl;
    240240            for (int i = 0; i < (int) forwardNamespaces.count(); i++)
    241                 out << "}" << endl;
     241                out << '}' << endl;
    242242        }
    243243    }
    … …  
    246246        QString fd = *it;
    247247        fd = fd.trimmed();
    248         if (!fd.endsWith(QLatin1String(";")))
    249             fd += QLatin1String(";");
     248        if (!fd.endsWith(QLatin1Char(';')))
     249            fd += QLatin1Char(';');
    250250        out << fd << endl;
    251251    }
    … …  
    280280    out << "#define " << protector << endl;
    281281    out << endl;
    282     out << "#include \"" << convertedUiFile << "\"" << endl;
     282    out << "#include \"" << convertedUiFile << '\"' << endl;
    283283
    284284    createWrapperDeclContents(e);
    … …  
    310310    out << "class ";
    311311    if (!exportMacro.isEmpty())
    312         out << exportMacro << " ";
    313     out << bareNameOfClass << " : public " << objClass << ", public Ui::" << bareNameOfClass << endl << "{" << endl;
     312        out << exportMacro << ' ';
     313    out << bareNameOfClass << " : public " << objClass << ", public Ui::" << bareNameOfClass << endl << '{' << endl;
    314314
    315315    /* qmake ignore Q_OBJECT */
    … …  
    363363        QString returnType = n.attribute(QLatin1String("returnType"), QLatin1String("void"));
    364364        QString functionName = n.firstChild().toText().data().trimmed();
    365         if (functionName.endsWith(QLatin1String(";")))
    366             functionName = functionName.left(functionName.length() - 1);
     365        if (functionName.endsWith(QLatin1Char(';')))
     366            functionName.chop(1);
    367367        QString specifier = n.attribute(QLatin1String("specifier"));
    368368        QString access = n.attribute(QLatin1String("access"));
    … …  
    395395        QString returnType = n.attribute(QLatin1String("returnType"), QLatin1String("void"));
    396396        QString functionName = n.firstChild().toText().data().trimmed();
    397         if (functionName.endsWith(QLatin1String(";")))
    398             functionName = functionName.left(functionName.length() - 1);
     397        if (functionName.endsWith(QLatin1Char(';')))
     398            functionName.chop(1);
    399399        QString specifier = n.attribute(QLatin1String("specifier"));
    400400        QString access = n.attribute(QLatin1String("access"));
    … …  
    424424        QString access = n.attribute(QLatin1String("access"), QLatin1String("protected"));
    425425        QString var = fixDeclaration(n.firstChild().toText().data().trimmed());
    426         if (!var.endsWith(QLatin1String(";")))
    427             var += QLatin1String(";");
     426        if (!var.endsWith(QLatin1Char(';')))
     427            var += QLatin1Char(';');
    428428        if (access == QLatin1String("public"))
    429429            publicVars += var;
    … …  
    459459            continue;
    460460        QString sigName = n.firstChild().toText().data().trimmed();
    461         if (sigName.endsWith(QLatin1String(";")))
     461        if (sigName.endsWith(QLatin1Char(';')))
    462462            sigName = sigName.left(sigName.length() - 1);
    463463        extraSignals += fixDeclaration(sigName);
    … …  
    468468        out << "signals:" << endl;
    469469        for (it = extraSignals.constBegin(); it != extraSignals.constEnd(); ++it)
    470             out << "    void " << (*it) << ";" << endl;
     470            out << "    void " << (*it) << ';' << endl;
    471471        out << endl;
    472472    }
    … …  
    514514    out << "};" << endl;
    515515    for (i = 0; i < (int) namespaces.count(); i++)
    516         out << "}" << endl;
     516        out << '}' << endl;
    517517
    518518    out << endl;
    … …  
    544544        signature = fixDeclaration(signature);
    545545        type = fixType(type);
    546         out << "    " << specifier << type << " " << signature << pure << ";" << endl;
     546        out << "    " << specifier << type << ' ' << signature << pure << ';' << endl;
    547547    }
    548548    out << endl;
    … …  
    584584            continue;
    585585        QString functionName = n.firstChild().toText().data().trimmed();
    586         if (functionName.endsWith(QLatin1String(";")))
    587             functionName = functionName.left(functionName.length() - 1);
     586        if (functionName.endsWith(QLatin1Char(';')))
     587            functionName.chop(1);
    588588        extraFuncts += functionName;
    589589        extraFunctTyp += n.attribute(QLatin1String("returnType"), QLatin1String("void"));
    … …  
    599599            continue;
    600600        QString functionName = n.firstChild().toText().data().trimmed();
    601         if (functionName.endsWith(QLatin1String(";")))
    602             functionName = functionName.left(functionName.length() - 1);
     601        if (functionName.endsWith(QLatin1Char(';')))
     602            functionName.chop(1);
    603603        extraFuncts += functionName;
    604604        extraFunctTyp += n.attribute(QLatin1String("returnType"), QLatin1String("void"));
    … …  
    664664    for (it = globalIncludes.begin(); it != globalIncludes.end(); ++it) {
    665665        if (!(*it).isEmpty())
    666             out << "#include <" << fixHeaderName(*it) << ">" << endl;
     666            out << "#include <" << fixHeaderName(*it) << '>' << endl;
    667667    }
    668668
    … …  
    678678    for (it = localIncludes.begin(); it != localIncludes.end(); ++it) {
    679679        if (!(*it).isEmpty() && *it != QFileInfo(fileName + QLatin1String(".h")).fileName())
    680             out << "#include \"" << fixHeaderName(*it) << "\"" << endl;
     680            out << "#include \"" << fixHeaderName(*it) << '\"' << endl;
    681681    }
    682682
    … …  
    685685        if (!outputFileName.isEmpty())
    686686            uiDotH = QString::fromUtf8(combinePath(uiDotH.ascii(), outputFileName.ascii()));
    687         out << "#include \"" << uiDotH << "\"" << endl;
     687        out << "#include \"" << uiDotH << '\"' << endl;
    688688        writeFunctImpl = false;
    689689    }
    … …  
    703703        out << " *" << endl;
    704704        out << " *  The " << objClass.mid(1).toLower() << " will by default be modeless, unless you set 'modal' to" << endl;
    705         out << " *  true to construct a modal " << objClass.mid(1).toLower() << "." << endl;
     705        out << " *  true to construct a modal " << objClass.mid(1).toLower() << '.' << endl;
    706706        out << " */" << endl;
    707707        out << nameOfClass << "::" << bareNameOfClass << "(QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl)" << endl;
    … …  
    734734    out << endl;
    735735
    736     out << "{" << endl;
     736    out << '{' << endl;
    737737
    738738//
    … …  
    776776
    777777    // end of constructor
    778     out << "}" << endl;
     778    out << '}' << endl;
    779779    out << endl;
    780780
    … …  
    784784    out << " */" << endl;
    785785    out << nameOfClass << "::~" << bareNameOfClass << "()" << endl;
    786     out << "{" << endl;
     786    out << '{' << endl;
    787787    if (extraFuncts.contains(QLatin1String("destroy()")))
    788788        out << indent << "destroy();" << endl;
    789789    out << indent << "// no need to delete child widgets, Qt does it all for us" << endl;
    790     out << "}" << endl;
     790    out << '}' << endl;
    791791    out << endl;
    792792
    … …  
    817817    out << " */" << endl;
    818818    out << "void " << nameOfClass << "::languageChange()" << endl;
    819     out << "{" << endl;
     819    out << '{' << endl;
    820820    out << "    retranslateUi(this);" << endl;
    821     out << "}" << endl;
     821    out << '}' << endl;
    822822    out << endl;
    823823
    … …  
    834834            QString fname = fixDeclaration(Parser::cleanArgs(*it));
    835835            if (!(*it3).startsWith(QLatin1String("pure"))) { // "pure virtual" or "pureVirtual"
    836                 out << type << " " << nameOfClass << "::" << fname << endl;
    837                 out << "{" << endl;
     836                out << type << ' ' << nameOfClass << "::" << fname << endl;
     837                out << '{' << endl;
    838838                if (*it != QLatin1String("init()") && *it != QLatin1String("destroy()")) {
    839839                    QRegExp numeric(QLatin1String("^(?:signed|unsigned|u?char|u?short|u?int"
    … …  
    869869                        if (type == QLatin1String("bool")) {
    870870                            retVal = QLatin1String("false");
    871                         } else if (isBasicNumericType || type.endsWith(QLatin1String("*"))) {
     871                        } else if (isBasicNumericType || type.endsWith(QLatin1Char('*'))) {
    872872                            retVal = QLatin1String("0");
    873                         } else if (type.endsWith(QLatin1String("&"))) {
     873                        } else if (type.endsWith(QLatin1Char('&'))) {
    874874                            do {
    875875                                type.chop(1);
    876                             } while (type.endsWith(QLatin1String(" ")));
     876                            } while (type.endsWith(QLatin1Char(' ')));
    877877                            retVal = QLatin1String("uic_temp_var");
    878                             out << indent << "static " << type << " " << retVal << ";" << endl;
     878                            out << indent << "static " << type << ' ' << retVal << ';' << endl;
    879879                        } else {
    880880                            retVal = type + QLatin1String("()");
    … …  
    884884                    out << indent << "qWarning(\"" << nameOfClass << "::" << fname << ": Not implemented yet\");" << endl;
    885885                    if (!retVal.isEmpty())
    886                         out << indent << "return " << retVal << ";" << endl;
     886                        out << indent << "return " << retVal << ';' << endl;
    887887                }
    888                 out << "}" << endl;
     888                out << '}' << endl;
    889889                out << endl;
    890890            }

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

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    115115                if (opt == "wrap" || opt[1] == '\0') {
    116116                    if (!(n < argc-1)) {
    117                         error = "Missing name of converted ui file";
     117                        error = "Missing name of converted UI file";
    118118                        break;
    119119                    }
    … …  
    231231                 "\t<uiheaderfile>  name of the data file\n"
    232232                 "   %s  [options] -wrap <converteduifile> <uifile>\n"
    233                  "\t<converteduifile>  name of the converted ui file\n"
     233                 "\t<converteduifile>  name of the converted UI file\n"
    234234                 "Generate implementation:\n"
    235235                 "   %s  [options] -impl <headerfile> <uifile>\n"
    … …  
    255255                 "\t-nofwd             Omit forward declarations of custom classes\n"
    256256                 "\t-no-implicit-includes Do not generate #include-directives for custom classes\n"
    257                  "\t-nounload          Don't unload plugins after processing\n"
     257                 "\t-nounload          Do not unload plugins after processing\n"
    258258                 "\t-tr func           Use func() instead of tr() for i18n\n"
    259259                 "\t-L path            Additional plugin search path\n"
    … …  
    368368
    369369    if (headerFile) {
    370         out << "#include \"" << headerFile << "\"" << endl << endl;
     370        out << "#include \"" << headerFile << '\"' << endl << endl;
    371371    }
    372372

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

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

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

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    4949{
    5050    QString slot(func);
    51     int begin = slot.indexOf(QLatin1String("(")) + 1;
     51    int begin = slot.indexOf(QLatin1Char('(')) + 1;
    5252    QString args = slot.mid(begin);
    53     args = args.left(args.indexOf(QLatin1String(")")));
     53    args = args.left(args.indexOf(QLatin1Char(')')));
    5454    QStringList lst = args.split(QLatin1Char(','));
    5555    QString res = slot.left(begin);
    5656    for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it) {
    5757        if (it != lst.begin())
    58             res += QLatin1String(",");
     58            res += QLatin1Char(',');
    5959        QString arg = *it;
    6060        int pos = 0;
    … …  
    6666            arg = arg.simplified();
    6767            if ((pos = arg.indexOf(QLatin1Char(':'))) != -1)
    68                 arg = arg.left(pos).simplified() + QLatin1String(":") + arg.mid(pos + 1).simplified();
     68                arg = arg.left(pos).simplified() + QLatin1Char(':') + arg.mid(pos + 1).simplified();
    6969            QStringList l = arg.split(QLatin1Char(' '));
    7070            if (l.count() == 2) {
    … …  
    7474                    arg = l[0];
    7575            } else if (l.count() == 3) {
    76                 arg = l[0] + QLatin1String(" ") + l[1];
     76                arg = l[0] + QLatin1Char(' ') + l[1];
    7777            }
    7878        }
    7979        res += arg;
    8080    }
    81     res += QLatin1String(")");
     81    res += QLatin1Char(')');
    8282    return res;
    8383}

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

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

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

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    150150    QString filePath;
    151151    //check QLibraryInfo::DataPath/filename
    152     filePath = QDir::cleanPath(QLibraryInfo::location(QLibraryInfo::DataPath) + QLatin1String("/") + fileName)  ;
     152    filePath = QDir::cleanPath(QLibraryInfo::location(QLibraryInfo::DataPath) + QLatin1Char('/') + fileName)  ;
    153153
    154154    //check QLibraryInfo::PrefixPath/tools/porting/src/filename

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

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

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

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    7070
    7171    out << "class " << subClass << " : public " << nameOfClass << endl;
    72     out << "{" << endl;
     72    out << '{' << endl;
    7373
    7474/* tmake ignore Q_OBJECT */
    … …  
    106106        QString returnType = n.attribute(QLatin1String("returnType"), QLatin1String("void"));
    107107        QString functionName = n.firstChild().toText().data().trimmed();
    108         if ( functionName.endsWith(QLatin1String(";")))
    109             functionName = functionName.left( functionName.length() - 1 );
     108        if ( functionName.endsWith(QLatin1Char(';')))
     109            functionName.chop(1);
    110110        QString specifier = n.attribute(QLatin1String("specifier"));
    111111        QString access = n.attribute(QLatin1String("access"));
    … …  
    134134        QString returnType = n.attribute(QLatin1String("returnType"), QLatin1String("void"));
    135135        QString functionName = n.firstChild().toText().data().trimmed();
    136         if ( functionName.endsWith(QLatin1String(";")) )
    137             functionName = functionName.left( functionName.length() - 1 );
     136        if ( functionName.endsWith(QLatin1Char(';')) )
     137            functionName.chop(1);
    138138        QString specifier = n.attribute(QLatin1String("specifier"));
    139139        QString access = n.attribute(QLatin1String("access"));
    … …  
    196196        if ( *it3 == QLatin1String("non virtual") )
    197197            continue;
    198         out << "    " << type << " " << fixDeclaration(*it) << ";" << endl;
     198        out << "    " << type << ' ' << fixDeclaration(*it) << ';' << endl;
    199199    }
    200200    out << endl;
    … …  
    224224        out << " *" << endl;
    225225        out << " *  The " << objClass.mid(1).toLower() << " will by default be modeless, unless you set 'modal' to" << endl;
    226         out << " *  true to construct a modal " << objClass.mid(1).toLower() << "." << endl;
     226        out << " *  true to construct a modal " << objClass.mid(1).toLower() << '.' << endl;
    227227        out << " */" << endl;
    228228        out << subClass << "::" << subClass << "( QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl )" << endl;
    … …  
    236236        out << "    : " << nameOfClass << "( parent, name, fl )" << endl;
    237237    }
    238     out << "{" << endl;
    239     out << "}" << endl;
     238    out << '{' << endl;
     239    out << '}' << endl;
    240240    out << endl;
    241241
    … …  
    245245    out << " */" << endl;
    246246    out << subClass << "::~" << subClass << "()" << endl;
    247     out << "{" << endl;
     247    out << '{' << endl;
    248248    out << "    // no need to delete child widgets, Qt does it all for us" << endl;
    249     out << "}" << endl;
     249    out << '}' << endl;
    250250    out << endl;
    251251
    … …  
    269269        QString returnType = n.attribute(QLatin1String("returnType"), QLatin1String("void"));
    270270        QString functionName = n.firstChild().toText().data().trimmed();
    271         if ( functionName.endsWith(QLatin1String(";")) )
    272             functionName = functionName.left( functionName.length() - 1 );
     271        if ( functionName.endsWith(QLatin1Char(';')) )
     272            functionName.chop(1);
    273273        QString specifier = n.attribute(QLatin1String("specifier"));
    274274        QString access = n.attribute(QLatin1String("access"));
    … …  
    297297        QString returnType = n.attribute(QLatin1String("returnType"), QLatin1String("void"));
    298298        QString functionName = n.firstChild().toText().data().trimmed();
    299         if ( functionName.endsWith(QLatin1String(";")) )
    300             functionName = functionName.left( functionName.length() - 1 );
     299        if ( functionName.endsWith(QLatin1Char(';')) )
     300            functionName.chop(1);
    301301        QString specifier = n.attribute(QLatin1String("specifier"));
    302302        QString access = n.attribute(QLatin1String("access"));
    … …  
    352352        out << " * " << descr << endl;
    353353        out << " */" << endl;
    354         out << type << " " << subClass << "::" << fixDeclaration(*it) << endl;
    355         out << "{" << endl;
     354        out << type << ' ' << subClass << "::" << fixDeclaration(*it) << endl;
     355        out << '{' << endl;
    356356        out << "    qWarning( \"" << subClass << "::" << fixDeclaration(*it) << " not yet implemented!\" );" << endl;
    357         out << "}" << endl << endl;
     357        out << '}' << endl << endl;
    358358    }
    359359    out << endl;

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

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    126126    if (!encode) {
    127127        s = str;
    128         s.replace(QLatin1String("\\"), QLatin1String("\\\\"));
    129         s.replace(QLatin1String("\""), QLatin1String("\\\""));
    130         s.replace(QLatin1String("\r"), QLatin1String(""));
    131         s.replace(QLatin1String("\n"), QLatin1String("\\n\"\n\""));
     128        s.replace(QLatin1Char('\\'), QLatin1String("\\\\"));
     129        s.replace(QLatin1Char('\"'), QLatin1String("\\\""));
     130        s.remove(QLatin1Char('\r'));
     131        s.replace(QLatin1Char('\n'), QLatin1String("\\n\"\n\""));
    132132    } else {
    133133        QByteArray utf8 = str.utf8();
    … …  
    137137    }
    138138
    139     return QLatin1String("\"") + s + QLatin1String("\"");
     139    return QLatin1Char('\"') + s + QLatin1Char('\"');
    140140}
    141141
    … …  
    159159
    160160    if (comment.isEmpty()) {
    161         return t + QLatin1String("(") + fixString(sourceText, encode) + QLatin1String(")");
     161        return t + QLatin1Char('(') + fixString(sourceText, encode) + QLatin1Char(')');
    162162    } else {
    163         return t + QLatin1String("(")
     163        return t + QLatin1Char('(')
    164164            + fixString(sourceText, encode)
    165165            + QLatin1String(", ")
    166             + fixString(comment, encode) + QLatin1String(")");
     166            + fixString(comment, encode) + QLatin1Char(')');
    167167    }
    168168}
    … …  
    481481            if (!pixmapLoaderFunction.isEmpty()) {
    482482                pixmap.prepend(pixmapLoaderFunction
    483                     + QLatin1String("(")
     483                    + QLatin1Char('(')
    484484                    + QLatin1String(externPixmaps ? "\"" : ""));
    485485
    486                 pixmap.append(QLatin1String(externPixmaps ? "\"" : "") + QLatin1String(")"));
     486                pixmap.append(QLatin1String(externPixmaps ? "\"" : "") + QLatin1Char(')'));
    487487            }
    488488            out << indent << name << ".setBrush(QColorGroup::"
    … …  
    579579    if (objectNames.contains(result)) {
    580580        int i = 2;
    581         while (objectNames.contains(result + QLatin1String("_") + QString::number(i)))
     581        while (objectNames.contains(result + QLatin1Char('_') + QString::number(i)))
    582582            i++;
    583         result += QLatin1String("_");
     583        result += QLatin1Char('_');
    584584        result += QString::number(i);
    585585    }

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

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

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

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    145145
    146146        out << "/********************************************************************************\n";
    147         out << "** Form generated from reading ui file '" << QFileInfo(opt.inputFile).fileName() << "'\n";
     147        out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n";
    148148        out << "**\n";
    149149        out << "** Created: " << QDateTime::currentDateTime().toString() << "\n";
    150150        out << "**      " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR));
    151151        out << "**\n";
    152         out << "** WARNING! All changes made in this file will be lost when recompiling ui file!\n";
     152        out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n";
    153153        out << "********************************************************************************/\n\n";
    154154}
    … …  
    323323}
    324324
     325bool Uic::isCustomWidgetContainer(const QString &className) const
     326{
     327    return customWidgetsInfo()->isCustomWidgetContainer(className);
     328}
     329
    325330bool Uic::isStatusBar(const QString &className) const
    326331{

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

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    115115    bool isButton(const QString &className) const;
    116116    bool isContainer(const QString &className) const;
     117    bool isCustomWidgetContainer(const QString &className) const;
    117118    bool isMenuBar(const QString &className) const;
    118119    bool isMenu(const QString &className) const;

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

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

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

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
Note: See TracChangeset for help on using the changeset viewer.