Revision eb06a17...

Go back to digest for 16th November 2014

Other in Development Tools

Milian Wolff committed changes in [kdevelop/4.7] /:

Refactor the custom defines and includes plugin.

The compiler provider is not a plugin anymore, but a library that
is used in multiple places. In KF5, when the KCM is also not a
plugin anymore, we can merge all three together into one single
plugin .so.

For now, this move already simplifies the logic tremendously and
removes a lot of boilerplate code that was required to access
the CompilerProvider/SettingsManager from various places.

Note that the distinction between CompilerProvider and SettingsManager
is also pretty artificial. I plan to merge the two classes together
and futher clean up the code then. There is a one-to-one relation ship
after all between these two classes.

In addition to the above, I cleaned up the code wherever I noticed
any opportunity for that. There are probably more places for that.

File Changes

Deleted 2 files
  • /plugins/custom-definesandincludes/compilerprovider
  •   languages/icompilerprovider.h
  •   languages/kdevcompilerprovider.desktop.cmake
Modified 30 files
  •   languages/cpp/kdevcppsupport.desktop.cmake
  •   languages/plugins/custom-definesandincludes/CMakeLists.txt
  •   languages/plugins/custom-definesandincludes/definesandincludesmanager.cpp
  •   languages/plugins/custom-definesandincludes/definesandincludesmanager.h
  •   languages/plugins/custom-definesandincludes/compilerprovider/CMakeLists.txt
  •   languages/plugins/custom-definesandincludes/compilerprovider/compilerprovider.cpp
  •   languages/plugins/custom-definesandincludes/compilerprovider/compilerprovider.h
  •   languages/plugins/custom-definesandincludes/compilerprovider/gcclikecompiler.cpp
  •   languages/plugins/custom-definesandincludes/compilerprovider/gcclikecompiler.h
  •   languages/plugins/custom-definesandincludes/compilerprovider/icompiler.cpp
  •   languages/plugins/custom-definesandincludes/compilerprovider/icompiler.h
  •   languages/plugins/custom-definesandincludes/compilerprovider/icompilerfactory.h
  •   languages/plugins/custom-definesandincludes/compilerprovider/msvccompiler.cpp
  •   languages/plugins/custom-definesandincludes/compilerprovider/msvccompiler.h
  •   languages/plugins/custom-definesandincludes/kcm_widget/CMakeLists.txt
  •   languages/plugins/custom-definesandincludes/kcm_widget/compilersmodel.cpp
  •   languages/plugins/custom-definesandincludes/kcm_widget/compilerswidget.cpp
  •   languages/plugins/custom-definesandincludes/kcm_widget/definesmodel.cpp
  •   languages/plugins/custom-definesandincludes/kcm_widget/definesmodel.h
  •   languages/plugins/custom-definesandincludes/kcm_widget/defineswidget.cpp
  •   languages/plugins/custom-definesandincludes/kcm_widget/defineswidget.h
  •   languages/plugins/custom-definesandincludes/kcm_widget/kcm_customdefinesandincludes.cpp
  •   languages/plugins/custom-definesandincludes/kcm_widget/projectpathsmodel.cpp
  •   languages/plugins/custom-definesandincludes/kcm_widget/projectpathsmodel.h
  •   languages/plugins/custom-definesandincludes/kcm_widget/projectpathswidget.cpp
  •   languages/plugins/custom-definesandincludes/kcm_widget/projectpathswidget.h
  •   languages/plugins/custom-definesandincludes/tests/definesandincludestest.cpp
  •   languages/plugins/custom-definesandincludes/compilerprovider/tests/CMakeLists.txt
  •   languages/plugins/custom-definesandincludes/compilerprovider/tests/test_compilerprovider.cpp
  •   languages/plugins/custom-definesandincludes/compilerprovider/tests/test_compilerprovider.h
32 files changed in total