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

Issue #77 getLogCategories returns a simple QStringList instead of our own class

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-10-28 16:48:31 +00:00
parent 05d28017e7
commit 63e8de8f00
156 changed files with 862 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackgui/components/copyconfigurationcomponent.cpp
View File

@@ -38,9 +38,9 @@ namespace BlackGui
{
namespace Components
{
const CLogCategoryList &CCopyConfigurationComponent::getLogCategories()
const QStringList &CCopyConfigurationComponent::getLogCategories()
{
static const BlackMisc::CLogCategoryList cats { CLogCategory::guiComponent() };
static const QStringList cats { CLogCategories::guiComponent() };
return cats;
}
@@ -451,9 +451,9 @@ namespace BlackGui
ui->tv_Source->setMinimumWidth(wView);
}
const CLogCategoryList &CCopyConfigurationWizardPage::getLogCategories()
const QStringList &CCopyConfigurationWizardPage::getLogCategories()
{
static const CLogCategoryList cats { CLogCategory::wizard(), CLogCategory::guiComponent() };
static const QStringList cats { CLogCategories::wizard(), CLogCategories::guiComponent() };
return cats;
}

4
src/blackgui/components/copyconfigurationcomponent.h
View File

@@ -34,7 +34,7 @@ namespace BlackGui
public:
//! Log.categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Constructor
explicit CCopyConfigurationComponent(QWidget *parent = nullptr);
@@ -152,7 +152,7 @@ namespace BlackGui
using QWizardPage::QWizardPage;
//! Log.categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Set config
void setConfigComponent(CCopyConfigurationComponent *config) { m_config = config; }

4
src/blackgui/components/dbautostashingcomponent.cpp
View File

@@ -48,9 +48,9 @@ namespace BlackGui
{
namespace Components
{
const CLogCategoryList &CDbAutoStashingComponent::getLogCategories()
const QStringList &CDbAutoStashingComponent::getLogCategories()
{
static const BlackMisc::CLogCategoryList cats { CLogCategory::mapping(), CLogCategory::guiComponent() };
static const QStringList cats { CLogCategories::mapping(), CLogCategories::guiComponent() };
return cats;
}

2
src/blackgui/components/dbautostashingcomponent.h
View File

@@ -54,7 +54,7 @@ namespace BlackGui
};
//! Log categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Constructor
explicit CDbAutoStashingComponent(QWidget *parent = nullptr);

4
src/blackgui/components/dbmodelworkbenchcomponent.cpp
View File

@@ -61,9 +61,9 @@ namespace BlackGui
// void
}
const CLogCategoryList &CDbModelWorkbenchComponent::getLogCategories()
const QStringList &CDbModelWorkbenchComponent::getLogCategories()
{
static const CLogCategoryList l({ CLogCategory::modelGui(), CLogCategory::guiComponent() });
static const QStringList l({ CLogCategories::modelGui(), CLogCategories::guiComponent() });
return l;
}

2
src/blackgui/components/dbmodelworkbenchcomponent.h
View File

@@ -55,7 +55,7 @@ namespace BlackGui
virtual ~CDbModelWorkbenchComponent() override;
//! Log categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Own (installed) model for given model string
BlackMisc::Simulation::CAircraftModel getOwnModelForModelString(const QString &modelString) const;

4
src/blackgui/components/dbownmodelscomponent.cpp
View File

@@ -97,9 +97,9 @@ namespace BlackGui
// void
}
const CLogCategoryList &CDbOwnModelsComponent::getLogCategories()
const QStringList &CDbOwnModelsComponent::getLogCategories()
{
static const CLogCategoryList l({ CLogCategory::modelGui(), CLogCategory::guiComponent() });
static const QStringList l({ CLogCategories::modelGui(), CLogCategories::guiComponent() });
return l;
}

2
src/blackgui/components/dbownmodelscomponent.h
View File

@@ -66,7 +66,7 @@ namespace BlackGui
virtual ~CDbOwnModelsComponent() override;
//! Log categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Own (installed) model for given model string
BlackMisc::Simulation::CAircraftModel getOwnModelForModelString(const QString &modelString) const;

4
src/blackgui/components/dbownmodelsetformdialog.cpp
View File

