From 5e8ff1a4ca99213bacf109180e6ee2ab20e429e7 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Sat, 30 Nov 2024 12:12:28 +0100 Subject: [PATCH] refactor: Remove old comments --- src/core/context/contextaudio.cpp | 5 +---- src/core/db/databasereader.cpp | 1 - src/core/fsd/fsdclient.cpp | 2 +- src/gui/infoarea.cpp | 6 +----- src/gui/settings/dockwidgetsettings.h | 5 +---- src/misc/icons.cpp | 6 +----- src/misc/range.h | 3 +-- .../interpolation/interpolatorspline.cpp | 3 +-- src/misc/swiftdirectories.h | 1 - src/misc/test/testing.cpp | 1 - src/misc/worker.cpp | 2 +- src/plugins/simulator/fscommon/fsuipcimpl.cpp | 19 ------------------- src/swiftguistandard/swiftguistd.h | 2 -- 13 files changed, 8 insertions(+), 48 deletions(-) diff --git a/src/core/context/contextaudio.cpp b/src/core/context/contextaudio.cpp index c7ccd3e93..4fbb068f6 100644 --- a/src/core/context/contextaudio.cpp +++ b/src/core/context/contextaudio.cpp @@ -439,9 +439,6 @@ namespace swift::core::context m_voiceClient->setOutputMuted(muted); if (!muted) { m_voiceClient->setNormalizedMasterOutputVolume(m_outMasterVolumeBeforeMute); } - - // signal no longer need, signaled by m_voiceClient->setMuted - // emit this->changedMute(muted); } bool CContextAudioBase::isOutputMuted() const @@ -456,7 +453,7 @@ namespace swift::core::context const int ms = t.toMs(); if (ms > 10) { - // As of https://dev.swift-project.org/T558 play additional notification + // Play additional notification const QPointer myself(this); QTimer::singleShot(ms, this, [=] { if (!sApp || sApp->isShuttingDown() || !myself) { return; } diff --git a/src/core/db/databasereader.cpp b/src/core/db/databasereader.cpp index 2d85fdae2..2043777c1 100644 --- a/src/core/db/databasereader.cpp +++ b/src/core/db/databasereader.cpp @@ -243,7 +243,6 @@ namespace swift::core::db // ps_read is implemented in the derived classes if (entities == CEntityFlags::NoEntity) { return; } - //! https://dev.swift-project.org/T490 QPointer myself(this); QTimer::singleShot(0, this, [=] { if (!sApp || sApp->isShuttingDown() || !myself) { return; } diff --git a/src/core/fsd/fsdclient.cpp b/src/core/fsd/fsdclient.cpp index 1084fb78f..546f0b096 100644 --- a/src/core/fsd/fsdclient.cpp +++ b/src/core/fsd/fsdclient.cpp @@ -1082,7 +1082,7 @@ namespace swift::core::fsd // IVAO parts // https://discordapp.com/channels/539048679160676382/695961646992195644/707915838845485187 - // https://dev.swift-project.org/w/knowhow/simandinterpolation/ivaoparts/ + // https://github.com/swift-project/pilotclient/wiki/Knowledgebase-Simulation:-IVAO-parts } void CFSDClient::handleAtcDataUpdate(const QStringList &tokens) diff --git a/src/gui/infoarea.cpp b/src/gui/infoarea.cpp index 0ec66d5d7..30ebfad76 100644 --- a/src/gui/infoarea.cpp +++ b/src/gui/infoarea.cpp @@ -532,11 +532,7 @@ namespace swift::gui // this->setParent(m_originalParent, this->windowFlags() & ~Qt::Window); this->setWindowFlags(this->windowFlags() & ~Qt::Window); - // RW: The line below is commented to prevent making this widget visible as a top window - // in case it is constructed without parent or anchestor widget. Contrary to the comment, - // it does not seem to be necessary https://dev.vatsim-germany.org/issues/738 - // KB 2018-12 with T447 T452 re-eanled the line again, but with parent condition - if (this->parentWidget()) // this line + if (this->parentWidget()) { this->setVisible(true); // after redocking this is required } diff --git a/src/gui/settings/dockwidgetsettings.h b/src/gui/settings/dockwidgetsettings.h index 707522361..ca0df1c1c 100644 --- a/src/gui/settings/dockwidgetsettings.h +++ b/src/gui/settings/dockwidgetsettings.h @@ -115,10 +115,7 @@ namespace swift::gui::settings struct TDockWidget : public swift::misc::TSettingTrait { //! \copydoc swift::misc::TSettingTrait::key - static const char *key() - { - return "guidockwidget/%Application%/%OwnerName%"; - } // Key in data cache https://dev.vatsim-germany.org/issues/776 + static const char *key() { return "guidockwidget/%Application%/%OwnerName%"; } // Key in data cache //! \copydoc swift::misc::TSettingTrait::humanReadable static const QString &humanReadable() diff --git a/src/misc/icons.cpp b/src/misc/icons.cpp index 33d4f46d4..92ade20cf 100644 --- a/src/misc/icons.cpp +++ b/src/misc/icons.cpp @@ -955,11 +955,7 @@ namespace swift::misc return pm; } - const QPixmap &CIcons::modelExclude16() - { - // Alternative: static const QPixmap pm(":/diagona/icons/diagona/icons/paper-plane--minus.png"); - return cross16(); - } + const QPixmap &CIcons::modelExclude16() { return cross16(); } const QPixmap &CIcons::modelConverterX() { diff --git a/src/misc/range.h b/src/misc/range.h index fcb0185a8..fc3c43e56 100644 --- a/src/misc/range.h +++ b/src/misc/range.h @@ -227,8 +227,7 @@ namespace swift::misc //! Create a range from reverse iterators. CRange reverse() const { - static_assert(std::is_same_v, - "see https://dev.swift-project.org/T700"); + static_assert(std::is_same_v, ""); return { rbegin(), rend() }; } diff --git a/src/misc/simulation/interpolation/interpolatorspline.cpp b/src/misc/simulation/interpolation/interpolatorspline.cpp index f7cc5a743..d32ec2cbf 100644 --- a/src/misc/simulation/interpolation/interpolatorspline.cpp +++ b/src/misc/simulation/interpolation/interpolatorspline.cpp @@ -139,8 +139,7 @@ namespace swift::misc::simulation if (latest.isNewerThanAdjusted(m_s[1])) { m_s[2] = latest; } const qint64 currentAdjusted = m_s[1].getAdjustedMSecsSinceEpoch(); - // with https://dev.swift-project.org/T668#15841 avoid 2 very close positions - // currently done by time, maybe we can also choose distance + // avoid 2 very close positions currently done by time, maybe we can also choose distance const qint64 osNotTooClose = qRound64(0.8 * os); const CAircraftSituation older = m_currentSituations.findObjectBeforeAdjustedOrDefault(currentAdjusted - osNotTooClose); diff --git a/src/misc/swiftdirectories.h b/src/misc/swiftdirectories.h index 9ad48f775..30148ca3d 100644 --- a/src/misc/swiftdirectories.h +++ b/src/misc/swiftdirectories.h @@ -26,7 +26,6 @@ namespace swift::misc //! Returns the bin directory. On Windows/Linux this is the same directory as //! QCoreApplication::applicationDirPath(), but on MacOS the exceutable is //! located deeper in the hierarchy of the bundles - //! \see https://dev.swift-project.org/w/dev/swiftpc/dirstructure/ static const QString &binDirectory(); //! Plugins directory diff --git a/src/misc/test/testing.cpp b/src/misc/test/testing.cpp index 14fdce812..2a36ae353 100644 --- a/src/misc/test/testing.cpp +++ b/src/misc/test/testing.cpp @@ -40,7 +40,6 @@ namespace swift::misc::test CAtcStation CTesting::createStation(int index, bool byPropertyIndex) { // from WGS is slow, so static const (only 1 time init) - // https://dev.vatsim-germany.org/issues/322#note-2 static const CCoordinateGeodetic geoPos = CCoordinateGeodetic::fromWgs84("48° 21′ 13″ N", "11° 47′ 09″ E", CAltitude(index, CLengthUnit::ft())); const QString cs = QStringLiteral("%1MI-SNO_TWR").arg(index); diff --git a/src/misc/worker.cpp b/src/misc/worker.cpp index b64633e9d..e90efd527 100644 --- a/src/misc/worker.cpp +++ b/src/misc/worker.cpp @@ -174,7 +174,7 @@ namespace swift::misc setStarted(); auto *thread = new CRegularThread(m_owner); - Q_ASSERT(m_owner); // must not be null, see (9) https://dev.vatsim-germany.org/issues/402 + Q_ASSERT(m_owner); // must not be null if (m_owner) { const QString ownerName = diff --git a/src/plugins/simulator/fscommon/fsuipcimpl.cpp b/src/plugins/simulator/fscommon/fsuipcimpl.cpp index 51ac3d8c4..e045249e3 100644 --- a/src/plugins/simulator/fscommon/fsuipcimpl.cpp +++ b/src/plugins/simulator/fscommon/fsuipcimpl.cpp @@ -191,25 +191,6 @@ namespace swift::simplugin::fscommon bool situationN = !situation; bool aircraftPartsN = !aircraftParts; - /** KB 2019-03 disabled as this should be fixed the whole block can be removed as soon this has been tested - //! \todo KB 2018-11 BUG fix for broken connection, needs to go as soon as issue is fixed - //! Seems to be fixed with - //! a) https://dev.swift-project.org/T471 - //! b) https://dev.swift-project.org/T444 - //! Remove after 2019-03 if issue is resolved - if (!(FSUIPC_Read(0x0238, 3, localFsTimeRaw, &dwResult) && FSUIPC_Process(&dwResult))) - { - FSUIPC_Close(); - FSUIPC_Open(SIM_ANY, &dwResult); - m_closeCount++; - m_openCount++; - if (m_openCount < 10) - { - CLogMessage(this).warning(u"Used FSUIPC open/close workaround"); - } - } - **/ - if (FSUIPC_Read(0x0238, 3, localFsTimeRaw, &dwResult) && // COM settings diff --git a/src/swiftguistandard/swiftguistd.h b/src/swiftguistandard/swiftguistd.h index bab804727..ae2b5b471 100644 --- a/src/swiftguistandard/swiftguistd.h +++ b/src/swiftguistandard/swiftguistd.h @@ -337,6 +337,4 @@ private: //! @} }; -// #pragma pop_macro("interface") - #endif // guard