From 01a03ff84be2ad464bcd29526c4973f84d24d27a Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Sat, 13 May 2017 09:19:41 +0200
Subject: [PATCH] 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                  | 22 +++++++++----------
 autotests/feedbackconfigtest.cpp              |  8 +++----
 autotests/providertest.cpp                    |  8 +++----
 autotests/selectionratiosourcetest.cpp        |  2 +-
 src/provider/core/CMakeLists.txt              |  2 +-
 src/provider/widgets/feedbackconfigdialog.cpp |  2 +-
 src/provider/widgets/feedbackconfigwidget.cpp |  4 ++--
 src/provider/widgets/notificationpopup.cpp    |  4 ++--
 tests/feedbackconfigwidgettest.cpp            | 12 +++++-----
 tests/notificationpopuptest.cpp               |  6 ++---
 10 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/autotests/datasourcetest.cpp b/autotests/datasourcetest.cpp
index 454a047..e815403 100644
--- a/autotests/datasourcetest.cpp
+++ b/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>
diff --git a/autotests/feedbackconfigtest.cpp b/autotests/feedbackconfigtest.cpp
index cd0fc0d..b8de4f6 100644
--- a/autotests/feedbackconfigtest.cpp
+++ b/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>
diff --git a/autotests/providertest.cpp b/autotests/providertest.cpp
index ce084ff..5dbdd4e 100644
--- a/autotests/providertest.cpp
+++ b/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>
diff --git a/autotests/selectionratiosourcetest.cpp b/autotests/selectionratiosourcetest.cpp
index 7a68880..148fb5e 100644
--- a/autotests/selectionratiosourcetest.cpp
+++ b/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>
diff --git a/src/provider/core/CMakeLists.txt b/src/provider/core/CMakeLists.txt
index 9b3a3aa..26c461f 100644
--- a/src/provider/core/CMakeLists.txt
+++ b/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
diff --git a/src/provider/widgets/feedbackconfigdialog.cpp b/src/provider/widgets/feedbackconfigdialog.cpp
index 3e7f1ba..94dc46c 100644
--- a/src/provider/widgets/feedbackconfigdialog.cpp
+++ b/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>
diff --git a/src/provider/widgets/feedbackconfigwidget.cpp b/src/provider/widgets/feedbackconfigwidget.cpp
index 299803b..3d04a60 100644
--- a/src/provider/widgets/feedbackconfigwidget.cpp
+++ b/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>
diff --git a/src/provider/widgets/notificationpopup.cpp b/src/provider/widgets/notificationpopup.cpp
index 2d0e8b6..7d69751 100644
--- a/src/provider/widgets/notificationpopup.cpp
+++ b/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>
diff --git a/tests/feedbackconfigwidgettest.cpp b/tests/feedbackconfigwidgettest.cpp
index 57b35a7..28e8409 100644
--- a/tests/feedbackconfigwidgettest.cpp
+++ b/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>
diff --git a/tests/notificationpopuptest.cpp b/tests/notificationpopuptest.cpp
index 0204ee0..24708f8 100644
--- a/tests/notificationpopuptest.cpp
+++ b/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>
-- 
GitLab