@@ -30,9 +30,9 @@ namespace BlackGui
{
namespace Components
{
const CLogCategoryList &CDbOwnModelSetFormDialog::getLogCategories()
const QStringList &CDbOwnModelSetFormDialog::getLogCategories()
{
static const CLogCategoryList cats({ CLogCategory("swift.ownmodelset"), CLogCategory::guiComponent()});
static const QStringList cats({ "swift.ownmodelset", CLogCategories::guiComponent()});
return cats;
}

2
src/blackgui/components/dbownmodelsetformdialog.h
View File

@@ -36,7 +36,7 @@ namespace BlackGui
public:
//! Categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Constructor
explicit CDbOwnModelSetFormDialog(QWidget *parent = nullptr);

4
src/blackgui/components/dbquickmappingwizard.cpp
View File

@@ -72,9 +72,9 @@ namespace BlackGui
CDbQuickMappingWizard::~CDbQuickMappingWizard()
{ }
const CLogCategoryList &CDbQuickMappingWizard::getLogCategories()
const QStringList &CDbQuickMappingWizard::getLogCategories()
{
static const CLogCategoryList cats { CLogCategory::mapping(), CLogCategory::guiComponent() };
static const QStringList cats { CLogCategories::mapping(), CLogCategories::guiComponent() };
return cats;
}

2
src/blackgui/components/dbquickmappingwizard.h
View File

@@ -62,7 +62,7 @@ namespace BlackGui
virtual bool validateCurrentPage() override;
//! Log categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
protected:
//! \copydoc QWizard::keyPressEvent

8
src/blackgui/components/downloadcomponent.cpp
View File

@@ -92,7 +92,7 @@ namespace BlackGui
if (downloadDir.isEmpty()) { return; } // canceled
if (!QDir(downloadDir).exists())
{
const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).warning(u"'%1' is not a valid download directory") << downloadDir;
const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).warning(u"'%1' is not a valid download directory") << downloadDir;
this->showOverlayMessage(msg, CDownloadComponent::OverlayMsgTimeoutMs);
return;
}
@@ -182,7 +182,7 @@ namespace BlackGui
if (!sGui || !sGui->hasWebDataServices() || sGui->isShuttingDown()) { return false; }
if (!this->existsDownloadDir())
{
const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"Invalid download directory");
const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"Invalid download directory");
this->showOverlayMessage(msg, CDownloadComponent::OverlayMsgTimeoutMs);
return false;
}
@@ -190,7 +190,7 @@ namespace BlackGui
const CUrl download = remoteFile.getSmartUrl();
if (download.isEmpty())
{
const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"No download URL for file name '%1'") << remoteFile.getBaseNameAndSize();
const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"No download URL for file name '%1'") << remoteFile.getBaseNameAndSize();
this->showOverlayMessage(msg, CDownloadComponent::OverlayMsgTimeoutMs);
return false;
}
@@ -227,7 +227,7 @@ namespace BlackGui
}
else
{
const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"Starting download for '%1' failed") << download.getFullUrl();
const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"Starting download for '%1' failed") << download.getFullUrl();
this->showOverlayMessage(msg, CDownloadComponent::OverlayMsgTimeoutMs);
}
return success;

4
src/blackgui/components/firstmodelsetcomponent.cpp
View File

@@ -34,9 +34,9 @@ namespace BlackGui
{
namespace Components
{
const CLogCategoryList &CFirstModelSetComponent::getLogCategories()
const QStringList &CFirstModelSetComponent::getLogCategories()
{
static const CLogCategoryList cats { CLogCategory::modelGui() };
static const QStringList cats { CLogCategories::modelGui() };
return cats;
}

2
src/blackgui/components/firstmodelsetcomponent.h
View File

@@ -38,7 +38,7 @@ namespace BlackGui
public:
//! Log categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Constructor
explicit CFirstModelSetComponent(QWidget *parent = nullptr);

4
src/blackgui/components/flightplancomponent.cpp
View File

@@ -296,9 +296,9 @@ namespace BlackGui
}
}
const CLogCategoryList &CFlightPlanComponent::getLogCategories()
const QStringList &CFlightPlanComponent::getLogCategories()
{
static const CLogCategoryList cats { CLogCategory::flightPlan(), CLogCategory::guiComponent() };
static const QStringList cats { CLogCategories::flightPlan(), CLogCategories::guiComponent() };
return cats;
}

2
src/blackgui/components/flightplancomponent.h
View File

