summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppcodeformatter.cpp
Commit message (Collapse)AuthorAgeFilesLines
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* C++: Use Token::utf16chars{Begin,End} where appropriateNikolai Kosjar2014-05-231-6/+6
| | | | | | | | ...especially in CppTools/CppEditor where the offsets are used with a QString/QTextDocument. Change-Id: Ic6d18fbc01fb9cc899a9bd2d7424cd2edae487f1 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* CppTools: Fix indentation of stream operators after stringOrgad Shaneh2014-05-161-6/+14
| | | | | | Task-number: QTCREATORBUG-12053 Change-Id: Ia34165d860bd7fd371a84a8349bed7a3fe1c01a9 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* C++: Clarify units of a TokenNikolai Kosjar2014-05-151-6/+6
| | | | | | | | | | | | | This will avoid confusion when later more length and indices methods are added. In Token: length() --> bytes() begin() --> bytesBegin() end() --> bytesEnd() Change-Id: I244c69b022e239ee762b4114559e707f93ff344f Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* CppTools: Fix indentation for concatenated stringsOrgad Shaneh2014-03-311-0/+15
| | | | | Change-Id: I801a56804e7873be75a9ebc085dc3f4a2d64ea35 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* CppTools: Fix indent after ">>" in return typeDave Lewis2014-03-251-0/+1
| | | | | | | | | Add case for ">>" token in declaration_start state to prevent falling through to stream_op. Task-number: QTCREATORBUG-9199 Change-Id: I53710be55eff4574de89f9159e95bbc1de2ba34e Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* CppTools: Fix indent after template paramsDave Lewis2014-03-251-0/+1
| | | | | | | | Add case for ">>" token when in template_param state. Task-number: QTCREATORBUG-9640 Change-Id: Icc5fc868202d6503d2afd954aa739cd2634cdff1 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Fix some typosSergio Ahumada2014-03-051-1/+1
| | | | | | Change-Id: I3be73c2a4d256a0d28e863fd2517a4d7442b34d8 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* C++: fix indentation for static var decls of anonymous classes.Erik Verbruggen2014-02-271-0/+3
| | | | | | | Task-number: QTCREATORBUG-11392 Change-Id: Ie5dd9014383b639e63653e8abc856fea9e620e49 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* C++: Fix support for incremental input with \nOrgad Shaneh2014-02-041-2/+3
| | | | | | | | | | | | Also fix false positive line continuation on blank line e.g. "foo \ bar" Change-Id: Ic6d345a4b578c955411d119b8438c8dc5065c072 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* C++: Store token kind as lexer stateOrgad Shaneh2014-01-201-4/+4
| | | | | | | ... when needed Change-Id: I32a1649c87e1fa42da80eff5003b2f5714062064 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* CPlusPlus: Make (sub-)languague selection more generichjk2013-10-151-2/+7
| | | | | Change-Id: I4e2df6992b446adec662ab07671acd41715e41fd Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Reduce usage of QStringRef::toString() in cppcodeformatter.cpp.Friedemann Kleint2013-08-291-1/+1
| | | | | Change-Id: Iff4634c3bd3829d236e3dd38e4d29ced5f118db6 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Fix coding style for else statementsOrgad Shaneh2013-07-171-2/+2
| | | | | Change-Id: I1309db70e98d678e150388c76ce665e988fdf081 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* C++: handle braced return statements in indenter.Erik Verbruggen2013-06-031-0/+2
| | | | | | | Task-number: QTCREATORBUG-9314 Change-Id: I59c026cce02b85eeb54f4d10d5c9fb0c59bfe28a Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Clean headers in CppTools.Friedemann Kleint2013-04-101-6/+0
| | | | | | | | Ran script to remove inludes on a trial-and-error basis and manually corrected it. Change-Id: Ic8464ea084ca1ab401e9f4a7d0183b92b4038902 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* fix include style relating to cplusplus librariesOswald Buddenhagen2013-04-031-4/+5
| | | | | | | | | | | ... and adjust INCLUDEPATH accordingly. while i'm at messing with include statements, also re-order the include blocks according to policy and sort them within bigger blocks. Change-Id: I7762abfd7c4ecf59432b99db2f424e4fa25733a5 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-081-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #!/usr/bin/env ruby Dir.glob('**/*.cpp') { |file| # skip ast (excluding paste, astpath, and canv'ast'imer) next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i s = File.read(file) next if s.include?('qlalr') orig = s.dup s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m| res = $& if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces res else res.gsub!('} else', 'else') res.gsub!(/\n +} *\n/m, "\n") res.gsub(/ *{$/, '') end } s.gsub!(/ *$/, '') File.open(file, 'wb').write(s) if s != orig } Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc Reviewed-by: hjk <qthjk@ovi.com>
* | Add whitespace after control keywordsOrgad Shaneh2012-11-281-1/+1
| | | | | | | | | | | | | | | | find -name \*.cpp -o -name \*.h | \ xargs sed -Ei 's/ (for|foreach|if|switch|while)\(/ \1 (/g' Change-Id: I9efdff4bf0c8c01a52baaaeb75198483c77b0390 Reviewed-by: hjk <qthjk@ovi.com>
* | 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
View Lorry Controller Status