chore(general): Move RXValidator to StatusQ

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)

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)

ui/StatusQ/src/rxvalidator.cpp

@@ -1,4 +1,4 @@
-#include "DOtherSide/Status/RXValidator.h"
+#include "StatusQ/rxvalidator.h"
 
 RXValidator::RXValidator(QObject* parent)
     : QValidator(parent)

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

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)

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