diff --git a/src/blackcore/settings/audio.h b/src/blackcore/settings/audio.h index 1a5883241..25763d9f4 100644 --- a/src/blackcore/settings/audio.h +++ b/src/blackcore/settings/audio.h @@ -33,7 +33,6 @@ namespace BlackCore //! \copydoc BlackMisc::CSettingTrait::isValid static bool isValid(const BlackMisc::Audio::Settings::CSettingsAudio &value) { Q_UNUSED(value); return true; } }; - } // ns } // ns } // ns diff --git a/src/blackgui/dropbase.h b/src/blackgui/dropbase.h index c82dd3e72..38c79bc69 100644 --- a/src/blackgui/dropbase.h +++ b/src/blackgui/dropbase.h @@ -23,9 +23,6 @@ namespace BlackGui class BLACKGUI_EXPORT CDropBase { public: - //! Set text for drop site - void setInfoText(const QString &dropSiteText); - //! Accepted ids void setAcceptedMetaTypeIds(const QList &ids); @@ -38,15 +35,15 @@ namespace BlackGui //! Drop allowed virtual void allowDrop(bool allowed); + //! Accept drop? + bool acceptDrop(const QMimeData *mime) const; + //! Mime data to CVariant (normally encapsulating a value object) BlackMisc::CVariant toCVariant(const QMimeData *mime) const; protected: CDropBase(); - //! Accept drop - bool acceptDrop(const QMimeData *mime) const; - private: bool m_allowDrop = true; //!< dropping allowed? QList m_acceptedMetaTypes; //!< accepted meta types diff --git a/src/blackmisc/simulation/aircraftmodel.h b/src/blackmisc/simulation/aircraftmodel.h index ce957581b..8fe936c6c 100644 --- a/src/blackmisc/simulation/aircraftmodel.h +++ b/src/blackmisc/simulation/aircraftmodel.h @@ -106,6 +106,9 @@ namespace BlackMisc //! Compare by index int comparePropertyByIndex(const CAircraftModel &compareValue, const CPropertyIndex &index) const; + //! \copydoc BlackMisc::Mixin::String::toQString + QString convertToQString(bool i18n = false) const; + //! Can be initialized from FSD bool canInitializeFromFsd() const; @@ -284,9 +287,6 @@ namespace BlackMisc //! Validate BlackMisc::CStatusMessageList validate(bool withNestedObjects) const; - //! \copydoc BlackMisc::Mixin::String::toQString - QString convertToQString(bool i18n = false) const; - //! To database JSON QJsonObject toDatabaseJson() const;