From a78b7582266610eea803dec36c9645f2569de110 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 14 Apr 2017 17:43:26 +0300 Subject: [PATCH] SonarQube warnings. --HG-- branch : release --- src/app/tape/mapplication.cpp | 4 ++-- src/app/valentina/core/vapplication.cpp | 7 ++++--- src/app/valentina/core/vapplication.h | 1 - src/app/valentina/core/vcmdexport.cpp | 2 +- .../configpages/preferencesconfigurationpage.cpp | 2 +- .../dialogs/configpages/preferencespathpage.cpp | 7 ++++++- .../dialogs/configpages/preferencespatternpage.cpp | 2 +- src/libs/fervor/fvupdater.cpp | 10 +++++----- 8 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/app/tape/mapplication.cpp b/src/app/tape/mapplication.cpp index 9750a5b6a..ed82c4be5 100644 --- a/src/app/tape/mapplication.cpp +++ b/src/app/tape/mapplication.cpp @@ -470,8 +470,8 @@ bool MApplication::event(QEvent *e) //--------------------------------------------------------------------------------------------------------------------- void MApplication::OpenSettings() { - settings = new VTapeSettings(QSettings::IniFormat, QSettings::UserScope, QApplication::organizationName(), - QApplication::applicationName(), this); + settings = new VTapeSettings(QSettings::IniFormat, QSettings::UserScope, QCoreApplication::organizationName(), + QCoreApplication::applicationName(), this); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/valentina/core/vapplication.cpp b/src/app/valentina/core/vapplication.cpp index 08e3179e3..233ba7386 100644 --- a/src/app/valentina/core/vapplication.cpp +++ b/src/app/valentina/core/vapplication.cpp @@ -459,7 +459,8 @@ QString VApplication::LogDirPath() const QStandardPaths::LocateDirectory) + "Valentina"; #else const QString logDirPath = QStandardPaths::locate(QStandardPaths::ConfigLocation, QString(), - QStandardPaths::LocateDirectory) + organizationName(); + QStandardPaths::LocateDirectory) + + QCoreApplication::organizationName(); #endif return logDirPath; } @@ -674,8 +675,8 @@ bool VApplication::event(QEvent *e) */ void VApplication::OpenSettings() { - settings = new VSettings(QSettings::IniFormat, QSettings::UserScope, QApplication::organizationName(), - QApplication::applicationName(), this); + settings = new VSettings(QSettings::IniFormat, QSettings::UserScope, QCoreApplication::organizationName(), + QCoreApplication::applicationName(), this); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/valentina/core/vapplication.h b/src/app/valentina/core/vapplication.h index 18df75d3b..f2704aaa4 100644 --- a/src/app/valentina/core/vapplication.h +++ b/src/app/valentina/core/vapplication.h @@ -37,7 +37,6 @@ #include "vcmdexport.h" class VApplication;// use in define -class VPattern; #if defined(qApp) #undef qApp diff --git a/src/app/valentina/core/vcmdexport.cpp b/src/app/valentina/core/vcmdexport.cpp index 4c28822b1..96b8a4e62 100644 --- a/src/app/valentina/core/vcmdexport.cpp +++ b/src/app/valentina/core/vcmdexport.cpp @@ -53,7 +53,7 @@ VCommandLine::VCommandLine() : parser(), optionsUsed(), optionsIndex(), isGuiEna VCommandLineOptions::const_iterator i = optionsUsed.constBegin(); while (i != optionsUsed.constEnd()) { - parser.addOption(*((*i))); + parser.addOption(*(*i)); ++i; } } diff --git a/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp b/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp index e0215f921..6fc5d3d82 100644 --- a/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp +++ b/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp @@ -159,7 +159,7 @@ void PreferencesConfigurationPage::Apply() m_unitChanged = false; const QString text = tr("The Default unit has been updated and will be used as the default for the next " "pattern you create."); - QMessageBox::information(this, QApplication::applicationName(), text); + QMessageBox::information(this, QCoreApplication::applicationName(), text); } if (m_labelLangChanged) { diff --git a/src/app/valentina/dialogs/configpages/preferencespathpage.cpp b/src/app/valentina/dialogs/configpages/preferencespathpage.cpp index 14bd768a4..43a11f6a0 100644 --- a/src/app/valentina/dialogs/configpages/preferencespathpage.cpp +++ b/src/app/valentina/dialogs/configpages/preferencespathpage.cpp @@ -57,7 +57,12 @@ PreferencesPathPage::~PreferencesPathPage() //--------------------------------------------------------------------------------------------------------------------- void PreferencesPathPage::Apply() { - + VSettings *settings = qApp->ValentinaSettings(); + settings->SetPathIndividualMeasurements(ui->pathTable->item(0, 1)->text()); + settings->SetPathStandardMeasurements(ui->pathTable->item(1, 1)->text()); + settings->SetPathPattern(ui->pathTable->item(2, 1)->text()); + settings->SetPathLayout(ui->pathTable->item(3, 1)->text()); + settings->SetPathTemplate(ui->pathTable->item(4, 1)->text()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/valentina/dialogs/configpages/preferencespatternpage.cpp b/src/app/valentina/dialogs/configpages/preferencespatternpage.cpp index 7973ec4b1..2cf9578ad 100644 --- a/src/app/valentina/dialogs/configpages/preferencespatternpage.cpp +++ b/src/app/valentina/dialogs/configpages/preferencespatternpage.cpp @@ -49,7 +49,7 @@ PreferencesPatternPage::PreferencesPatternPage(QWidget *parent) pSet->ClearUserDefinedMaterial(); pSet->sync(); QString qsMsg = tr("All user defined materials have been deleted!"); - QMessageBox::information(this, QApplication::applicationName(), qsMsg); + QMessageBox::information(this, QCoreApplication::applicationName(), qsMsg); }); ui->forbidFlippingCheck->setChecked(qApp->ValentinaSettings()->GetForbidWorkpieceFlipping()); diff --git a/src/libs/fervor/fvupdater.cpp b/src/libs/fervor/fvupdater.cpp index 4a82b2be2..8c6040ed4 100644 --- a/src/libs/fervor/fvupdater.cpp +++ b/src/libs/fervor/fvupdater.cpp @@ -228,25 +228,25 @@ bool FvUpdater::CheckForUpdates(bool silentAsMuchAsItCouldGet) // Check if application's organization name and domain are set, fail otherwise // (nowhere to store QSettings to) - if (QApplication::organizationName().isEmpty()) + if (QCoreApplication::organizationName().isEmpty()) { qCritical() << "QApplication::organizationName is not set. Please do that."; return false; } - if (QApplication::organizationDomain().isEmpty()) + if (QCoreApplication::organizationDomain().isEmpty()) { qCritical() << "QApplication::organizationDomain is not set. Please do that."; return false; } // Set application name / version is not set yet - if (QApplication::applicationName().isEmpty()) + if (QCoreApplication::applicationName().isEmpty()) { qCritical() << "QApplication::applicationName is not set. Please do that."; return false; } - if (QApplication::applicationVersion().isEmpty()) + if (QCoreApplication::applicationVersion().isEmpty()) { qCritical() << "QApplication::applicationVersion is not set. Please do that."; return false; @@ -299,7 +299,7 @@ void FvUpdater::startDownloadFeed(const QUrl &url) QNetworkRequest request; request.setHeader(QNetworkRequest::ContentTypeHeader, QStringLiteral("application/xml")); - request.setHeader(QNetworkRequest::UserAgentHeader, QApplication::applicationName()); + request.setHeader(QNetworkRequest::UserAgentHeader, QCoreApplication::applicationName()); request.setUrl(url); request.setSslConfiguration(QSslConfiguration::defaultConfiguration());