From 862a84b66128ef5cc0d540b5111efb51db9792f2 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 1 Aug 2016 15:37:42 +0200 Subject: [PATCH] refs #697, BlackGui settings renamed --- src/blackgui/components/logincomponent.h | 4 +- src/blackgui/components/navigatordialog.cpp | 4 +- src/blackgui/components/navigatordialog.h | 4 +- src/blackgui/dockwidget.cpp | 26 ++++++------ src/blackgui/dockwidget.h | 8 ++-- src/blackgui/registermetadata.cpp | 10 ++--- ...sdockwidget.cpp => dockwidgetsettings.cpp} | 40 +++++++++---------- ...tingsdockwidget.h => dockwidgetsettings.h} | 36 ++++++++--------- .../settings/{settingsgui.h => guisettings.h} | 2 +- ...ngsnavigator.cpp => navigatorsettings.cpp} | 24 +++++------ ...ettingsnavigator.h => navigatorsettings.h} | 20 +++++----- src/blackmisc/propertyindex.h | 4 +- 12 files changed, 91 insertions(+), 91 deletions(-) rename src/blackgui/settings/{settingsdockwidget.cpp => dockwidgetsettings.cpp} (80%) rename src/blackgui/settings/{settingsdockwidget.h => dockwidgetsettings.h} (82%) rename src/blackgui/settings/{settingsgui.h => guisettings.h} (89%) rename src/blackgui/settings/{settingsnavigator.cpp => navigatorsettings.cpp} (79%) rename src/blackgui/settings/{settingsnavigator.h => navigatorsettings.h} (85%) diff --git a/src/blackgui/components/logincomponent.h b/src/blackgui/components/logincomponent.h index 1c2480094..47f9f27a2 100644 --- a/src/blackgui/components/logincomponent.h +++ b/src/blackgui/components/logincomponent.h @@ -15,7 +15,7 @@ #include "blackcore/settings/network.h" #include "blackcore/data/vatsimsetup.h" #include "blackgui/blackguiexport.h" -#include "blackgui/settings/settingsgui.h" +#include "blackgui/settings/guisettings.h" #include "blackmisc/aviation/callsign.h" #include "blackmisc/network/entityflags.h" #include "blackmisc/network/server.h" @@ -166,7 +166,7 @@ namespace BlackGui const int LogoffIntervalSeconds = 10; QTimer *m_logoffCountdownTimer { nullptr }; BlackMisc::CSettingReadOnly m_otherTrafficNetworkServers { this, &CLoginComponent::ps_reloadSettings }; - BlackMisc::CSetting m_currentAircraftModel { this }; + BlackMisc::CSetting m_currentAircraftModel { this }; BlackMisc::CData m_currentVatsimServer { this }; }; } // namespace diff --git a/src/blackgui/components/navigatordialog.cpp b/src/blackgui/components/navigatordialog.cpp index e99e6d4b8..cd3bd09bb 100644 --- a/src/blackgui/components/navigatordialog.cpp +++ b/src/blackgui/components/navigatordialog.cpp @@ -118,7 +118,7 @@ namespace BlackGui void CNavigatorDialog::restoreFromSettings() { - const CSettingsNavigator s = this->m_settings.get(); + const CNavigatorSettings s = this->m_settings.get(); this->setContentsMargins(s.getMargins()); if (this->isFrameless() != s.isFramless()) { this->toggleFrameless(); } this->buildNavigator(s.getColumns()); @@ -128,7 +128,7 @@ namespace BlackGui void CNavigatorDialog::saveToSettings() { - CSettingsNavigator s = this->m_settings.get(); + CNavigatorSettings s = this->m_settings.get(); s.setFrameless(this->isFrameless()); s.setMargins(this->contentsMargins()); s.setGeometry(this->saveGeometry()); diff --git a/src/blackgui/components/navigatordialog.h b/src/blackgui/components/navigatordialog.h index d11d71de4..e746d27c7 100644 --- a/src/blackgui/components/navigatordialog.h +++ b/src/blackgui/components/navigatordialog.h @@ -14,7 +14,7 @@ #include "blackgui/blackguiexport.h" #include "blackgui/enableforframelesswindow.h" -#include "blackgui/settings/settingsnavigator.h" +#include "blackgui/settings/navigatorsettings.h" #include #include @@ -118,7 +118,7 @@ namespace BlackGui int m_currentColumns = 1; QWidgetAction *m_marginMenuAction = nullptr; //!< menu widget(!) action for margin widget CMarginsInput *m_input = nullptr; //!< margins widget - BlackMisc::CSetting m_settings { this, &CNavigatorDialog::ps_settingsChanged }; + BlackMisc::CSetting m_settings { this, &CNavigatorDialog::ps_settingsChanged }; }; } // ns } // ns diff --git a/src/blackgui/dockwidget.cpp b/src/blackgui/dockwidget.cpp index b8b575146..9f72256bb 100644 --- a/src/blackgui/dockwidget.cpp +++ b/src/blackgui/dockwidget.cpp @@ -99,7 +99,7 @@ namespace BlackGui void CDockWidget::setMarginsWhenFloating(const QMargins &margins) { - CSettingsDockWidget s = this->getSettings(); + CDockWidgetSettings s = this->getSettings(); s.setMarginsWhenFloating(margins); this->setSettings(s); } @@ -116,7 +116,7 @@ namespace BlackGui void CDockWidget::setMarginsWhenFramelessFloating(const QMargins &margins) { - CSettingsDockWidget s = this->getSettings(); + CDockWidgetSettings s = this->getSettings(); s.setMarginsWhenFramelessFloating(margins); this->setSettings(s); } @@ -133,7 +133,7 @@ namespace BlackGui void CDockWidget::setMarginsWhenDocked(const QMargins &margins) { - CSettingsDockWidget s = this->getSettings(); + CDockWidgetSettings s = this->getSettings(); s.setMarginsWhenDocked(margins); this->setSettings(s); } @@ -272,7 +272,7 @@ namespace BlackGui bool CDockWidget::restoreFromSettings() { - const CSettingsDockWidget s = this->getSettings(); + const CDockWidgetSettings s = this->getSettings(); if (s.isFloating() != this->isFloating()) { this->toggleFloating(); @@ -536,7 +536,7 @@ namespace BlackGui void CDockWidget::initSettings() { const QString name(this->getNameForSettings()); - CSettingsDockWidgets all = this->m_settings.get(); + CDockWidgetsSettings all = this->m_settings.get(); if (all.contains(name)) { return; } all.getByNameOrInitToDefault(name); this->m_settings.setAndSave(all); @@ -549,19 +549,19 @@ namespace BlackGui return n; } - CSettingsDockWidget CDockWidget::getSettings() const + CDockWidgetSettings CDockWidget::getSettings() const { - const CSettingsDockWidgets all = this->m_settings.get(); + const CDockWidgetsSettings all = this->m_settings.get(); const QString name(this->getNameForSettings()); - const CSettingsDockWidget s = all.value(name); + const CDockWidgetSettings s = all.value(name); return s; } - void CDockWidget::setSettings(const CSettingsDockWidget &settings) + void CDockWidget::setSettings(const CDockWidgetSettings &settings) { - const CSettingsDockWidget current = getSettings(); + const CDockWidgetSettings current = getSettings(); if (current == settings) { return; } - CSettingsDockWidgets all = this->m_settings.get(); + CDockWidgetsSettings all = this->m_settings.get(); const QString name(this->getNameForSettings()); all.insert(name, settings); const CStatusMessage m = this->m_settings.set(all); // saved when shutdown @@ -573,7 +573,7 @@ namespace BlackGui void CDockWidget::saveToSettings() { - CSettingsDockWidget s = this->getSettings(); + CDockWidgetSettings s = this->getSettings(); s.setFloating(this->isFloating()); s.setFrameless(this->isFrameless()); s.setGeometry(this->saveGeometry()); @@ -582,7 +582,7 @@ namespace BlackGui void CDockWidget::resetSettings() { - CSettingsDockWidget s = this->getSettings(); + CDockWidgetSettings s = this->getSettings(); s.reset(); this->setSettings(s); this->restoreFromSettings(); diff --git a/src/blackgui/dockwidget.h b/src/blackgui/dockwidget.h index d600ee512..b89166db5 100644 --- a/src/blackgui/dockwidget.h +++ b/src/blackgui/dockwidget.h @@ -15,7 +15,7 @@ #include "blackgui/blackguiexport.h" #include "blackgui/enableforframelesswindow.h" #include "blackgui/managedstatusbar.h" -#include "blackgui/settings/settingsdockwidget.h" +#include "blackgui/settings/dockwidgetsettings.h" #include "blackmisc/statusmessage.h" #include "blackmisc/statusmessagelist.h" @@ -232,7 +232,7 @@ namespace BlackGui bool m_selected = false; //!< selected when tabbed bool m_dockWidgetVisible = false; //!< logical visible, not to be confused with QDockWidget::isVisible() bool m_wasFrameless = false; //!< frameless when last floating - BlackMisc::CSetting m_settings { this, &CDockWidget::ps_settingsChanged }; //!< all docked wigets settings + BlackMisc::CSetting m_settings { this, &CDockWidget::ps_settingsChanged }; //!< all docked wigets settings //! Empty widget with no size void initTitleBarWidgets(); @@ -250,10 +250,10 @@ namespace BlackGui QString getNameForSettings() const; //! This widget`s settings - BlackGui::Settings::CSettingsDockWidget getSettings() const; + BlackGui::Settings::CDockWidgetSettings getSettings() const; //! Save my updated settings - void setSettings(const BlackGui::Settings::CSettingsDockWidget &settings); + void setSettings(const BlackGui::Settings::CDockWidgetSettings &settings); }; } // namespace diff --git a/src/blackgui/registermetadata.cpp b/src/blackgui/registermetadata.cpp index 86e2e4b57..e7e08edfe 100644 --- a/src/blackgui/registermetadata.cpp +++ b/src/blackgui/registermetadata.cpp @@ -8,17 +8,17 @@ */ #include "blackgui/registermetadata.h" -#include "blackgui/settings/settingsdockwidget.h" -#include "blackgui/settings/settingsnavigator.h" +#include "blackgui/settings/dockwidgetsettings.h" +#include "blackgui/settings/navigatorsettings.h" #include "blackgui/components/registermetadatacomponents.h" namespace BlackGui { void registerMetadata() { - BlackGui::Settings::CSettingsDockWidget::registerMetadata(); - BlackGui::Settings::CSettingsDockWidgets::registerMetadata(); - BlackGui::Settings::CSettingsNavigator::registerMetadata(); + BlackGui::Settings::CDockWidgetSettings::registerMetadata(); + BlackGui::Settings::CDockWidgetsSettings::registerMetadata(); + BlackGui::Settings::CNavigatorSettings::registerMetadata(); BlackGui::Components::registerMetadata(); } } diff --git a/src/blackgui/settings/settingsdockwidget.cpp b/src/blackgui/settings/dockwidgetsettings.cpp similarity index 80% rename from src/blackgui/settings/settingsdockwidget.cpp rename to src/blackgui/settings/dockwidgetsettings.cpp index 3120bb959..f87f0bf1c 100644 --- a/src/blackgui/settings/settingsdockwidget.cpp +++ b/src/blackgui/settings/dockwidgetsettings.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "settingsdockwidget.h" +#include "dockwidgetsettings.h" #include "blackgui/guiutility.h" #include "blackmisc/stringutils.h" #include @@ -19,10 +19,10 @@ namespace BlackGui { namespace Settings { - CSettingsDockWidget::CSettingsDockWidget() + CDockWidgetSettings::CDockWidgetSettings() { } - void CSettingsDockWidget::resetMarginsToDefault() + void CDockWidgetSettings::resetMarginsToDefault() { // this->setMarginsWhenFloating(QMargins(0, 3, 15, 35)); // found by trial and error on windows this->setMarginsWhenFloating(QMargins(0, 0, 0, 0)); @@ -30,58 +30,58 @@ namespace BlackGui this->setMarginsWhenDocked(QMargins(0, 0, 0, 0)); } - void CSettingsDockWidget::reset() + void CDockWidgetSettings::reset() { this->resetMarginsToDefault(); this->m_geometry = ""; } - void CSettingsDockWidget::setMarginsWhenFramelessFloating(const QMargins &margins) + void CDockWidgetSettings::setMarginsWhenFramelessFloating(const QMargins &margins) { this->m_floatingFramelessMargins = CGuiUtility::marginsToString(margins); } - QMargins CSettingsDockWidget::getMarginsWhenFramelessFloating() const + QMargins CDockWidgetSettings::getMarginsWhenFramelessFloating() const { return CGuiUtility::stringToMargins(this->m_floatingFramelessMargins); } - void CSettingsDockWidget::setMarginsWhenFloating(const QMargins &margins) + void CDockWidgetSettings::setMarginsWhenFloating(const QMargins &margins) { this->m_floatingMargins = CGuiUtility::marginsToString(margins); } - QMargins CSettingsDockWidget::getMarginsWhenFloating() const + QMargins CDockWidgetSettings::getMarginsWhenFloating() const { return CGuiUtility::stringToMargins(this->m_floatingMargins); } - void CSettingsDockWidget::setMarginsWhenDocked(const QMargins &margins) + void CDockWidgetSettings::setMarginsWhenDocked(const QMargins &margins) { this->m_dockedMargins = CGuiUtility::marginsToString(margins); } - QMargins CSettingsDockWidget::getMarginsWhenDocked() const + QMargins CDockWidgetSettings::getMarginsWhenDocked() const { return CGuiUtility::stringToMargins(this->m_dockedMargins); } - QByteArray CSettingsDockWidget::getGeometry() const + QByteArray CDockWidgetSettings::getGeometry() const { return byteArrayFromHexString(this->m_geometry); } - void CSettingsDockWidget::setGeometry(const QByteArray &ba) + void CDockWidgetSettings::setGeometry(const QByteArray &ba) { this->m_geometry = bytesToHexString(ba); } - QString CSettingsDockWidget::convertToQString(bool i18n) const + QString CDockWidgetSettings::convertToQString(bool i18n) const { return convertToQString(", ", i18n); } - QString CSettingsDockWidget::convertToQString(const QString &separator, bool i18n) const + QString CDockWidgetSettings::convertToQString(const QString &separator, bool i18n) const { Q_UNUSED(i18n); QString s("floating: "); @@ -101,7 +101,7 @@ namespace BlackGui return s; } - CVariant CSettingsDockWidget::propertyByIndex(const CPropertyIndex &index) const + CVariant CDockWidgetSettings::propertyByIndex(const CPropertyIndex &index) const { if (index.isMyself()) { return CVariant::from(*this); } ColumnIndex i = index.frontCasted(); @@ -122,9 +122,9 @@ namespace BlackGui } } - void CSettingsDockWidget::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant) + void CDockWidgetSettings::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant) { - if (index.isMyself()) { (*this) = variant.to(); return; } + if (index.isMyself()) { (*this) = variant.to(); return; } ColumnIndex i = index.frontCasted(); switch (i) @@ -150,10 +150,10 @@ namespace BlackGui } } - CSettingsDockWidget CSettingsDockWidgets::getByNameOrInitToDefault(const QString &name) + CDockWidgetSettings CDockWidgetsSettings::getByNameOrInitToDefault(const QString &name) { if (this->contains(name)) { return this->value(name); } - CSettingsDockWidget s; + CDockWidgetSettings s; // default values can be set here, this could be enhanced if needed // e.g. by platform dependent defaults @@ -162,7 +162,7 @@ namespace BlackGui return s; } - void CSettingsDockWidgets::resetToDefaults(const QString &name) + void CDockWidgetsSettings::resetToDefaults(const QString &name) { if (this->contains(name)) { diff --git a/src/blackgui/settings/settingsdockwidget.h b/src/blackgui/settings/dockwidgetsettings.h similarity index 82% rename from src/blackgui/settings/settingsdockwidget.h rename to src/blackgui/settings/dockwidgetsettings.h index 423ddcd89..219f47539 100644 --- a/src/blackgui/settings/settingsdockwidget.h +++ b/src/blackgui/settings/dockwidgetsettings.h @@ -27,14 +27,14 @@ namespace BlackGui namespace Settings { //! Settings for dockwidget - class BLACKGUI_EXPORT CSettingsDockWidget : - public BlackMisc::CValueObject + class BLACKGUI_EXPORT CDockWidgetSettings : + public BlackMisc::CValueObject { public: //! Properties by index enum ColumnIndex { - IndexFloatingMargins = BlackMisc::CPropertyIndex::GlobalIndexCSettingsDockWidget, + IndexFloatingMargins = BlackMisc::CPropertyIndex::GlobalIndexCDockWidgetSettings, IndexFloatingFramelessMargins, IndexDockedMargins, IndexFrameless, @@ -42,10 +42,10 @@ namespace BlackGui }; //! Default constructor - CSettingsDockWidget(); + CDockWidgetSettings(); //! Destructor. - ~CSettingsDockWidget() {} + ~CDockWidgetSettings() {} //! Reset margins to default void resetMarginsToDefault(); @@ -110,7 +110,7 @@ namespace BlackGui bool m_frameless = false; //!< frameless BLACK_METACLASS( - CSettingsDockWidget, + CDockWidgetSettings, BLACK_METAMEMBER(floatingMargins), BLACK_METAMEMBER(floatingFramelessMargins), BLACK_METAMEMBER(dockedMargins), @@ -121,29 +121,29 @@ namespace BlackGui }; //! Needed to compile properly with Q_DECLARE_METATYPE - using CDockWidgetSettingsDictionary = BlackMisc::CDictionary; + using CDockWidgetSettingsDictionary = BlackMisc::CDictionary; //! Settings for all dock widgets - class BLACKGUI_EXPORT CSettingsDockWidgets : + class BLACKGUI_EXPORT CDockWidgetsSettings : public CDockWidgetSettingsDictionary, - public BlackMisc::Mixin::MetaType, - public BlackMisc::Mixin::JsonOperators + public BlackMisc::Mixin::MetaType, + public BlackMisc::Mixin::JsonOperators { public: - BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CSettingsDockWidgets) + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CDockWidgetsSettings) //! Default constructor. - CSettingsDockWidgets() {} + CDockWidgetsSettings() {} //! Get setting or init by estimated default values - CSettingsDockWidget getByNameOrInitToDefault(const QString &name); + CDockWidgetSettings getByNameOrInitToDefault(const QString &name); //! Reset to defaults void resetToDefaults(const QString &name); }; //! Trait for settings for dock widget - struct SettingsDockWidgets : public BlackMisc::CSettingTrait + struct TDockWidgets : public BlackMisc::CSettingTrait { //! Key in data cache static const char *key() { return "guidockwidget"; } @@ -151,10 +151,10 @@ namespace BlackGui } // ns } // ns -Q_DECLARE_METATYPE(BlackGui::Settings::CSettingsDockWidget) -Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) +Q_DECLARE_METATYPE(BlackGui::Settings::CDockWidgetSettings) +Q_DECLARE_METATYPE(BlackMisc::CCollection) +Q_DECLARE_METATYPE(BlackMisc::CSequence) Q_DECLARE_METATYPE(BlackGui::Settings::CDockWidgetSettingsDictionary) -Q_DECLARE_METATYPE(BlackGui::Settings::CSettingsDockWidgets) +Q_DECLARE_METATYPE(BlackGui::Settings::CDockWidgetsSettings) #endif // guard diff --git a/src/blackgui/settings/settingsgui.h b/src/blackgui/settings/guisettings.h similarity index 89% rename from src/blackgui/settings/settingsgui.h rename to src/blackgui/settings/guisettings.h index b669941a3..edf7fc3c6 100644 --- a/src/blackgui/settings/settingsgui.h +++ b/src/blackgui/settings/guisettings.h @@ -21,7 +21,7 @@ namespace BlackGui namespace Settings { //! Settings for last manual entries of own aircraft mode - struct OwnAircraftModel : public BlackMisc::CSettingTrait + struct TOwnAircraftModel : public BlackMisc::CSettingTrait { //! Key in data cache static const char *key() { return "guinownaircraftmodel"; } diff --git a/src/blackgui/settings/settingsnavigator.cpp b/src/blackgui/settings/navigatorsettings.cpp similarity index 79% rename from src/blackgui/settings/settingsnavigator.cpp rename to src/blackgui/settings/navigatorsettings.cpp index a0cc35d5d..6f3b0393e 100644 --- a/src/blackgui/settings/settingsnavigator.cpp +++ b/src/blackgui/settings/navigatorsettings.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "settingsnavigator.h" +#include "navigatorsettings.h" #include "blackgui/guiutility.h" #include "blackmisc/stringutils.h" #include @@ -19,38 +19,38 @@ namespace BlackGui { namespace Settings { - CSettingsNavigator::CSettingsNavigator() + CNavigatorSettings::CNavigatorSettings() { } - void CSettingsNavigator::reset() + void CNavigatorSettings::reset() { } - void CSettingsNavigator::setMargins(const QMargins &margins) + void CNavigatorSettings::setMargins(const QMargins &margins) { this->m_margins = CGuiUtility::marginsToString(margins); } - QMargins CSettingsNavigator::getMargins() const + QMargins CNavigatorSettings::getMargins() const { return CGuiUtility::stringToMargins(this->m_margins); } - QByteArray CSettingsNavigator::getGeometry() const + QByteArray CNavigatorSettings::getGeometry() const { return byteArrayFromHexString(this->m_geometry); } - void CSettingsNavigator::setGeometry(const QByteArray &ba) + void CNavigatorSettings::setGeometry(const QByteArray &ba) { this->m_geometry = bytesToHexString(ba); } - QString CSettingsNavigator::convertToQString(bool i18n) const + QString CNavigatorSettings::convertToQString(bool i18n) const { return convertToQString(", ", i18n); } - QString CSettingsNavigator::convertToQString(const QString &separator, bool i18n) const + QString CNavigatorSettings::convertToQString(const QString &separator, bool i18n) const { Q_UNUSED(i18n); QString s("margins: "); @@ -64,7 +64,7 @@ namespace BlackGui return s; } - CVariant CSettingsNavigator::propertyByIndex(const CPropertyIndex &index) const + CVariant CNavigatorSettings::propertyByIndex(const CPropertyIndex &index) const { if (index.isMyself()) { return CVariant::from(*this); } ColumnIndex i = index.frontCasted(); @@ -81,9 +81,9 @@ namespace BlackGui } } - void CSettingsNavigator::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant) + void CNavigatorSettings::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant) { - if (index.isMyself()) { (*this) = variant.to(); return; } + if (index.isMyself()) { (*this) = variant.to(); return; } ColumnIndex i = index.frontCasted(); switch (i) diff --git a/src/blackgui/settings/settingsnavigator.h b/src/blackgui/settings/navigatorsettings.h similarity index 85% rename from src/blackgui/settings/settingsnavigator.h rename to src/blackgui/settings/navigatorsettings.h index ff2b47194..8ace08ac2 100644 --- a/src/blackgui/settings/settingsnavigator.h +++ b/src/blackgui/settings/navigatorsettings.h @@ -26,23 +26,23 @@ namespace BlackGui namespace Settings { //! Settings for dockwidget - class BLACKGUI_EXPORT CSettingsNavigator : - public BlackMisc::CValueObject + class BLACKGUI_EXPORT CNavigatorSettings : + public BlackMisc::CValueObject { public: //! Properties by index enum ColumnIndex { - IndexMargins = BlackMisc::CPropertyIndex::GlobalIndexCSettingsNavigator, + IndexMargins = BlackMisc::CPropertyIndex::GlobalIndexCNavigatorSettings, IndexFrameless, IndexColumns }; //! Default constructor - CSettingsNavigator(); + CNavigatorSettings(); //! Destructor. - ~CSettingsNavigator() {} + ~CNavigatorSettings() {} //! Reset to defaults void reset(); @@ -90,7 +90,7 @@ namespace BlackGui int m_columns = 1; //!< number of columns BLACK_METACLASS( - CSettingsNavigator, + CNavigatorSettings, BLACK_METAMEMBER(margins), BLACK_METAMEMBER(frameless), BLACK_METAMEMBER(columns), @@ -99,7 +99,7 @@ namespace BlackGui }; //! Trait for settings for navigator - struct SettingsNavigator : public BlackMisc::CSettingTrait + struct TNavigator : public BlackMisc::CSettingTrait { //! Key in data cache static const char *key() { return "guinavigator"; } @@ -107,8 +107,8 @@ namespace BlackGui } // ns } // ns -Q_DECLARE_METATYPE(BlackGui::Settings::CSettingsNavigator) -Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) +Q_DECLARE_METATYPE(BlackGui::Settings::CNavigatorSettings) +Q_DECLARE_METATYPE(BlackMisc::CCollection) +Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif // guard diff --git a/src/blackmisc/propertyindex.h b/src/blackmisc/propertyindex.h index 42e2e3e13..9117571aa 100644 --- a/src/blackmisc/propertyindex.h +++ b/src/blackmisc/propertyindex.h @@ -136,8 +136,8 @@ namespace BlackMisc GlobalIndexCVatsimSetup = 12200, GlobalIndexCGuiStateDbOwnModelsComponent = 14000, GlobalIndexCGuiStateDbOwnModelSetComponent = 14100, - GlobalIndexCSettingsDockWidget = 14200, - GlobalIndexCSettingsNavigator = 14300, + GlobalIndexCDockWidgetSettings = 14200, + GlobalIndexCNavigatorSettings = 14300, GlobalIndexCSettingsReaders = 14400, GlobalIndexLineNumber = 20000, //!< pseudo index for line numbers };