summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppcodeformatter.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* | Clean up whitespace before EOLOrgad Shaneh2012-11-281-2/+2
| | | | | | | | | | Change-Id: I385544a10b9be66589b0d1a48594128035836c8a Reviewed-by: hjk <qthjk@ovi.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-051-21/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessageloghandler.h src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/madde/maemodeployconfigurationwidget.h src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentinfo.h src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/ichecklib_global.h tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h tests/manual/ssh/tunnel/tunnel.h Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
| * Adjust license headershjk2012-10-051-21/+20
| | | | | | | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | C++11: Fix indent of brace initializers in ctor lists.Christian Kamm2012-09-191-4/+14
|/ | | | | Change-Id: Ib784df9e17ff2fe6bb249dcf8c2fee7310340f50 Reviewed-by: hjk <qthjk@ovi.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* C++: Introduce unicode char/strings supportLeandro Melo2012-06-061-0/+2
| | | | | | | | | | | | | | Those are the types char16_t and char32_t along with the new char/string literals u'', U'', u"", u8"", and U"". This is particularly important for the use of QStringLiteral since in some platforms it relies on expansion such as above. Note: The string literals quickfixes still need some tunning. Task-number: QTCREATORBUG-7449 Change-Id: Iebcfea15677dc8e0ebb6143def89a5477e1be7d4 Reviewed-by: hjk <qthjk@ovi.com>
* C++: Lambda formatting issues.Flex Ferrum2012-03-121-0/+68
| | | | | | | | Fix code formatting in cases when '{' and '}' appear within expression context (ex. lambda expression, initializer lists). Change-Id: I42b28170a8d6d5fd08a9a1a8d8e7698219c18966 Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-5/+5
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* C++: Replace non-absolute-critical asserts for soft onesLeandro Melo2012-01-241-5/+6
| | | | | Change-Id: I021074a78d90929b4e83b8aff9db1ae7995e8c6a Reviewed-by: hjk <qthjk@ovi.com>
* C++ indenter: Improve member initializer indent.Christian Kamm2011-12-081-4/+22
| | | | | | | | If you indent the first initializer differently, that will now stick for the following ones. Change-Id: Ib08dfbf64282eda41202528b7255e693c350f7c6 Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-111-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/qmljs/qmljsinterpreter.cpp src/libs/qmljs/qmljsinterpreter.h src/plugins/debugger/qml/scriptconsole.cpp src/plugins/git/gitplugin.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
| * all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | | | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | C++ indenter: Accept attributes in access specifiers.Christian Kamm2011-10-111-1/+17
|/ | | | | | | | Change-Id: Ie85b8264c9579e8c8312e30018280fb11f95edda Reviewed-on: http://codereview.qt-project.org/6328 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com> Sanity-Review: Erik Verbruggen <erik.verbruggen@nokia.com>
* C++ indenter: Fix preserving indent in comments with tabs.Christian Kamm2011-09-211-1/+1
| | | | | | | Task-number: QTCREATORBUG-6151 Change-Id: I584666441dce05af9a91cd28812b230c36bdd830 Reviewed-on: http://codereview.qt-project.org/5318 Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* C++ indenter: Make continuations after ( consistent.Christian Kamm2011-07-061-4/+1
| | | | | | Change-Id: Iae780127065e3fce274db10e173f5c0bde15bd92 Reviewed-on: http://codereview.qt.nokia.com/1229 Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
* C++ indenter: Fix function declaration continuation indent.Christian Kamm2011-07-061-9/+13
| | | | | | Change-Id: I0ebe1f0f531cb4830f80b80c6bb52caeaee01353 Reviewed-on: http://codereview.qt.nokia.com/1167 Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
* C++ indenter: Fix multiple initializers.Christian Kamm2011-06-011-0/+2
| | | | | | | | Task-number: QTCREATORBUG-4993 Change-Id: I0f7d541eb7b26c37b8167e30e2949b6b939fe4b8 Reviewed-on: http://codereview.qt.nokia.com/297 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* C++ indenter: Fix indent in body of function with default argument.Christian Kamm2011-05-301-0/+2
| | | | | | Change-Id: I9d4f5b3ae7b8a59f8350cf756979a3a430398112 Reviewed-on: http://codereview.qt.nokia.com/206 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Make C++ code style configurable.Christian Kamm2011-05-241-129/+178
| | | | | | | | | | | | | | Change-Id: Iaf08edb2361146e6b5e1cbafdb716a23c938875b Done-with: Jarek Kobus Task-number: QTCREATORBUG-2670 Task-number: QTCREATORBUG-4310 Task-number: QTCREATORBUG-2763 Task-number: QTCREATORBUG-3623 Task-number: QTCREATORBUG-567 Reviewed-on: http://codereview.qt.nokia.com/74 Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* C++ indenter: Treat extern "C" like namespace.Christian Kamm2011-05-191-0/+23
| | | | | | | Change-Id: Ib0553d35fbd83aada2b8809aa008b1f75ca77c32 Done-with: Erik Verbruggen Reviewed-on: http://codereview.qt.nokia.com/14 Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
* C++ indenter: Fix extra specifier in return type of func decl.Christian Kamm2011-05-191-0/+2
| | | | | | | | | Like struct Foo bar() { } Change-Id: I946937c23d1660909757952a5a3bd400c4781826 Reviewed-on: http://codereview.qt.nokia.com/13 Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Fix more krazy warnings.Friedemann Kleint2011-04-191-1/+1
|
* Update license.hjk2011-04-131-14/+13
|
* C++ indenter: Fix for use of << and >> in parentheses.Christian Kamm2011-03-151-1/+2
| | | | Task-number: QTCREATORBUG-4076
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* C++: Add parsing of Q_PRIVATE_PROPERTY.Christian Kamm2011-01-041-0/+1
| | | | Reviewed-by: Roberto Raggi
* Merge branch '2.1'con2010-12-171-7/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/basemode.cpp src/plugins/coreplugin/basemode.h src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp src/plugins/debugger/debuggeragents.cpp src/plugins/debugger/debuggeruiswitcher.cpp src/plugins/debugger/debuggeruiswitcher.h src/plugins/projectexplorer/buildconfigdialog.cpp src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp src/plugins/qmldesigner/components/propertyeditor/colorwidget.h src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h src/plugins/qmldesigner/designercore/include/modelutilities.h src/plugins/qmldesigner/designercore/include/nodeinstance.h src/plugins/qmldesigner/designercore/include/propertymetainfo.h src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp src/plugins/qmldesigner/designercore/model/modelutilities.cpp src/plugins/snippets/inputwidget.cpp src/plugins/snippets/snippetscompletion.cpp src/plugins/snippets/snippetscompletion.h src/plugins/snippets/snippetspec.cpp src/plugins/snippets/snippetsplugin.cpp src/plugins/snippets/snippetswindow.cpp src/plugins/snippets/snippetswindow.h src/plugins/texteditor/snippetsparser.cpp src/tools/qml/qmldom/main.cpp tests/manual/trk/runner.cpp tests/manual/trk/trkolddevice.cpp tests/manual/trk/trkolddevice.h tests/manual/trk/trkserver.cpp
| * License headers.con2010-12-171-7/+11
| |
* | C++ indenter: Fix labels.Christian Kamm2010-12-011-0/+20
| | | | | | | | Reviewed-by: Roberto Raggi
* | C++ indenter: Align to next token instead of end of current.Christian Kamm2010-11-221-15/+16
| | | | | | | | | | Task-number: QTCREATORBUG-3136 Reviewed-by: Erik Verbruggen
* | C++ indenter: Fix for GNU and Whitesmiths style switch statement.Christian Kamm2010-11-041-5/+18
|/ | | | Task-number: QTCREATORBUG-2994
* C++ indenter: Ensure indent and padding are non-negative.Christian Kamm2010-10-251-4/+20
| | | | Reviewed-by: Roberto Raggi
* C++ indenter: Fix indentation after namespace aliases.Christian Kamm2010-10-191-0/+1
| | | | | Task-number: QTCREATORBUG-2574 Reviewed-by: Roberto Raggi
* C++ indenter: Don't get confused on 'for (a in b)'.Christian Kamm2010-10-081-0/+2
| | | | | | Reviewed-by: Roberto Raggi Reviewed-by: Erik Verbruggen (cherry picked from commit c2d890f65e3d1975022aec4a70a93c53e43f38bc)
* C++ indenter: Fix member initializer indent being hardcoded to 4.Christian Kamm2010-09-271-1/+1
| | | | Task-number: QTCREATORBUG-2456
* C++ indenter: Fix error recovery in function definitions.Christian Kamm2010-09-241-2/+2
| | | | Task-number: QTCREATORBUG-1517
* C++ indenter: Add some small error recovery.Christian Kamm2010-09-241-0/+7
|
* C++ indenter: Fix indentation if template and class appear on one line.Christian Kamm2010-09-241-6/+9
| | | | Task-number: QTCREATORBUG-2427
* C++ indenter: Simplify debugging by making dump() more verbose.Christian Kamm2010-09-241-1/+4
|
* C++ indenter: Fix curly brace placement for ANSI style.Christian Kamm2010-09-151-0/+5
| | | | | | | | There was a bug in 5cd6ebfdfd94aa9745f2ca8e92c5ed24d6bc1afa which meant no reindent of the current line was triggered for the opening curly brace on a new line. Task-number: QTCREATORBUG-2331
* C++ indenter: Fix for statement indentation and add test.Christian Kamm2010-09-151-4/+8
|
* C++ indenter: Separate indent into logical indent and padding.Christian Kamm2010-09-131-53/+106
|
* C++: Only reindent on electric characters if indent wasn't user-changed.Christian Kamm2010-09-081-0/+6
| | | | | | | This should make the indenter less strict and annoying for non-standard indentation styles. Reviewed-by: Roberto Raggi
* C++ indenter: Fix nested array/struct initializers.Christian Kamm2010-08-311-4/+12
|
* C++: Fix indenting of QML_* macros.Christian Kamm2010-08-251-0/+1
| | | | Task-number: QTCREATORBUG-2111
* Indenters: Move style setup into the QtStyleCodeFormatter constructors.Christian Kamm2010-08-121-0/+27
| | | | | This makes sure styles are consistent for the editor and the quick fix engine.
* C++ indenter: Fix indent of block statements in substatement blocks.Christian Kamm2010-07-281-0/+1
| | | | Task-number: QTCREATORBUG-1919
* C++ indenter: Indent member initializer lists correctly.Christian Kamm2010-07-161-9/+29
| | | | | | | Without requiring ',' to be an electric character. Task-number: QTCREATORBUG-1866 Reviewed-by: Roberto Raggi
View Lorry Controller Status