Skip to content

Commit 6700f66

Browse files
committed
fix: Annotations from GitHub build resolved
1 parent 53d069a commit 6700f66

File tree

6 files changed

+6
-11
lines changed

6 files changed

+6
-11
lines changed

src/misc/simulation/settings/simulatorsettings.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,6 @@ namespace swift::misc::simulation::settings
707707
// msfs2024 uses no model directories but uses the field "packages directory" for filtering modelstrings
708708
// Asterix stands for everything == no filtering
709709
static const QString msfs2024 = "*";
710-
if (msfs2024.isEmpty()) { return e; }
711710
static const QStringList md { msfs2024 };
712711
return md;
713712
}

src/plugins/simulator/msfs2024/simconnectsymbolsmsfs2024.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ using PfnSimConnect_AICreateSimulatedObject_EX1 = HRESULT(__stdcall *)(HANDLE, c
120120

121121
//! The SimConnect Symbols
122122
//! \private
123-
struct SimConnectSymbols
123+
struct SimConnectSymbolsMsfs2024
124124
{
125125
PfnSimConnect_Open SimConnect_Open = nullptr;
126126
PfnSimConnect_Close SimConnect_Close = nullptr;
@@ -169,7 +169,7 @@ struct SimConnectSymbols
169169
#endif
170170
};
171171

172-
static SimConnectSymbols gSymbols;
172+
static SimConnectSymbolsMsfs2024 gSymbols;
173173

174174
template <typename FuncPtr>
175175
bool resolveSimConnectSymbol(QLibrary &library, FuncPtr &funcPtr, const char *funcName)

src/plugins/simulator/msfs2024/simulatormsfs2024common.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -513,17 +513,15 @@ namespace swift::simplugin::msfs2024common
513513
bool incremnental = true;
514514
bool sortByDistributor = true;
515515
bool consolidateWithDb = false;
516-
bool ShowAllInstalledModells = true;
516+
bool ShowAllInstalledModells = true; // msfs20424 always show all installed models
517517

518518
if (gui_application)
519519
{
520520
givenDistributorsOnly = m_generic.getPropertyDistributorFiltered();
521521
dbDataOnly = m_generic.getPropertyWithDbEntry();
522-
dbIcaoOnly = false;
523522
incremnental = false;
524-
sortByDistributor = true;
525523
consolidateWithDb = true;
526-
ShowAllInstalledModells = true; // msfs20424 always show all installed models
524+
ShowAllInstalledModells = true;
527525
}
528526

529527
// CDistributorList distributorList;

src/plugins/simulator/msfs2024/simulatormsfs2024simconnectproc.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,6 @@ namespace swift::simplugin::msfs2024common
221221
const DWORD requestId = event->dwRequestID;
222222
const DWORD objectId = event->dwObjectID;
223223

224-
const QString Test = CSimulatorMsfs2024::requestIdToString(requestId);
225-
226224
simulatorMsfs2024->m_dispatchRequestIdLast = requestId;
227225

228226
if (CSimulatorMsfs2024::isRequestForSimConnectObject(requestId))

src/swiftdata/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
4242
}
4343
CSwiftData w;
4444
w.show();
45-
int r = a.exec();
45+
r = a.exec();
4646
}
4747
return r;
4848
}

src/swiftdata/swiftdataapplication.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ CStatusMessageList CSwiftDataApplication::startHookIn()
7474
bool CSwiftDataApplication::parsingHookIn()
7575
{
7676
// Parse core relevant arguments
77-
const QString dBusAddress(this->getCmdDBusAddressValue());
77+
// const QString dBusAddress(this->getCmdDBusAddressValue());
7878
// if (!dBusAddress.isEmpty())
7979
//{
8080
// // check if reachable

0 commit comments

Comments
 (0)