From 302e9fc9d07c69b0de0c90064a1f0794a977a739 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 25 Aug 2018 14:14:56 +0200 Subject: [PATCH] Use QStringBuilder in livery --- src/blackgui/settings/viewdirectorysettings.h | 42 ------------------- src/blackmisc/aviation/livery.cpp | 16 +++---- 2 files changed, 8 insertions(+), 50 deletions(-) delete mode 100644 src/blackgui/settings/viewdirectorysettings.h diff --git a/src/blackgui/settings/viewdirectorysettings.h b/src/blackgui/settings/viewdirectorysettings.h deleted file mode 100644 index 69c7e621a..000000000 --- a/src/blackgui/settings/viewdirectorysettings.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright (C) 2017 - * swift project community / contributors - * - * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level - * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project, - * including this file, may be copied, modified, propagated, or distributed except according to the terms - * contained in the LICENSE file. - */ - -//! \file - -#ifndef BLACKGUI_SETTINGS_VIEWDIRECTORYSETTINGS_H -#define BLACKGUI_SETTINGS_VIEWDIRECTORYSETTINGS_H - -#include "blackgui/blackguiexport.h" -#include "blackmisc/settingscache.h" -#include "blackmisc/directoryutils.h" -#include - -namespace BlackGui -{ - namespace Settings - { - //! Trait for directory settings - struct TViewDirectorySettings : public BlackMisc::TSettingTrait - { - //! \copydoc BlackCore::TSettingTrait::key - static const char *key() { return "guiviewdirectory/%Application%"; } - - //! \copydoc BlackCore::TSettingTrait::humanReadable - static const QString &humanReadable() { static const QString name("View directory"); return name; } - - //! \copydoc BlackCore::TSettingTrait::isValid - static bool isValid(const QString &directory) { Q_UNUSED(directory); return true; } - - //! \copydoc BlackCore::TSettingTrait::defaultValue - static const QString &defaultValue() { return BlackMisc::CDirectoryUtils::documentationDirectory(); } - }; - } // ns -} // ns - -#endif // guard diff --git a/src/blackmisc/aviation/livery.cpp b/src/blackmisc/aviation/livery.cpp index 84bcbdb51..7b0054406 100644 --- a/src/blackmisc/aviation/livery.cpp +++ b/src/blackmisc/aviation/livery.cpp @@ -239,7 +239,7 @@ namespace BlackMisc return CLivery(); } - const QString combinedCode(json.value(prefix + "combinedcode").toString()); + const QString combinedCode(json.value(prefix % QStringLiteral("combinedcode")).toString()); if (combinedCode.isEmpty()) { CLivery liveryStub; // only consists of id, maybe key and timestamp @@ -248,10 +248,10 @@ namespace BlackMisc } const bool isColorLivery = combinedCode.startsWith(colorLiveryMarker()); - const QString description(json.value(prefix + "description").toString()); - const CRgbColor colorFuselage(json.value(prefix + "colorfuselage").toString()); - const CRgbColor colorTail(json.value(prefix + "colortail").toString()); - const bool military = CDatastoreUtility::dbBoolStringToBool(json.value(prefix + "military").toString()); + const QString description(json.value(prefix % QStringLiteral("description")).toString()); + const CRgbColor colorFuselage(json.value(prefix % QStringLiteral("colorfuselage")).toString()); + const CRgbColor colorTail(json.value(prefix % QStringLiteral("colortail")).toString()); + const bool military = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % QStringLiteral("military")).toString()); CAirlineIcaoCode airline; if (!isColorLivery) { airline = CAirlineIcaoCode::fromDatabaseJson(json, "al_"); } CLivery livery(combinedCode, airline, description, colorFuselage, colorTail, military); @@ -367,9 +367,9 @@ namespace BlackMisc } if (!m_colorFuselage.isValid()) { this->setColorFuselage(otherLivery.getColorFuselage()); } - if (!m_colorTail.isValid()) { this->setColorTail(otherLivery.getColorTail()); } - if (m_combinedCode.isEmpty()) { this->setCombinedCode(otherLivery.getCombinedCode());} - if (m_description.isEmpty()) { this->setDescription(otherLivery.getDescription());} + if (!m_colorTail.isValid()) { this->setColorTail(otherLivery.getColorTail()); } + if (m_combinedCode.isEmpty()) { this->setCombinedCode(otherLivery.getCombinedCode());} + if (m_description.isEmpty()) { this->setDescription(otherLivery.getDescription());} m_airline.updateMissingParts(otherLivery.getAirlineIcaoCode()); if (!this->hasValidDbKey())