mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-01 05:26:45 +08:00
Caches: rename "get" to "getThreadLocal" and rename "getCopy" to get.
This commit is contained in:
committed by
Klaus Basan
parent
332d8e5fc8
commit
9bef6854ca
@@ -656,8 +656,8 @@ namespace BlackSimPlugin
|
||||
}
|
||||
else
|
||||
{
|
||||
CLogMessage(this).debug() << "Starting XBus on" << m_xbusServerSetting.get();
|
||||
m_conn = CSimulatorXPlane::connectionFromString(m_xbusServerSetting.get());
|
||||
CLogMessage(this).debug() << "Starting XBus on" << m_xbusServerSetting.getThreadLocal();
|
||||
m_conn = CSimulatorXPlane::connectionFromString(m_xbusServerSetting.getThreadLocal());
|
||||
m_watcher = new QDBusServiceWatcher(xbusServiceName(), m_conn, QDBusServiceWatcher::WatchForRegistration, this);
|
||||
connect(m_watcher, &QDBusServiceWatcher::serviceRegistered, this, &CSimulatorXPlaneListener::ps_serviceRegistered);
|
||||
}
|
||||
@@ -674,7 +674,7 @@ namespace BlackSimPlugin
|
||||
|
||||
bool CSimulatorXPlaneListener::isXBusRunning() const
|
||||
{
|
||||
QDBusConnection conn = CSimulatorXPlane::connectionFromString(m_xbusServerSetting.get());
|
||||
QDBusConnection conn = CSimulatorXPlane::connectionFromString(m_xbusServerSetting.getThreadLocal());
|
||||
CXBusServiceProxy *service = new CXBusServiceProxy(conn);
|
||||
CXBusTrafficProxy *traffic = new CXBusTrafficProxy(conn);
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ namespace BlackSimPlugin
|
||||
connect(ui->bb_OkCancel, &QDialogButtonBox::accepted, this, &CSimulatorXPlaneConfigWindow::close);
|
||||
connect(ui->bb_OkCancel, &QDialogButtonBox::rejected, this, &CSimulatorXPlaneConfigWindow::close);
|
||||
|
||||
ui->cp_XBusServer->setCurrentText(m_xbusServerSetting.get());
|
||||
ui->cp_XBusServer->setCurrentText(m_xbusServerSetting.getThreadLocal());
|
||||
|
||||
if (xBusAvailable())
|
||||
connect(ui->pb_InstallXBus, &QPushButton::clicked, this, &CSimulatorXPlaneConfigWindow::ps_installXBus);
|
||||
@@ -74,7 +74,7 @@ namespace BlackSimPlugin
|
||||
|
||||
void CSimulatorXPlaneConfigWindow::ps_storeSettings()
|
||||
{
|
||||
if (ui->cp_XBusServer->currentText() != m_xbusServerSetting.get())
|
||||
if (ui->cp_XBusServer->currentText() != m_xbusServerSetting.getThreadLocal())
|
||||
{
|
||||
m_xbusServerSetting.set(ui->cp_XBusServer->currentText());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user