diff --git a/src/Cloud/CloudDBCommon.cpp b/src/Cloud/CloudDBCommon.cpp index 08268f45d..24f0202dd 100644 --- a/src/Cloud/CloudDBCommon.cpp +++ b/src/Cloud/CloudDBCommon.cpp @@ -145,9 +145,9 @@ void CloudDBAcceptConditionsDialog::rejectConditions() { // Initialize static members of CloudDBCommon -QString CloudDBCommon::cloudDBBaseURL = QString("https://%1.appspot.com/v1/").arg(GC_CLOUD_DB_APP_NAME); +QString CloudDBCommon::cloudDBBaseURL = QString("https://%1.appspot.com/v1/").arg(QT_STRINGIFY(GC_CLOUD_DB_APP_NAME)); QVariant CloudDBCommon::cloudDBContentType = QVariant("application/json"); -QByteArray CloudDBCommon::cloudDBBasicAuth = "Basic " + QByteArray(GC_CLOUD_DB_BASIC_AUTH) ; +QByteArray CloudDBCommon::cloudDBBasicAuth = "Basic " + QByteArray(QT_STRINGIFY(GC_CLOUD_DB_BASIC_AUTH)); QList CloudDBCommon::cloudDBLangsIds = QList() << "en" << "fr" << "ja" << "pt-br" << "it" << "de" << "ru" << "cs" << "es" << "pt" << "zh-cn" << "zh-tw" << "nl" << "sv" << "xx"; diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index 41a23fa2a..258deff17 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -893,9 +893,7 @@ MainWindow::importChart() { QString fileName = QFileDialog::getOpenFileName(this, tr("Select Chart file to import"), "", tr("GoldenCheetah Chart Files (*.gchart)")); - if (fileName.isEmpty()) { - QMessageBox::critical(this, tr("Import Chart"), tr("No chart file selected!")); - } else { + if (!fileName.isEmpty()) { importCharts(QStringList()<