summaryrefslogtreecommitdiff
path: root/src/libs/cplusplus/OverviewModel.cpp
Commit message (Collapse)AuthorAgeFilesLines
* fix include style relating to cplusplus librariesOswald Buddenhagen2013-04-031-3/+4
| | | | | | | | | | | ... 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>
| * Qt5: Compile fix for generate-ast.Nikolai Kosjar2012-11-051-1/+2
| | | | | | | | | | | | | | | | 1. Earlier refactoring did not adapt usages here. 2. Compile with Qt5. Change-Id: Ic461f2acb03d51e9ad903c4aa65b7d9e6d80fe86 Reviewed-by: hjk <qthjk@ovi.com>
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-081-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #!/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>
* | 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>
* | Do not use QAbstractItemModel::reset().Christian Kandeler2012-09-201-1/+2
|/ | | | | | | | | | Change-Id: Ie49bdf576a6d3543aef6df133b27c8827775c935 Rationale: a) It is conceptually cleaner to do the changes to the model in between calls to beginResetModel() and endResetModel, respectively. b) The function is deprecated in Qt 5, for exactly that reason. Reviewed-by: hjk <qthjk@ovi.com>
* Fix display of templates in outline.Francois Ferrand2012-08-211-0/+18
| | | | | Change-Id: I8b099c8234fac55ef0de17b014c89fbe02534bf4 Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
* libs/cplusplus: remove unneeded #includeshjk2012-08-151-3/+0
| | | | | Change-Id: Iadd8ace8a3870a9b0046dc65bf00d7e702e15b97 Reviewed-by: hjk <qthjk@ovi.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>
* Add function return type in outline.Francois Ferrand2012-07-171-3/+4
| | | | | | | | Append the function return type in outline (after arguments), consistently with variable type indication. Change-Id: I1cc6d69634fc83227eb7fc9e3a0ee2ad6ca6ace8 Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-2/+2
| | | | | | | | 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>
* 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
|
* Header cleanup in src, specify module name.Friedemann Kleint2011-01-241-2/+2
|
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* License headers.con2010-12-171-7/+11
|
* Renamed Symbol::scope() to Symbol::enclosingScope().Roberto Raggi2010-08-261-3/+3
|
* Get rid of the old Semantic pass.Roberto Raggi2010-08-131-1/+0
|
* Renamed Symboo::isScopedSymbol().Roberto Raggi2010-08-121-1/+1
|
* Merged ScopedSymbol and Scope.Roberto Raggi2010-08-111-19/+10
|
* Long live the king!hjk2010-03-051-1/+1
|
* Added "@property" to the outline entries for ObjC properties.Erik Verbruggen2010-01-221-0/+2
|
* long live the kinghjk2009-08-141-1/+1
|
* Fixed semantic checks for Objective-C methods and fast-enumeration.Erik Verbruggen2009-08-051-4/+18
|
* Added Semantic checks for ObjC methods.Erik Verbruggen2009-07-311-0/+6
|
* 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
|
* Revert now unnecessary checks for null-typesThorbjørn Lindeijer2009-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commits: c721304a4731a91a9e143a54d2ab3ef89526e05e 885d908ea336de72e7fce2141c1060e425f2af0a a0909989f7d71ee754cdb61202a519cabff25f7c fb4ad59ddbf727f13f29df6bcff80a88e1e1a319 0a9a67cf547701a278f19dbe2b9fb0a70a36cdb8 0d1624d4d1d5ce4e350476fbc86a361fad2ef6b8 d018cfd5cb4aad0101c321fe2fcf9b21598e9590 0504fdd00bce8d9580a52335093b57215f4272da a2fd10fe193dbf8369e43d7df9a59503c8853b2b Conflicts: src/plugins/cpptools/cppcodecompletion.cpp Reviewed-by: Roberto Raggi
* Fixes: Possible crash in OverviewModel.Roberto Raggi2009-02-091-1/+1
|
* Reimplemented Type::as*Type() using virtual methods.Roberto Raggi2009-02-091-1/+1
|
* Bump year in licence header.Daniel Molkentin2009-01-131-1/+1
|
* chancge Nokia GPL exception version from 1.2 to 1.3hjk2008-12-161-1/+1
|
* Don't use QTC_ASSERT in the C++ front-end library. The engine does notRoberto Raggi2008-12-101-7/+5
| | | | | recover from invalid asserts, so it will crash anyway, but not in a controlled environment.
* use QTC_ASSERT instead of Q_ASSERThjk2008-12-091-5/+7
|
* Fixes: - Show <No Symbols> or <Select Symbol> in 'empty' method combo boxcon2008-12-081-10/+36
| | | | | Task: - 234321 RevBy: - Bjoern
* 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-4/+14
|
* Initial importcon2008-12-021-0/+183
View Lorry Controller Status