Remove reference to our source folder layout from internal includes

This makes it easier to use this code embedded into another codebase.

autotests/datasourcetest.cpp

@@ -15,17 +15,17 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <provider/core/applicationversionsource.h>
-#include <provider/core/compilerinfosource.h>
-#include <provider/core/cpuinfosource.h>
-#include <provider/core/localeinfosource.h>
-#include <provider/core/platforminfosource.h>
-#include <provider/core/propertyratiosource.h>
-#include <provider/core/qtversionsource.h>
-#include <provider/core/screeninfosource.h>
-#include <provider/core/startcountsource.h>
-#include <provider/core/usagetimesource.h>
-#include <provider/core/openglinfosource.h>
+#include <applicationversionsource.h>
+#include <compilerinfosource.h>
+#include <cpuinfosource.h>
+#include <localeinfosource.h>
+#include <platforminfosource.h>
+#include <propertyratiosource.h>
+#include <qtversionsource.h>
+#include <screeninfosource.h>
+#include <startcountsource.h>
+#include <usagetimesource.h>
+#include <openglinfosource.h>
 
 #include <QDebug>
 #include <QtTest/qtest.h>

autotests/feedbackconfigtest.cpp

@@ -15,10 +15,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <provider/widgets/feedbackconfigwidget.h>
-#include <provider/core/platforminfosource.h>
-#include <provider/core/provider.h>
-#include <provider/core/screeninfosource.h>
+#include <feedbackconfigwidget.h>
+#include <platforminfosource.h>
+#include <provider.h>
+#include <screeninfosource.h>
 
 #include <QDebug>
 #include <QLabel>

autotests/providertest.cpp

@@ -15,10 +15,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <provider/core/provider.h>
-#include <provider/core/platforminfosource.h>
-#include <provider/core/screeninfosource.h>
-#include <provider/core/startcountsource.h>
+#include <provider.h>
+#include <platforminfosource.h>
+#include <screeninfosource.h>
+#include <startcountsource.h>
 
 #include <QDebug>
 #include <QtTest/qtest.h>

autotests/selectionratiosourcetest.cpp

@@ -15,7 +15,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <provider/core/selectionratiosource.h>
+#include <selectionratiosource.h>
 
 #include <QDebug>
 #include <QItemSelectionModel>

src/provider/core/CMakeLists.txt

@@ -35,7 +35,7 @@ else()
     target_link_libraries(UserFeedbackCore PUBLIC ${QT_QTCORE_LIBRARIES} PRIVATE ${QT_QTGUI_LIBRARIES} ${QT_QTNETWORK_LIBRARIES})
 endif()
 target_link_libraries(UserFeedbackCore PRIVATE UserFeedbackCommon)
-target_include_directories(UserFeedbackCore PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_CURRENT_BINARY_DIR};${CMAKE_SOURCE_DIR}/src>")
+target_include_directories(UserFeedbackCore PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_CURRENT_BINARY_DIR}>")
 target_include_directories(UserFeedbackCore INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/UserFeedback;${KDE_INSTALL_INCLUDEDIR}>")
 
 ecm_generate_headers(UserFeedbackCore_HEADERS

src/provider/widgets/feedbackconfigdialog.cpp

@@ -18,7 +18,7 @@
 #include "feedbackconfigdialog.h"
 #include "ui_feedbackconfigdialog.h"
 
-#include <provider/core/provider.h>
+#include <provider.h>
 
 #include <QDebug>
 #include <QPushButton>

src/provider/widgets/feedbackconfigwidget.cpp

@@ -18,8 +18,8 @@
 #include "feedbackconfigwidget.h"
 #include "ui_feedbackconfigwidget.h"
 
-#include <provider/core/abstractdatasource.h>
-#include <provider/core/provider.h>
+#include <abstractdatasource.h>
+#include <provider.h>
 
 #include <QApplication>
 #include <QDebug>

src/provider/widgets/notificationpopup.cpp

@@ -19,8 +19,8 @@
 #include "ui_notificationpopup.h"
 #include "feedbackconfigdialog.h"
 
-#include <provider/core/provider.h>
-#include <provider/core/surveyinfo.h>
+#include <provider.h>
+#include <surveyinfo.h>
 
 #include <QApplication>
 #include <QDebug>

tests/feedbackconfigwidgettest.cpp

@@ -15,13 +15,13 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <provider/widgets/feedbackconfigdialog.h>
+#include <feedbackconfigdialog.h>
 
-#include <provider/core/applicationversionsource.h>
-#include <provider/core/platforminfosource.h>
-#include <provider/core/provider.h>
-#include <provider/core/qtversionsource.h>
-#include <provider/core/screeninfosource.h>
+#include <applicationversionsource.h>
+#include <platforminfosource.h>
+#include <provider.h>
+#include <qtversionsource.h>
+#include <screeninfosource.h>
 
 #include <QApplication>
 #include <QStandardPaths>

tests/notificationpopuptest.cpp

@@ -15,9 +15,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <provider/widgets/notificationpopup.h>
-#include <provider/core/provider.h>
-#include <provider/core/surveyinfo.h>
+#include <notificationpopup.h>
+#include <provider.h>
+#include <surveyinfo.h>
 
 #include <QApplication>
 #include <QPushButton>