diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-05 20:00:54 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-12 22:07:39 +0100 |
commit | 17af244afa77991cb071d10f1ce9af09c46a5397 (patch) | |
tree | 3913b34f315cc785d75eb95f580525d0c4362d92 | |
parent | cb1f26633db3e33a263555a8758f4e8a591aeab6 (diff) | |
download | qttools-17af244afa77991cb071d10f1ce9af09c46a5397.tar.gz |
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>
-rw-r--r-- | src/linguist/lupdate/cpp.cpp | 15 | ||||
-rw-r--r-- | src/linguist/lupdate/lupdate.h | 1 | ||||
-rw-r--r-- | src/linguist/lupdate/ui.cpp | 12 |
3 files changed, 1 insertions, 27 deletions
diff --git a/src/linguist/lupdate/cpp.cpp b/src/linguist/lupdate/cpp.cpp index 985781486..f3063a188 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 2f9064453..3f3095a89 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 c99958d8a..5584a551c 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 { |