diff --git a/src/blackcore/context/contextapplication.h b/src/blackcore/context/contextapplication.h index f874fb904..55a86db99 100644 --- a/src/blackcore/context/contextapplication.h +++ b/src/blackcore/context/contextapplication.h @@ -124,6 +124,10 @@ namespace BlackCore //! Work around for audio context, #382 void fakedSetComVoiceRoom(const BlackMisc::Audio::CVoiceRoomList &requestedRooms); + //! Request a message to be displayed on console, whatever the console is + //! \note no guarantee it is really written to console + void requestDisplayOnConsole(const QString &message); + public slots: //! Log a log message //! \note Not pure because it can be called from the base class constructor. @@ -192,13 +196,13 @@ namespace BlackCore //! Remote enabled version of writing a text file virtual bool writeToFile(const QString &fileName, const QString &content) = 0; - //! Remote enabled version of reading a text file + //! Remote enabled version of reading a text file virtual QString readFromFile(const QString &fileName) const = 0; - //! Remote enabled version of deleting a file + //! Remote enabled version of deleting a file virtual bool removeFile(const QString &fileName) = 0; - //! Remote enabled version of file exists + //! Remote enabled version of file exists virtual bool existsFile(const QString &fileName) const = 0; //! The HTML help for dot commands diff --git a/src/blackcore/context/contextapplicationimpl.cpp b/src/blackcore/context/contextapplicationimpl.cpp index 4d6344ad0..158c9c64b 100644 --- a/src/blackcore/context/contextapplicationimpl.cpp +++ b/src/blackcore/context/contextapplicationimpl.cpp @@ -159,7 +159,7 @@ namespace BlackCore if (!m_registeredApplications.contains(application)) { m_registeredApplications.push_back(application); - emit registrationChanged(); + emit this->registrationChanged(); emit this->hotkeyActionsRegistered(CInputManager::instance()->allAvailableActions(), {}); } else diff --git a/src/blackcore/context/contextsimulatorimpl.cpp b/src/blackcore/context/contextsimulatorimpl.cpp index 61905fa4d..1978d4c18 100644 --- a/src/blackcore/context/contextsimulatorimpl.cpp +++ b/src/blackcore/context/contextsimulatorimpl.cpp @@ -372,7 +372,6 @@ namespace BlackCore for (const CSimulatorPluginInfo &p : plugins) { Q_ASSERT(!p.isUnspecified()); - if (p.isValid()) { listenForSimulator(p); diff --git a/src/blackcore/corefacade.h b/src/blackcore/corefacade.h index 2030e9090..2fe9bf4ea 100644 --- a/src/blackcore/corefacade.h +++ b/src/blackcore/corefacade.h @@ -170,7 +170,7 @@ namespace BlackCore // DBus BlackMisc::CDBusServer *m_dbusServer = nullptr; - bool m_initDBusConnection = false; + bool m_initDBusConnection = false; QDBusConnection m_dbusConnection { "default" }; // contexts: diff --git a/src/blackgui/components/internalscomponent.h b/src/blackgui/components/internalscomponent.h index 77002c0bb..784e3064a 100644 --- a/src/blackgui/components/internalscomponent.h +++ b/src/blackgui/components/internalscomponent.h @@ -22,7 +22,6 @@ class QShowEvent; namespace Ui { class CInternalsComponent; } - namespace BlackGui { namespace Components diff --git a/src/blackgui/guiapplication.h b/src/blackgui/guiapplication.h index 333f62dca..40bafc99f 100644 --- a/src/blackgui/guiapplication.h +++ b/src/blackgui/guiapplication.h @@ -221,7 +221,7 @@ namespace BlackGui virtual void cmdLineVersionMessage() const override; //! @} - //! Handle paring of special GUI cmd arguments + //! Handle parsing of special GUI cmd arguments virtual bool parsingHookIn() override; //! Check for a new version (update) diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp index 7b5a35e5c..08b32d1ec 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp @@ -265,7 +265,7 @@ namespace BlackSimPlugin { m_simConnected = true; this->initSimulatorInternals(); - emitSimulatorCombinedStatus(); + this->emitSimulatorCombinedStatus(); // Internals depends on sim data which take a while to be read // this is a trich and I re-init again after a while (which is not really expensive) @@ -317,7 +317,7 @@ namespace BlackSimPlugin return; } - emitSimulatorCombinedStatus(); // force sending status + this->emitSimulatorCombinedStatus(); // force sending status } void CSimulatorFsxCommon::onSimStopped() @@ -676,7 +676,7 @@ namespace BlackSimPlugin if (!simObject.getAircraftModelString().isEmpty()) { m_addPendingAircraft.push_back(simObject.getAircraft()); - CLogMessage(this).warning("Aircraft removed, '%1' '%2' object id '%3' out of reality bubble or other reason. Interpolator: %4") + CLogMessage(this).warning("Aircraft removed, '%1' '%2' object id '%3' out of reality bubble or other reason. Interpolator: '%4'") << callsign.toQString() << simObject.getAircraftModelString() << objectID << simObject.getInterpolatorInfo(); } @@ -686,13 +686,13 @@ namespace BlackSimPlugin } } - // in all cases we remove + // in all cases we remove the object const int c = m_simConnectObjects.remove(callsign); const bool removedAny = (c > 0); const bool updated = this->updateAircraftRendered(simObject.getCallsign(), false); if (updated) { - emit aircraftRenderingChanged(simObject.getAircraft()); + emit this->aircraftRenderingChanged(simObject.getAircraft()); } // models we have to add again after removing @@ -900,7 +900,7 @@ namespace BlackSimPlugin if (simObject.isPendingAdded()) { // problem: we try to delete an aircraft just requested to be added - // best solution so far, call remove again with a delays + // best solution so far, call remove again with a delay QTimer::singleShot(2000, this, [ = ] { this->physicallyRemoveRemoteAircraft(callsign); @@ -916,12 +916,12 @@ namespace BlackSimPlugin m_hints.remove(simObject.getCallsign()); // mark in provider - const bool updated = updateAircraftRendered(callsign, false); + const bool updated = this->updateAircraftRendered(callsign, false); if (updated) { CSimulatedAircraft aircraft(simObject.getAircraft()); aircraft.setRendered(false); - emit aircraftRenderingChanged(aircraft); + emit this->aircraftRenderingChanged(aircraft); } // cleanup function, actually this should not be needed