flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-19 20:25:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #413 Access control of convertToQString changed from protected to public.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-04-30 21:11:12 +01:00
parent 97d83e5e41
commit b64ae55a86
61 changed files with 24 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/pq/measurementunit.h
View File

@@ -247,13 +247,13 @@ namespace BlackMisc
// return this->getName(false);
// }
public:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override
{
return this->getSymbol(i18n);
}
public:
//! \copydoc CValueObject::marshallToDbus
void marshallToDbus(QDBusArgument &argument) const
{

7
src/blackmisc/pq/physicalquantity.h
View File

@@ -222,8 +222,10 @@ namespace BlackMisc
//! \copydoc CValueObject::setPropertyByIndex
virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override;
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
protected:
//! Default constructor
//! \todo Remove as part of MS' CValueObject refactoring
CPhysicalQuantity();
@@ -234,9 +236,6 @@ namespace BlackMisc
//! Constructor by parsed string, e.g. 10m
CPhysicalQuantity(const QString &unitString);
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
private:
double m_value; //!< numeric part
MU m_unit; //!< unit part

3
src/blackmisc/pq/pqstring.h
View File

@@ -29,11 +29,10 @@ namespace BlackMisc
*/
class BLACKMISC_EXPORT CPqString : public CValueObject<CPqString>
{
protected:
public:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
public:
//! Number separators / group separators
enum SeparatorMode
{