remove Java support from lupdate and uic

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/tools/lupdate/CMakeLists.txt b/src/tools/lupdate/CMakeLists.txt
index a84fb06..18de07d 100644 (file)
--- a/src/tools/lupdate/CMakeLists.txt
+++ b/src/tools/lupdate/CMakeLists.txt
@@ -16,7 +16,6 @@ set(LUPDATE_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/lupdate.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/merge.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/cpp.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/java.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/qscript.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ui.cpp
 )

diff --git a/src/tools/lupdate/java.cpp b/src/tools/lupdate/java.cpp
deleted file mode 100644 (file)
index 09a5427..0000000
--- a/src/tools/lupdate/java.cpp
+++ /dev/null
@@ -1,645 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Linguist of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "lupdate.h"
-
-#include <translator.h>
-
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
-#include <QtCore/QRegExp>
-#include <QtCore/QStack>
-#include <QtCore/QStack>
-#include <QtCore/QString>
-#include <QtCore/QTextCodec>
-#include <QtCore/QCoreApplication>
-
-#include <iostream>
-
-#include <ctype.h>
-
-QT_BEGIN_NAMESPACE
-
-class LU {
-    Q_DECLARE_TR_FUNCTIONS(LUpdate)
-};
-
-enum { Tok_Eof, Tok_class, Tok_return, Tok_tr,
-       Tok_translate, Tok_Ident, Tok_Package,
-       Tok_Comment, Tok_String, Tok_Colon, Tok_Dot,
-       Tok_LeftBrace, Tok_RightBrace, Tok_LeftParen,
-       Tok_RightParen, Tok_Comma, Tok_Semicolon,
-       Tok_Integer, Tok_Plus, Tok_PlusPlus, Tok_PlusEq, Tok_null };
-
-class Scope
-{
-    public:
-        QString name;
-        enum Type {Clazz, Function, Other} type;
-        int line;
-
-        Scope(const QString & name, Type type, int line) :
-                name(name),
-                type(type),
-                line(line)
-        {}
-
-        ~Scope()
-        {}
-};
-
-/*
-  The tokenizer maintains the following global variables. The names
-  should be self-explanatory.
-*/
-
-static QString yyFileName;
-static QChar yyCh;
-static QString yyIdent;
-static QString yyComment;
-static QString yyString;
-
-
-static qlonglong yyInteger;
-static int yyParenDepth;
-static int yyLineNo;
-static int yyCurLineNo;
-static int yyParenLineNo;
-static int yyTok;
-
-// the string to read from and current position in the string
-static QString yyInStr;
-static int yyInPos;
-
-// The parser maintains the following global variables.
-static QString yyPackage;
-static QStack<Scope*> yyScope;
-static QString yyDefaultContext;
-
-std::ostream &yyMsg(int line = 0)
-{
-    return std::cerr << qPrintable(yyFileName) << ':' << (line ? line : yyLineNo) << ": ";
-}
-
-static QChar getChar()
-{
-    if (yyInPos >= yyInStr.size())
-        return EOF;
-    QChar c = yyInStr[yyInPos++];
-    if (c.unicode() == '\n')
-        ++yyCurLineNo;
-    return c.unicode();
-}
-
-static int getToken()
-{
-    const char tab[] = "bfnrt\"\'\\";
-    const char backTab[] = "\b\f\n\r\t\"\'\\";
-
-    yyIdent.clear();
-    yyComment.clear();
-    yyString.clear();
-
-    while ( yyCh != EOF ) {
-        yyLineNo = yyCurLineNo;
-
-        if ( yyCh.isLetter() || yyCh.toLatin1() == '_' ) {
-            do {
-                yyIdent.append(yyCh);
-                yyCh = getChar();
-            } while ( yyCh.isLetterOrNumber() || yyCh.toLatin1() == '_' );
-
-            if (yyTok != Tok_Dot) {
-                switch ( yyIdent.at(0).toLatin1() ) {
-                    case 'r':
-                        if ( yyIdent == QLatin1String("return") )
-                            return Tok_return;
-                        break;
-                     case 'c':
-                        if ( yyIdent == QLatin1String("class") )
-                            return Tok_class;
-                        break;
-                     case 'n':
-                         if ( yyIdent == QLatin1String("null") )
-                             return Tok_null;
-                        break;
-                }
-            }
-            switch ( yyIdent.at(0).toLatin1() ) {
-            case 'T':
-                // TR() for when all else fails
-                if ( yyIdent == QLatin1String("TR") )
-                    return Tok_tr;
-                break;
-            case 'p':
-                if( yyIdent == QLatin1String("package") )
-                    return Tok_Package;
-                break;
-            case 't':
-                if ( yyIdent == QLatin1String("tr") )
-                    return Tok_tr;
-                if ( yyIdent == QLatin1String("translate") )
-                    return Tok_translate;
-                }
-            return Tok_Ident;
-        } else {
-            switch ( yyCh.toLatin1() ) {
-
-            case '/':
-                yyCh = getChar();
-                if ( yyCh == QLatin1Char('/') ) {
-                    do {
-                        yyCh = getChar();
-                        if (yyCh == EOF)
-                            break;
-                        yyComment.append(yyCh);
-                    } while (yyCh != QLatin1Char('\n'));
-                    return Tok_Comment;
-
-                } else if ( yyCh == QLatin1Char('*') ) {
-                    bool metAster = false;
-                    bool metAsterSlash = false;
-
-                    while ( !metAsterSlash ) {
-                        yyCh = getChar();
-                        if ( yyCh == EOF ) {
-                            yyMsg() << qPrintable(LU::tr("Unterminated Java comment.\n"));
-                            return Tok_Comment;
-                        }
-
-                        yyComment.append( yyCh );
-
-                        if ( yyCh == QLatin1Char('*') )
-                            metAster = true;
-                        else if ( metAster && yyCh == QLatin1Char('/') )
-                            metAsterSlash = true;
-                        else
-                            metAster = false;
-                    }
-                    yyComment.chop(2);
-                    yyCh = getChar();
-
-                    return Tok_Comment;
-                }
-                break;
-            case '"':
-                yyCh = getChar();
-
-                while ( yyCh != EOF && yyCh != QLatin1Char('\n') && yyCh != QLatin1Char('"') ) {
-                    if ( yyCh == QLatin1Char('\\') ) {
-                        yyCh = getChar();
-                        if ( yyCh == QLatin1Char('u') ) {
-                            yyCh = getChar();
-                            uint unicode(0);
-                            for (int i = 4; i > 0; --i) {
-                                unicode = unicode << 4;
-                                if( yyCh.isDigit() ) {
-                                    unicode += yyCh.digitValue();
-                                }
-                                else {
-                                    int sub(yyCh.toLower().toAscii() - 87);
-                                    if( sub > 15 || sub < 10) {
-                                        yyMsg() << qPrintable(LU::tr("Invalid Unicode value.\n"));
-                                        break;
-                                    }
-                                    unicode += sub;
-                                }
-                                yyCh = getChar();
-                            }
-                            yyString.append(QChar(unicode));
-                        }
-                        else if ( yyCh == QLatin1Char('\n') ) {
-                            yyCh = getChar();
-                        }
-                        else {
-                            yyString.append( QLatin1Char(backTab[strchr( tab, yyCh.toAscii() ) - tab]) );
-                            yyCh = getChar();
-                        }
-                    } else {
-                        yyString.append(yyCh);
-                        yyCh = getChar();
-                    }
-                }
-
-                if ( yyCh != QLatin1Char('"') )
-                    yyMsg() << qPrintable(LU::tr("Unterminated string.\n"));
-
-                yyCh = getChar();
-
-                return Tok_String;
-
-            case ':':
-                yyCh = getChar();
-                return Tok_Colon;
-            case '\'':
-                yyCh = getChar();
-
-                if ( yyCh == QLatin1Char('\\') )
-                    yyCh = getChar();
-                do {
-                    yyCh = getChar();
-                } while ( yyCh != EOF && yyCh != QLatin1Char('\'') );
-                yyCh = getChar();
-                break;
-            case '{':
-                yyCh = getChar();
-                return Tok_LeftBrace;
-            case '}':
-                yyCh = getChar();
-                return Tok_RightBrace;
-            case '(':
-                if (yyParenDepth == 0)
-                    yyParenLineNo = yyCurLineNo;
-                yyParenDepth++;
-                yyCh = getChar();
-                return Tok_LeftParen;
-            case ')':
-                if (yyParenDepth == 0)
-                    yyParenLineNo = yyCurLineNo;
-                yyParenDepth--;
-                yyCh = getChar();
-                return Tok_RightParen;
-            case ',':
-                yyCh = getChar();
-                return Tok_Comma;
-            case '.':
-                yyCh = getChar();
-                return Tok_Dot;
-            case ';':
-                yyCh = getChar();
-                return Tok_Semicolon;
-            case '+':
-                yyCh = getChar();
-                if (yyCh == QLatin1Char('+')) {
-                    yyCh = getChar();
-                    return Tok_PlusPlus;
-               }
-                if( yyCh == QLatin1Char('=') ){
-                    yyCh = getChar();
-                    return Tok_PlusEq;
-               }
-                return Tok_Plus;
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-                {
-                    QByteArray ba;
-                    ba += yyCh.toLatin1();
-                    yyCh = getChar();
-                    bool hex = yyCh == QLatin1Char('x');
-                    if ( hex ) {
-                        ba += yyCh.toLatin1();
-                        yyCh = getChar();
-                    }
-                    while ( hex ? isxdigit(yyCh.toLatin1()) : yyCh.isDigit() ) {
-                        ba += yyCh.toLatin1();
-                        yyCh = getChar();
-                    }
-                    bool ok;
-                    yyInteger = ba.toLongLong(&ok);
-                    if (ok) return Tok_Integer;
-                    break;
-                }
-            default:
-                yyCh = getChar();
-            }
-        }
-    }
-    return Tok_Eof;
-}
-
-static bool match( int t )
-{
-    bool matches = ( yyTok == t );
-    if ( matches )
-        yyTok = getToken();
-    return matches;
-}
-
-static bool matchString( QString &s )
-{
-    if ( yyTok != Tok_String )
-        return false;
-
-    s = yyString;
-    yyTok = getToken();
-    while ( yyTok == Tok_Plus ) {
-        yyTok = getToken();
-        if (yyTok == Tok_String)
-            s += yyString;
-        else {
-            yyMsg() << qPrintable(LU::tr(
-                "String used in translation can contain only literals"
-                " concatenated with other literals, not expressions or numbers.\n"));
-            return false;
-        }
-        yyTok = getToken();
-    }
-    return true;
-}
-
-static bool matchStringOrNull(QString &s)
-{
-    bool matches = matchString(s);
-    if (!matches) {
-        matches = (yyTok == Tok_null);
-        if (matches)
-            yyTok = getToken();
-    }
-    return matches;
-}
-
-/*
- * match any expression that can return a number, which can be
- * 1. Literal number (e.g. '11')
- * 2. simple identifier (e.g. 'm_count')
- * 3. simple function call (e.g. 'size()' )
- * 4. function call on an object (e.g. 'list.size()')
- * 5. function call on an object (e.g. 'list->size()')
- *
- * Other cases:
- * size(2,4)
- * list().size()
- * list(a,b).size(2,4)
- * etc...
- */
-static bool matchExpression()
-{
-    if (match(Tok_Integer)) {
-        return true;
-    }
-
-    int parenlevel = 0;
-    while (match(Tok_Ident) || parenlevel > 0) {
-        if (yyTok == Tok_RightParen) {
-            if (parenlevel == 0) break;
-            --parenlevel;
-            yyTok = getToken();
-        } else if (yyTok == Tok_LeftParen) {
-            yyTok = getToken();
-            if (yyTok == Tok_RightParen) {
-                yyTok = getToken();
-            } else {
-                ++parenlevel;
-            }
-        } else if (yyTok == Tok_Ident) {
-            continue;
-        } else if (parenlevel == 0) {
-            return false;
-        }
-    }
-    return true;
-}
-
-static const QString context()
-{
-      QString context(yyPackage);
-      bool innerClass = false;
-      for (int i = 0; i < yyScope.size(); ++i) {
-         if (yyScope.at(i)->type == Scope::Clazz) {
-             if (innerClass)
-                 context.append(QLatin1String("$"));
-             else
-                 context.append(QLatin1String("."));
-
-             context.append(yyScope.at(i)->name);
-             innerClass = true;
-         }
-     }
-     return context.isEmpty() ? yyDefaultContext : context;
-}
-
-static void recordMessage(
-    Translator *tor, const QString &context, const QString &text, const QString &comment,
-    const QString &extracomment, bool plural)
-{
-    TranslatorMessage msg(
-        context, text, comment, QString(),
-        yyFileName, yyLineNo, QStringList(),
-        TranslatorMessage::Unfinished, plural);
-    msg.setExtraComment(extracomment.simplified());
-    tor->extend(msg);
-}
-
-static void parse( Translator *tor )
-{
-    QString text;
-    QString com;
-    QString extracomment;
-
-    yyCh = getChar();
-
-    yyTok = getToken();
-    while ( yyTok != Tok_Eof ) {
-        switch ( yyTok ) {
-        case Tok_class:
-            yyTok = getToken();
-            if(yyTok == Tok_Ident) {
-                yyScope.push(new Scope(yyIdent, Scope::Clazz, yyLineNo));
-            }
-            else {
-                yyMsg() << qPrintable(LU::tr("'class' must be followed by a class name.\n"));
-                break;
-            }
-            while (!match(Tok_LeftBrace)) {
-                yyTok = getToken();
-            }
-            break;
-
-        case Tok_tr:
-            yyTok = getToken();
-            if ( match(Tok_LeftParen) && matchString(text) ) {
-                com.clear();
-                bool plural = false;
-
-                if ( match(Tok_RightParen) ) {
-                    // no comment
-                } else if (match(Tok_Comma) && matchStringOrNull(com)) {   //comment
-                    if ( match(Tok_RightParen)) {
-                        // ok,
-                    } else if (match(Tok_Comma)) {
-                        plural = true;
-                    }
-                }
-                if (!text.isEmpty())
-                    recordMessage(tor, context(), text, com, extracomment, plural);
-            }
-            break;
-        case Tok_translate:
-            {
-                QString contextOverride;
-                yyTok = getToken();
-                if ( match(Tok_LeftParen) &&
-                     matchString(contextOverride) &&
-                     match(Tok_Comma) &&
-                     matchString(text) ) {
-
-                    com.clear();
-                    bool plural = false;
-                    if (!match(Tok_RightParen)) {
-                        // look for comment
-                        if ( match(Tok_Comma) && matchStringOrNull(com)) {
-                            if (!match(Tok_RightParen)) {
-                                if (match(Tok_Comma) && matchExpression() && match(Tok_RightParen)) {
-                                    plural = true;
-                                } else {
-                                    break;
-                                }
-                            }
-                        } else {
-                            break;
-                        }
-                    }
-                    if (!text.isEmpty())
-                        recordMessage(tor, contextOverride, text, com, extracomment, plural);
-                }
-            }
-            break;
-
-        case Tok_Ident:
-            yyTok = getToken();
-            break;
-
-        case Tok_Comment:
-            if (yyComment.startsWith(QLatin1Char(':'))) {
-                yyComment.remove(0, 1);
-                extracomment.append(yyComment);
-            }
-            yyTok = getToken();
-            break;
-
-        case Tok_RightBrace:
-            if ( yyScope.isEmpty() ) {
-                yyMsg() << qPrintable(LU::tr("Excess closing brace.\n"));
-            }
-            else
-                delete (yyScope.pop());
-            extracomment.clear();
-            yyTok = getToken();
-            break;
-
-         case Tok_LeftBrace:
-            yyScope.push(new Scope(QString(), Scope::Other, yyLineNo));
-            yyTok = getToken();
-            break;
-
-        case Tok_Semicolon:
-            extracomment.clear();
-            yyTok = getToken();
-            break;
-
-        case Tok_Package:
-            yyTok = getToken();
-            while(!match(Tok_Semicolon)) {
-                switch(yyTok) {
-                    case Tok_Ident:
-                        yyPackage.append(yyIdent);
-                        break;
-                    case Tok_Dot:
-                        yyPackage.append(QLatin1String("."));
-                        break;
-                    default:
-                         yyMsg() << qPrintable(LU::tr("'package' must be followed by package name.\n"));
-                         break;
-                }
-                yyTok = getToken();
-            }
-            break;
-
-        default:
-            yyTok = getToken();
-        }
-    }
-
-    if ( !yyScope.isEmpty() )
-        yyMsg(yyScope.top()->line) << qPrintable(LU::tr("Unbalanced opening brace.\n"));
-    else if ( yyParenDepth != 0 )
-        yyMsg(yyParenLineNo) << qPrintable(LU::tr("Unbalanced opening parenthesis.\n"));
-}
-
-
-bool loadJava(Translator &translator, const QString &filename, ConversionData &cd)
-{
-    QFile file(filename);
-    if (!file.open(QIODevice::ReadOnly)) {
-        cd.appendError(LU::tr("Cannot open %1: %2").arg(filename, file.errorString()));
-        return false;
-    }
-
-    yyDefaultContext = cd.m_defaultContext;
-    yyInPos = -1;
-    yyFileName = filename;
-    yyPackage.clear();
-    yyScope.clear();
-    yyTok = -1;
-    yyParenDepth = 0;
-    yyCurLineNo = 0;
-    yyParenLineNo = 1;
-
-    QTextStream ts(&file);
-    QByteArray codecName;
-    if (!cd.m_codecForSource.isEmpty())
-        codecName = cd.m_codecForSource;
-    else
-        codecName = translator.codecName(); // Just because it should be latin1 already
-    ts.setCodec(QTextCodec::codecForName(codecName));
-    ts.setAutoDetectUnicode(true);
-    yyInStr = ts.readAll();
-    yyInPos = 0;
-    yyFileName = filename;
-    yyCurLineNo = 1;
-    yyParenLineNo = 1;
-
-    parse(&translator);
-
-    // Java uses UTF-16 internally and Jambi makes UTF-8 for tr() purposes of it.
-    translator.setCodecName("UTF-8");
-    return true;
-}
-
-QT_END_NAMESPACE