@@ -87,7 +87,7 @@ namespace BlackGui
const BlackMisc::Aviation::CFlightPlan &getSentFlightPlan() const { return m_sentFlightPlan; }
//! Log.categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
private:
static constexpr int OverlayTimeoutMs = 5000;

26
src/blackgui/components/installxswiftbuscomponent.cpp
View File

@@ -76,7 +76,7 @@ namespace BlackGui
if (xPlanePluginDir.isEmpty()) { return; } // canceled
if (!QDir(xPlanePluginDir).exists())
{
const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).warning(u"'%1' is not a valid X-Plane plugin directory") << xPlanePluginDir;
const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).warning(u"'%1' is not a valid X-Plane plugin directory") << xPlanePluginDir;
this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs);
return;
}
@@ -92,7 +92,7 @@ namespace BlackGui
if (downloadDir.isEmpty()) { return; } // canceled
if (!QDir(downloadDir).exists())
{
const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).warning(u"'%1' is not a valid download directory") << downloadDir;
const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).warning(u"'%1' is not a valid download directory") << downloadDir;
this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs);
return;
}
@@ -108,7 +108,7 @@ namespace BlackGui
if (!downloadFile.exists())
{
const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"Cannot read downloaded file '%1'") << downloadFileName;
const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"Cannot read downloaded file '%1'") << downloadFileName;
this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs);
return;
}
@@ -116,7 +116,7 @@ namespace BlackGui
const QString xSwiftBusDirectory = this->xSwiftBusDir();
if (xSwiftBusDirectory.isEmpty())
{
const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"No directory to install to'");
const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"No directory to install to'");
this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs);
return;
}
@@ -124,7 +124,7 @@ namespace BlackGui
const QDir installDir(xSwiftBusDirectory);
if (!installDir.exists())
{
const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"Directory '%1' does not exist") << xSwiftBusDirectory;
const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"Directory '%1' does not exist") << xSwiftBusDirectory;
this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs);
return;
}
@@ -137,7 +137,7 @@ namespace BlackGui
const bool removed = destFile.remove();
if (!removed)
{
const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"Cannot remove '%1'") << destFileName;
const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"Cannot remove '%1'") << destFileName;
this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs);
return;
}
@@ -147,7 +147,7 @@ namespace BlackGui
const bool copied = QFile::copy(downloadFileName, destFileName);
if (!copied)
{
const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"Cannot copy '%1' to '%2'") << downloadFileName << destFileName;
const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"Cannot copy '%1' to '%2'") << downloadFileName << destFileName;
this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs);
return;
}
@@ -156,7 +156,7 @@ namespace BlackGui
const QFileInfo destFile(destFileName);
if (!destFile.exists())
{
const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"XSwiftBus file '%1' does not exist") << destFileName;
const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"XSwiftBus file '%1' does not exist") << destFileName;
this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs);
return;
}
@@ -166,7 +166,7 @@ namespace BlackGui
if (CCompressUtils::zip7Uncompress(destFile.absoluteFilePath(), xSwiftBusDirectory, &stdOutAndError))
{
// capture values by copy!
const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).info(u"Uncompressed XSwiftBus in '%1'") << xSwiftBusDirectory;
const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).info(u"Uncompressed XSwiftBus in '%1'") << xSwiftBusDirectory;
this->showOverlayMessagesWithConfirmation(msg, false, "Delete downloaded file?", [ = ]
{
if (!myself) { return; }
@@ -179,7 +179,7 @@ namespace BlackGui
}
else
{
const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).warning(u"Unzip failed: stdout '%1' stderr '%2'") << safeAt(stdOutAndError, 0) << safeAt(stdOutAndError, 1);
const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).warning(u"Unzip failed: stdout '%1' stderr '%2'") << safeAt(stdOutAndError, 0) << safeAt(stdOutAndError, 1);
this->showOverlayMessage(msg);
}
@@ -214,7 +214,7 @@ namespace BlackGui
if (!this->existsDownloadDir())
{
const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"Invalid download directory");
const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"Invalid download directory");
this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs);
return;
}
@@ -222,7 +222,7 @@ namespace BlackGui
const CUrl download = rf.getSmartUrl();
if (download.isEmpty())
{
const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"No download URL for file name '%1'") << rf.getBaseNameAndSize();
const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"No download URL for file name '%1'") << rf.getBaseNameAndSize();
this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs);
return;
}
@@ -257,7 +257,7 @@ namespace BlackGui
}
else
{
const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"Starting download for '%1' failed") << download.getFullUrl();
const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"Starting download for '%1' failed") << download.getFullUrl();
this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs);
}
}

