summaryrefslogtreecommitdiff
path: root/src/libs/cplusplus/SimpleLexer.cpp
Commit message (Collapse)AuthorAgeFilesLines
* CPlusPlus: Make (sub-)languague selection more generichjk2013-10-151-42/+10
| | | | | Change-Id: I4e2df6992b446adec662ab07671acd41715e41fd Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* fix include style relating to cplusplus librariesOswald Buddenhagen2013-04-031-3/+3
| | | | | | | | | | | ... 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>
* | C++: Highlight argument to gcc's #include_next extension properlyhjk2013-01-041-0/+3
|/ | | | | Change-Id: I90097e11689fbbb964fc4344a1e3ba60c718a1cf Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* rename QtDebug to QDebughjk2012-08-061-1/+1
| | | | | | | More uniform. Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2 Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* C++: Initialize memberLeandro Melo2012-06-281-1/+2
| | | | | Change-Id: Ifb708cb875aa1403de66a4c3302f70e0d1b4d2ac Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* C++: Enabled C++0x in SimpleLexerLeandro Melo2011-11-181-0/+11
| | | | | | | We should create a UI flag for C++0x... Change-Id: Iba30090aa580554af629c0fb59ae5fc22b306b80 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* 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>
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Update license.hjk2011-04-131-14/+13
|
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* License headers.con2010-12-171-7/+11
|
* More completion fixes.Erik Verbruggen2010-07-061-1/+1
|
* Fixed completion for doxygen comments.Erik Verbruggen2010-07-061-1/+1
|
* C++: Remember joined state in SimpleLexer.Christian Kamm2010-07-021-2/+10
| | | | Done-with: Erik Verbruggen
* Removing SimpleTokenErik Verbruggen2010-07-021-62/+18
|
* Removed the TokenCache.Erik Verbruggen2010-07-021-0/+32
|
* Introduced token caching to prevent repetetive tokenizing.Erik Verbruggen2010-06-141-5/+4
| | | | | | Also removed TokenUnderCursor as it's functionality is in the token cache. Reviewed-by: ckamm
* Fixed #import completion to act the same as #include completion.Erik Verbruggen2010-03-231-0/+4
|
* Long live the king!hjk2010-03-051-1/+1
|
* Revert "Split Objective-C keyword parsing to handle the '@' separately."Erik Verbruggen2010-02-151-1/+1
| | | | This reverts commit 2a59d2ae0c889fe6e4ac50a3f110b0103f880c15.
* Split Objective-C keyword parsing to handle the '@' separately.Erik Verbruggen2010-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | Because apparently, while designing the Objective-C language, somebody thought it was a world-class idea to allow any white-space between the '@' character and the subsequent keyword. With this fix, we now correctly parse: @ dynamic and: @ selector and: @"foo" "bar" @"mooze" (This last one is 1 single string split over multiple lines.) Wonderful, isn't it? What we (and Clang) do not support, but what GCC supports is something like: @"foo"@@ "bar" @"mooze" @@ which is equivalent to @"foobarmooze".
* Renamed method.Erik Verbruggen2010-02-041-1/+1
|
* Small inclusion fixes.Tobias Hunger2010-01-081-1/+2
| | | | | | | * Remove duplicate headers. * Move own headers to the top. Reviewed-by: Roberto Raggi
* Syntax highlighting for Objective-C identifiers (super, self, nil, Nil, ↵Erik Verbruggen2009-10-091-1/+4
| | | | _cmd, SEL, IMP, BOOL, YES, NO, id).
* Introduced T_CPP_COMMENT and T_CPP_DOXY_COMMENT to handle C++-style comments ↵Roberto Raggi2009-09-291-1/+2
| | | | | | and improved CPPEditor::isInComment to handle the newly introduced tokens. As side effect,this change should fix the regression we introduced in the "automagically" quote/brace insertion.
* Made the indenter more Qt friendly. Added support for moc keywords.Roberto Raggi2009-09-211-13/+0
|
* Use the backward scanner to indent labeled statements, ctor-initializers and ↵Roberto Raggi2009-09-211-5/+31
| | | | access specifiers.
* long live the kinghjk2009-08-141-1/+1
|
* Compile the C++ parser library with Sun CC 5.9.Thiago Macieira2009-08-031-2/+2
| | | | | | | | | | | | Things you mustn't do: 1) end an enum with a comma 2) #include <cxxxx> and not use std:: 3) use anonymous structures All three things are invalid C++. Anonymous structures inside anonymous unions are allowed by GCC, but that doesn't mean it's valid.
* Oops! operators are not objc keywords :)Roberto Raggi2009-07-131-1/+1
|
* Fixed a few typos and bugs in the ObjC++ support.Roberto Raggi2009-07-131-0/+5
|
* Update license headers and sales contact details.Jason McDonald2009-06-171-2/+2
| | | | Reviewed-by: Trust Me
* Fixes: change file license headers to include LGPLhjk2009-02-251-21/+17
|
* Initial support for doxygen comments.Roberto Raggi2009-02-201-0/+5
|
* Fixes: Enable ObjC support.Roberto Raggi2009-02-051-1/+3
|
* Bump year in licence header.Daniel Molkentin2009-01-131-1/+1
|
* More ObjC++Roberto Raggi2009-01-091-7/+6
|
* Added objcEnabled()/setObjcEnabled() to SimpleLexer.Roberto Raggi2009-01-081-1/+14
|
* chancge Nokia GPL exception version from 1.2 to 1.3hjk2008-12-161-1/+1
|
* off-by-one in headershjk2008-12-021-1/+0
|
* end-of-line whitespace correction of the new headershjk2008-12-021-10/+11
|
* more cosmetic changeshjk2008-12-021-7/+22
|
* Initial importcon2008-12-021-0/+117
View Lorry Controller Status