From 17af244afa77991cb071d10f1ce9af09c46a5397 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Tue, 5 Mar 2013 20:00:54 +0100
Subject: [PATCH] purge ui3 support from lupdate

there is no qt3support in qt 5 any more.

Change-Id: I9da9c209095a753d45419fb34a5737cd8dde4dc4
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
 src/linguist/lupdate/cpp.cpp   | 15 ---------------
 src/linguist/lupdate/lupdate.h |  1 -
 src/linguist/lupdate/ui.cpp    | 12 +-----------
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/src/linguist/lupdate/cpp.cpp b/src/linguist/lupdate/cpp.cpp
index 9857814..f3063a1 100644
--- a/src/linguist/lupdate/cpp.cpp
+++ b/src/linguist/lupdate/cpp.cpp
@@ -2236,21 +2236,6 @@ const ParseResults *CppParser::recordResults(bool isHeader)
     }
 }
 
-/*
-  Fetches tr() calls in C++ code in UI files (inside "<function>"
-  tag). This mechanism is obsolete.
-*/
-void fetchtrInlinedCpp(const QString &in, Translator &translator, const QString &context)
-{
-    CppParser parser;
-    parser.setInput(in);
-    ConversionData cd;
-    QSet<QString> inclusions;
-    parser.setTranslator(&translator);
-    parser.parse(context, cd, QStringList(), inclusions);
-    parser.deleteResults();
-}
-
 void loadCPP(Translator &translator, const QStringList &filenames, ConversionData &cd)
 {
     QByteArray codecName = cd.m_codecForSource.isEmpty()
diff --git a/src/linguist/lupdate/lupdate.h b/src/linguist/lupdate/lupdate.h
index 2f90644..3f3095a 100644
--- a/src/linguist/lupdate/lupdate.h
+++ b/src/linguist/lupdate/lupdate.h
@@ -75,7 +75,6 @@ Translator merge(
     const Translator &tor, const Translator &virginTor, const QList<Translator> &aliens,
     UpdateOptions options, QString &err);
 
-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 loadUI(Translator &translator, const QString &filename, ConversionData &cd);
diff --git a/src/linguist/lupdate/ui.cpp b/src/linguist/lupdate/ui.cpp
index c99958d..5584a55 100644
--- a/src/linguist/lupdate/ui.cpp
+++ b/src/linguist/lupdate/ui.cpp
@@ -102,15 +102,7 @@ bool UiReader::startElement(const QString &namespaceURI,
     Q_UNUSED(namespaceURI);
     Q_UNUSED(localName);
 
-    if (qName == QLatin1String("item")) { // UI3 menu entries
-        flush();
-        if (!atts.value(QLatin1String("text")).isEmpty()) {
-            m_source = atts.value(QLatin1String("text"));
-            m_isTrString = true;
-            if (!m_cd.m_noUiLines)
-                m_lineNumber = m_locator->lineNumber();
-        }
-    } else if (qName == QLatin1String("string")) {
+    if (qName == QLatin1String("string")) {
         flush();
         if (!m_insideStringList)
             readTranslationAttributes(atts);
@@ -139,8 +131,6 @@ bool UiReader::endElement(const QString &namespaceURI,
     } else if (qName == QLatin1String("comment")) { // FIXME: what's that?
         m_comment = m_accum;
         flush();
-    } else if (qName == QLatin1String("function")) { // UI3 embedded code
-        fetchtrInlinedCpp(m_accum, m_translator, m_context);
     } else if (qName == QLatin1String("stringlist")) {
         m_insideStringList = false;
     } else {
-- 
2.7.4