From 0d75fa1a0a729344b9d82819146459b6d56c84c0 Mon Sep 17 00:00:00 2001
From: "Jonathan \"Duke\" Leto" <jonathan@leto.net>
Date: Thu, 5 Dec 2019 07:25:08 -0800
Subject: [PATCH] compile checkpoint

---
 src/mainwindow.cpp |  7 ++++---
 src/mainwindow.h   |  2 +-
 src/settings.cpp   | 16 +++++++++++-----
 src/settings.h     |  2 +-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index d59ec9b..4a74add 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -297,9 +297,10 @@ void MainWindow::setupSettingsModal() {
         });
 
         // Get Currency Data
-        int currency_index = settings.comboBoxCurrency->findText(Settings::getInstance()->get_currency_name(), Qt::MatchExactly);
+        QString ticker = QString::fromStdString( Settings::getInstance()->get_currency_name() );
+        int currency_index = settings.comboBoxCurrency->findText(ticker, Qt::MatchExactly);
         settings.comboBoxCurrency->setCurrentIndex(currency_index);
-        QObject::connect(settings.comboBoxCurrency, &QComboBox::currentTextChanged, [=] (QString currency_name) {
+        QObject::connect(settings.comboBoxCurrency, &QComboBox::currentTextChanged, [=] (QString ticker) {
             this->slot_change_currency(currency_name);
             rpc->refresh(true);
             QMessageBox::information(this, tr("Currency Change"), tr("This change can take a few seconds."), QMessageBox::Ok);
@@ -943,7 +944,7 @@ void MainWindow::setupMarketTab() {
     auto ticker = s->get_currency_name();
 
     ui->volumeExchange->setText(QString::number((double)       s->getVolume("HUSH") ,'f',8) + " HUSH");
-    ui->volumeExchangeLocal->setText(QString::number((double)  s->getVolume(ticker) ,'f',8) + " " + ticker);
+    ui->volumeExchangeLocal->setText(QString::number((double)  s->getVolume(ticker) ,'f',8) + " " + QString::fromStdString(ticker));
     ui->volumeExchangeBTC->setText(QString::number((double)    s->getVolume("BTC") ,'f',8) + " BTC");
 }
 
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 5531e97..50249bb 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -84,7 +84,7 @@ private:
     void setupMarketTab();
 
     void slot_change_theme(const QString& themeName);
-    void slot_change_currency(std::string& currencyName);
+    void slot_change_currency(const std::string& currencyName);
     void setupTurnstileDialog();
     void setupSettingsModal();
     void setupStatusBar();
diff --git a/src/settings.cpp b/src/settings.cpp
index 0b38f41..5c838f3 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -162,16 +162,22 @@ double Settings::getZECPrice() {
 }
 
 double Settings::get_price(std::string currency) {
+    QString ticker = QString::fromStdString(currency);
     auto search = prices.find(currency);
     if (search != prices.end()) {
-        qDebug() << "Found price of " << currency << " = " << search->second;
+        qDebug() << "Found price of " << ticker << " = " << search->second;
         return search->second;
     } else {
+        qDebug() << "Could not find price of" << ticker << "!!!";
         return -1.0;
     }
 }
 
-void Settings::set_price(std::string ticker, double price) {
+void Settings::set_price(std::string curr, double price) {
+    QString ticker = QString::fromStdString(curr);
+    qDebug() << "Setting price of " << ticker << "=" << QString::number(price);
+    // prices[curr] = price;
+    //auto it = prices.insert( std::make_pair(ticker, price) );
 }
 
 unsigned int Settings::getBTCPrice() {
@@ -293,16 +299,16 @@ bool Settings::addToZcashConf(QString confLocation, QString line) {
     return true;
 }
 
-QString Settings::get_currency_name() {
+std::string Settings::get_currency_name() {
     // Load from the QT Settings.
-    return QSettings().value("options/currency_name", false).toString();
+    return QSettings().value("options/currency_name", false).toString().toStdString();
 }
 
 void Settings::set_currency_name(std::string currency_name) {
     QSettings().setValue("options/currency_name", QString::fromStdString(currency_name));
 }
 
-double Settings::getVolume(QString ticker) {
+double Settings::getVolume(std::string ticker) {
     return 0.0;
 }
 
diff --git a/src/settings.h b/src/settings.h
index a231a2b..36f3263 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -99,7 +99,7 @@ public:
     unsigned int  getBTCPrice();
     double get_price(std::string currency);
     void   set_price(std::string currency, double price);
-    double getVolume(QString ticker);
+    double getVolume(std::string ticker);
 
     void    setPeers(int peers);
     int     getPeers();