diff --git a/src/tools/lupdate/lupdate.cpp b/src/tools/lupdate/lupdate.cpp
index 87ac48c..7651249 100644 (file)
--- a/src/tools/lupdate/lupdate.cpp
+++ b/src/tools/lupdate/lupdate.cpp
@@ -91,7 +91,7 @@ static void printUsage()
         "Usage:\n"
         "    lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file\n\n"
         "lupdate is part of Qt's Linguist tool chain. It extracts translatable\n"
-        "messages from Qt UI files, C++, Java and JavaScript/QtScript source code.\n"
+        "messages from Qt UI files, C++ and JavaScript/QtScript source code.\n"
         "Extracted messages are stored in textual translation source files (typically\n"
         "Qt TS XML). New and modified messages can be merged into existing TS files.\n\n"
         "Options:\n"
@@ -229,10 +229,7 @@ static void processSources(Translator &fetchedTor,
 {
     QStringList sourceFilesCpp;
     for (QStringList::const_iterator it = sourceFiles.begin(); it != sourceFiles.end(); ++it) {
-        if (it->endsWith(QLatin1String(".java"), Qt::CaseInsensitive))
-            loadJava(fetchedTor, *it, cd);
-        else if (it->endsWith(QLatin1String(".ui"), Qt::CaseInsensitive)
-                 || it->endsWith(QLatin1String(".jui"), Qt::CaseInsensitive))
+        if (it->endsWith(QLatin1String(".ui"), Qt::CaseInsensitive))
             loadUI(fetchedTor, *it, cd);
         else if (it->endsWith(QLatin1String(".js"), Qt::CaseInsensitive)
                  || it->endsWith(QLatin1String(".qs"), Qt::CaseInsensitive))
@@ -260,7 +257,7 @@ int main(int argc, char **argv)
     }
 #endif // Q_OS_WIN32
 
-    m_defaultExtensions = QLatin1String("java,jui,ui,c,c++,cc,cpp,cxx,ch,h,h++,hh,hpp,hxx,js,qs,qml");
+    m_defaultExtensions = QLatin1String("ui,c,c++,cc,cpp,cxx,ch,h,h++,hh,hpp,hxx,js,qs,qml");
 
     QStringList args = app.arguments();
     QStringList tsFileNames;
@@ -474,9 +471,7 @@ int main(int argc, char **argv)
                         QString fn = QDir::cleanPath(fi.absoluteFilePath());
                         sourceFiles << fn;
 
-                        if (!fn.endsWith(QLatin1String(".java"))
-                            && !fn.endsWith(QLatin1String(".jui"))
-                            && !fn.endsWith(QLatin1String(".ui"))
+                        if (!fn.endsWith(QLatin1String(".ui"))
                             && !fn.endsWith(QLatin1String(".js"))
                             && !fn.endsWith(QLatin1String(".qs"))
                             && !fn.endsWith(QLatin1String(".qml"))) {

diff --git a/src/tools/lupdate/lupdate.h b/src/tools/lupdate/lupdate.h
index 74bd349..dc62f85 100644 (file)
--- a/src/tools/lupdate/lupdate.h
+++ b/src/tools/lupdate/lupdate.h
@@ -76,7 +76,6 @@ Translator merge(const Translator &tor, const Translator &virginTor,
 
 void fetchtrInlinedCpp(const QString &in, Translator &translator, const QString &context);
 void loadCPP(Translator &translator, const QStringList &filenames, ConversionData &cd);
-bool loadJava(Translator &translator, const QString &filename, ConversionData &cd);
 bool loadQScript(Translator &translator, const QString &filename, ConversionData &cd);
 bool loadUI(Translator &translator, const QString &filename, ConversionData &cd);
 

diff --git a/src/tools/lupdate/lupdate.pro b/src/tools/lupdate/lupdate.pro
index 6bce1c5..7406130 100644 (file)
--- a/src/tools/lupdate/lupdate.pro
+++ b/src/tools/lupdate/lupdate.pro
@@ -1,7 +1,3 @@
-include($$QT_SOURCE_TREE/src/declarative/qml/parser/parser.pri)
-INCLUDEPATH += $$QT_SOURCE_TREE/src/declarative/qml $$QT_BUILD_TREE/include/QtDeclarative
-
-
 win32:RC_FILE = winmanifest.rc
 
 embed_manifest_exe:win32-msvc2005 {
@@ -9,7 +5,3 @@ embed_manifest_exe:win32-msvc2005 {
     # already embedded via RC_FILE. Vs2008 already have the necessary manifest entry
     QMAKE_POST_LINK += $$quote(mt.exe -updateresource:$$DESTDIR/lupdate.exe -manifest \"$${PWD}\\lupdate.exe.manifest\")
 }
-
-target.path=$$[QT_INSTALL_BINS]
-INSTALLS        += target
-

diff --git a/src/tools/uic/CMakeLists.txt b/src/tools/uic/CMakeLists.txt
index 42604b3..19d7f5e 100644 (file)
--- a/src/tools/uic/CMakeLists.txt
+++ b/src/tools/uic/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_definitions(-DQT_UIC -DQT_UIC_CPP_GENERATOR)
+add_definitions(-DQT_UIC)
 set(EXTRA_UIC_LIBS KtCore KtXml)
 
 include_directories(

diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 943d7b5..d12778a 100644 (file)
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -972,7 +972,7 @@ void WriteInitialization::acceptLayout(DomLayout *node)
     TreeWalker::acceptLayout(node);
     m_layoutChain.pop();
 
-    // Stretch? (Unless we are compiling for UIC3)
+    // Stretch?
     const QString numberNull = QString(QLatin1Char('0'));
     writePropertyList(varName, QLatin1String("setStretch"), node->attributeStretch(), numberNull);
     writePropertyList(varName, QLatin1String("setRowStretch"), node->attributeRowStretch(), numberNull);

diff --git a/src/tools/uic/driver.cpp b/src/tools/uic/driver.cpp
index d626d2a..23a9f1d 100644 (file)
--- a/src/tools/uic/driver.cpp
+++ b/src/tools/uic/driver.cpp
@@ -267,14 +267,7 @@ bool Driver::uic(const QString &fileName, DomUI *ui, QTextStream *out)
     m_output = out != 0 ? out : &m_stdout;
 
     Uic tool(this);
-    bool rtn = false;
-#ifdef QT_UIC_CPP_GENERATOR
-    rtn = tool.write(ui);
-#else
-    Q_UNUSED(ui);
-    fprintf(stderr, "uic: option to generate cpp code not compiled in [%s:%d]\n",
-            __FILE__, __LINE__);
-#endif
+    bool rtn = tool.write(ui);
 
     m_output = oldOutput;
 

diff --git a/src/tools/uic/option.h b/src/tools/uic/option.h
index 9f1b1f5..371ed6f 100644 (file)
--- a/src/tools/uic/option.h
+++ b/src/tools/uic/option.h
@@ -49,12 +49,6 @@ QT_BEGIN_NAMESPACE
 
 struct Option
 {
-    enum Generator
-    {
-        CppGenerator,
-        JavaGenerator
-    };
-
     unsigned int headerProtection : 1;
     unsigned int copyrightHeader : 1;
     unsigned int generateImplemetation : 1;
@@ -64,7 +58,6 @@ struct Option
     unsigned int extractImages : 1;
     unsigned int limitXPM_LineLength : 1;
     unsigned int implicitIncludes: 1;
-    Generator generator;
 
     QString inputFile;
     QString outputFile;
@@ -73,15 +66,9 @@ struct Option
     QString prefix;
     QString postfix;
     QString translateFunction;
-    QString uic3;
-#ifdef QT_UIC_JAVA_GENERATOR
-    QString javaPackage;
-    QString javaOutputDirectory;
-#endif
 
     Option()
-        : headerProtection(1),
-          copyrightHeader(1),
+        : copyrightHeader(1),
           generateImplemetation(0),
           generateNamespace(1),
           autoConnection(1),
@@ -89,7 +76,6 @@ struct Option
           extractImages(0),
           limitXPM_LineLength(0),
           implicitIncludes(1),
-          generator(CppGenerator),
           prefix(QLatin1String("Ui_"))
     { indent.fill(QLatin1Char(' '), 4); }
 

diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp
index 8e29c9f..633a816 100644 (file)
--- a/src/tools/uic/uic.cpp
+++ b/src/tools/uic/uic.cpp
@@ -45,16 +45,8 @@
 #include "option.h"
 #include "treewalker.h"
 #include "validator.h"
-
-#ifdef QT_UIC_CPP_GENERATOR
 #include "cppwriteincludes.h"
 #include "cppwritedeclaration.h"
-#endif
-
-#ifdef QT_UIC_JAVA_GENERATOR
-#include "javawriteincludes.h"
-#include "javawritedeclaration.h"
-#endif
 
 #include <QtCore/QXmlStreamReader>
 #include <QtCore/QFileInfo>
@@ -193,11 +185,6 @@ DomUI *Uic::parseUiFile(QXmlStreamReader &reader)
 
 bool Uic::write(QIODevice *in)
 {
-    if (option().generator == Option::JavaGenerator) {
-         // the Java generator ignores header protection
-        opt.headerProtection = false;
-    }
-
     DomUI *ui = 0;
     {
         QXmlStreamReader reader;
@@ -218,38 +205,18 @@ bool Uic::write(QIODevice *in)
 
     QString language = ui->attributeLanguage();
 
-
-    bool rtn = false;
-
-    if (option().generator == Option::JavaGenerator) {
-#ifdef QT_UIC_JAVA_GENERATOR
-        if (language.toLower() != QLatin1String("jambi")) {
-            fprintf(stderr, "uic: File is not a 'jambi' form\n");
-            return false;
-        }
-        rtn = jwrite (ui);
-#else
-        fprintf(stderr, "uic: option to generate java code not compiled in\n");
-#endif
-    } else {
-#ifdef QT_UIC_CPP_GENERATOR
-        if (!language.isEmpty() && language.toLower() != QLatin1String("c++")) {
-            fprintf(stderr, "uic: File is not a 'c++' ui file, language=%s\n", qPrintable(language));
-            return false;
-        }
-
-        rtn = write (ui);
-#else
-        fprintf(stderr, "uic: option to generate cpp code not compiled in\n");
-#endif
+    if (!language.isEmpty() && language.toLower() != QLatin1String("c++")) {
+        fprintf(stderr, "uic: File is not a 'c++' ui file, language=%s\n", qPrintable(language));
+        return false;
     }
 
+    bool rtn = write (ui);
+
     delete ui;
 
     return rtn;
 }
 
-#ifdef QT_UIC_CPP_GENERATOR
 bool Uic::write(DomUI *ui)
 {
     using namespace CPP;
@@ -284,37 +251,6 @@ bool Uic::write(DomUI *ui)
 
     return true;
 }
-#endif
-
-#ifdef QT_UIC_JAVA_GENERATOR
-bool Uic::jwrite(DomUI *ui)
-{
-    using namespace Java;
-
-    if (!ui || !ui->elementWidget())
-        return false;
-
-    if (opt.copyrightHeader)
-        writeCopyrightHeader(ui);
-
-    pixFunction = ui->elementPixmapFunction();
-    if (pixFunction == QLatin1String("QPixmap::fromMimeSource"))
-        pixFunction = QLatin1String("qPixmapFromMimeSource");
-
-    externalPix = ui->elementImages() == 0;
-
-    info.acceptUI(ui);
-    cWidgetsInfo.acceptUI(ui);
-    WriteIncludes(this).acceptUI(ui);
-
-    Validator(this).acceptUI(ui);
-    WriteDeclaration(this).acceptUI(ui);
-
-    return true;
-}
-#endif
-
-#ifdef QT_UIC_CPP_GENERATOR
 
 void Uic::writeHeaderProtectionStart()
 {
@@ -328,7 +264,6 @@ void Uic::writeHeaderProtectionEnd()
     QString h = drv->headerFileName();
     out << "#endif // " << h << "\n";
 }
-#endif
 
 bool Uic::isMainWindow(const QString &className) const
 {

diff --git a/src/tools/uic/uic.h b/src/tools/uic/uic.h
index 4cb43aa..0cb4b6a 100644 (file)
--- a/src/tools/uic/uic.h
+++ b/src/tools/uic/uic.h
@@ -102,13 +102,7 @@ public:
 
     bool write(QIODevice *in);
 
-#ifdef QT_UIC_JAVA_GENERATOR
-    bool jwrite(DomUI *ui);
-#endif
-
-#ifdef QT_UIC_CPP_GENERATOR
     bool write(DomUI *ui);
-#endif
 
     bool isMainWindow(const QString &className) const;
     bool isToolBar(const QString &className) const;
@@ -124,11 +118,9 @@ private:
     void writeCopyrightHeader(DomUI *ui);
     DomUI *parseUiFile(QXmlStreamReader &reader);
 
-#ifdef QT_UIC_CPP_GENERATOR
     // header protection
     void writeHeaderProtectionStart();
     void writeHeaderProtectionEnd();
-#endif
 
 private:
     Driver *drv;

diff --git a/src/tools/uic/uicmain.cpp b/src/tools/uic/uicmain.cpp
index ac4914c..1b3e6e1 100644 (file)
--- a/src/tools/uic/uicmain.cpp
+++ b/src/tools/uic/uicmain.cpp
@@ -65,8 +65,6 @@ void showHelp(const char *appName)
             "  -tr <func>                use func() for i18n\n"
             "  -p, -no-protection        disable header protection\n"
             "  -n, -no-implicit-includes disable generation of #include-directives\n"
-            "                            for forms generated by uic3\n"
-            "  -g <name>                 change generator\n"
             "\n", appName);
 }
 
@@ -105,13 +103,6 @@ int runUic(int argc, char *argv[])
                 return 1;
             }
             driver.option().postfix = QLatin1String(argv[arg]);
-        } else if (opt == QLatin1String("-3")) {
-            ++arg;
-            if (!argv[arg]) {
-                showHelp(argv[0]);
-                return 1;
-            }
-            driver.option().uic3 = QFile::decodeName(argv[arg]);
         } else if (opt == QLatin1String("-tr") || opt == QLatin1String("-translate")) {
             ++arg;
             if (!argv[arg]) {
@@ -119,14 +110,6 @@ int runUic(int argc, char *argv[])
                 return 1;
             }
             driver.option().translateFunction = QLatin1String(argv[arg]);
-        } else if (opt == QLatin1String("-g") || opt == QLatin1String("-generator")) {
-            ++arg;
-            if (!argv[arg]) {
-                showHelp(argv[0]);
-                return 1;
-            }
-            QString name = QString::fromLocal8Bit(argv[arg]).toLower ();
-            driver.option().generator = (name == QLatin1String ("java")) ? Option::JavaGenerator : Option::CppGenerator;
         } else if (!fileName) {
             fileName = argv[arg];
         } else {