summaryrefslogtreecommitdiff
path: root/src/plugins/cppeditor/cppinsertvirtualmethods.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* CppEditor: Tests: Refactor out BaseQuickFixTestCaseNikolai Kosjar2014-11-281-3/+3
| | | | | | | | We will add another type of test case that allows us to test the list of offered operations. Change-Id: I528b3844181c139c8955091ac0bbcf6475fd8a4f Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-141-7/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/ipaddresslineedit.cpp src/libs/utils/logging.h src/plugins/analyzerbase/AnalyzerBase.pluginspec.in src/plugins/android/Android.pluginspec.in src/plugins/android/androiddeploystep.cpp src/plugins/android/androiddeploystep.h src/plugins/android/androiddeploystepfactory.cpp src/plugins/android/androiddeploystepwidget.cpp src/plugins/android/androidpackagecreationfactory.cpp src/plugins/android/androidpackagecreationstep.cpp src/plugins/android/androidpackagecreationstep.h src/plugins/android/androidpackagecreationwidget.cpp src/plugins/android/androidpackagecreationwidget.h src/plugins/android/javafilewizard.cpp src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/baremetal/BareMetal.pluginspec.in src/plugins/bazaar/Bazaar.pluginspec.in src/plugins/beautifier/Beautifier.pluginspec.in src/plugins/bineditor/BinEditor.pluginspec.in src/plugins/bookmarks/Bookmarks.pluginspec.in src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in src/plugins/clangcodemodel/clanghighlightingsupport.cpp src/plugins/clangcodemodel/clangsymbolsearcher.cpp src/plugins/classview/ClassView.pluginspec.in src/plugins/clearcase/ClearCase.pluginspec.in src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp src/plugins/cmakeprojectmanager/cmakehighlighter.cpp src/plugins/coreplugin/Core.pluginspec.in src/plugins/cpaster/CodePaster.pluginspec.in src/plugins/cppeditor/CppEditor.pluginspec.in src/plugins/cppeditor/cppfilewizard.cpp src/plugins/cpptools/CppTools.pluginspec.in src/plugins/cpptools/cpphighlightingsupportinternal.cpp src/plugins/cpptools/cppmodelmanagerinterface.cpp src/plugins/cpptools/cppmodelmanagerinterface.h src/plugins/cvs/CVS.pluginspec.in src/plugins/debugger/Debugger.pluginspec.in src/plugins/designer/Designer.pluginspec.in src/plugins/diffeditor/DiffEditor.pluginspec.in src/plugins/emacskeys/EmacsKeys.pluginspec.in src/plugins/fakevim/FakeVim.pluginspec.in src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in src/plugins/git/Git.pluginspec.in src/plugins/git/gitorious/gitorious.cpp src/plugins/git/gitorious/gitorious.h src/plugins/git/gitorious/gitoriousclonewizard.cpp src/plugins/git/gitorious/gitorioushostwidget.cpp src/plugins/git/gitorious/gitorioushostwidget.h src/plugins/git/gitorious/gitorioushostwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwidget.cpp src/plugins/git/gitorious/gitoriousprojectwidget.h src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwizardpage.h src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp src/plugins/git/gitorious/gitoriousrepositorywizardpage.h src/plugins/glsleditor/GLSLEditor.pluginspec.in src/plugins/glsleditor/glsleditorfactory.cpp src/plugins/glsleditor/glslfilewizard.cpp src/plugins/helloworld/HelloWorld.pluginspec.in src/plugins/help/Help.pluginspec.in src/plugins/imageviewer/ImageViewer.pluginspec.in src/plugins/ios/Ios.pluginspec.in src/plugins/macros/Macros.pluginspec.in src/plugins/mercurial/Mercurial.pluginspec.in src/plugins/perforce/Perforce.pluginspec.in src/plugins/projectexplorer/ProjectExplorer.pluginspec.in src/plugins/pythoneditor/PythonEditor.pluginspec.in src/plugins/pythoneditor/pythoneditorwidget.cpp src/plugins/pythoneditor/wizard/pythonfilewizard.cpp src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in src/plugins/qmakeprojectmanager/profileeditorfactory.cpp src/plugins/qmldesigner/QmlDesigner.pluginspec.in src/plugins/qmljseditor/QmlJSEditor.pluginspec.in src/plugins/qmljseditor/qmljseditorfactory.cpp src/plugins/qmljstools/QmlJSTools.pluginspec.in src/plugins/qmlprofiler/QmlProfiler.pluginspec.in src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in src/plugins/qnx/Qnx.pluginspec.in src/plugins/qtsupport/QtSupport.pluginspec.in src/plugins/remotelinux/RemoteLinux.pluginspec.in src/plugins/resourceeditor/ResourceEditor.pluginspec.in src/plugins/resourceeditor/resourcewizard.h src/plugins/subversion/Subversion.pluginspec.in src/plugins/tasklist/TaskList.pluginspec.in src/plugins/texteditor/TextEditor.pluginspec.in src/plugins/texteditor/basetexteditor_p.h src/plugins/texteditor/basetextmark.cpp src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h src/plugins/texteditor/codeassist/defaultassistinterface.h src/plugins/texteditor/codeassist/iassistproposalitem.cpp src/plugins/texteditor/itexteditor.cpp src/plugins/texteditor/itexteditor.h src/plugins/texteditor/itextmark.cpp src/plugins/texteditor/plaintexteditor.cpp src/plugins/texteditor/plaintexteditor.h src/plugins/texteditor/texteditoractionhandler.cpp src/plugins/todo/Todo.pluginspec.in src/plugins/updateinfo/UpdateInfo.pluginspec.in src/plugins/valgrind/Valgrind.pluginspec.in src/plugins/vcsbase/VcsBase.pluginspec.in src/plugins/welcome/Welcome.pluginspec.in src/plugins/winrt/WinRt.pluginspec.in tests/auto/debugger/temporarydir.h Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
| * License updateEike Ziller2014-10-091-7/+8
| | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | CppEditor: Simplify CppQuickFixOperation interfacehjk2014-09-301-17/+18
| | | | | | | | | | Change-Id: I5c047cf5e2bffa2f7c19c145c4f8d0adf3e64533 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | TextEditor: Add a convenience append method for quick fixeshjk2014-09-261-1/+1
| | | | | | | | | | | | | | Less noise on the user side. Change-Id: Ia5b495a1f9d3ec43623056d793f6771b3b84fd6b Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | CppEditor: Fix leaking ClassItemNikolai Kosjar2014-09-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | ...in InsertVirtualMethodsOp. Leak occurred while running test_quickfix_InsertVirtualMethods(final_function_removed) in valgrind memcheck. Change-Id: I1119b68feb25ecd6e210201c7e0f1e651e2542f9 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | CppEditor: Compile fix for clang after renaminghjk2014-08-281-29/+32
|/ | | | | Change-Id: Iaabb45fb066afb600718d874a0461bc88fae92e5 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* C++: Get rid of {Name,Type}::isEqualTo()Nikolai Kosjar2014-05-231-2/+2
| | | | | | | | | ...since it's superseded by the class Matcher. For consistency, rename FullySpecifiedType::isEqualTo() to match(). Change-Id: I07640f9218d814e0350265de45f05929e5d595a9 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* CppEditor: Tests: Fix newline handlingNikolai Kosjar2014-05-151-20/+20
| | | | | | | | | | | | removeTrailingWhitespace() appended one '\n' too much. As time went by, excess '\n' where added to the test code. * Remove excess '\n'. * For consistency, ensure that each test code line ends with '\n'. Change-Id: Ie2d4a1b8b27989f26bf154cb3b891dfb8fe6b2fd Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* CppEditor: Hide only functions that are implemented in the target classOrgad Shaneh2014-02-041-1/+1
| | | | | | | ... in Insert Virtual Methods Change-Id: Ifc5ece2e98c316190331f56187fe39954e49b519 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* CppEditor: Remove final functions from virtuals treeOrgad Shaneh2014-02-041-0/+115
| | | | | Change-Id: I2daad43539927e012af23b19dbca00f3aaa644e2 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* CppEditor: Enable choosing any override in Insert Virtual MethodsOrgad Shaneh2014-02-041-19/+38
| | | | | Change-Id: I839cfeb2650f991bcf9660e5ccbfa52452917eb8 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* CppEditor: Fix Qt4 compilationOrgad Shaneh2014-01-281-6/+4
| | | | | | | Change-Id: Icf86c9c1f39ce5f97e34a27ea456688cba1cd210 Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* CppEditor: Use a custom model for InsertVirtualMethodsOrgad Shaneh2014-01-271-120/+307
| | | | | | | Simplifies the code, enables easier enhancing Change-Id: I644befc903b2537053b214dfdef3f51dc7af216a Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* CppEditor: build fix (Qt5)Alessandro Portale2014-01-241-0/+1
| | | | | Change-Id: I8771ee574f9b2d0cd78786f6cd7c2e19d8865412 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* CppEditor: Move InsertVirtualMethods to its own fileOrgad Shaneh2014-01-241-0/+1417
It contains many components, doesn't make sense to have it with all other quickfixes. Change-Id: Idede14c90ba9b612ae9e9048f5795d674811acfe Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
View Lorry Controller Status