From 940d8cd2c02ea77914374005c66c9e24c385ccdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Cie=C5=9Blak?= <michalcieslak@status.im>
Date: Mon, 6 Feb 2023 14:37:25 +0100
Subject: [PATCH] chore(general): Move RXValidator to StatusQ

---
 storybook/CMakeLists.txt                                     | 2 ++
 .../StatusQ/include/StatusQ/rxvalidator.h                    | 0
 ui/StatusQ/sandbox/CMakeLists.txt                            | 2 ++
 .../Status/RXValidator.cpp => ui/StatusQ/src/rxvalidator.cpp | 2 +-
 ui/imports/shared/popups/NicknamePopup.qml                   | 3 +--
 vendor/DOtherSide/lib/CMakeLists.txt                         | 2 ++
 vendor/DOtherSide/lib/src/DOtherSide.cpp                     | 5 ++---
 7 files changed, 10 insertions(+), 6 deletions(-)
 rename vendor/DOtherSide/lib/include/DOtherSide/Status/RXValidator.h => ui/StatusQ/include/StatusQ/rxvalidator.h (100%)
 rename vendor/DOtherSide/lib/src/Status/RXValidator.cpp => ui/StatusQ/src/rxvalidator.cpp (96%)

diff --git a/storybook/CMakeLists.txt b/storybook/CMakeLists.txt
index 0df989288d..dc936308dc 100644
--- a/storybook/CMakeLists.txt
+++ b/storybook/CMakeLists.txt
@@ -36,6 +36,7 @@ set(STATUSQ_HEADERS
     ${STATUSQ_DIR}/include/StatusQ/typesregistration.h
     ${STATUSQ_DIR}/include/StatusQ/QClipboardProxy.h
     ${STATUSQ_DIR}/include/StatusQ/statussyntaxhighlighter.h
+    ${STATUSQ_DIR}/include/StatusQ/rxvalidator.h
 )
 
 set(STATUSQ_SOURCES
@@ -43,6 +44,7 @@ set(STATUSQ_SOURCES
     ${STATUSQ_DIR}/src/typesregistration.cpp
     ${STATUSQ_DIR}/src/QClipboardProxy.cpp
     ${STATUSQ_DIR}/src/statussyntaxhighlighter.cpp
+    ${STATUSQ_DIR}/src/rxvalidator.cpp
 )
 
 if(APPLE)
diff --git a/vendor/DOtherSide/lib/include/DOtherSide/Status/RXValidator.h b/ui/StatusQ/include/StatusQ/rxvalidator.h
similarity index 100%
rename from vendor/DOtherSide/lib/include/DOtherSide/Status/RXValidator.h
rename to ui/StatusQ/include/StatusQ/rxvalidator.h
diff --git a/ui/StatusQ/sandbox/CMakeLists.txt b/ui/StatusQ/sandbox/CMakeLists.txt
index a7dd08eb2e..ff0f2c9b81 100644
--- a/ui/StatusQ/sandbox/CMakeLists.txt
+++ b/ui/StatusQ/sandbox/CMakeLists.txt
@@ -17,6 +17,7 @@ set(STATUSQ_HEADERS
     ${STATUSQ_DIR}/include/StatusQ/typesregistration.h
     ${STATUSQ_DIR}/include/StatusQ/QClipboardProxy.h
     ${STATUSQ_DIR}/include/StatusQ/statussyntaxhighlighter.h
+    ${STATUSQ_DIR}/include/StatusQ/rxvalidator.h
 )
 
 set(STATUSQ_SOURCES
@@ -24,6 +25,7 @@ set(STATUSQ_SOURCES
     ${STATUSQ_DIR}/src/typesregistration.cpp
     ${STATUSQ_DIR}/src/QClipboardProxy.cpp
     ${STATUSQ_DIR}/src/statussyntaxhighlighter.cpp
+    ${STATUSQ_DIR}/src/rxvalidator.cpp
 )
 
 if(APPLE)
diff --git a/vendor/DOtherSide/lib/src/Status/RXValidator.cpp b/ui/StatusQ/src/rxvalidator.cpp
similarity index 96%
rename from vendor/DOtherSide/lib/src/Status/RXValidator.cpp
rename to ui/StatusQ/src/rxvalidator.cpp
index b4ce87c777..bd7ad2b41a 100644
--- a/vendor/DOtherSide/lib/src/Status/RXValidator.cpp
+++ b/ui/StatusQ/src/rxvalidator.cpp
@@ -1,4 +1,4 @@
-#include "DOtherSide/Status/RXValidator.h"
+#include "StatusQ/rxvalidator.h"
 
 RXValidator::RXValidator(QObject* parent)
     : QValidator(parent)
diff --git a/ui/imports/shared/popups/NicknamePopup.qml b/ui/imports/shared/popups/NicknamePopup.qml
index be73f1f866..58950fb5df 100644
--- a/ui/imports/shared/popups/NicknamePopup.qml
+++ b/ui/imports/shared/popups/NicknamePopup.qml
@@ -1,11 +1,10 @@
 import QtQuick 2.13
 import QtQuick.Controls 2.13
 
-import DotherSide 0.1
-
 import utils 1.0
 import shared.controls 1.0
 
+import StatusQ 0.1
 import StatusQ.Core 0.1
 import StatusQ.Core.Theme 0.1
 import StatusQ.Controls 0.1
diff --git a/vendor/DOtherSide/lib/CMakeLists.txt b/vendor/DOtherSide/lib/CMakeLists.txt
index 6a9ec78db7..3e9bfdfb01 100644
--- a/vendor/DOtherSide/lib/CMakeLists.txt
+++ b/vendor/DOtherSide/lib/CMakeLists.txt
@@ -24,6 +24,7 @@ macro(add_target name type)
         ${STATUSQ_DIR}/include/StatusQ/typesregistration.h
         ${STATUSQ_DIR}/include/StatusQ/QClipboardProxy.h
         ${STATUSQ_DIR}/include/StatusQ/statussyntaxhighlighter.h
+        ${STATUSQ_DIR}/include/StatusQ/rxvalidator.h
     )
 
     set(STATUSQ_SOURCES
@@ -31,6 +32,7 @@ macro(add_target name type)
         ${STATUSQ_DIR}/src/typesregistration.cpp
         ${STATUSQ_DIR}/src/QClipboardProxy.cpp
         ${STATUSQ_DIR}/src/statussyntaxhighlighter.cpp
+        ${STATUSQ_DIR}/src/rxvalidator.cpp
     )
 
     if(APPLE)
diff --git a/vendor/DOtherSide/lib/src/DOtherSide.cpp b/vendor/DOtherSide/lib/src/DOtherSide.cpp
index 33cdc77aaa..0f10e05d9c 100644
--- a/vendor/DOtherSide/lib/src/DOtherSide.cpp
+++ b/vendor/DOtherSide/lib/src/DOtherSide.cpp
@@ -71,9 +71,9 @@
 #include "DOtherSide/Status/OSNotification.h"
 #include "DOtherSide/Status/KeychainManager.h"
 #include "DOtherSide/Status/SoundManager.h"
-#include "DOtherSide/Status/RXValidator.h"
 
 #include "StatusQ/QClipboardProxy.h"
+#include "StatusQ/rxvalidator.h"
 #include "StatusQ/statussyntaxhighlighter.h"
 #include "StatusQ/statuswindow.h"
 
@@ -92,10 +92,9 @@ void register_meta_types()
 
     qmlRegisterType<StatusWindow>("StatusQ", 0 , 1, "StatusWindow");
     qmlRegisterType<StatusSyntaxHighlighter>("StatusQ", 0 , 1, "StatusSyntaxHighlighter");
+    qmlRegisterType<RXValidator>("StatusQ", 0, 1, "RXValidator");
     qmlRegisterSingletonType<QClipboardProxy>("StatusQ", 0 , 1, "QClipboardProxy", &QClipboardProxy::qmlInstance);
 
-    qmlRegisterType<RXValidator>("DotherSide", 0, 1, "RXValidator");
-
 #ifdef MONITORING
     qmlRegisterSingletonType<Monitor>("Monitoring", 1 , 0, "Monitor", &Monitor::qmlInstance);
 #endif