From 2ccd59e90b9eecc042f064ab430e5862288c3af7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 16 Apr 2022 11:59:31 +0200 Subject: [PATCH] [libcalamaresui] Move waitingspinnerwidget.* into calamaresui Although this is 3rd-party code, it now diverges -- by merging the stale PR from upstream, and from adding features of our own -- enough that we should not pretend that it is the original 3rdparty code. Chase a couple of include paths that called this from 3rdparty/ --- src/libcalamaresui/CMakeLists.txt | 7 +------ src/libcalamaresui/widgets/WaitingWidget.h | 2 +- .../libcalamaresui/widgets}/waitingspinnerwidget.cpp | 0 .../libcalamaresui/widgets}/waitingspinnerwidget.h | 0 src/modules/partition/gui/ScanningDialog.cpp | 2 +- 5 files changed, 3 insertions(+), 8 deletions(-) rename {3rdparty => src/libcalamaresui/widgets}/waitingspinnerwidget.cpp (100%) rename {3rdparty => src/libcalamaresui/widgets}/waitingspinnerwidget.h (100%) diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt index 48e4c4b4d..48ac201d3 100644 --- a/src/libcalamaresui/CMakeLists.txt +++ b/src/libcalamaresui/CMakeLists.txt @@ -33,17 +33,12 @@ set( calamaresui_SOURCES widgets/LogWidget.cpp widgets/TranslationFix.cpp widgets/WaitingWidget.cpp - ${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp + widgets/waitingspinnerwidget.cpp Branding.cpp ViewManager.cpp ) -# Don't warn about third-party sources -mark_thirdparty_code( - ${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp -) - if( WITH_PYTHON ) list( APPEND calamaresui_SOURCES modulesystem/PythonJobModule.cpp diff --git a/src/libcalamaresui/widgets/WaitingWidget.h b/src/libcalamaresui/widgets/WaitingWidget.h index 009f17f49..1b78809de 100644 --- a/src/libcalamaresui/widgets/WaitingWidget.h +++ b/src/libcalamaresui/widgets/WaitingWidget.h @@ -10,7 +10,7 @@ #ifndef WAITINGWIDGET_H #define WAITINGWIDGET_H -#include "3rdparty/waitingspinnerwidget.h" +#include "widgets/waitingspinnerwidget.h" #include #include diff --git a/3rdparty/waitingspinnerwidget.cpp b/src/libcalamaresui/widgets/waitingspinnerwidget.cpp similarity index 100% rename from 3rdparty/waitingspinnerwidget.cpp rename to src/libcalamaresui/widgets/waitingspinnerwidget.cpp diff --git a/3rdparty/waitingspinnerwidget.h b/src/libcalamaresui/widgets/waitingspinnerwidget.h similarity index 100% rename from 3rdparty/waitingspinnerwidget.h rename to src/libcalamaresui/widgets/waitingspinnerwidget.h diff --git a/src/modules/partition/gui/ScanningDialog.cpp b/src/modules/partition/gui/ScanningDialog.cpp index 56133e21f..7dd85ff86 100644 --- a/src/modules/partition/gui/ScanningDialog.cpp +++ b/src/modules/partition/gui/ScanningDialog.cpp @@ -10,7 +10,7 @@ #include "ScanningDialog.h" -#include "3rdparty/waitingspinnerwidget.h" +#include "widgets/waitingspinnerwidget.h" #include #include