commit c867eb91a7b58f3fb9dacd00b12d4e5ff8b3b87f
author Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Sun Mar 08 13:15:17 2020 -0400
committer Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Mon Mar 09 11:26:31 2020 -0400
tree 4372d281a96a2c6e9d39d6b2bfd89434ecddd1f8
parent f61a767344123ce39111066eb0bf749cb38a5a67

lrc: adapt to new API

Change-Id: Ie49319e9263a76a28ceaeab4f5aa325e69a256a0

src/ConnectToAccManagerVC.mm

diff --git a/src/ConnectToAccManagerVC.mm b/src/ConnectToAccManagerVC.mm
index 9316f14..885936e 100644
--- a/src/ConnectToAccManagerVC.mm
+++ b/src/ConnectToAccManagerVC.mm
@@ -41,7 +41,7 @@
 
 QMetaObject::Connection accountCreatedSuccess;
 QMetaObject::Connection accountNotCreated;
-std::string accointId;
+QString accointId;
 
 @synthesize accountModel;
 
@@ -93,27 +93,27 @@
     QObject::disconnect(accountNotCreated);
     accountCreatedSuccess = QObject::connect(self.accountModel,
                                       &lrc::api::NewAccountModel::accountAdded,
-                                      [self] (const std::string& accountID) {
+                                      [self] (const QString& accountID) {
                                           if(accountID.compare(accointId) != 0) {
                                               return;
                                           }
                                           [self.delegate didSignInSuccess:YES];
                                           lrc::api::account::ConfProperties_t accountProperties = self.accountModel->getAccountConfig(accountID);
-                                          accountProperties.Ringtone.ringtonePath = [defaultRingtonePath() UTF8String];
+                                          accountProperties.Ringtone.ringtonePath = QString::fromNSString(defaultRingtonePath());
                                           self.accountModel->setAccountConfig(accountID, accountProperties);
                                           QObject::disconnect(accountCreatedSuccess);
                                           QObject::disconnect(accountNotCreated);
                                       });
     accountNotCreated = QObject::connect(self.accountModel,
                                       &lrc::api::NewAccountModel::accountRemoved,
-                                      [self] (const std::string& accountID) {
+                                      [self] (const QString& accountID) {
                                           if(accountID.compare(accointId) == 0) {
                                               [self showError];
                                           }
                                       });
     accountNotCreated = QObject::connect(self.accountModel,
                                       &lrc::api::NewAccountModel::invalidAccountDetected,
-                                      [self] (const std::string& accountID) {
+                                      [self] (const QString& accountID) {
                                           if(accountID.compare(accointId) == 0) {
                                               [self showError];
                                           }
@@ -121,7 +121,7 @@
 
     [self showLoading];
 
-    accointId = self.accountModel->connectToAccountManager([userNameField.stringValue UTF8String], [passwordTextField.stringValue UTF8String], [accountManagerField.stringValue UTF8String]);
+    accointId = self.accountModel->connectToAccountManager(QString::fromNSString(userNameField.stringValue), QString::fromNSString(passwordTextField.stringValue), QString::fromNSString(accountManagerField.stringValue));
 }
 
 @end