From eaba696173f8777917eee7538e6dbd0975ec1456 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 29 Apr 2019 06:38:09 -0400
Subject: [PATCH] [libcalamares] Move the crash() function to the one place
 it's used

---
 src/libcalamares/utils/CalamaresUtils.cpp |  8 --------
 src/libcalamares/utils/CalamaresUtils.h   |  5 -----
 src/libcalamaresui/utils/DebugWindow.cpp  | 16 ++++++++++++----
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/libcalamares/utils/CalamaresUtils.cpp b/src/libcalamares/utils/CalamaresUtils.cpp
index b44be6795..0fd72e267 100644
--- a/src/libcalamares/utils/CalamaresUtils.cpp
+++ b/src/libcalamares/utils/CalamaresUtils.cpp
@@ -120,12 +120,4 @@ obscure( const QString& string )
     return result;
 }
 
-
-void
-crash()
-{
-    volatile int* a = nullptr;
-    *a = 1;
-}
-
 }
diff --git a/src/libcalamares/utils/CalamaresUtils.h b/src/libcalamares/utils/CalamaresUtils.h
index 39d338d5c..2387a7005 100644
--- a/src/libcalamares/utils/CalamaresUtils.h
+++ b/src/libcalamares/utils/CalamaresUtils.h
@@ -51,11 +51,6 @@ namespace CalamaresUtils
      * @return the obfuscated string.
      */
     DLLEXPORT QString obscure( const QString& string );
-
-    /**
-     * @brief crash makes Calamares crash immediately.
-     */
-    DLLEXPORT void crash();
 }  // namespace
 
 #endif
diff --git a/src/libcalamaresui/utils/DebugWindow.cpp b/src/libcalamaresui/utils/DebugWindow.cpp
index 03f4f6aa8..a9be30411 100644
--- a/src/libcalamaresui/utils/DebugWindow.cpp
+++ b/src/libcalamaresui/utils/DebugWindow.cpp
@@ -37,6 +37,17 @@
 #include <QStringListModel>
 #include <QTreeView>
 
+/**
+ * @brief crash makes Calamares crash immediately.
+ */
+static void
+crash()
+{
+    volatile int* a = nullptr;
+    *a = 1;
+}
+
+
 namespace Calamares {
 
 DebugWindow::DebugWindow()
@@ -172,10 +183,7 @@ DebugWindow::DebugWindow()
         }
     } );
 
-    connect( crashButton, &QPushButton::clicked,
-             this, [] {
-        CalamaresUtils::crash();
-    } );
+    connect( crashButton, &QPushButton::clicked, this, [] { ::crash(); } );
 
     CALAMARES_RETRANSLATE(
         retranslateUi( this );