1 files changed, 18 insertions, 86 deletions

diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp
index 8e4709c831..a5b331192f 100644
--- a/src/tools/uic/uic.cpp
+++ b/src/tools/uic/uic.cpp
@@ -33,18 +33,12 @@
 #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 <qxmlstream.h>
 #include <qfileinfo.h>
+#include <qscopedpointer.h>
 #include <qtextstream.h>
 
 QT_BEGIN_NAMESPACE
@@ -56,9 +50,7 @@ Uic::Uic(Driver *d)
 {
 }
 
-Uic::~Uic()
-{
-}
+Uic::~Uic() = default;
 
 bool Uic::printDependencies()
 {
@@ -174,65 +166,33 @@ 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;
+    QScopedPointer<DomUI> ui;
     {
         QXmlStreamReader reader;
         reader.setDevice(in);
-        ui = parseUiFile(reader);
-
-        if (!ui)
-            return false;
+        ui.reset(parseUiFile(reader));
     }
 
+    if (ui.isNull())
+        return false;
+
     double version = ui->attributeVersion().toDouble();
     if (version < 4.0) {
-        delete ui;
-
         fprintf(stderr, "uic: File generated with too old version of Qt Designer\n");
         return false;
     }
 
-    QString language = ui->attributeLanguage();
+    const QString &language = ui->attributeLanguage();
     driver()->setUseIdBasedTranslations(ui->attributeIdbasedtr());
 
-    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");
-            delete ui;
-            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));
-            delete ui;
-            return false;
-        }
-
-        rtn = write (ui);
-#else
-        fprintf(stderr, "uic: option to generate cpp code not compiled in\n");
-#endif
+    if (!language.isEmpty() && language.compare(QLatin1String("c++"), Qt::CaseInsensitive) != 0) {
+        fprintf(stderr, "uic: File is not a \"c++\" ui file, language=%s\n", qPrintable(language));
+        return false;
     }
 
-    delete ui;
-
-    return rtn;
+    return write(ui.data());
 }
 
-#ifdef QT_UIC_CPP_GENERATOR
 bool Uic::write(DomUI *ui)
 {
     using namespace CPP;
@@ -249,8 +209,12 @@ bool Uic::write(DomUI *ui)
     }
 
     pixFunction = ui->elementPixmapFunction();
-    if (pixFunction == QLatin1String("QPixmap::fromMimeSource"))
-        pixFunction = QLatin1String("qPixmapFromMimeSource");
+    if (pixFunction == QLatin1String("QPixmap::fromMimeSource")
+        || pixFunction == QLatin1String("qPixmapFromMimeSource")) {
+        fprintf(stderr, "%s: Warning: Obsolete pixmap function '%s' specified in the UI file.\n",
+                qPrintable(opt.messagePrefix()), qPrintable(pixFunction));
+        pixFunction.clear();
+    }
 
     info.acceptUI(ui);
     cWidgetsInfo.acceptUI(ui);
@@ -265,37 +229,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()
 {
@@ -309,7 +242,6 @@ void Uic::writeHeaderProtectionEnd()
     QString h = drv->headerFileName();
     out << "#endif // " << h << "\n";
 }
-#endif
 
 bool Uic::isMainWindow(const QString &className) const
 {