mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-20 20:40:29 +08:00
fix: Annotations from GitHub build resolved
This commit is contained in:
@@ -707,7 +707,6 @@ namespace swift::misc::simulation::settings
|
|||||||
// msfs2024 uses no model directories but uses the field "packages directory" for filtering modelstrings
|
// msfs2024 uses no model directories but uses the field "packages directory" for filtering modelstrings
|
||||||
// Asterix stands for everything == no filtering
|
// Asterix stands for everything == no filtering
|
||||||
static const QString msfs2024 = "*";
|
static const QString msfs2024 = "*";
|
||||||
if (msfs2024.isEmpty()) { return e; }
|
|
||||||
static const QStringList md { msfs2024 };
|
static const QStringList md { msfs2024 };
|
||||||
return md;
|
return md;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -120,7 +120,7 @@ using PfnSimConnect_AICreateSimulatedObject_EX1 = HRESULT(__stdcall *)(HANDLE, c
|
|||||||
|
|
||||||
//! The SimConnect Symbols
|
//! The SimConnect Symbols
|
||||||
//! \private
|
//! \private
|
||||||
struct SimConnectSymbols
|
struct SimConnectSymbolsMsfs2024
|
||||||
{
|
{
|
||||||
PfnSimConnect_Open SimConnect_Open = nullptr;
|
PfnSimConnect_Open SimConnect_Open = nullptr;
|
||||||
PfnSimConnect_Close SimConnect_Close = nullptr;
|
PfnSimConnect_Close SimConnect_Close = nullptr;
|
||||||
@@ -169,7 +169,7 @@ struct SimConnectSymbols
|
|||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
static SimConnectSymbols gSymbols;
|
static SimConnectSymbolsMsfs2024 gSymbols;
|
||||||
|
|
||||||
template <typename FuncPtr>
|
template <typename FuncPtr>
|
||||||
bool resolveSimConnectSymbol(QLibrary &library, FuncPtr &funcPtr, const char *funcName)
|
bool resolveSimConnectSymbol(QLibrary &library, FuncPtr &funcPtr, const char *funcName)
|
||||||
|
|||||||
@@ -513,17 +513,15 @@ namespace swift::simplugin::msfs2024common
|
|||||||
bool incremnental = true;
|
bool incremnental = true;
|
||||||
bool sortByDistributor = true;
|
bool sortByDistributor = true;
|
||||||
bool consolidateWithDb = false;
|
bool consolidateWithDb = false;
|
||||||
bool ShowAllInstalledModells = true;
|
bool ShowAllInstalledModells = true; // msfs20424 always show all installed models
|
||||||
|
|
||||||
if (gui_application)
|
if (gui_application)
|
||||||
{
|
{
|
||||||
givenDistributorsOnly = m_generic.getPropertyDistributorFiltered();
|
givenDistributorsOnly = m_generic.getPropertyDistributorFiltered();
|
||||||
dbDataOnly = m_generic.getPropertyWithDbEntry();
|
dbDataOnly = m_generic.getPropertyWithDbEntry();
|
||||||
dbIcaoOnly = false;
|
|
||||||
incremnental = false;
|
incremnental = false;
|
||||||
sortByDistributor = true;
|
|
||||||
consolidateWithDb = true;
|
consolidateWithDb = true;
|
||||||
ShowAllInstalledModells = true; // msfs20424 always show all installed models
|
ShowAllInstalledModells = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// CDistributorList distributorList;
|
// CDistributorList distributorList;
|
||||||
|
|||||||
@@ -221,8 +221,6 @@ namespace swift::simplugin::msfs2024common
|
|||||||
const DWORD requestId = event->dwRequestID;
|
const DWORD requestId = event->dwRequestID;
|
||||||
const DWORD objectId = event->dwObjectID;
|
const DWORD objectId = event->dwObjectID;
|
||||||
|
|
||||||
const QString Test = CSimulatorMsfs2024::requestIdToString(requestId);
|
|
||||||
|
|
||||||
simulatorMsfs2024->m_dispatchRequestIdLast = requestId;
|
simulatorMsfs2024->m_dispatchRequestIdLast = requestId;
|
||||||
|
|
||||||
if (CSimulatorMsfs2024::isRequestForSimConnectObject(requestId))
|
if (CSimulatorMsfs2024::isRequestForSimConnectObject(requestId))
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
|
|||||||
}
|
}
|
||||||
CSwiftData w;
|
CSwiftData w;
|
||||||
w.show();
|
w.show();
|
||||||
int r = a.exec();
|
r = a.exec();
|
||||||
}
|
}
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ CStatusMessageList CSwiftDataApplication::startHookIn()
|
|||||||
bool CSwiftDataApplication::parsingHookIn()
|
bool CSwiftDataApplication::parsingHookIn()
|
||||||
{
|
{
|
||||||
// Parse core relevant arguments
|
// Parse core relevant arguments
|
||||||
const QString dBusAddress(this->getCmdDBusAddressValue());
|
// const QString dBusAddress(this->getCmdDBusAddressValue());
|
||||||
// if (!dBusAddress.isEmpty())
|
// if (!dBusAddress.isEmpty())
|
||||||
//{
|
//{
|
||||||
// // check if reachable
|
// // check if reachable
|
||||||
|
|||||||
Reference in New Issue
Block a user