4
src/blackgui/components/interpolationlogdisplay.cpp
View File

@@ -33,9 +33,9 @@ namespace BlackGui
{
namespace Components
{
const CLogCategoryList &CInterpolationLogDisplay::getLogCategories()
const QStringList &CInterpolationLogDisplay::getLogCategories()
{
static const CLogCategoryList cats { CLogCategory::interpolator(), CLogCategory::driver() };
static const QStringList cats { CLogCategories::interpolator(), CLogCategories::driver() };
return cats;
}

2
src/blackgui/components/interpolationlogdisplay.h
View File

@@ -43,7 +43,7 @@ namespace BlackGui
public:
//! Categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Tabs
enum Tab

4
src/blackgui/components/loginadvcomponent.cpp
View File

@@ -67,9 +67,9 @@ namespace BlackGui
{
namespace Components
{
const CLogCategoryList &CLoginAdvComponent::getLogCategories()
const QStringList &CLoginAdvComponent::getLogCategories()
{
static const BlackMisc::CLogCategoryList cats { CLogCategory::guiComponent() };
static const QStringList cats { CLogCategories::guiComponent() };
return cats;
}

2
src/blackgui/components/loginadvcomponent.h
View File

@@ -56,7 +56,7 @@ namespace BlackGui
public:
//! Log categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Constructor
explicit CLoginAdvComponent(QWidget *parent = nullptr);

4
src/blackgui/components/logincomponent.cpp
View File

@@ -67,9 +67,9 @@ namespace BlackGui
{
namespace Components
{
const CLogCategoryList &CLoginComponent::getLogCategories()
const QStringList &CLoginComponent::getLogCategories()
{
static const CLogCategoryList cats { CLogCategory::guiComponent() };
static const QStringList cats { CLogCategories::guiComponent() };
return cats;
}

2
src/blackgui/components/logincomponent.h
View File

@@ -66,7 +66,7 @@ namespace BlackGui
};
//! Log categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Constructor
explicit CLoginComponent(QWidget *parent = nullptr);

4
src/blackgui/components/loginoverviewcomponent.cpp
View File

@@ -67,9 +67,9 @@ namespace BlackGui
{
namespace Components
{
const CLogCategoryList &CLoginOverviewComponent::getLogCategories()
const QStringList &CLoginOverviewComponent::getLogCategories()
{
static const BlackMisc::CLogCategoryList cats { CLogCategory::guiComponent() };
static const QStringList cats { CLogCategories::guiComponent() };
return cats;
}

2
src/blackgui/components/loginoverviewcomponent.h
View File

@@ -54,7 +54,7 @@ namespace BlackGui
public:
//! Log categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Constructor
explicit CLoginOverviewComponent(QWidget *parent = nullptr);

4
src/blackgui/components/mappingcomponent.cpp
View File

@@ -56,9 +56,9 @@ namespace BlackGui
{
namespace Components
{
const CLogCategoryList &CMappingComponent::getLogCategories()
const QStringList &CMappingComponent::getLogCategories()
{
static const CLogCategoryList cats({ CLogCategory::mapping(), CLogCategory::guiComponent() });
static const QStringList cats({ CLogCategories::mapping(), CLogCategories::guiComponent() });
return cats;
}

2
src/blackgui/components/mappingcomponent.h
View File

@@ -66,7 +66,7 @@ namespace BlackGui
};
//! Log categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Constructor
explicit CMappingComponent(QWidget *parent = nullptr);

4
src/blackgui/components/settingssimulatorbasicscomponent.cpp
View File

@@ -29,9 +29,9 @@ namespace BlackGui
{
namespace Components
{
const CLogCategoryList &CSettingsSimulatorBasicsComponent::getLogCategories()
const QStringList &CSettingsSimulatorBasicsComponent::getLogCategories()
{
static const CLogCategoryList cats({ CLogCategory::guiComponent(), CLogCategory::wizard() });
static const QStringList cats({ CLogCategories::guiComponent(), CLogCategories::wizard() });
return cats;
}

2
src/blackgui/components/settingssimulatorbasicscomponent.h
View File

@@ -34,7 +34,7 @@ namespace BlackGui
public:
//! Log categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Constructor
explicit CSettingsSimulatorBasicsComponent(QWidget *parent = nullptr);

4
src/blackgui/components/settingsxswiftbuscomponent.cpp
View File

@@ -22,9 +22,9 @@ namespace BlackGui
{
namespace Components
{
const CLogCategoryList &CSettingsXSwiftBusComponent::getLogCategories()
const QStringList &CSettingsXSwiftBusComponent::getLogCategories()
{
static const CLogCategoryList cats { CLogCategory::guiComponent() };
static const QStringList cats { CLogCategories::guiComponent() };
return cats;
}

2
src/blackgui/components/settingsxswiftbuscomponent.h
View File

@@ -32,7 +32,7 @@ namespace BlackGui
public:
//! Log categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Constructor
explicit CSettingsXSwiftBusComponent(QWidget *parent = nullptr);

4
src/blackgui/components/simulatorcomponent.cpp
View File

@@ -38,9 +38,9 @@ namespace BlackGui
{
namespace Components
{
const CLogCategoryList &CSimulatorComponent::getLogCategories()
const QStringList &CSimulatorComponent::getLogCategories()
{
static const CLogCategoryList cats { CLogCategory::guiComponent(), CLogCategory::matching() };
static const QStringList cats { CLogCategories::guiComponent(), CLogCategories::matching() };
return cats;
}

2
src/blackgui/components/simulatorcomponent.h
View File

@@ -44,7 +44,7 @@ namespace BlackGui
public:
//! Categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Constructor
explicit CSimulatorComponent(QWidget *parent = nullptr);

4
src/blackgui/guiapplication.cpp
View File

@@ -88,9 +88,9 @@ namespace BlackGui
return qobject_cast<CGuiApplication *>(CApplication::instance());
}
const BlackMisc::CLogCategoryList &CGuiApplication::getLogCategories()
const QStringList &CGuiApplication::getLogCategories()
{
static const CLogCategoryList l(CApplication::getLogCategories().join({ CLogCategory::guiComponent() }));
static const QStringList l(CApplication::getLogCategories() + QStringList { CLogCategories::guiComponent() });
return l;
}

2
src/blackgui/guiapplication.h
View File

@@ -80,7 +80,7 @@ namespace BlackGui
static CGuiApplication *instance();
//! Own log categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Organization string used for settings, is the registry key under windows
static const QString &settingsOrganization();

16
src/blackgui/menus/aircraftmodelmenus.cpp
View File

@@ -36,9 +36,9 @@ namespace BlackGui
void IAircraftModelViewMenu::anchor()
{ }
const CLogCategoryList &IAircraftModelViewMenu::getLogCategories()
const QStringList &IAircraftModelViewMenu::getLogCategories()
{
static const CLogCategoryList cats { CLogCategory::guiComponent() };
static const QStringList cats { CLogCategories::guiComponent() };
return cats;
}
@@ -74,9 +74,9 @@ namespace BlackGui
IAircraftModelViewMenu(modelView), m_messageFrame(messageFrame)
{ }
const CLogCategoryList &CShowSimulatorFileMenu::getLogCategories()
const QStringList &CShowSimulatorFileMenu::getLogCategories()
{
static const CLogCategoryList cats { CLogCategory::guiComponent() };
static const QStringList cats { CLogCategories::guiComponent() };
return cats;
}
@@ -175,9 +175,9 @@ namespace BlackGui
}
}
const CLogCategoryList &CConsolidateWithDbDataMenu::getLogCategories()
const QStringList &CConsolidateWithDbDataMenu::getLogCategories()
{
static const CLogCategoryList cats { CLogCategory::mapping(), CLogCategory::guiComponent() };
static const QStringList cats { CLogCategories::mapping(), CLogCategories::guiComponent() };
return cats;
}
@@ -280,9 +280,9 @@ namespace BlackGui
}
}
const CLogCategoryList &CConsolidateWithSimulatorModels::getLogCategories()
const QStringList &CConsolidateWithSimulatorModels::getLogCategories()
{
static const CLogCategoryList cats { CLogCategory::mapping(), CLogCategory::guiComponent() };
static const QStringList cats { CLogCategories::mapping(), CLogCategories::guiComponent() };
return cats;
}

8
src/blackgui/menus/aircraftmodelmenus.h
View File

@@ -38,7 +38,7 @@ namespace BlackGui
{}
//! Log.categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
protected:
//! Model view
@@ -64,7 +64,7 @@ namespace BlackGui
CShowSimulatorFileMenu(Views::CAircraftModelView *modelView, COverlayMessagesFrame *messageFrame);
//! Log.categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! \copydoc IMenuDelegate::customMenu
virtual void customMenu(CMenuActions &menuActions) override;
@@ -93,7 +93,7 @@ namespace BlackGui
CConsolidateWithDbDataMenu(BlackGui::Views::CAircraftModelView *modelView, QObject *modelsTarget);
//! Log.categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! \copydoc IMenuDelegate::customMenu
virtual void customMenu(CMenuActions &menuActions) override;
@@ -125,7 +125,7 @@ namespace BlackGui
CConsolidateWithSimulatorModels(Views::CAircraftModelView *modelView, QObject *modelsTarget);
//! Log.categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! \copydoc IMenuDelegate::customMenu
virtual void customMenu(CMenuActions &menuActions) override;

4
src/blackgui/menus/fontmenus.cpp
View File

@@ -19,9 +19,9 @@ namespace BlackGui
{
namespace Menus
{
const CLogCategoryList &CFontMenu::getLogCategories()
const QStringList &CFontMenu::getLogCategories()
{
static const CLogCategoryList cats { CLogCategory::guiComponent() };
static const QStringList cats { CLogCategories::guiComponent() };
return cats;
}

2
src/blackgui/menus/fontmenus.h
View File

@@ -35,7 +35,7 @@ namespace BlackGui
CFontMenu(QWidget *widget, Qt::ShortcutContext shortcutContext = Qt::WidgetShortcut);
//! Log.categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! \copydoc IMenuDelegate::customMenu
virtual void customMenu(CMenuActions &menuActions) override;

4
src/blackgui/menus/menudelegate.h
View File

@@ -42,9 +42,9 @@ namespace BlackGui
virtual ~IMenuDelegate() {}
//! Log categories
const BlackMisc::CLogCategoryList &getLogCategories()
const QStringList &getLogCategories()
{
static const BlackMisc::CLogCategoryList cats({BlackMisc::CLogCategory::guiComponent()});
static const QStringList cats({BlackMisc::CLogCategories::guiComponent()});
return cats;
}

2
src/blackgui/models/statusmessagefilter.cpp
View File

@@ -59,7 +59,7 @@ namespace BlackGui
return CVariant::from(CLogPattern::exactMatch(m_category).withSeverityAtOrAbove(m_severity));
}
CLogCategoryList categories = CLogCategory::allSpecialCategories();
CLogCategoryList categories = CLogCategoryList::fromQStringList(CLogCategories::allSpecialCategories());
categories.removeIf([this](const CLogCategory &cat) { return this->stringMatchesFilterExpression(cat.toQString(), this->m_category); });
CSequence<QString> humanNames = CLogPattern::allHumanReadableNames();
humanNames.removeIf([this](const QString &name) { return this->stringMatchesFilterExpression(name, this->m_category); });

6
src/blackgui/stylesheetutility.cpp
View File

@@ -43,9 +43,9 @@ namespace BlackGui
connect(&m_fileWatcher, &QFileSystemWatcher::fileChanged, this, &CStyleSheetUtility::qssDirectoryChanged);
}
const CLogCategoryList &CStyleSheetUtility::getLogCategories()
const QStringList &CStyleSheetUtility::getLogCategories()
{
static const CLogCategoryList cats { CLogCategory::guiComponent() };
static const QStringList cats { CLogCategories::guiComponent() };
return cats;
}
@@ -268,7 +268,7 @@ namespace BlackGui
}
else
{
CLogMessage(getLogCategories()).warning(u"Cannot open file '%1' for writing") << fn;
CLogMessage(static_cast<CStyleSheetUtility *>(nullptr)).warning(u"Cannot open file '%1' for writing") << fn;
}
return ok;
}

2
src/blackgui/stylesheetutility.h
View File

@@ -42,7 +42,7 @@ namespace BlackGui
explicit CStyleSheetUtility(BlackMisc::Restricted<CGuiApplication>, QObject *parent = nullptr);
//! Log cats.
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Style for given file name
QString style(const QString &fileName) const;