SVN commit 568388 by treat: Merge kdev-its-gonna-be-great -r 565232:568297 into trunk CCMAIL:kdevelop-devel@kdevelop.org M +1 -1 CMakeLists.txt M +3 -3 buildtools/builders/makebuilder/CMakeLists.txt M +2 -2 buildtools/importers/automake/CMakeLists.txt M +1 -1 buildtools/importers/automake/tests/CMakeLists.txt M +2 -3 buildtools/importers/cmake/CMakeLists.txt M +2 -2 buildtools/importers/generic/CMakeLists.txt M +1 -1 buildtools/importers/generic/kdevgenericimporter.cpp M +2 -2 buildtools/importers/qmake/CMakeLists.txt M +12 -12 kdevelop.kdevelop M +2 -2 languages/cpp/CMakeLists.txt M +11 -10 languages/cpp/cpplanguagesupport.cpp M +1 -1 languages/cpp/parser/CMakeLists.txt M +2 -2 languages/csharp/CMakeLists.txt M +9 -8 languages/csharp/csharplanguagesupport.cpp M +2 -2 languages/java/CMakeLists.txt M +9 -8 languages/java/javalanguagesupport.cpp M +128 -6 lib/CMakeLists.txt A lib/Mainpage.dox branches/work/kdev-its-gonna-be-great/lib/Mainpage.dox#568297 M +2 -2 lib/debugger/CMakeLists.txt A lib/domutil.cpp branches/work/kdev-its-gonna-be-great/lib/domutil.cpp#568297 A lib/domutil.h branches/work/kdev-its-gonna-be-great/lib/domutil.h#568297 D lib/dummy.cpp AM lib/extras (directory) branches/work/kdev-its-gonna-be-great/lib/extras#568297 A lib/extras/Mainpage.dox branches/work/kdev-its-gonna-be-great/lib/extras/Mainpage.dox#568297 A lib/extras/kdevcompileroptions.cpp branches/work/kdev-its-gonna-be-great/lib/extras/kdevcompileroptions.cpp#568297 A lib/extras/kdevcompileroptions.h branches/work/kdev-its-gonna-be-great/lib/extras/kdevcompileroptions.h#568297 A lib/extras/kdevelopcompileroptions.desktop branches/work/kdev-its-gonna-be-great/lib/extras/kdevelopcompileroptions.desktop#568297 A lib/extras/kdevelopvcsintegrator.desktop branches/work/kdev-its-gonna-be-great/lib/extras/kdevelopvcsintegrator.desktop#568297 A lib/extras/kdevvcsintegrator.cpp branches/work/kdev-its-gonna-be-great/lib/extras/kdevvcsintegrator.cpp#568297 A lib/extras/kdevvcsintegrator.h branches/work/kdev-its-gonna-be-great/lib/extras/kdevvcsintegrator.h#568297 A lib/filetemplate.cpp branches/work/kdev-its-gonna-be-great/lib/filetemplate.cpp#568297 A lib/filetemplate.h branches/work/kdev-its-gonna-be-great/lib/filetemplate.h#568297 D lib/interfaces (directory) A lib/kdevappfrontend.cpp branches/work/kdev-its-gonna-be-great/lib/kdevappfrontend.cpp#568297 A lib/kdevappfrontend.h branches/work/kdev-its-gonna-be-great/lib/kdevappfrontend.h#568297 A lib/kdevast.cpp lib/interfaces/kdevast.cpp#568297 A lib/kdevast.h lib/interfaces/kdevast.h#568297 A lib/kdevbackgroundparser.cpp lib/interfaces/kdevbackgroundparser.cpp#568370 [License: LGPL (v2+)] A lib/kdevbackgroundparser.h lib/interfaces/kdevbackgroundparser.h#568297 A lib/kdevbuildableproject.cpp branches/work/kdev-its-gonna-be-great/lib/kdevbuildableproject.cpp#568297 A lib/kdevbuildableproject.h branches/work/kdev-its-gonna-be-great/lib/kdevbuildableproject.h#568297 A lib/kdevbuildmanager.cpp branches/work/kdev-its-gonna-be-great/lib/kdevbuildmanager.cpp#568297 A lib/kdevbuildmanager.h branches/work/kdev-its-gonna-be-great/lib/kdevbuildmanager.h#568297 A lib/kdevcatalog.cpp branches/work/kdev-its-gonna-be-great/lib/kdevcatalog.cpp#568297 A lib/kdevcatalog.h branches/work/kdev-its-gonna-be-great/lib/kdevcatalog.h#568297 A lib/kdevcmodule.cpp branches/work/kdev-its-gonna-be-great/lib/kdevcmodule.cpp#568297 A lib/kdevcmodule.h branches/work/kdev-its-gonna-be-great/lib/kdevcmodule.h#568297 A lib/kdevcodeaggregate.cpp branches/work/kdev-its-gonna-be-great/lib/kdevcodeaggregate.cpp#568297 A lib/kdevcodeaggregate_p.h branches/work/kdev-its-gonna-be-great/lib/kdevcodeaggregate_p.h#568297 A lib/kdevcodedelegate.cpp branches/work/kdev-its-gonna-be-great/lib/kdevcodedelegate.cpp#568297 A lib/kdevcodedelegate.h branches/work/kdev-its-gonna-be-great/lib/kdevcodedelegate.h#568297 A lib/kdevcodemodel.cpp branches/work/kdev-its-gonna-be-great/lib/kdevcodemodel.cpp#568297 A lib/kdevcodemodel.h branches/work/kdev-its-gonna-be-great/lib/kdevcodemodel.h#568297 A lib/kdevcodeproxy.cpp branches/work/kdev-its-gonna-be-great/lib/kdevcodeproxy.cpp#568297 A lib/kdevcodeproxy.h branches/work/kdev-its-gonna-be-great/lib/kdevcodeproxy.h#568297 A lib/kdevcoderepository.cpp branches/work/kdev-its-gonna-be-great/lib/kdevcoderepository.cpp#568297 A lib/kdevcoderepository.h branches/work/kdev-its-gonna-be-great/lib/kdevcoderepository.h#568297 A lib/kdevconfig.cpp branches/work/kdev-its-gonna-be-great/lib/kdevconfig.cpp#568297 A lib/kdevconfig.h branches/work/kdev-its-gonna-be-great/lib/kdevconfig.h#568297 A lib/kdevconfigskeleton.cpp branches/work/kdev-its-gonna-be-great/lib/kdevconfigskeleton.cpp#568297 A lib/kdevconfigskeleton.h branches/work/kdev-its-gonna-be-great/lib/kdevconfigskeleton.h#568297 A lib/kdevcontext.cpp branches/work/kdev-its-gonna-be-great/lib/kdevcontext.cpp#568297 A lib/kdevcontext.h branches/work/kdev-its-gonna-be-great/lib/kdevcontext.h#568297 A lib/kdevcore.cpp branches/work/kdev-its-gonna-be-great/lib/kdevcore.cpp#568297 [License: LGPL (v2+)] A lib/kdevcore.h branches/work/kdev-its-gonna-be-great/lib/kdevcore.h#568297 [License: LGPL (v2+)] A lib/kdevcreatefile.h branches/work/kdev-its-gonna-be-great/lib/kdevcreatefile.h#568297 A lib/kdevdifffrontend.cpp branches/work/kdev-its-gonna-be-great/lib/kdevdifffrontend.cpp#568297 A lib/kdevdifffrontend.h branches/work/kdev-its-gonna-be-great/lib/kdevdifffrontend.h#568297 A lib/kdevdocument.cpp branches/work/kdev-its-gonna-be-great/lib/kdevdocument.cpp#568297 A lib/kdevdocument.h branches/work/kdev-its-gonna-be-great/lib/kdevdocument.h#568297 A lib/kdevdocumentcontroller.cpp branches/work/kdev-its-gonna-be-great/lib/kdevdocumentcontroller.cpp#568297 A lib/kdevdocumentcontroller.h branches/work/kdev-its-gonna-be-great/lib/kdevdocumentcontroller.h#568297 A lib/kdevelop_part.desktop branches/work/kdev-its-gonna-be-great/lib/kdevelop_part.desktop#568297 A lib/kdevelop_rwpart.desktop branches/work/kdev-its-gonna-be-great/lib/kdevelop_rwpart.desktop#568297 A lib/kdevelopappfrontend.desktop branches/work/kdev-its-gonna-be-great/lib/kdevelopappfrontend.desktop#568297 A lib/kdevelopcreatefile.desktop branches/work/kdev-its-gonna-be-great/lib/kdevelopcreatefile.desktop#568297 A lib/kdevelopdifffrontend.desktop branches/work/kdev-its-gonna-be-great/lib/kdevelopdifffrontend.desktop#568297 A lib/kdeveloplanguagesupport.desktop branches/work/kdev-its-gonna-be-great/lib/kdeveloplanguagesupport.desktop#568297 A lib/kdevelopmakefrontend.desktop branches/work/kdev-its-gonna-be-great/lib/kdevelopmakefrontend.desktop#568297 A lib/kdeveloppcsimporter.desktop branches/work/kdev-its-gonna-be-great/lib/kdeveloppcsimporter.desktop#568297 A lib/kdevelopplugin.desktop branches/work/kdev-its-gonna-be-great/lib/kdevelopplugin.desktop#568297 A lib/kdevelopproject.desktop branches/work/kdev-its-gonna-be-great/lib/kdevelopproject.desktop#568297 A lib/kdevelopprojectbuilder.desktop branches/work/kdev-its-gonna-be-great/lib/kdevelopprojectbuilder.desktop#568297 A lib/kdevelopprojectfilemanager.desktop branches/work/kdev-its-gonna-be-great/lib/kdevelopprojectfilemanager.desktop#568297 A lib/kdevenvironment.cpp branches/work/kdev-its-gonna-be-great/lib/kdevenvironment.cpp#568297 A lib/kdevenvironment.h branches/work/kdev-its-gonna-be-great/lib/kdevenvironment.h#568297 A lib/kdevfilemanager.cpp branches/work/kdev-its-gonna-be-great/lib/kdevfilemanager.cpp#568297 A lib/kdevfilemanager.h branches/work/kdev-its-gonna-be-great/lib/kdevfilemanager.h#568297 A lib/kdevitemmodel.cpp branches/work/kdev-its-gonna-be-great/lib/kdevitemmodel.cpp#568297 A lib/kdevitemmodel.h branches/work/kdev-its-gonna-be-great/lib/kdevitemmodel.h#568297 A lib/kdevlanguagecontroller.cpp branches/work/kdev-its-gonna-be-great/lib/kdevlanguagecontroller.cpp#568297 A lib/kdevlanguagecontroller.h branches/work/kdev-its-gonna-be-great/lib/kdevlanguagecontroller.h#568297 A lib/kdevlanguagesupport.cpp branches/work/kdev-its-gonna-be-great/lib/kdevlanguagesupport.cpp#568297 A lib/kdevlanguagesupport.h branches/work/kdev-its-gonna-be-great/lib/kdevlanguagesupport.h#568297 [License: LGPL (v2+)] A lib/kdevmainwindow.cpp branches/work/kdev-its-gonna-be-great/lib/kdevmainwindow.cpp#568297 A lib/kdevmainwindow.h branches/work/kdev-its-gonna-be-great/lib/kdevmainwindow.h#568297 A lib/kdevmakefrontend.cpp branches/work/kdev-its-gonna-be-great/lib/kdevmakefrontend.cpp#568297 A lib/kdevmakefrontend.h branches/work/kdev-its-gonna-be-great/lib/kdevmakefrontend.h#568297 A lib/kdevparsejob.cpp lib/interfaces/kdevparsejob.cpp#568297 A lib/kdevparsejob.h lib/interfaces/kdevparsejob.h#568297 A lib/kdevpartcontroller.cpp branches/work/kdev-its-gonna-be-great/lib/kdevpartcontroller.cpp#568297 A lib/kdevpartcontroller.h branches/work/kdev-its-gonna-be-great/lib/kdevpartcontroller.h#568297 A lib/kdevpcsimporter.cpp branches/work/kdev-its-gonna-be-great/lib/kdevpcsimporter.cpp#568297 A lib/kdevpcsimporter.h branches/work/kdev-its-gonna-be-great/lib/kdevpcsimporter.h#568297 A lib/kdevplugin.cpp branches/work/kdev-its-gonna-be-great/lib/kdevplugin.cpp#568297 A lib/kdevplugin.h branches/work/kdev-its-gonna-be-great/lib/kdevplugin.h#568297 A lib/kdevplugincontroller.cpp branches/work/kdev-its-gonna-be-great/lib/kdevplugincontroller.cpp#568297 A lib/kdevplugincontroller.h branches/work/kdev-its-gonna-be-great/lib/kdevplugincontroller.h#568297 A lib/kdevprofile.cpp branches/work/kdev-its-gonna-be-great/lib/kdevprofile.cpp#568297 A lib/kdevprofile.h branches/work/kdev-its-gonna-be-great/lib/kdevprofile.h#568297 A lib/kdevprofileengine.cpp branches/work/kdev-its-gonna-be-great/lib/kdevprofileengine.cpp#568297 A lib/kdevprofileengine.h branches/work/kdev-its-gonna-be-great/lib/kdevprofileengine.h#568297 A lib/kdevproject.cpp branches/work/kdev-its-gonna-be-great/lib/kdevproject.cpp#568297 A lib/kdevproject.h branches/work/kdev-its-gonna-be-great/lib/kdevproject.h#568297 A lib/kdevprojectbuilder.cpp branches/work/kdev-its-gonna-be-great/lib/kdevprojectbuilder.cpp#568297 A lib/kdevprojectbuilder.h branches/work/kdev-its-gonna-be-great/lib/kdevprojectbuilder.h#568297 A lib/kdevprojectcontroller.cpp branches/work/kdev-its-gonna-be-great/lib/kdevprojectcontroller.cpp#568297 A lib/kdevprojectcontroller.h branches/work/kdev-its-gonna-be-great/lib/kdevprojectcontroller.h#568297 A lib/kdevprojectmodel.cpp branches/work/kdev-its-gonna-be-great/lib/kdevprojectmodel.cpp#568297 A lib/kdevprojectmodel.h branches/work/kdev-its-gonna-be-great/lib/kdevprojectmodel.h#568297 A lib/kdevsharedptr.h branches/work/kdev-its-gonna-be-great/lib/kdevsharedptr.h#568297 A lib/mainwindowshare.cpp branches/work/kdev-its-gonna-be-great/lib/mainwindowshare.cpp#568297 A lib/mainwindowshare.h branches/work/kdev-its-gonna-be-great/lib/mainwindowshare.h#568297 A lib/mimewarningdialog.ui branches/work/kdev-its-gonna-be-great/lib/mimewarningdialog.ui#568297 M +2 -2 lib/projectmanager/CMakeLists.txt M +2 -1 lib/projectmanager/kdevprojectmanager.cpp M +5 -5 lib/projectmanager/kdevprojectmanager_part.cpp A lib/settings (directory) branches/work/kdev-its-gonna-be-great/lib/settings#568297 A lib/settings/CMakeLists.txt branches/work/kdev-its-gonna-be-great/lib/settings/CMakeLists.txt#568297 A lib/settings/data.kdev4 branches/work/kdev-its-gonna-be-great/lib/settings/data.kdev4#568297 A lib/settings/kcm_kdevelop_settings.desktop branches/work/kdev-its-gonna-be-great/lib/settings/kcm_kdevelop_settings.desktop#568297 A lib/settings/kcm_kdevenv_settings.desktop branches/work/kdev-its-gonna-be-great/lib/settings/kcm_kdevenv_settings.desktop#568297 A lib/settings/kdevelopconfig.kcfg branches/work/kdev-its-gonna-be-great/lib/settings/kdevelopconfig.kcfg#568297 A lib/settings/kdevelopconfig.kcfgc branches/work/kdev-its-gonna-be-great/lib/settings/kdevelopconfig.kcfgc#568297 A lib/settings/kdeveloppreferences.cpp branches/work/kdev-its-gonna-be-great/lib/settings/kdeveloppreferences.cpp#568297 A lib/settings/kdeveloppreferences.h branches/work/kdev-its-gonna-be-great/lib/settings/kdeveloppreferences.h#568297 A lib/settings/kdevenvpreferences.cpp branches/work/kdev-its-gonna-be-great/lib/settings/kdevenvpreferences.cpp#568297 A lib/settings/kdevenvpreferences.h branches/work/kdev-its-gonna-be-great/lib/settings/kdevenvpreferences.h#568297 A lib/settings/kdevenvsettings.ui branches/work/kdev-its-gonna-be-great/lib/settings/kdevenvsettings.ui#568297 A lib/settings/kdevenvwidget.cpp branches/work/kdev-its-gonna-be-great/lib/settings/kdevenvwidget.cpp#568297 A lib/settings/kdevenvwidget.h branches/work/kdev-its-gonna-be-great/lib/settings/kdevenvwidget.h#568297 A lib/settings/settingswidget.ui branches/work/kdev-its-gonna-be-great/lib/settings/settingswidget.ui#568297 A lib/shellextension.cpp branches/work/kdev-its-gonna-be-great/lib/shellextension.cpp#568297 A lib/shellextension.h branches/work/kdev-its-gonna-be-great/lib/shellextension.h#568297 A lib/statusbar.cpp branches/work/kdev-its-gonna-be-great/lib/statusbar.cpp#568297 A lib/statusbar.h branches/work/kdev-its-gonna-be-great/lib/statusbar.h#568297 A lib/tag.cpp branches/work/kdev-its-gonna-be-great/lib/tag.cpp#568297 A lib/tag.h branches/work/kdev-its-gonna-be-great/lib/tag.h#568297 M +2 -2 lib/util/CMakeLists.txt M +2 -2 lib/widgets/CMakeLists.txt M +2 -2 plugins/codeview/CMakeLists.txt M +23 -24 plugins/codeview/kdevcodeview.cpp M +5 -5 plugins/codeview/kdevcodeview_part.cpp M +2 -2 plugins/documentview/CMakeLists.txt M +2 -2 plugins/documentview/kdevdocumentview.cpp M +25 -26 plugins/documentview/kdevdocumentview_part.cpp M +2 -2 plugins/documentview/settings/CMakeLists.txt M +2 -2 plugins/fileselector/CMakeLists.txt M +9 -9 plugins/fileselector/fileselector_part.cpp M +2 -2 plugins/fileselector/fileselector_widget.cpp M +2 -2 plugins/guibuilder/CMakeLists.txt M +11 -11 plugins/guibuilder/guibuilder_part.cpp M +2 -2 plugins/konsole/CMakeLists.txt M +3 -3 plugins/konsole/kdevkonsoleview.cpp M +2 -2 plugins/konsole/kdevkonsoleview_part.cpp M +0 -1 plugins/tipofday/tipofday_part.cpp M +2 -2 plugins/valgrind/CMakeLists.txt M +10 -9 plugins/valgrind/valgrind_part.cpp M +5 -5 plugins/valgrind/valgrind_widget.cpp M +12 -52 src/CMakeLists.txt D src/core.cpp D src/core.h D src/data.kdev4 D src/documentationpart.cpp D src/documentationpart.h D src/documentcontroller.cpp D src/documentcontroller.h D src/editorproxy.cpp D src/editorproxy.h D src/kcm_kdevelop_settings.desktop A src/kdev3Tokdev4 (directory) branches/work/kdev-its-gonna-be-great/src/kdev3Tokdev4#568297 A src/kdev3Tokdev4/projectmanager.cpp branches/work/kdev-its-gonna-be-great/src/kdev3Tokdev4/projectmanager.cpp#568297 A src/kdev3Tokdev4/projectmanager.h branches/work/kdev-its-gonna-be-great/src/kdev3Tokdev4/projectmanager.h#568297 A src/kdev3Tokdev4/projectsession.cpp branches/work/kdev-its-gonna-be-great/src/kdev3Tokdev4/projectsession.cpp#568297 A src/kdev3Tokdev4/projectsession.h branches/work/kdev-its-gonna-be-great/src/kdev3Tokdev4/projectsession.h#568297 D src/kdevelopconfig.kcfg D src/kdevelopconfig.kcfgc D src/kdeveloppreferences.cpp D src/kdeveloppreferences.h D src/languagecontroller.cpp D src/languagecontroller.h M +36 -20 src/main.cpp M +10 -19 src/main_assistant.cpp D src/mainwindowshare.cpp D src/mainwindowshare.h D src/mimewarningdialog.ui M +1 -1 src/newui/CMakeLists.txt D src/partcontroller.cpp D src/partcontroller.h D src/plugincontroller.cpp D src/plugincontroller.h M +2 -2 src/profileengine/editor/CMakeLists.txt D src/projectcontroller.cpp D src/projectcontroller.h D src/projectmanager.cpp D src/projectmanager.h D src/projectsession.cpp D src/projectsession.h D src/settingswidget.ui D src/shellextension.cpp D src/shellextension.h D src/simplemainwindow.cpp D src/simplemainwindow.h D src/statusbar.cpp D src/statusbar.h D src/toplevel.cpp D src/toplevel.h