From 2d4ccd70198a812974eff2f011511b2768e9ab26 Mon Sep 17 00:00:00 2001
From: tobtoht <thotbot@protonmail.com>
Date: Tue, 25 May 2021 15:06:38 +0200
Subject: [PATCH] Move Tails/Whonix to utils/os

---
 src/CMakeLists.txt              | 2 ++
 src/WindowManager.cpp           | 2 +-
 src/appcontext.h                | 2 +-
 src/dialog/debuginfodialog.cpp  | 2 +-
 src/dialog/torinfodialog.cpp    | 2 +-
 src/mainwindow.cpp              | 2 +-
 src/utils/TorManager.cpp        | 2 +-
 src/utils/WebsocketNotifier.cpp | 4 ++--
 src/utils/config.cpp            | 2 +-
 src/utils/nodes.cpp             | 2 +-
 src/utils/{ => os}/tails.cpp    | 0
 src/utils/{ => os}/tails.h      | 0
 src/utils/{ => os}/whonix.cpp   | 0
 src/utils/{ => os}/whonix.h     | 0
 src/utils/utils.cpp             | 4 ++--
 15 files changed, 14 insertions(+), 12 deletions(-)
 rename src/utils/{ => os}/tails.cpp (100%)
 rename src/utils/{ => os}/tails.h (100%)
 rename src/utils/{ => os}/whonix.cpp (100%)
 rename src/utils/{ => os}/whonix.h (100%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 94b89688..bdac1b53 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,6 +22,8 @@ file(GLOB SOURCE_FILES
         "api/*.cpp"
         "utils/*.h"
         "utils/*.cpp"
+        "utils/os/*.h"
+        "utils/os/*.cpp"
         "libwalletqt/*.h"
         "libwalletqt/*.cpp"
         "daemon/*.h"
diff --git a/src/WindowManager.cpp b/src/WindowManager.cpp
index f920d664..f01219c8 100644
--- a/src/WindowManager.cpp
+++ b/src/WindowManager.cpp
@@ -6,7 +6,7 @@
 #include "dialog/passworddialog.h"
 #include "dialog/splashdialog.h"
 #include "utils/WebsocketNotifier.h"
-#include "utils/tails.h"
+#include "utils/os/tails.h"
 #include "utils/Icons.h"
 #include "utils/NetworkManager.h"
 #include "utils/TorManager.h"
diff --git a/src/appcontext.h b/src/appcontext.h
index af45fa64..ebf482b8 100644
--- a/src/appcontext.h
+++ b/src/appcontext.h
@@ -7,7 +7,7 @@
 #include <QObject>
 #include <QTimer>
 
-#include "utils/whonix.h"
+#include "utils/os/whonix.h"
 #include "utils/networking.h"
 #include "utils/wsclient.h"
 #include "utils/FeatherSeed.h"
diff --git a/src/dialog/debuginfodialog.cpp b/src/dialog/debuginfodialog.cpp
index 768fa07e..f6371ad4 100644
--- a/src/dialog/debuginfodialog.cpp
+++ b/src/dialog/debuginfodialog.cpp
@@ -7,7 +7,7 @@
 #include "utils/WebsocketClient.h"
 #include "utils/TorManager.h"
 #include "utils/WebsocketNotifier.h"
-#include "utils/tails.h"
+#include "utils/os/tails.h"
 
 DebugInfoDialog::DebugInfoDialog(QSharedPointer<AppContext> ctx, QWidget *parent)
         : QDialog(parent)
diff --git a/src/dialog/torinfodialog.cpp b/src/dialog/torinfodialog.cpp
index 0c9ab787..1c395a9c 100644
--- a/src/dialog/torinfodialog.cpp
+++ b/src/dialog/torinfodialog.cpp
@@ -9,7 +9,7 @@
 #include <QMessageBox>
 
 #include "utils/TorManager.h"
-#include "utils/tails.h"
+#include "utils/os/tails.h"
 
 TorInfoDialog::TorInfoDialog(QSharedPointer<AppContext> ctx, QWidget *parent)
         : QDialog(parent)
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index baedfd42..04705ae2 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -31,7 +31,7 @@
 #include "utils/Icons.h"
 #include "utils/WebsocketNotifier.h"
 #include "utils/Updater.h"
-#include "utils/tails.h"
+#include "utils/os/tails.h"
 #include "utils/TorManager.h"
 
 MainWindow::MainWindow(WindowManager *windowManager, Wallet *wallet, QWidget *parent)
diff --git a/src/utils/TorManager.cpp b/src/utils/TorManager.cpp
index 398fd826..3a9c7bb7 100644
--- a/src/utils/TorManager.cpp
+++ b/src/utils/TorManager.cpp
@@ -9,7 +9,7 @@
 #include <QRegularExpression>
 
 #include "utils/utils.h"
-#include "utils/tails.h"
+#include "utils/os/tails.h"
 #include "appcontext.h"
 #include "config-feather.h"
 
diff --git a/src/utils/WebsocketNotifier.cpp b/src/utils/WebsocketNotifier.cpp
index dff4d5d1..39a7c450 100644
--- a/src/utils/WebsocketNotifier.cpp
+++ b/src/utils/WebsocketNotifier.cpp
@@ -3,8 +3,8 @@
 
 #include "WebsocketNotifier.h"
 #include "utils.h"
-#include "tails.h"
-#include "whonix.h"
+#include "utils/os/tails.h"
+#include "utils/os/whonix.h"
 
 #include <QJsonObject>
 
diff --git a/src/utils/config.cpp b/src/utils/config.cpp
index fd393647..9af405c7 100644
--- a/src/utils/config.cpp
+++ b/src/utils/config.cpp
@@ -5,7 +5,7 @@
 
 #include "config.h"
 #include "utils/utils.h"
-#include "utils/tails.h"
+#include "utils/os/tails.h"
 
 #define QS QStringLiteral
 
diff --git a/src/utils/nodes.cpp b/src/utils/nodes.cpp
index a683c4ba..a16f5c06 100644
--- a/src/utils/nodes.cpp
+++ b/src/utils/nodes.cpp
@@ -5,7 +5,7 @@
 
 #include "nodes.h"
 #include "utils/utils.h"
-#include "utils/tails.h"
+#include "utils/os/tails.h"
 #include "appcontext.h"
 #include "constants.h"
 #include "utils/WebsocketNotifier.h"
diff --git a/src/utils/tails.cpp b/src/utils/os/tails.cpp
similarity index 100%
rename from src/utils/tails.cpp
rename to src/utils/os/tails.cpp
diff --git a/src/utils/tails.h b/src/utils/os/tails.h
similarity index 100%
rename from src/utils/tails.h
rename to src/utils/os/tails.h
diff --git a/src/utils/whonix.cpp b/src/utils/os/whonix.cpp
similarity index 100%
rename from src/utils/whonix.cpp
rename to src/utils/os/whonix.cpp
diff --git a/src/utils/whonix.h b/src/utils/os/whonix.h
similarity index 100%
rename from src/utils/whonix.h
rename to src/utils/os/whonix.h
diff --git a/src/utils/utils.cpp b/src/utils/utils.cpp
index eb352741..78fc8306 100644
--- a/src/utils/utils.cpp
+++ b/src/utils/utils.cpp
@@ -12,8 +12,8 @@
 
 #include "utils.h"
 #include "utils/config.h"
-#include "utils/tails.h"
-#include "utils/whonix.h"
+#include "utils/os/tails.h"
+#include "utils/os/whonix.h"
 #include "utils/ColorScheme.h"
 #include "constants.h"