Use new settings in remote factory

Author: Skarsnik

devices/remoteusb2sneswfactory.cpp

@@ -6,20 +6,27 @@ Q_LOGGING_CATEGORY(log_remoteusb2snes, "Remote factory")
 
 #include "remoteusb2sneswfactory.h"
 #include "remoteusb2sneswdevice.h"
+#include "settings.hpp"
+
+extern Settings*    mySettings;
 
 
 RemoteUsb2SnesWFactory::RemoteUsb2SnesWFactory(QObject *parent)
     : DeviceFactory{parent}
 {
     devFacStatus.name = name();
-    remoteUrl = "ws://192.168.0.37:" + QString::number(USB2SnesWS::defaultPort);
 }
 
 QStringList RemoteUsb2SnesWFactory::listDevices()
 {
     return QStringList();
 }
 
+QUrl RemoteUsb2SnesWFactory::remoteUrl()
+{
+    return QUrl("ws://" + mySettings->value<Settings::RemoteHost>() + ":" + QString::number(USB2SnesWS::defaultPort));
+}
+
 ADevice* RemoteUsb2SnesWFactory::attach(QString deviceName)
 {
     if (remote == nullptr)
@@ -44,7 +51,7 @@ ADevice* RemoteUsb2SnesWFactory::attach(QString deviceName)
         if (mapLocalNamesToRemoteNames.key(dev) == deviceName)
         {
             RemoteUsb2snesWDevice* newDev = new RemoteUsb2snesWDevice(mapLocalNamesToRemoteNames[deviceName]);
-            newDev->createWebsocket(remoteUrl);
+            newDev->createWebsocket(remoteUrl());
             return newDev;
         }
     }
@@ -168,7 +175,7 @@ void    RemoteUsb2SnesWFactory::checkStatus()
         remote->deviceList();
     } else {
         sDebug() << "Attempt to connect to remote";
-        remote->connectToHost("192.168.0.37", USB2SnesWS::defaultPort);
+        remote->connectToHost(mySettings->value<Settings::RemoteHost>(), USB2SnesWS::defaultPort);
         QTimer::singleShot(100, this, [=] {
             if (remote->state() == Usb2Snes::None)
             {

devices/remoteusb2sneswfactory.h

@@ -29,9 +29,9 @@ class RemoteUsb2SnesWFactory : public DeviceFactory
     DeviceFactoryStatus  devFacStatus;
     void        checkFailed(Error::DeviceFactoryError err);
     void        checkStatus();
-    QUrl        remoteUrl;
     void        createRemote();
     QStringList deviceList;
+    QUrl        remoteUrl();
 
 };
 

main.cpp

@@ -61,7 +61,7 @@ std::ostream* stdLogStream = nullptr;
 WSServer    wsServer;
 QSettings*  globalSettings;
 
-Settings    testSettings;
+Settings*    mySettings;
 
 /*
 #include "backward.hpp"
@@ -227,6 +227,8 @@ int main(int ac, char *ag[])
     if (!QFile::exists(SQPath::logDirectoryPath()))
         QDir().mkdir(SQPath::logDirectoryPath());
     //std::filebuf crashFile;
+    mySettings = new Settings();
+    mySettings->setValue<Settings::RemoteHost>("192.168.0.27");
 #ifndef Q_OS_WIN
     globalSettings = new QSettings("nyo.fr", "QUsb2Snes");
 #else
@@ -318,10 +320,5 @@ int main(int ac, char *ag[])
    });
    QTimer::singleShot(100, &startServer);
 #endif
-    qDebug() << std::is_convertible<const char*, std::string>::value;
-    qDebug() << std::is_convertible<const char*, QString>::value;
-    testSettings.setValue<Settings::RemoteHost>("PcxikoNyo");
-    qDebug() << "Settings" << testSettings.value<Settings::RemoteHost>();
-    //return 1;
     return app.exec();
 }

settings.hpp

@@ -24,7 +24,11 @@ class Settings : private QSettings
     };
 
 public:
-    explicit Settings(QObject *parent = nullptr) : QSettings("Test.ini", QSettings::IniFormat) {};
+#ifndef Q_OS_WIN
+    explicit Settings(QObject *parent = nullptr) : QSettings("nyo.fr", "QUsb2Snes") {};
+#else
+    explicit Settings(QObject *parent = nullptr) : QSettings("config.ini", QSettings::IniFormat) {};
+#endif
     ~Settings() {};
     template<SettingsV key> auto value()
     {

ui/appui.cpp

@@ -154,7 +154,7 @@ void AppUi::init()
             wsServer.addTrusted(ori);
         }
     }
-    //addRemoteFactory();
+    addRemoteFactory();
     checkForApplications();
     connect(qApp, &QCoreApplication::aboutToQuit, this, [=]() {
       sysTray->hide();