diff --git a/src/blackcore/data/globalsetup.h b/src/blackcore/data/globalsetup.h index 202e3e90b..f4d54bdc8 100644 --- a/src/blackcore/data/globalsetup.h +++ b/src/blackcore/data/globalsetup.h @@ -102,7 +102,7 @@ namespace BlackCore::Data //! \remark based on getDbRootDirectoryUrl BlackMisc::Network::CUrl getDbLoginServiceUrl() const; - //! alpha XSwiftBus files available + //! alpha xswiftbus files available BlackMisc::Network::CUrl getAlphaXSwiftBusFilesServiceUrl() const; //! Shared URLs diff --git a/src/blackgui/components/configurationwizard.ui b/src/blackgui/components/configurationwizard.ui index accc818e3..ef3bc906b 100644 --- a/src/blackgui/components/configurationwizard.ui +++ b/src/blackgui/components/configurationwizard.ui @@ -233,7 +233,7 @@ Simulator specific installations - Install XSwiftBus (X-Plane only) or swift terrain probe (FSX/P3D only) + Install xswiftbus (X-Plane only) or swift terrain probe (FSX/P3D only) @@ -276,7 +276,7 @@ - XPlane: Install XSwiftBus + XPlane: Install xswiftbus diff --git a/src/blackgui/components/dbusserveraddressselector.h b/src/blackgui/components/dbusserveraddressselector.h index e5431b028..4d46b8c95 100644 --- a/src/blackgui/components/dbusserveraddressselector.h +++ b/src/blackgui/components/dbusserveraddressselector.h @@ -52,7 +52,7 @@ namespace BlackGui::Components //! P2P visible void setP2PDBusVisible(bool visible); - //! Set to be used for XSwiftBus + //! Set to be used for xswiftbus void setForXSwiftBus(); signals: diff --git a/src/blackgui/components/installxswiftbuscomponent.cpp b/src/blackgui/components/installxswiftbuscomponent.cpp index 2659f9af4..3ec52ba4e 100644 --- a/src/blackgui/components/installxswiftbuscomponent.cpp +++ b/src/blackgui/components/installxswiftbuscomponent.cpp @@ -149,7 +149,7 @@ namespace BlackGui::Components const QFileInfo destFile(destFileName); if (!destFile.exists()) { - const CStatusMessage msg = CStatusMessage(this, CLogCategories::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; } @@ -159,7 +159,7 @@ namespace BlackGui::Components if (CCompressUtils::zip7Uncompress(destFile.absoluteFilePath(), xSwiftBusDirectory, &stdOutAndError)) { // capture values by copy! - const CStatusMessage msg = CStatusMessage(this, CLogCategories::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; } QFile downloadFile(downloadFileName); @@ -178,7 +178,7 @@ namespace BlackGui::Components //! fixme Ref T253, once we have a zip library we will directly unzip const QMessageBox::StandardButton reply = QMessageBox::question(this, "Install XSwiftXBus", - "You need to manually unzip XSwiftBus into the plugins directory.\nIt needs to look like 'plugin/xswiftbus'.\n\nOpen the archive?", + "You need to manually unzip xswiftbus into the plugins directory.\nIt needs to look like 'plugin/xswiftbus'.\n\nOpen the archive?", QMessageBox::Yes | QMessageBox::No); if (reply == QMessageBox::Yes) @@ -194,9 +194,9 @@ namespace BlackGui::Components if (!rf.getBaseName().contains(CBuildConfig::getVersionString())) { const QMessageBox::StandardButton reply = QMessageBox::question(this, - "Download XSwiftBus", + "Download xswiftbus", QStringLiteral( - u"The XSwiftBus versions seems to be for a different version\n" + u"The xswiftbus versions seems to be for a different version\n" u"Your version is '%1'. Use this version.\n\n" u"If not available, you can try the version next to your version number.\n\n" u"Continue with this version?") @@ -244,7 +244,7 @@ namespace BlackGui::Components const QNetworkReply *r = sGui->downloadFromNetwork(download, saveAsFile, { this, &CInstallXSwiftBusComponent::downloadedXSwiftBusFile }); if (r) { - CLogMessage(this).info(u"Triggered downloading of XSwiftBus file from '%1'") << download.getHost(); + CLogMessage(this).info(u"Triggered downloading of xswiftbus file from '%1'") << download.getHost(); this->showLoading(120 * 1000); // timeout in any case } else diff --git a/src/blackgui/components/installxswiftbuscomponent.h b/src/blackgui/components/installxswiftbuscomponent.h index 2b372f092..260856a81 100644 --- a/src/blackgui/components/installxswiftbuscomponent.h +++ b/src/blackgui/components/installxswiftbuscomponent.h @@ -25,7 +25,7 @@ namespace Ui namespace BlackGui::Components { /*! - * Download and install XSwiftBus + * Download and install xswiftbus */ class CInstallXSwiftBusComponent : public COverlayMessagesFrame, @@ -65,19 +65,19 @@ namespace BlackGui::Components //! Install from download directory to X-Plane directory void installXSwiftBus(); - //! Trigger downloading of the XSwiftBus file + //! Trigger downloading of the xswiftbus file void triggerDownloadingOfXSwiftBusFile(); - //! Downloaded XSwiftBus file + //! Downloaded xswiftbus file void downloadedXSwiftBusFile(const BlackMisc::CStatusMessage &status); - //! Full filename + path for the downloaded XSwiftBus file + //! Full filename + path for the downloaded xswiftbus file BlackMisc::Network::CRemoteFile getRemoteFileSelected() const; //! Download dir from UI QString downloadDir() const; - //! XSwiftBus dir from UI + //! xswiftbus dir from UI QString xSwiftBusDir() const; //! Is the download dir existing? diff --git a/src/blackgui/components/installxswiftbuscomponent.ui b/src/blackgui/components/installxswiftbuscomponent.ui index d796622e4..e57cce228 100644 --- a/src/blackgui/components/installxswiftbuscomponent.ui +++ b/src/blackgui/components/installxswiftbuscomponent.ui @@ -11,7 +11,7 @@ - Install XSwiftBus + Install xswiftbus @@ -42,7 +42,7 @@ - <html><head/><body><p><span style=" font-size:9pt; font-style:italic;">XSwiftBus</span><span style=" font-size:9pt;"> is an X-Plane plugin that allows X-Plane and </span><span style=" font-size:9pt; font-style:italic;">swift</span><span style=" font-size:9pt;"> to communicate with each other. If you want to use </span><span style=" font-size:9pt; font-style:italic;">swift</span><span style=" font-size:9pt;"> with X-Plane you will need to install </span><span style=" font-size:9pt; font-style:italic;">XSwiftBus</span><span style=" font-size:9pt;">. Download </span><span style=" font-size:9pt; font-style:italic;">XSwiftBus</span><span style=" font-size:9pt;"> and extract it into the </span><span style=" font-size:9pt; text-decoration: underline;">X-Plane/Resources/plugins</span><span style=" font-size:9pt;"> folder.</span></p></body></html> + <html><head/><body><p><span style=" font-size:9pt; font-style:italic;">xswiftbus</span><span style=" font-size:9pt;"> is an X-Plane plugin that allows X-Plane and </span><span style=" font-size:9pt; font-style:italic;">swift</span><span style=" font-size:9pt;"> to communicate with each other. If you want to use </span><span style=" font-size:9pt; font-style:italic;">swift</span><span style=" font-size:9pt;"> with X-Plane you will need to install </span><span style=" font-size:9pt; font-style:italic;">xswiftbus</span><span style=" font-size:9pt;">. Download </span><span style=" font-size:9pt; font-style:italic;">xswiftbus</span><span style=" font-size:9pt;"> and extract it into the </span><span style=" font-size:9pt; text-decoration: underline;">X-Plane/Resources/plugins</span><span style=" font-size:9pt;"> folder.</span></p></body></html> Qt::RichText @@ -58,7 +58,7 @@ - Download and install XSwiftBus + Download and install xswiftbus @@ -162,7 +162,7 @@ - <html><head/><body><p><span style=" font-weight:600;">Warning: </span>Possible conflicts with plugins using the same libraries <span style=" font-style:italic;">(e.g. XSquawkBox</span>). You have to disable those pluigns before you can use <span style=" font-style:italic;">swiftXSwiftBus</span>.</p></body></html> + <html><head/><body><p><span style=" font-weight:600;">Warning: </span>Possible conflicts with plugins using the same libraries <span style=" font-style:italic;">(e.g. XSquawkBox</span>). You have to disable those plugins before you can use <span style=" font-style:italic;">xswiftbus</span>.</p></body></html> true @@ -175,7 +175,7 @@ - XSwiftBus settings + xswiftbus settings diff --git a/src/blackgui/components/installxswiftbusdialog.ui b/src/blackgui/components/installxswiftbusdialog.ui index f842bc5f6..af9f6ce3d 100644 --- a/src/blackgui/components/installxswiftbusdialog.ui +++ b/src/blackgui/components/installxswiftbusdialog.ui @@ -17,7 +17,7 @@ - Install XSwiftBus dialog + Install xswiftbus dialog diff --git a/src/blackgui/components/settingsxswiftbuscomponent.h b/src/blackgui/components/settingsxswiftbuscomponent.h index a244b301f..9b1e60d26 100644 --- a/src/blackgui/components/settingsxswiftbuscomponent.h +++ b/src/blackgui/components/settingsxswiftbuscomponent.h @@ -20,7 +20,7 @@ namespace Ui namespace BlackGui::Components { /*! - * XSwiftBus setup + * xswiftbus setup */ class BLACKGUI_EXPORT CSettingsXSwiftBusComponent : public QFrame { diff --git a/src/blackgui/components/settingsxswiftbuscomponent.ui b/src/blackgui/components/settingsxswiftbuscomponent.ui index 0b9224970..0bbd53f24 100644 --- a/src/blackgui/components/settingsxswiftbuscomponent.ui +++ b/src/blackgui/components/settingsxswiftbuscomponent.ui @@ -11,7 +11,7 @@ - XSwiftBus settings + xswiftbus settings diff --git a/src/blackgui/components/updateinfocomponent.cpp b/src/blackgui/components/updateinfocomponent.cpp index 6b2259772..70a9bd145 100644 --- a/src/blackgui/components/updateinfocomponent.cpp +++ b/src/blackgui/components/updateinfocomponent.cpp @@ -126,8 +126,8 @@ namespace BlackGui::Components if (!stringCompare(currentXsb, currentSwift, Qt::CaseInsensitive)) { - const QString msg = QStringLiteral("XSwiftBus '%1' does NOT match swift version, download anyway?").arg(currentXsb, currentSwift); - const QMessageBox::StandardButton reply = QMessageBox::question(this, QStringLiteral("Download XSwiftBus"), msg, QMessageBox::Yes | QMessageBox::No); + const QString msg = QStringLiteral("xswiftbus '%1' does NOT match swift version, download anyway?").arg(currentXsb, currentSwift); + const QMessageBox::StandardButton reply = QMessageBox::question(this, QStringLiteral("Download xswiftbus"), msg, QMessageBox::Yes | QMessageBox::No); if (reply != QMessageBox::Yes) { return; } } @@ -206,7 +206,7 @@ namespace BlackGui::Components const CDistribution selectedDistribution(this->getSelectedOrDefaultDistribution()); const CPlatform selectedPlatform(this->getSelectedOrDefaultPlatform()); - // for XSwiftBus we only show public (unrestricted) ones, as the follow up dialog will only show unrestricted + // for xswiftbus we only show public (unrestricted) ones, as the follow up dialog will only show unrestricted const CUpdateInfo updateInfo(m_updateInfo.get()); const CArtifactList artifactsPilotClient = updateInfo.getArtifactsPilotClient().findByDistributionAndPlatform(selectedDistribution, selectedPlatform, true); const CArtifactList artifactsXsb = updateInfo.getArtifactsXSwiftBus().findWithUnrestrictedDistributions().findByDistributionAndPlatform(selectedDistribution, selectedPlatform, true); diff --git a/src/blackgui/components/updateinfocomponent.h b/src/blackgui/components/updateinfocomponent.h index 8c3f94379..0126cc861 100644 --- a/src/blackgui/components/updateinfocomponent.h +++ b/src/blackgui/components/updateinfocomponent.h @@ -82,7 +82,7 @@ namespace BlackGui::Components //! Selection changed void uiSelectionChanged(); - //! Install XSwiftBus dialog + //! Install xswiftbus dialog void downloadXSwiftBusDialog(); //! Download installer dialog diff --git a/src/blackgui/components/updateinfocomponent.ui b/src/blackgui/components/updateinfocomponent.ui index 4ddb5c6bc..99fa078c8 100644 --- a/src/blackgui/components/updateinfocomponent.ui +++ b/src/blackgui/components/updateinfocomponent.ui @@ -81,7 +81,7 @@ Only required for XP - XSwiftBus: + xswiftbus: diff --git a/src/blackgui/copyxswiftbusdialog.cpp b/src/blackgui/copyxswiftbusdialog.cpp index cc16bcaeb..ce95b31c3 100644 --- a/src/blackgui/copyxswiftbusdialog.cpp +++ b/src/blackgui/copyxswiftbusdialog.cpp @@ -33,8 +33,8 @@ namespace BlackGui } const QMessageBox::StandardButton reply = QMessageBox::question(parent, - "Copy XSwiftBus", - QStringLiteral("Copy XSwiftBus from build directory '%1' to plugin directory '%2'?").arg(CSwiftDirectories::getXSwiftBusBuildDirectory(), CXPlaneUtil::xswiftbusPluginDir(xplaneRootDir)), + "Copy xswiftbus", + QStringLiteral("Copy xswiftbus from build directory '%1' to plugin directory '%2'?").arg(CSwiftDirectories::getXSwiftBusBuildDirectory(), CXPlaneUtil::xswiftbusPluginDir(xplaneRootDir)), QMessageBox::Yes | QMessageBox::No); if (reply != QMessageBox::Yes) { return 0; } return CXPlaneUtil::copyXSwiftBusBuildFiles(xplaneRootDir); diff --git a/src/blackgui/copyxswiftbusdialog.h b/src/blackgui/copyxswiftbusdialog.h index 4542ae06c..d9b2ac7bf 100644 --- a/src/blackgui/copyxswiftbusdialog.h +++ b/src/blackgui/copyxswiftbusdialog.h @@ -11,11 +11,11 @@ namespace BlackGui { - //! Show dialog about to copy XSwiftBus build files + //! Show dialog about to copy xswiftbus build files class BLACKGUI_EXPORT CCopyXSwiftBusDialog { public: - //! Display a dialog to copy the latest XSwiftBus files + //! Display a dialog to copy the latest xswiftbus files //! \remark normally only displayed in a local environment static int displayDialogAndCopyBuildFiles(const QString &xplaneRootDir, bool checkLatestFile = true, QWidget *parent = nullptr); }; diff --git a/src/blackmisc/db/artifact.cpp b/src/blackmisc/db/artifact.cpp index ad2c6045b..90d47c0a7 100644 --- a/src/blackmisc/db/artifact.cpp +++ b/src/blackmisc/db/artifact.cpp @@ -183,7 +183,7 @@ namespace BlackMisc::Db const QString &CArtifact::typeToString(CArtifact::ArtifactType type) { - static const QString xswb("XSwiftBus"); + static const QString xswb("xswiftbus"); static const QString installer("pilot client installer"); static const QString symbols("symbols"); static const QString unknown("unknown"); diff --git a/src/blackmisc/db/updateinfo.h b/src/blackmisc/db/updateinfo.h index 30b8ed660..3e667b577 100644 --- a/src/blackmisc/db/updateinfo.h +++ b/src/blackmisc/db/updateinfo.h @@ -46,13 +46,13 @@ namespace BlackMisc::Db //! \note sorted by version CArtifactList getArtifactsPilotClientForCurrentPlatform() const; - //! Artifacts (XSwiftBus) + //! Artifacts (xswiftbus) const CArtifactList &getArtifactsXSwiftBus() const { return m_artifactsXSwiftBus; } - //! Artifacts (XSwiftBus) + //! Artifacts (xswiftbus) CArtifactList getArtifactsXSwiftBusLatestVersionFirst() const; - //! Artifacts (XSwiftBus) + //! Artifacts (xswiftbus) CArtifactList getArtifactsXSwiftBusOldestVersionFirst() const; //! Artifacts for current platform @@ -97,7 +97,7 @@ namespace BlackMisc::Db private: CArtifactList m_artifactsPilotClient; //!< artifacts pilot client - CArtifactList m_artifactsXSwiftBus; //!< artifacts XSwiftBus + CArtifactList m_artifactsXSwiftBus; //!< artifacts xswiftbus CDistributionList m_distributions; //!< all distributions (for any artifacts) BLACK_METACLASS( diff --git a/src/blackmisc/registermetadata.cpp b/src/blackmisc/registermetadata.cpp index aeda94146..55d74aa86 100644 --- a/src/blackmisc/registermetadata.cpp +++ b/src/blackmisc/registermetadata.cpp @@ -96,7 +96,7 @@ namespace BlackMisc SharedState::CAnyMatch::registerMetadata(); - // needed by XSwiftBus proxy class + // needed by xswiftbus proxy class qDBusRegisterMetaType>(); qRegisterMetaTypeStreamOperators>(); } diff --git a/src/blackmisc/simulation/settings/xswiftbussettings.h b/src/blackmisc/simulation/settings/xswiftbussettings.h index 2aba22394..cdf771f83 100644 --- a/src/blackmisc/simulation/settings/xswiftbussettings.h +++ b/src/blackmisc/simulation/settings/xswiftbussettings.h @@ -19,7 +19,7 @@ BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation::Settings, CXSwiftBusSett namespace BlackMisc::Simulation::Settings { - //! XSwiftBus settings + //! xswiftbus settings class BLACKMISC_EXPORT CXSwiftBusSettings final : public CValueObject, public CXSwiftBusSettingsQtFree, @@ -105,7 +105,7 @@ namespace BlackMisc::Simulation::Settings }; /*! - * Setting for XSwiftBus. + * Setting for xswiftbus. */ struct TXSwiftBusSettings : public TSettingTrait { @@ -115,7 +115,7 @@ namespace BlackMisc::Simulation::Settings //! \copydoc BlackMisc::TSettingTrait::humanReadable static const QString &humanReadable() { - static const QString name("XSwiftBus"); + static const QString name("xswiftbus"); return name; } diff --git a/src/blackmisc/simulation/settings/xswiftbussettingsqtfree.h b/src/blackmisc/simulation/settings/xswiftbussettingsqtfree.h index 23fa20d6e..fe7ae2cb2 100644 --- a/src/blackmisc/simulation/settings/xswiftbussettingsqtfree.h +++ b/src/blackmisc/simulation/settings/xswiftbussettingsqtfree.h @@ -12,8 +12,8 @@ namespace BlackMisc::Simulation::Settings { /*! - * XSwiftBus/swift side settings class, JSON capable, shared among all services - * \details Used on swift and XSwiftBus side, MUST BE Qt free + * xswiftbus/swift side settings class, JSON capable, shared among all services + * \details Used on swift and xswiftbus side, MUST BE Qt free */ class CXSwiftBusSettingsQtFree { diff --git a/src/blackmisc/simulation/xplane/qtfreeutils.h b/src/blackmisc/simulation/xplane/qtfreeutils.h index 698d0f5f8..7d28dcc59 100644 --- a/src/blackmisc/simulation/xplane/qtfreeutils.h +++ b/src/blackmisc/simulation/xplane/qtfreeutils.h @@ -14,8 +14,8 @@ #include #include -// Strict header only X-Plane model parser utils shared between BlackMisc and XSwiftBus. -// Header only is necessary to no require XSwiftBus to link against BlackMisc. +// Strict header only X-Plane model parser utils shared between BlackMisc and xswiftbus. +// Header only is necessary to no require xswiftbus to link against BlackMisc. namespace BlackMisc::Simulation::XPlane::QtFreeUtils { diff --git a/src/blackmisc/simulation/xplane/xplaneutil.h b/src/blackmisc/simulation/xplane/xplaneutil.h index 7786cdedf..afe2c4a78 100644 --- a/src/blackmisc/simulation/xplane/xplaneutil.h +++ b/src/blackmisc/simulation/xplane/xplaneutil.h @@ -62,10 +62,10 @@ namespace BlackMisc::Simulation::XPlane //! Exclude directories for models static const QStringList &xplaneModelExcludeDirectoryPatterns(); - //! XSwiftBus plugin directory + //! xswiftbus plugin directory static QString xswiftbusPluginDir(const QString &xplaneRootDir = CXPlaneUtil::xplaneRootDir()); - //! XSwiftBus legacy directory + //! xswiftbus legacy directory static QString xswiftbusLegacyDir(const QString &xplaneRootDir = CXPlaneUtil::xplaneRootDir()); //! Both directories, plugin and @@ -78,17 +78,17 @@ namespace BlackMisc::Simulation::XPlane //! \remark uses CXPlaneUtil::xplanePluginPath as default static QStringList findAllXplFiles(const QString &pluginDir = {}); - //! Newer XSwiftBus build + //! Newer xswiftbus build static bool hasNewerXSwiftBusBuild(const QString &xplaneRootDir = CXPlaneUtil::xplaneRootDir()); - //! Copy a XSwiftBus build + //! Copy a xswiftbus build //! \remark only copying in a local build environment static int copyXSwiftBusBuildFiles(const QString &xplaneRootDir = CXPlaneUtil::xplaneRootDir()); //! XPlane relative plugin path static const QString &xplanePluginPathName(); - //! XSwiftBus path name + //! xswiftbus path name static const QString &xswiftbusPathName(); //! Filter filter for xpl files diff --git a/src/blackmisc/simulation/xplane/xswiftbusconfigwriter.cpp b/src/blackmisc/simulation/xplane/xswiftbusconfigwriter.cpp index c80e7b646..78cdae5c3 100644 --- a/src/blackmisc/simulation/xplane/xswiftbusconfigwriter.cpp +++ b/src/blackmisc/simulation/xplane/xswiftbusconfigwriter.cpp @@ -72,7 +72,7 @@ namespace BlackMisc::Simulation::XPlane configFile.remove(); if (configFile.open(QIODevice::WriteOnly)) { - // this code should be similar to XSwiftBus config.cpp + // this code should be similar to xswiftbus config.cpp QTextStream ts(&configFile); ts << "# DBus Mode - Options: p2p, session" << Qt::endl; ts << "dbusMode = " << m_dbusMode << Qt::endl; diff --git a/src/blackmisc/simulation/xplane/xswiftbusconfigwriter.h b/src/blackmisc/simulation/xplane/xswiftbusconfigwriter.h index eb5bb60e0..48c5956f1 100644 --- a/src/blackmisc/simulation/xplane/xswiftbusconfigwriter.h +++ b/src/blackmisc/simulation/xplane/xswiftbusconfigwriter.h @@ -12,7 +12,7 @@ namespace BlackMisc::Simulation::XPlane { - //! XSwiftBus configuration file writer + //! xswiftbus configuration file writer class BLACKMISC_EXPORT CXSwiftBusConfigWriter : public QObject { Q_OBJECT diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index a792a940f..7f5091225 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -1558,16 +1558,16 @@ namespace BlackSimPlugin::XPlane const QString xswiftbusCommitHash = service.getCommitHash(); if (xswiftbusVersion.isEmpty()) { - CLogMessage(this).warning(u"Could not determine which version of XSwiftBus is running. Mismatched versions might cause instability."); + CLogMessage(this).warning(u"Could not determine which version of xswiftbus is running. Mismatched versions might cause instability."); } else if (commitHash() != xswiftbusCommitHash) { - CLogMessage(this).error(u"You are using an incorrect version of XSwiftBus. The version of XSwiftBus (%1) should match the version of swift (%2). Consider upgrading!") << xswiftbusVersion << swiftVersion; + CLogMessage(this).error(u"You are using an incorrect version of xswiftbus. The version of xswiftbus (%1) should match the version of swift (%2). Consider upgrading!") << xswiftbusVersion << swiftVersion; } if (!traffic.initialize()) { - CLogMessage(this).error(u"Connection to XSwiftBus successful, but could not initialize XSwiftBus. Check X-Plane Log.txt."); + CLogMessage(this).error(u"Connection to xswiftbus successful, but could not initialize xswiftbus. Check X-Plane Log.txt."); return; } @@ -1575,7 +1575,7 @@ namespace BlackSimPlugin::XPlane if (!info.hasAcquired) { const QString owner = info.owner.trimmed().isEmpty() ? QStringLiteral("unknown plugin") : info.owner.trimmed(); - CLogMessage(this).error(u"Connection to XSwiftBus successful, but could not acquire multiplayer planes. '%1' has acquired them already. Disable '%2' or remove it if not required and reload XSwiftBus.") << owner << owner.toLower(); + CLogMessage(this).error(u"Connection to xswiftbus successful, but could not acquire multiplayer planes. '%1' has acquired them already. Disable '%2' or remove it if not required and reload xswiftbus.") << owner << owner.toLower(); return; } diff --git a/src/plugins/simulator/xplane/simulatorxplane.json b/src/plugins/simulator/xplane/simulatorxplane.json index c4b3c1770..e1d21e274 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.json +++ b/src/plugins/simulator/xplane/simulatorxplane.json @@ -2,6 +2,6 @@ "identifier" : "org.swift-project.plugins.simulator.xplane", "name" : "X-Plane", "simulator" : "xplane", - "description" : "Support for the X-Plane simulator via the XSwiftBus plugin.", + "description" : "Support for the X-Plane simulator via the xswiftbus plugin.", "config" : "org.swift-project.plugins.simulator.xplane.config" } diff --git a/src/plugins/simulator/xplane/xswiftbusserviceproxy.h b/src/plugins/simulator/xplane/xswiftbusserviceproxy.h index 1a00a7fa1..2f6608e4e 100644 --- a/src/plugins/simulator/xplane/xswiftbusserviceproxy.h +++ b/src/plugins/simulator/xplane/xswiftbusserviceproxy.h @@ -92,7 +92,7 @@ namespace BlackSimPlugin::XPlane void sceneryLoaded(); public slots: - //! Get XSwiftBus version number + //! Get xswiftbus version number QString getVersionNumber(); //! Get SHA1 of the last commit that could influence xswiftbus diff --git a/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp b/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp index e9c1abb6c..77c720fa8 100644 --- a/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp +++ b/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp @@ -152,7 +152,7 @@ namespace BlackSimPlugin::XPlane else { const QString errorMsg = reply.error().message(); - CLogMessage(this).warning(u"XSwiftBus DBus error getRemoteAircraftData: %1") << errorMsg; + CLogMessage(this).warning(u"xswiftbus DBus error getRemoteAircraftData: %1") << errorMsg; } watcher->deleteLater(); }; diff --git a/src/plugins/simulator/xplane/xswiftbustrafficproxy.h b/src/plugins/simulator/xplane/xswiftbustrafficproxy.h index eeb7a4664..1eedc6b5f 100644 --- a/src/plugins/simulator/xplane/xswiftbustrafficproxy.h +++ b/src/plugins/simulator/xplane/xswiftbustrafficproxy.h @@ -138,7 +138,7 @@ namespace BlackSimPlugin::XPlane //! Multiplayer Acquire Info struct MultiplayerAcquireInfo { - bool hasAcquired; //!< Has XSwiftBus acquired multiplayer planes? + bool hasAcquired; //!< Has xswiftbus acquired multiplayer planes? QString owner; //!< Name of the plugin having multiplayer planes acquired }; diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui index f35667bd7..b16b7cc39 100644 --- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui +++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui @@ -38,7 +38,7 @@ - XSwiftBus DBus + xswiftbus DBus diff --git a/src/swiftguistandard/swiftguistd.h b/src/swiftguistandard/swiftguistd.h index 4ff249aa1..5614baaf2 100644 --- a/src/swiftguistandard/swiftguistd.h +++ b/src/swiftguistandard/swiftguistd.h @@ -314,7 +314,7 @@ private: //! Ckeck if the DB data have been loaded void checkDbDataLoaded(); - //! Copy the XSwiftBus files from build directory + //! Copy the xswiftbus files from build directory void copyXSwiftBusDialog(bool checkFileTimestamp); //! Auto publish diloag diff --git a/src/swiftguistandard/swiftguistdmenus.cpp b/src/swiftguistandard/swiftguistdmenus.cpp index 4d6a130f9..497b4ed08 100644 --- a/src/swiftguistandard/swiftguistdmenus.cpp +++ b/src/swiftguistandard/swiftguistdmenus.cpp @@ -144,7 +144,7 @@ void SwiftGuiStd::initMenus() if (CBuildConfig::isLocalDeveloperDebugBuild() && ui->menu_File && ui->menu_File->actions().size() > 5) { - QAction *act = new QAction(CIcons::swift16(), "Copy XSwiftBus dialog"); + QAction *act = new QAction(CIcons::swift16(), "Copy xswiftbus dialog"); ui->menu_File->insertAction(ui->menu_File->actions().at(5), act); c = connect( act, &QAction::triggered, this, [=] { @@ -170,7 +170,7 @@ void SwiftGuiStd::copyXSwiftBusDialog(bool checkFileTimestamp) if (!xpDirExists) { if (checkFileTimestamp) { return; } - QMessageBox::warning(this, tr("Copy XSwiftBus"), tr("XPlane directory does not exists!"), QMessageBox::Close); + QMessageBox::warning(this, tr("Copy xswiftbus"), tr("XPlane directory does not exists!"), QMessageBox::Close); return; } diff --git a/src/xswiftbus/config.cpp b/src/xswiftbus/config.cpp index d5b57d9ff..bdc396d8d 100644 --- a/src/xswiftbus/config.cpp +++ b/src/xswiftbus/config.cpp @@ -70,7 +70,7 @@ namespace XSwiftBus void CConfig::print() { - DEBUG_LOG("XSwiftBus configuration:"); + DEBUG_LOG("xswiftbus configuration:"); DEBUG_LOG("DBus mode: " + dbusModeToString(m_dbusMode)); DEBUG_LOG("DBus server address: " + m_dbusAddress); DEBUG_LOG("DBus server port: " + std::to_string(m_dbusPort)); @@ -114,7 +114,7 @@ namespace XSwiftBus localtime_r(&now, &tms); #endif configFile << std::endl; - configFile << "# Updated by XSwiftBus plugin " << std::put_time(&tms, "%T"); + configFile << "# Updated by xswiftbus plugin " << std::put_time(&tms, "%T"); configFile << std::endl; configFile.close(); return true; diff --git a/src/xswiftbus/config.h b/src/xswiftbus/config.h index 78653dee1..9cbcb1d27 100644 --- a/src/xswiftbus/config.h +++ b/src/xswiftbus/config.h @@ -9,7 +9,7 @@ namespace XSwiftBus { /*! - * XSwiftBus configuration class + * xswiftbus configuration class */ class CConfig { diff --git a/src/xswiftbus/main.cpp b/src/xswiftbus/main.cpp index e749f41e6..c4c1376ba 100644 --- a/src/xswiftbus/main.cpp +++ b/src/xswiftbus/main.cpp @@ -24,8 +24,8 @@ PLUGIN_API int XPluginStart(char *o_name, char *o_sig, char *o_desc) XPLMEnableFeature("XPLM_USE_NATIVE_PATHS", 1); #endif - INFO_LOG("XSwiftBus plugin starting"); - std::strcpy(o_name, "XSwiftBus"); + INFO_LOG("xswiftbus plugin starting"); + std::strcpy(o_name, "xswiftbus"); std::strcpy(o_sig, "org.swift-project.xswiftbus"); std::strcpy(o_desc, "Allows swift to connect to X-Plane via D-Bus IPC"); return 1; diff --git a/src/xswiftbus/messages.cpp b/src/xswiftbus/messages.cpp index 7c15ac36e..09893b39d 100644 --- a/src/xswiftbus/messages.cpp +++ b/src/xswiftbus/messages.cpp @@ -102,13 +102,13 @@ namespace XSwiftBus } CMessageBoxControl::CMessageBoxControl(int left, int right, int top) : m_messageBox(left, right, top), - m_showCommand("org/swift-project/xswiftbus/show_messages", "Show XSwiftBus text messages", [this] { show(); }), - m_hideCommand("org/swift-project/xswiftbus/hide_messages", "Hide XSwiftBus text messages", [this] { hide(); }), - m_toggleCommand("org/swift-project/xswiftbus/toggle_messages", "Toggle XSwiftBus text messages", [this] { toggle(); }), - m_scrollUpCommand("org/swift-project/xswiftbus/scroll_up", "Scroll up XSwiftBus text messages", [this] { scrollUp(); }), - m_scrollDownCommand("org/swift-project/xswiftbus/scroll_down", "Scroll down XSwiftBus text messages", [this] { scrollDown(); }), - m_scrollToTopCommand("org/swift-project/xswiftbus/scroll_top", "Scroll to top of XSwiftBus text messages", [this] { scrollToTop(); }), - m_scrollToBottomCommand("org/swift-project/xswiftbus/scroll_bottom", "Scroll to bottom of XSwiftBus text messages", [this] { scrollToBottom(); }) + m_showCommand("org/swift-project/xswiftbus/show_messages", "Show xswiftbus text messages", [this] { show(); }), + m_hideCommand("org/swift-project/xswiftbus/hide_messages", "Hide xswiftbus text messages", [this] { hide(); }), + m_toggleCommand("org/swift-project/xswiftbus/toggle_messages", "Toggle xswiftbus text messages", [this] { toggle(); }), + m_scrollUpCommand("org/swift-project/xswiftbus/scroll_up", "Scroll up xswiftbus text messages", [this] { scrollUp(); }), + m_scrollDownCommand("org/swift-project/xswiftbus/scroll_down", "Scroll down xswiftbus text messages", [this] { scrollDown(); }), + m_scrollToTopCommand("org/swift-project/xswiftbus/scroll_top", "Scroll to top of xswiftbus text messages", [this] { scrollToTop(); }), + m_scrollToBottomCommand("org/swift-project/xswiftbus/scroll_bottom", "Scroll to bottom of xswiftbus text messages", [this] { scrollToBottom(); }) { show(); } diff --git a/src/xswiftbus/plugin.cpp b/src/xswiftbus/plugin.cpp index c557edbd6..83a67542b 100644 --- a/src/xswiftbus/plugin.cpp +++ b/src/xswiftbus/plugin.cpp @@ -22,7 +22,7 @@ namespace namespace XSwiftBus { CPlugin::CPlugin() - : m_dbusConnection(std::make_shared()), m_menu(CMenu::mainMenu().subMenu("XSwiftBus")) + : m_dbusConnection(std::make_shared()), m_menu(CMenu::mainMenu().subMenu("xswiftbus")) { m_showHideLabelsMenuItem = m_menu.item("Show/Hide Aircraft Labels", [this] { m_traffic->setDrawingLabels(!m_traffic->isDrawingLabels()); @@ -55,7 +55,7 @@ namespace XSwiftBus } });*/ - // Delay the start of XSwiftBus. + // Delay the start of xswiftbus. // http://www.xsquawkbox.net/xpsdk/mediawiki/DeferredInitialization XPLMRegisterFlightLoopCallback(startServerDeferred, -1, this); @@ -102,7 +102,7 @@ namespace XSwiftBus std::string listenAddress = "tcp:host=" + m_pluginConfig.getDBusAddress() + ",port=" + std::to_string(m_pluginConfig.getDBusPort()); if (!m_dbusP2PServer->listen(listenAddress)) { - m_service->addTextMessage("XSwiftBus startup failed!", 255, 0, 0); + m_service->addTextMessage("xswiftbus startup failed!", 255, 0, 0); return; } m_dbusP2PServer->setDispatcher(&m_dbusDispatcher); @@ -141,7 +141,7 @@ namespace XSwiftBus } //! todo RR: Send all logs to the the message window. - const std::string msg = "XSwiftBus " + m_service->getVersionNumber() + " started."; + const std::string msg = "xswiftbus " + m_service->getVersionNumber() + " started."; INFO_LOG(msg); m_service->addTextMessage(msg, 0, 255, 255); } @@ -179,7 +179,7 @@ namespace XSwiftBus { plugin->startServer(); plugin->m_isRunning = true; - INFO_LOG("XSwiftBus plugin started (deferred)"); + INFO_LOG("xswiftbus plugin started (deferred)"); } return 0; } diff --git a/src/xswiftbus/service.h b/src/xswiftbus/service.h index 996ed544b..d888d2ac5 100644 --- a/src/xswiftbus/service.h +++ b/src/xswiftbus/service.h @@ -28,7 +28,7 @@ namespace XSwiftBus { /*! - * XSwiftBus service object which is accessible through DBus + * xswiftbus service object which is accessible through DBus */ class CService : public CDBusObject { @@ -59,7 +59,7 @@ namespace XSwiftBus //! Called by XPluginReceiveMessage when some scenery is loaded. void onSceneryLoaded(); - //! Returns the XSwiftBus version number + //! Returns the xswiftbus version number std::string getVersionNumber() const; //! Returns the SHA1 of the last commit that could influence xswiftbus. diff --git a/src/xswiftbus/settings.h b/src/xswiftbus/settings.h index 53cda5d49..ae220a7a1 100644 --- a/src/xswiftbus/settings.h +++ b/src/xswiftbus/settings.h @@ -12,7 +12,7 @@ namespace XSwiftBus { /*! - * XSwiftBus/swift side settings class, JSON capable, shared among all services + * xswiftbus/swift side settings class, JSON capable, shared among all services */ class CSettings final : public BlackMisc::Simulation::Settings::CXSwiftBusSettingsQtFree { diff --git a/src/xswiftbus/traffic.h b/src/xswiftbus/traffic.h index 992ecbe3e..ca49f283e 100644 --- a/src/xswiftbus/traffic.h +++ b/src/xswiftbus/traffic.h @@ -27,7 +27,7 @@ namespace XSwiftBus { /*! - * XSwiftBus service object for traffic aircraft which is accessible through DBus + * xswiftbus service object for traffic aircraft which is accessible through DBus */ class CTraffic : public CDBusObject { diff --git a/src/xswiftbus/weather.h b/src/xswiftbus/weather.h index 33f22b1ad..11879dff5 100644 --- a/src/xswiftbus/weather.h +++ b/src/xswiftbus/weather.h @@ -20,7 +20,7 @@ namespace XSwiftBus { /*! - * XSwiftBus weather object which is accessible through DBus + * xswiftbus weather object which is accessible through DBus */ class CWeather : public CDBusObject {