From ae5c677cfe043da9e47de1f144a1b38c162c7702 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 26 Jul 2014 23:24:33 +0200 Subject: [PATCH] Formatting: Icon names, headers, Doxygen --- src/blackcore/context_network_impl.cpp | 12 +++++--- src/blackcore/context_network_impl.h | 12 +++++--- src/blackmisc/avaircraft.cpp | 15 ++++++++-- src/blackmisc/avaircraft.h | 20 +++++++------ src/blackmisc/avaircraftlist.h | 4 +-- src/blackmisc/avatcstation.cpp | 2 +- src/blackmisc/avatcstation.h | 2 +- src/blackmisc/avcallsign.cpp | 40 +++++++++++++------------- src/blackmisc/avcallsign.h | 17 +++++++---- src/blackmisc/avcallsignlist.cpp | 12 +++++--- src/blackmisc/avcallsignlist.h | 16 ++++++----- src/blackmisc/avheading.cpp | 12 +++++--- src/blackmisc/avheading.h | 12 +++++--- src/blackmisc/avinformationmessage.cpp | 9 ++++++ src/blackmisc/avinformationmessage.h | 16 ++++++----- src/blackmisc/blackmiscfreefunctions.h | 4 +-- src/blackmisc/indexvariantmap.cpp | 9 ++++++ src/blackmisc/indexvariantmap.h | 22 +++++++------- src/blackmisc/nwvoicecapabilites.cpp | 9 ++++++ src/blackmisc/nwvoicecapabilities.h | 22 ++++++++------ src/blackmisc/pqphysicalquantity.cpp | 12 +++++--- src/blackmisc/pqphysicalquantity.h | 16 +++++++---- src/blackmisc/statusmessage.cpp | 9 ++++++ src/blackmisc/statusmessage.h | 17 ++++++++--- src/blackmisc/valueobject.cpp | 11 ++++++- src/blackmisc/valueobject.h | 18 +++++++----- src/blackmisc/variant.h | 16 ++++++----- 27 files changed, 243 insertions(+), 123 deletions(-) diff --git a/src/blackcore/context_network_impl.cpp b/src/blackcore/context_network_impl.cpp index dcd83a018..1e8db1703 100644 --- a/src/blackcore/context_network_impl.cpp +++ b/src/blackcore/context_network_impl.cpp @@ -1,7 +1,11 @@ -/* Copyright (C) 2013 VATSIM Community / authors - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +/* Copyright (C) 2013 + * 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. + */ #include "context_network_impl.h" #include "context_runtime.h" diff --git a/src/blackcore/context_network_impl.h b/src/blackcore/context_network_impl.h index 6276b7892..babff488e 100644 --- a/src/blackcore/context_network_impl.h +++ b/src/blackcore/context_network_impl.h @@ -1,7 +1,11 @@ -/* Copyright (C) 2013 VATSIM Community / authors - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +/* Copyright (C) 2013 + * 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. + */ #ifndef BLACKCORE_CONTEXTNETWORK_IMPL_H #define BLACKCORE_CONTEXTNETWORK_IMPL_H diff --git a/src/blackmisc/avaircraft.cpp b/src/blackmisc/avaircraft.cpp index dda9ccdf7..77c716bf7 100644 --- a/src/blackmisc/avaircraft.cpp +++ b/src/blackmisc/avaircraft.cpp @@ -1,3 +1,12 @@ +/* Copyright (C) 2013 + * 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. + */ + #include "avaircraft.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/pqconstants.h" @@ -198,6 +207,8 @@ namespace BlackMisc { case IndexCallsign: return QVariant::fromValue(this->m_callsign); + case IndexIcon: + return QVariant(this->m_callsign.toIcon()); case IndexCallsignAsString: return QVariant::fromValue(this->m_callsign.toQString(true)); case IndexCallsignAsStringAsSet: @@ -236,8 +247,8 @@ namespace BlackMisc { QVariant qv = this->propertyByIndex(index); // special treatment - // this is required as it is possible an ATC station is not containing all - // properties + // this is required, as it is possible that an aircraft is not + // containing all properties switch (index) { case IndexFrequencyCom1: diff --git a/src/blackmisc/avaircraft.h b/src/blackmisc/avaircraft.h index 60dfe78d9..17ef8f45c 100644 --- a/src/blackmisc/avaircraft.h +++ b/src/blackmisc/avaircraft.h @@ -1,14 +1,17 @@ -/* Copyright (C) 2013 VATSIM Community / authors - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -/*! - \file -*/ +/* Copyright (C) 2013 + * 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. + */ #ifndef BLACKMISC_AIRCRAFT_H #define BLACKMISC_AIRCRAFT_H + +//! \file + #include "nwuser.h" #include "avaircraftsituation.h" #include "avaircrafticao.h" @@ -219,6 +222,7 @@ namespace BlackMisc enum ColumnIndex { IndexCallsign = 0, + IndexIcon, IndexCallsignAsString, IndexCallsignAsStringAsSet, IndexPilotId, diff --git a/src/blackmisc/avaircraftlist.h b/src/blackmisc/avaircraftlist.h index 33d318d52..f94950d1c 100644 --- a/src/blackmisc/avaircraftlist.h +++ b/src/blackmisc/avaircraftlist.h @@ -3,9 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/*! - \file -*/ +//! \file #ifndef BLACKMISC_AIRCRAFTLIST_H #define BLACKMISC_AIRCRAFTLIST_H diff --git a/src/blackmisc/avatcstation.cpp b/src/blackmisc/avatcstation.cpp index feab2edca..c10ef0b15 100644 --- a/src/blackmisc/avatcstation.cpp +++ b/src/blackmisc/avatcstation.cpp @@ -319,7 +319,7 @@ namespace BlackMisc return QVariant(this->m_callsign.asString()); case IndexCallsignAsStringAsSet: return QVariant(this->m_callsign.getStringAsSet()); - case IndexCallsignIcon: + case IndexIcon: return QVariant(this->m_callsign.toIcon()); case IndexController: return this->m_controller.toQVariant(); diff --git a/src/blackmisc/avatcstation.h b/src/blackmisc/avatcstation.h index e491b3489..d18d7ccd4 100644 --- a/src/blackmisc/avatcstation.h +++ b/src/blackmisc/avatcstation.h @@ -36,9 +36,9 @@ namespace BlackMisc enum ColumnIndex { IndexCallsign = 0, + IndexIcon, // representing icon IndexCallsignAsString, IndexCallsignAsStringAsSet, - IndexCallsignIcon, IndexController, IndexControllerRealName, IndexControllerId, diff --git a/src/blackmisc/avcallsign.cpp b/src/blackmisc/avcallsign.cpp index fc25b7671..d5bf89098 100644 --- a/src/blackmisc/avcallsign.cpp +++ b/src/blackmisc/avcallsign.cpp @@ -1,4 +1,14 @@ +/* Copyright (C) 2013 + * 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. + */ + #include "avcallsign.h" +#include "iconsnetwork.h" namespace BlackMisc { @@ -27,34 +37,24 @@ namespace BlackMisc */ const QPixmap &CCallsign::convertToIcon(const CCallsign &callsign) { - static const QPixmap app(QPixmap(":/blackmisc/icons/aircraft_arrival.jpg").scaledToWidth(16, Qt::SmoothTransformation)); - static const QPixmap gnd(QPixmap(":/blackmisc/icons/gnd_framed.jpg").scaledToWidth(16, Qt::SmoothTransformation)); - static const QPixmap del(QPixmap(":/blackmisc/icons/aircraft_departure.jpg").scaledToWidth(16, Qt::SmoothTransformation)); - static const QPixmap twr(QPixmap(":/blackmisc/icons/tower_framed.jpg").scaledToWidth(16, Qt::SmoothTransformation)); - static const QPixmap ctr(QPixmap(":/blackmisc/icons/sky.jpg").scaledToWidth(16, Qt::SmoothTransformation)); - static const QPixmap pilot(QPixmap(":/blackmisc/icons/aeropuerto.png").scaledToWidth(16, Qt::SmoothTransformation)); - static const QPixmap sup(":/blackmisc/icons/SUP.png"); - static const QPixmap obs(":/blackmisc/icons/OBS.png"); - static const QPixmap unknown(QPixmap(":/blackmisc/icons/question.png").scaledToWidth(16, Qt::SmoothTransformation)); - QString t = callsign.asString().toUpper(); - if (t.length() < 3) return unknown; + if (t.length() < 3) return CIconsNetworkAndAviation::roleUnknown(); t = t.right(3); if (callsign.getStringAsSet().contains("_")) { - if ("APP" == t) return app; - if ("GND" == t) return gnd; - if ("TWR" == t) return twr; - if ("DEL" == t) return del; - if ("SUP" == t) return sup; - if ("CTR" == t) return ctr; - if ("OBS" == t) return obs; - return unknown; + if ("APP" == t) return CIconsNetworkAndAviation::roleApproach(); + if ("GND" == t) return CIconsNetworkAndAviation::roleGround(); + if ("TWR" == t) return CIconsNetworkAndAviation::roleTower(); + if ("DEL" == t) return CIconsNetworkAndAviation::roleDelivery(); + if ("CTR" == t) return CIconsNetworkAndAviation::roleCenter(); + if ("SUP" == t) return CIconsNetworkAndAviation::roleSup(); + if ("OBS" == t) return CIconsNetworkAndAviation::roleObs(); + return CIconsNetworkAndAviation::roleUnknown(); } else { - return pilot; + return CIconsNetworkAndAviation::rolePilot(); } } diff --git a/src/blackmisc/avcallsign.h b/src/blackmisc/avcallsign.h index 0b6f9e214..14054ce65 100644 --- a/src/blackmisc/avcallsign.h +++ b/src/blackmisc/avcallsign.h @@ -1,17 +1,24 @@ -/* Copyright (C) 2013 VATSIM Community / authors - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +/* Copyright (C) 2013 + * 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 BLACKMISC_CALLSIGN_H #define BLACKMISC_CALLSIGN_H + #include "valueobject.h" namespace BlackMisc { namespace Aviation { - //! \brief Value object encapsulating information of a callsign. + //! Value object encapsulating information of a callsign. class CCallsign : public BlackMisc::CValueObject { diff --git a/src/blackmisc/avcallsignlist.cpp b/src/blackmisc/avcallsignlist.cpp index 66daf2fc1..33f025a33 100644 --- a/src/blackmisc/avcallsignlist.cpp +++ b/src/blackmisc/avcallsignlist.cpp @@ -1,7 +1,11 @@ -/* Copyright (C) 2013 VATSIM Community / authors - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +/* Copyright (C) 2013 + * 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. + */ #include "avcallsignlist.h" #include "predicates.h" diff --git a/src/blackmisc/avcallsignlist.h b/src/blackmisc/avcallsignlist.h index 24ea84683..b9402e53d 100644 --- a/src/blackmisc/avcallsignlist.h +++ b/src/blackmisc/avcallsignlist.h @@ -1,11 +1,13 @@ -/* Copyright (C) 2013 VATSIM Community / authors - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +/* Copyright (C) 2013 + * 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 -*/ +//! \file #ifndef BLACKMISC_CALLSIGNLIST_H #define BLACKMISC_CALLSIGNLIST_H diff --git a/src/blackmisc/avheading.cpp b/src/blackmisc/avheading.cpp index 6f76a2684..7e12a9d93 100644 --- a/src/blackmisc/avheading.cpp +++ b/src/blackmisc/avheading.cpp @@ -1,7 +1,11 @@ -/* Copyright (C) 2013 VATSIM Community - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +/* Copyright (C) 2013 + * 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. + */ #include "blackmiscfreefunctions.h" #include "avheading.h" diff --git a/src/blackmisc/avheading.h b/src/blackmisc/avheading.h index 67f36164a..856eb610c 100644 --- a/src/blackmisc/avheading.h +++ b/src/blackmisc/avheading.h @@ -1,7 +1,11 @@ -/* Copyright (C) 2013 VATSIM Community / contributors - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +/* Copyright (C) 2013 + * 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. + */ #ifndef BLACKMISC_AVHEADING_H #define BLACKMISC_AVHEADING_H diff --git a/src/blackmisc/avinformationmessage.cpp b/src/blackmisc/avinformationmessage.cpp index c0ac2aa6b..85d33a7b3 100644 --- a/src/blackmisc/avinformationmessage.cpp +++ b/src/blackmisc/avinformationmessage.cpp @@ -1,3 +1,12 @@ +/* Copyright (C) 2013 + * 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. + */ + #include "avinformationmessage.h" #include "blackmiscfreefunctions.h" diff --git a/src/blackmisc/avinformationmessage.h b/src/blackmisc/avinformationmessage.h index 406fb572e..c3bb3eb87 100644 --- a/src/blackmisc/avinformationmessage.h +++ b/src/blackmisc/avinformationmessage.h @@ -1,11 +1,13 @@ -/* Copyright (C) 2013 VATSIM Community / authors - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +/* Copyright (C) 2013 + * 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 -*/ +//! \file #ifndef BLACKMISC_INFORMATIONMESSAGE_H #define BLACKMISC_INFORMATIONMESSAGE_H diff --git a/src/blackmisc/blackmiscfreefunctions.h b/src/blackmisc/blackmiscfreefunctions.h index ba2770704..fa6fd1095 100644 --- a/src/blackmisc/blackmiscfreefunctions.h +++ b/src/blackmisc/blackmiscfreefunctions.h @@ -27,9 +27,7 @@ namespace BlackMisc { namespace PhysicalQuantities { - /*! - * \brief Register all metadata for PQs - */ + //! Register all metadata for PQs void registerMetadata(); } // PQ diff --git a/src/blackmisc/indexvariantmap.cpp b/src/blackmisc/indexvariantmap.cpp index 95d1eede4..d8563edb1 100644 --- a/src/blackmisc/indexvariantmap.cpp +++ b/src/blackmisc/indexvariantmap.cpp @@ -1,3 +1,12 @@ +/* Copyright (C) 2013 + * 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. + */ + #include "indexvariantmap.h" #include "blackmiscfreefunctions.h" #include "avaltitude.h" diff --git a/src/blackmisc/indexvariantmap.h b/src/blackmisc/indexvariantmap.h index 3b72271b2..9138bb618 100644 --- a/src/blackmisc/indexvariantmap.h +++ b/src/blackmisc/indexvariantmap.h @@ -1,11 +1,13 @@ -/* Copyright (C) 2013 VATSIM Community / authors - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +/* Copyright (C) 2013 + * 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 -*/ +//! \file #include "valueobject.h" #include "variant.h" @@ -27,7 +29,7 @@ namespace BlackMisc public: /*! - * \brief Constructor + * Constructor * \param wildcard when used in search, for setting values irrelevant */ CIndexVariantMap(bool wildcard = false); @@ -65,10 +67,10 @@ namespace BlackMisc //! values QList values() const { return this->m_values.values(); } - //! \brief Wildcard, only relevant when used in search + //! Wildcard, only relevant when used in search bool isWildcard() const { return this->m_wildcard; } - //! \brief Wildcard, only relevant when used in search + //! Wildcard, only relevant when used in search void setWildcard(bool wildcard) { this->m_wildcard = wildcard; } //! clear diff --git a/src/blackmisc/nwvoicecapabilites.cpp b/src/blackmisc/nwvoicecapabilites.cpp index 93f7d7032..08c1db607 100644 --- a/src/blackmisc/nwvoicecapabilites.cpp +++ b/src/blackmisc/nwvoicecapabilites.cpp @@ -1,3 +1,12 @@ +/* Copyright (C) 2013 + * 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. + */ + #include "blackmisc/nwvoicecapabilities.h" #include "blackmisc/blackmiscfreefunctions.h" #include diff --git a/src/blackmisc/nwvoicecapabilities.h b/src/blackmisc/nwvoicecapabilities.h index 3915ec66b..ef72272b1 100644 --- a/src/blackmisc/nwvoicecapabilities.h +++ b/src/blackmisc/nwvoicecapabilities.h @@ -1,11 +1,17 @@ -/* Copyright (C) 2013 VATSIM Community / authors - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +/* Copyright (C) 2013 + * 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. + */ #ifndef BLACKMISC_VOICECAPABILITIES_H #define BLACKMISC_VOICECAPABILITIES_H +//! \file + #include "valueobject.h" namespace BlackMisc @@ -50,10 +56,10 @@ namespace BlackMisc //! \copydoc CValueObject::toIcon() virtual const QPixmap &toIcon() const override; - //! \brief Equal operator == + //! Equal operator == bool operator ==(const CVoiceCapabilities &other) const; - //! \brief Unequal operator != + //! Unequal operator != bool operator !=(const CVoiceCapabilities &other) const; //! \copydoc CValueObject::getValueHash() @@ -65,10 +71,10 @@ namespace BlackMisc //! \copydoc CValueObject::fromJson void fromJson(const QJsonObject &json) override; - //! \brief Register metadata + //! Register metadata static void registerMetadata(); - //! \brief Members + //! Members static const QStringList &jsonMembers(); protected: diff --git a/src/blackmisc/pqphysicalquantity.cpp b/src/blackmisc/pqphysicalquantity.cpp index cdef08c85..eff0817ff 100644 --- a/src/blackmisc/pqphysicalquantity.cpp +++ b/src/blackmisc/pqphysicalquantity.cpp @@ -1,7 +1,11 @@ -/* Copyright (C) 2013 VATSIM Community / contributors - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +/* Copyright (C) 2013 + * 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. + */ #include "blackmisc/pqallquantities.h" #include "blackmiscfreefunctions.h" diff --git a/src/blackmisc/pqphysicalquantity.h b/src/blackmisc/pqphysicalquantity.h index c2c0670e3..8a238678c 100644 --- a/src/blackmisc/pqphysicalquantity.h +++ b/src/blackmisc/pqphysicalquantity.h @@ -1,7 +1,13 @@ -/* Copyright (C) 2013 VATSIM Community / contributors - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +/* Copyright (C) 2013 + * 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 BLACKMISC_PQPHYSICALQUANTITY_H #define BLACKMISC_PQPHYSICALQUANTITY_H @@ -21,7 +27,7 @@ namespace BlackMisc namespace PhysicalQuantities { /*! - * \brief A physical quantity such as "5m", "20s", "1500ft/s" + * A physical quantity such as "5m", "20s", "1500ft/s" */ template class CPhysicalQuantity : public BlackMisc::CValueObject { diff --git a/src/blackmisc/statusmessage.cpp b/src/blackmisc/statusmessage.cpp index 2586591c9..0b9bb3ced 100644 --- a/src/blackmisc/statusmessage.cpp +++ b/src/blackmisc/statusmessage.cpp @@ -1,3 +1,12 @@ +/* Copyright (C) 2013 + * 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. + */ + #include "statusmessage.h" #include "blackmiscfreefunctions.h" #include diff --git a/src/blackmisc/statusmessage.h b/src/blackmisc/statusmessage.h index 3cd954adf..a64dd4a7b 100644 --- a/src/blackmisc/statusmessage.h +++ b/src/blackmisc/statusmessage.h @@ -1,6 +1,17 @@ +/* Copyright (C) 2013 + * 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. + */ + #ifndef BLACKMISC_STATUSMESSAGE_H #define BLACKMISC_STATUSMESSAGE_H +//! \file + #include "valueobject.h" #include @@ -8,14 +19,12 @@ namespace BlackMisc { /*! - * \brief Streamable status message, e.g. from Core -> GUI + * Streamable status message, e.g. from Core -> GUI */ class CStatusMessage : public CValueObject { public: - /*! - * \brief Status types - */ + //! Status types enum StatusType { TypeUnknown, // not set diff --git a/src/blackmisc/valueobject.cpp b/src/blackmisc/valueobject.cpp index 3f62a4551..0beb1ff41 100644 --- a/src/blackmisc/valueobject.cpp +++ b/src/blackmisc/valueobject.cpp @@ -1,3 +1,12 @@ +/* Copyright (C) 2013 + * 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. + */ + #include "valueobject.h" #include "indexvariantmap.h" #include "blackmiscfreefunctions.h" @@ -79,7 +88,7 @@ namespace BlackMisc if (ut <= QVariant::UserType) return nullptr; // complex Qt type if (qv.canConvert()) return nullptr; // not unstreamed yet - // this cast cannot be dynamic, so the aboce conditions are crucical + // this cast cannot be dynamic, so the above conditions are crucical const CValueObject *vo = static_cast(qv.constData()); return vo; } diff --git a/src/blackmisc/valueobject.h b/src/blackmisc/valueobject.h index 8d8e29436..ecd7b2d3e 100644 --- a/src/blackmisc/valueobject.h +++ b/src/blackmisc/valueobject.h @@ -1,3 +1,12 @@ +/* Copyright (C) 2013 + * 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. + */ + #ifndef BLACKMISC_VALUEOBJECT_H #define BLACKMISC_VALUEOBJECT_H @@ -315,12 +324,7 @@ namespace BlackMisc return json; } - /*! - * \brief Non member, non friend operator >> for JSON - * \param json - * \param value - * \return - */ + //! Non member, non friend operator << for JSON inline QJsonArray &operator<<(QJsonArray &json, const CValueObject &value) { json.append(value.toJson()); @@ -328,7 +332,7 @@ namespace BlackMisc } /*! - * \brief Non member, non friend operator >> for JSON + * \brief Non member, non friend operator << for JSON * \param json * \param value as pair name/value * \return diff --git a/src/blackmisc/variant.h b/src/blackmisc/variant.h index e1d548d23..a03338c47 100644 --- a/src/blackmisc/variant.h +++ b/src/blackmisc/variant.h @@ -1,11 +1,13 @@ -/* Copyright (C) 2014 VATSIM Community / authors - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +/* Copyright (C) 2013 + * 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 -*/ +//! \file #ifndef BLACKMISC_VARIANT_H #define BLACKMISC_VARIANT_H