summaryrefslogtreecommitdiff
path: root/src/plugins/beautifier
Commit message (Collapse)AuthorAgeFilesLines
* TextEditor: More BaseText* -> Text* renamingshjk2014-09-262-6/+6
| | | | | | | *Document* and *Layout* classes, all basetext* files Change-Id: I1c6e376733a434fcb5c7f19c6210dfa031eeafde Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Use Q_DECL_OVERRIDE instead of QTC_OVERRIDEThomas Hartmann2014-09-2511-43/+32
| | | | | | | | | This patch removes src/libs/utils/qtcoverride.h and uses Q_DECL_OVERRIDE from Qt 5 instead. Change-Id: I61ffa539648ffe996dc061eec7708c04580c0f09 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Remove Qt version checks.Christian Kandeler2014-09-082-8/+0
| | | | | | | | Qt 5.3 is the minimum requirement these days. Remove all fallback code from sources and project files. Change-Id: If6188a471197acadda4d6baee71804ba1a8026c6 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Replace QLatin1String("x") with QLatin1Char('x') where possibleKai Koehne2014-09-041-1/+1
| | | | | Change-Id: I2f90c8ae7b5e968b9de882833f8661ab540a9232 Reviewed-by: hjk <hjk121@nokiamail.com>
* ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec filesEike Ziller2014-09-022-18/+20
| | | | | | | | Change-Id: I2b2c704260c613985a4bda179658ec1f8879e70f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Do not use deprecated Qt functionality.Christian Kandeler2014-08-292-2/+2
| | | | | | | | | | | | | | | Replace all* remaining deprecated Qt 4 functions with their Qt 5 counterparts. This means we no longer need to define the QT_DISABLE_DEPRECATED_BEFORE macro. This patch is relatively small because most source-compatible changes of this kind have been done before. * The one exception is the QmlDesigner, which uses QWeakPointer in a deprecated way all over the place. Change-Id: Id4b839c6685f3b5bdf2b89137f95231758ec53c7 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* TextEditor: Introduce some convenience text accessors in the editorhjk2014-08-272-10/+9
| | | | | | | And adjust users. Change-Id: I9329257cfa5f3298731deb07c2881bc37d9a051d Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* ExtensionSystem: Remove Qt4 supportEike Ziller2014-08-271-2/+0
| | | | | | | | Remove usage of the Q_EXPORT_PLUGIN macros, which do not exist in Qt 5. Change-Id: I678c3cf10b9c5d5c1b9f252b0ecd1c97dc810a47 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Use Qt 5's QStringList::join(QChar)hjk2014-08-253-3/+3
| | | | | | | Less typing and less cycles than join(QString) where appropriate Change-Id: I6ebc0e17e4d7fd9845864dd95b7de4ba4dad6906 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* "foreach (QString" -> "foreach (const QString &"Alessandro Portale2014-07-241-3/+3
| | | | | Change-Id: Idb866407347722766edbc85ce20799b088ce36dd Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Beautifier: Add @2x icon variantLorenz Haas2014-07-154-3/+4
| | | | | Change-Id: I839bdd215a9f70d2641a159166bda9f90db555e0 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Beautifier: Handle CRLF for Artistic Style on Windows correctlyLorenz Haas2014-07-104-2/+25
| | | | | | | | Artistic Style will return CRLF on Windows if you are using a pipe. Thus we have to convert it. Change-Id: Id24cac2f35cc3c1978d709fb6c66cee8c8814e34 Reviewed-by: David Schulz <david.schulz@digia.com>
* Beautifier: Fix Qt4 compileChristian Stenger2014-07-091-0/+1
| | | | | Change-Id: I2cb89df7bc7faf41f63fa92f7a3028f392014931 Reviewed-by: David Schulz <david.schulz@digia.com>
* Beautifier: Format current file asynchronousLorenz Haas2014-07-098-34/+142
| | | | | | | The formatting tool is now called asynchronous. Change-Id: I0415611655a584ba0275f4bccd065ea1182f83dc Reviewed-by: David Schulz <david.schulz@digia.com>
* Beautifier: Harmonize setting's translatable stringsLorenz Haas2014-06-233-4/+4
| | | | | | Change-Id: I9b0a4b305415e1f97353bd4ebc2631634cebd1cb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Beautifier: Fix ArtisticStyleSettingsRobert Loehning2014-05-302-6/+9
| | | | | | | Done-by: Eike Ziller <eike.ziller@digia.com> Change-Id: I6dd22f9519d4b14345d27ed2128559efac2cb697 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Beautifier: Fix compilation with Qt4Orgad Shaneh2014-05-281-1/+2
| | | | | Change-Id: I9e0af6b552c8e7da016fb1a9561a03ffacf1f981 Reviewed-by: hjk <hjk121@nokiamail.com>
* Beautifier: Remove duplicate includeOrgad Shaneh2014-05-281-1/+0
| | | | | Change-Id: Icb04c0f5b6675e63286aff27acf7ad570d747301 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Beautifier: Add -assume-filename to clang-formatAdam Strzelecki2014-05-281-0/+1
| | | | | | | | | | Otherwise -style=file will be unusable, since clang-format needs to know original file path in order to resolve .clang-format file location. Change-Id: I0581cbcdf5770eed98179fe37d5517f648d7b826 Reviewed-by: Lorenz Haas <lykurg@gmail.com> Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* Beautifier: Fix compilationChristian Stenger2014-05-281-0/+1
| | | | | | | Error introduced with ca433d9b2f20ad565ceecbae5357b4c81e580d9e. Change-Id: I4b9604c20dd28b5b8843c0e476cd480d6191f904 Reviewed-by: David Schulz <david.schulz@digia.com>
* Beautifier: Compile fix on Linuxhjk2014-05-281-0/+1
| | | | | Change-Id: I335e4e0304b3f57eec8e8a85222a900e20ed70ce Reviewed-by: hjk <hjk121@nokiamail.com>
* Beautifier: Add new class Command and option to format text via pipingLorenz Haas2014-05-2814-63/+350
| | | | | | | | | | | The tool's formatting command is now enclosed in Command. For the formatting itself it can be defined whether to use a temporary file or the pipe. Additionally, settings can return the current tool's version - if needed. Change-Id: I0e242c3e8016ed77cad92cc97a19fe3384dda858 Reviewed-by: David Schulz <david.schulz@digia.com>
* Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-05-281-1/+2
|\
| * Beautifier: create temporary file in input file dirPrzemyslaw Gorszkowski2014-05-261-1/+2
| | | | | | | | | | | | | | | | | | It fixes finding .clang-format file for "clang-format -style=file" Task-number: QTCREATORBUG-12057 Change-Id: Idd02de1535eef30e1a1eaf146ef0f9ac9d54c5fa Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Cleanup: Remove searchKeywords from optionspage widgetsTobias Hunger2014-05-266-84/+6
| | | | | | | | | | | | | | | | | | | | If no specialization is provided then the UI strings are searched. So get rid of extra code collecting all those strings in a lot of places. Change-Id: Ibcb48a67e5c7b74e5960fe38b1cb2f74259b503a Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Use double quotes instead of single quotes as per our guidelines.Christian Kandeler2014-04-221-1/+1
| | | | | | | | | | Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | Merge remote-tracking branch 'origin/3.1'Oswald Buddenhagen2014-03-274-2/+8
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
| * Beautifier: Replace $HOME with it's actual valueLorenz Haas2014-03-194-2/+8
| | | | | | | | | | | | | | | | | | Instead of having options texts like "Use file $HOME/abc", $HOME is eliminated in favor of the actual value of QDir::home(). Change-Id: I9ffe27d73e54a9d30e1f0d4a277fbfbb7969ed45 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Merge remote-tracking branch 'origin/3.1'Oswald Buddenhagen2014-03-182-3/+4
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: qbs/imports/QtcTool.qbs src/plugins/git/giteditor.cpp src/plugins/qmldesigner/qmldesignerplugin.cpp Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
| * Beautifier: Small, paranoid local caching in the hope for gaining speedLorenz Haas2014-03-181-2/+3
| | | | | | | | | | | | | | | | Avoid that QDir::home() is potentially called twice. Change-Id: I9fca53f800be74f05d941cf9baa34eecb6c899cb Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: David Schulz <david.schulz@digia.com>
| * use new base import style in qbs filesJoerg Bornemann2014-03-111-1/+1
| | | | | | | | | | | | Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/3.1'Oswald Buddenhagen2014-03-1110-12/+50
|\ \ | |/ | | | | | | | | | | | | Conflicts: README tests/auto/debugger/tst_dumpers.cpp Change-Id: Ib9aef37a246bc3bb9bca0c32a902af3b09ef3146
| * Beautifier: add punctuation to messagesLeena Miettinen2014-03-071-1/+1
| | | | | | | | | | | | Change-Id: I7cba7d2d88459c26af31d89a2fd3cd31b6fbe62d Reviewed-by: Lorenz Haas <lykurg@gmail.com> Reviewed-by: hjk <hjk121@nokiamail.com>
| * Beautifier: Add constant for a tool's display nameLorenz Haas2014-03-076-9/+11
| | | | | | | | | | | | Change-Id: I9cc50ad06d7515f5fc82394cbfb71e7327e7d9e1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com>
| * Reduce message duplication in Beautifier plugin.Friedemann Kleint2014-03-058-9/+45
| | | | | | | | | | Change-Id: I5216dd2e62e32ed889a71ebcad3f89baf0e0ff1b Reviewed-by: David Schulz <david.schulz@digia.com>
* | Editors: Move id() from editor to document.Eike Ziller2014-03-053-3/+6
|/ | | | | | Change-Id: Ib81076842ab1c16832224790194b001206404d64 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Normalize connect()Robert Loehning2014-02-281-2/+2
| | | | | Change-Id: I1e4098f6aaff5a75dea2e786f3f4404ed7e6ba76 Reviewed-by: David Schulz <david.schulz@digia.com>
* Beautifier: edit UI textLeena Miettinen2014-02-259-17/+17
| | | | | | | | | Make error message wording more consistent. Fix some punctuation and grammar issues. Change-Id: I21298fea201ff51635d4b6fa9f57445bc94dd0db Reviewed-by: Lorenz Haas <lykurg@gmail.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Beautifier: Fix possible endless loopLorenz Haas2014-02-211-2/+5
| | | | | | Change-Id: Ib2f98c2d761ea9abfd6a42ec30cf8318ee7bd575 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* Beautifier: Use QXmlStreamReader instead of QDomDocumentLorenz Haas2014-02-191-24/+26
| | | | | Change-Id: I6346933d6efe0709930fde74483dc31e278a3aed Reviewed-by: David Schulz <david.schulz@digia.com>
* Beautifier: Prevent writing of an empty documentation fileLorenz Haas2014-02-192-12/+30
| | | | | | | | | Only keep successfully created documentation files. Thus the automatic generation of a file can be triggered again. Change-Id: I8ec3becfd2f3387f18635741dd11288cb72c372d Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* Beautifier: Fix include in UI file.Christian Kandeler2014-02-181-1/+1
| | | | | | | | | Using a local include is not guaranteed to work, as the generated ui header file will not be necessarily be located alongside the included header. Change-Id: Ia154918d79a65912e4356fe1bb4abdfc75e3dc32 Reviewed-by: David Schulz <david.schulz@digia.com>
* Beautifier: Fix Qt4 compile.David Schulz2014-02-187-9/+27
| | | | | Change-Id: Ifbd01628b28abe6879d30d43f8bd1f389988086f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Introduce new Beautifier plug-inLorenz Haas2014-02-1844-0/+4639
Beautifier is a plug-in for source code beautifiers. Currently Artistic Style, Clang-format and Uncrustify are supported. Task-number: QTCREATORBUG-7489 Change-Id: I8dde9a8ba6a6a55537bfd450ec82ef966ed283c0 Reviewed-by: David Schulz <david.schulz@digia.com>