From dc11dd2203fda01e1f78e2c29225a885c2bc7449 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 7 Dec 2021 12:24:41 +0100
Subject: [PATCH] [libcalamaresui] Move ErrorDialog to the widgets/ part

---
 src/libcalamaresui/CMakeLists.txt                           | 6 +++---
 .../{utils/ErrorDialog => widgets}/ErrorDialog.cpp          | 0
 .../{utils/ErrorDialog => widgets}/ErrorDialog.h            | 0
 .../{utils/ErrorDialog => widgets}/ErrorDialog.ui           | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename src/libcalamaresui/{utils/ErrorDialog => widgets}/ErrorDialog.cpp (100%)
 rename src/libcalamaresui/{utils/ErrorDialog => widgets}/ErrorDialog.h (100%)
 rename src/libcalamaresui/{utils/ErrorDialog => widgets}/ErrorDialog.ui (100%)

diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt
index e745681f3..ab0ad963a 100644
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@@ -20,7 +20,6 @@ set( calamaresui_SOURCES
     utils/CalamaresUtilsGui.cpp
     utils/ImageRegistry.cpp
     utils/Paste.cpp
-    utils/ErrorDialog/ErrorDialog.cpp
 
     viewpages/BlankViewStep.cpp
     viewpages/ExecutionViewStep.cpp
@@ -28,6 +27,7 @@ set( calamaresui_SOURCES
     viewpages/ViewStep.cpp
 
     widgets/ClickableLabel.cpp
+    widgets/ErrorDialog.cpp
     widgets/FixedAspectRatioLabel.cpp
     widgets/PrettyRadioButton.cpp
     widgets/TranslationFix.cpp
@@ -76,8 +76,8 @@ calamares_add_library( calamaresui
         Qt5::Svg
     RESOURCES libcalamaresui.qrc
     EXPORT Calamares
-    UI 
-        utils/ErrorDialog/ErrorDialog.ui    
+    UI
+        utils/ErrorDialog/ErrorDialog.ui
     VERSION ${CALAMARES_VERSION_SHORT}
 )
 target_link_libraries( calamaresui PRIVATE yamlcpp::yamlcpp )
diff --git a/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp b/src/libcalamaresui/widgets/ErrorDialog.cpp
similarity index 100%
rename from src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp
rename to src/libcalamaresui/widgets/ErrorDialog.cpp
diff --git a/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h b/src/libcalamaresui/widgets/ErrorDialog.h
similarity index 100%
rename from src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h
rename to src/libcalamaresui/widgets/ErrorDialog.h
diff --git a/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.ui b/src/libcalamaresui/widgets/ErrorDialog.ui
similarity index 100%
rename from src/libcalamaresui/utils/ErrorDialog/ErrorDialog.ui
rename to src/libcalamaresui/widgets/ErrorDialog.ui