summaryrefslogtreecommitdiffstats
path: root/tools/linguist/shared
Commit message (Collapse)AuthorAgeFilesLines
* optimization: get rid of QString::fromUtf16() usageOswald Buddenhagen2010-02-011-1/+1
| | | | | | | | | | | | QString::fromUtf16() is slow - it does a BOM check and optionally byte swapping, which is utterly pointless when converting internal data structures which are raw utf16 in host byte order anyway. so replace it with QString::fromRawData() (for short-lived strings) or QString(const QChar *, int) (otherwise) if possible. Reviewed-by: axis Reviewed-by: mariusSO Reviewed-by: Bill King
* don't falsely complain about mismatched codecfortrOswald Buddenhagen2010-01-271-0/+1
| | | | normalize the user input first
* unshare pro post-processing codeOswald Buddenhagen2010-01-273-189/+0
| | | | | lrelease needs only the TRANSLATIONS value anyway, so there is hardly anything to share for real
* do not sort the TS filesOswald Buddenhagen2010-01-271-2/+1
| | | | really no point in doing so ...
* Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2010-01-1320-20/+20
|\ | | | | | | | | Conflicts: tests/auto/linguist/lupdate/testlupdate.cpp
| * Update copyright year to 2010Jason McDonald2010-01-0620-20/+20
| | | | | | | | Reviewed-by: Trust Me
* | QFile cannot deal with crlf-translated stdio, so use binary modeOswald Buddenhagen2010-01-121-0/+12
|/ | | | | | | of course, this will break if somebody actually pipes in windows files. oh, well. Suggested-by: joao
* make qph use language attributesOswald Buddenhagen2009-11-251-5/+18
|
* the definition needs xml escaping, tooOswald Buddenhagen2009-11-251-1/+1
|
* don't write context into <definition> fieldOswald Buddenhagen2009-11-251-3/+2
| | | | | | there is really no point in doing so Reviewed-by: hjk
* qph: don't clobber <definition> fieldsOswald Buddenhagen2009-11-251-1/+1
| | | | | | | | | | the translator comment field is not written out, so reading the definition into it is basically discarding it as far as any roundtrips which arrive at qph again are concerned. the message's disambiguation seems most suitable for the task. Reviewed-by: hjk Task-number: QTBUG-4498
* fix class/struct mismatch in the bootstrap magicOswald Buddenhagen2009-11-251-2/+4
| | | | | | qlocale.h includes qobjectdefs.h which forward-declares it as a class. Reviewed-by: aportale
* fix encodings, take NOswald Buddenhagen2009-11-202-5/+11
| | | | | Task-number: QTBUG-4499 Task-number: QTBUG-5276
* don't overwrite explicitly specified CODECFORTR on UTF-16 inputOswald Buddenhagen2009-11-191-1/+1
|
* build lrelease bootstrappedOswald Buddenhagen2009-11-104-0/+49
| | | | | | | | needed for build-time qm generation in qt itself. the downsides are a) that the other bootstrapped tools grow by ~12kB (on x86) due to qdatastream being pulled in by qbytearray and qstring and b) that lrelease isn't l10n'd itself anymore (the latter could be fixed by building a non-qobject qtranslator).
* record id-based messages even if they have an empty sourceOswald Buddenhagen2009-11-061-2/+2
| | | | | | this makes sense if one uses lupdate only for validation purposes, i.e. to find out if the code uses only ids which are defined in some external specification.
* handle messages with ids (more) correctlyOswald Buddenhagen2009-11-062-36/+100
| | | | | when comparing two messages which both have ids, compare only the ids. this affects finding/reporting duplicates and merging.
* kill TranslatorMessage::operator==() and qHash(TranslatorMessage)Oswald Buddenhagen2009-11-064-27/+25
| | | | preparation work ...
* eliminate TranslatorMessagePtr from the Translator apiOswald Buddenhagen2009-11-063-39/+41
|
* improve ordered message insertionOswald Buddenhagen2009-11-061-1/+1
| | | | | | | | | in a ts file, the top level categorization are the contexts, so it makes no sense to make messages adjoint by file when the context is different. a more clever algorithm which tries to order the entire contexts is conceivable. that would be advantageous for files which use multiple contexts subsequentially if each context appears in only one file.
* eliminate Translator::contains()Oswald Buddenhagen2009-11-063-11/+11
| | | | replace the one use case with something more efficient
* eliminate Translator::replace()Oswald Buddenhagen2009-11-062-10/+0
|
* do not consider plural source in comparisonsOswald Buddenhagen2009-11-061-4/+0
| | | | | | | | two messages with identical singular but different plural sources simply make no sense. this should be quite a bit faster, as it saves lots of QHash<QString,...> lookups.
* remove unused TranslatorMessage::operator<()Oswald Buddenhagen2009-11-062-12/+0
| | | | it was once needed for QMap, but we don't use that any more
* don't construct a new message for look-up purposes onlyOswald Buddenhagen2009-11-062-10/+0
|
* add -markuntranslated optionOswald Buddenhagen2009-11-042-16/+20
| | | | maemo *really* want it, so pushing it in now ...
* consider message id when comparing messagesOswald Buddenhagen2009-10-221-2/+6
|
* id-based: do not drop unfinished untranslated messagesOswald Buddenhagen2009-10-221-1/+1
| | | | otherwise the fallback to use the source string is rather pointless
* id-based: use source strings instead of empty translations only for ↵Oswald Buddenhagen2009-10-221-3/+4
| | | | unfinished messages
* Merge branch '4.5' into 4.6Thiago Macieira2009-09-301-4/+11
|\
| * Fix locale encoding in XLIFF filesAndy Shaw2009-09-301-4/+11
| | | | | | | | | | | | xlf uses xx-YY notation instead of xx_YY Reviewed-by: ossi
| * Update license headers again.Jason McDonald2009-09-0828-112/+112
| | | | | | | | Reviewed-by: Trust Me
| * Add missing license headersJason McDonald2009-09-031-0/+40
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-09-021-3/+0
| | | | | | | | Reviewed-by: Trust Me
* | Update license headers again.Jason McDonald2009-09-0920-80/+80
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-3120-260/+260
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
| * Update tech preview license header.Jason McDonald2009-08-3127-351/+351
| | | | | | | | Reviewed-by: Trust Me
| * remove withdrawn attributes (and fix syntax)Oswald Buddenhagen2009-08-141-9/+0
| |
| * Update license headers.Jason McDonald2009-08-1127-27/+27
| | | | | | | | Reviewed-by: Trust Me
| * Fix compilation with xlC 7: operands to ?: must match.Thiago Macieira2009-08-071-2/+2
| | | | | | | | | | | | | | See 3ae2cab9c8bd1790a00da2755ac036143a3a35f4 for another similar fix. Reviewed-by: Trust Me (cherry picked from commit 18fbfdf0f774198e2e1277e064cc3a8eb9dbb29d)
| * Fix compilation with xlC 7: operands to ?: must match.Thiago Macieira2009-08-071-1/+1
| | | | | | | | | | | | | | "../shared/qm.cpp", line 556.45: 1540-0207 (S) No common type found for operands with type "const char [7]" and "QByteArray". Reviewed-by: Trust Me (cherry picked from commit 3ae2cab9c8bd1790a00da2755ac036143a3a35f4)
* | qmake's include function now supports three argumentsKeith Isdale2009-08-141-2/+4
| | | | | | | | | | | | | | The second and third arguments to qmake's include function are optional Task-number: 259398 Reviewed-by: Stian Sandvik Thomassen
* | Update contact URL in license headers.Jason McDonald2009-08-1220-20/+20
| | | | | | | | Reviewed-by: Trust Me
* | nicer way to deal with missing support for template class friendsOswald Buddenhagen2009-08-062-4/+13
| |
* | Fix compilation with xlC 7: operands to ?: must match.Thiago Macieira2009-07-311-2/+2
| | | | | | | | | | | | See 3ae2cab9c8bd1790a00da2755ac036143a3a35f4 for another similar fix. Reviewed-by: Trust Me
* | Fix compilation with xlC 7: operands to ?: must match.Thiago Macieira2009-07-301-1/+1
| | | | | | | | | | | | "../shared/qm.cpp", line 556.45: 1540-0207 (S) No common type found for operands with type "const char [7]" and "QByteArray". Reviewed-by: Trust Me
* | sunpro doesn't like templated friend classes, eitherOswald Buddenhagen2009-07-212-2/+2
| |
* | Fix static leak to make valgrinding easier.dt2009-07-201-63/+61
| | | | | | | | | | | | Reviewed-By: ossi cherry-picked 98f8fc78bc0f8bcc0e36f19f9728d21063379a51 from creator
* | micro-optimize: (x.toLower() == y) => !x.compare(y, Qt:: CaseInsensitive)Oswald Buddenhagen2009-07-201-10/+10
| | | | | | | | cherry-picked dc0bc586462e2a74fba38f054d303d2226eec4e5 from creator
* | fix return value of error() & coOswald Buddenhagen2009-07-201-1/+2
| | | | | | | | cherry-picked bd0f0aa182b1422b942ae8efdc773c1a92344eb5 from creator