flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 12:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Unified formatting this->m_XX -> m_XX

Browse Source
This commit is contained in:
Klaus Basan
2017-09-17 01:08:40 +02:00
committed by Mathew Sutcliffe
parent 6c3a0243ab
commit d2b364c291
3 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackgui/components/dbstashcomponent.cpp
View File

@@ -405,7 +405,7 @@ namespace BlackGui
CAuthenticatedUser CDbStashComponent::getSwiftDbUser() const
{
return this->m_swiftDbUser.get();
return m_swiftDbUser.get();
}
CAircraftModel CDbStashComponent::consolidateModel(const CAircraftModel &model) const

30
src/blackgui/overlaymessagesframe.cpp
View File

@@ -50,7 +50,7 @@ namespace BlackGui
{
if (messages.isEmpty()) { return; }
this->initInnerFrame();
this->m_overlayMessages->showOverlayMessagesWithConfirmation(messages, appendOldMessages, confirmationMessage, okLambda, defaultButton, timeOutMs);
m_overlayMessages->showOverlayMessagesWithConfirmation(messages, appendOldMessages, confirmationMessage, okLambda, defaultButton, timeOutMs);
this->repaint();
}
@@ -63,7 +63,7 @@ namespace BlackGui
{
if (message.isEmpty()) { return; }
this->initInnerFrame();
this->m_overlayMessages->showOverlayMessage(message, timeOutMs);
m_overlayMessages->showOverlayMessage(message, timeOutMs);
this->repaint();
}
@@ -71,7 +71,7 @@ namespace BlackGui
{
if (messages.isEmpty()) { return; }
this->initInnerFrame();
this->m_overlayMessages->showOverlayMessages(messages, appendOldMessages, timeOutMs);
m_overlayMessages->showOverlayMessages(messages, appendOldMessages, timeOutMs);
this->repaint();
}
@@ -79,21 +79,21 @@ namespace BlackGui
{
if (textMessage.isEmpty()) { return; }
this->initInnerFrame();
this->m_overlayMessages->showOverlayTextMessage(textMessage, timeOutMs);
m_overlayMessages->showOverlayTextMessage(textMessage, timeOutMs);
this->repaint();
}
void COverlayMessagesFrame::showOverlayVariant(const BlackMisc::CVariant &variant, int timeOutMs)
{
this->initInnerFrame();
this->m_overlayMessages->showOverlayVariant(variant, timeOutMs);
m_overlayMessages->showOverlayVariant(variant, timeOutMs);
this->repaint();
}
void COverlayMessagesFrame::showOverlayImage(const BlackMisc::CPixmap &pixmap, int timeOutMs)
{
this->initInnerFrame();
this->m_overlayMessages->showOverlayImage(pixmap, timeOutMs);
m_overlayMessages->showOverlayImage(pixmap, timeOutMs);
this->repaint();
}
@@ -113,7 +113,7 @@ namespace BlackGui
void COverlayMessagesFrame::resizeEvent(QResizeEvent *event)
{
QFrame::resizeEvent(event);
if (this->m_overlayMessages && this->m_overlayMessages->isVisible())
if (m_overlayMessages && m_overlayMessages->isVisible())
{
this->initInnerFrame();
}
@@ -125,8 +125,8 @@ namespace BlackGui
const int w = std::max(this->width(), this->minimumWidth());
const int h = std::max(this->height(), this->minimumHeight());
int wInner = this->m_widthFactor * w;
int hInner = this->m_heightFactor * h;
int wInner = m_widthFactor * w;
int hInner = m_heightFactor * h;
if (wInner > this->maximumWidth()) wInner = this->maximumWidth();
if (hInner > this->maximumHeight()) hInner = this->maximumHeight();
return QSize(wInner, hInner);
@@ -135,15 +135,15 @@ namespace BlackGui
void COverlayMessagesFrame::initInnerFrame()
{
const QSize inner(innerFrameSize());
if (!this->m_overlayMessages)
if (!m_overlayMessages)
{
// lazy init
this->m_overlayMessages = new COverlayMessages(inner.width(), inner.height(), this);
this->m_overlayMessages->addShadow();
this->m_overlayMessages->showKillButton(m_showKillButton);
m_overlayMessages = new COverlayMessages(inner.width(), inner.height(), this);
m_overlayMessages->addShadow();
m_overlayMessages->showKillButton(m_showKillButton);
}
Q_ASSERT(this->m_overlayMessages);
Q_ASSERT(m_overlayMessages);
const bool isFrameless = CGuiUtility::isMainWindowFrameless();
const QPoint middle = this->geometry().center();
@@ -152,6 +152,6 @@ namespace BlackGui
const int h = inner.height();
const int x = middle.x() - w / 2;
const int y = middle.y() - h / yFactor;
this->m_overlayMessages->setGeometry(x, y, w, h);
m_overlayMessages->setGeometry(x, y, w, h);
}
} // ns

34
src/swiftguistandard/swiftguistd.cpp
View File

@@ -90,8 +90,8 @@ void SwiftGuiStd::mousePressEvent(QMouseEvent *event)
void SwiftGuiStd::performGracefulShutdown()
{
if (!this->m_init) { return; }
this->m_init = false;
if (!m_init) { return; }
m_init = false;
Q_ASSERT_X(CThreadUtils::isCurrentThreadApplicationThread(), Q_FUNC_INFO, "Should shutdown in main thread");
@@ -99,11 +99,11 @@ void SwiftGuiStd::performGracefulShutdown()
this->stopAllTimers(true);
// if we have a context, we shut some things down
if (this->m_contextNetworkAvailable)
if (m_contextNetworkAvailable)
{
if (sGui && sGui->getIContextNetwork() && sGui->getIContextNetwork()->isConnected())
{
if (this->m_contextAudioAvailable)
if (m_contextAudioAvailable)
{
sGui->getIContextAudio()->leaveAllVoiceRooms();
sGui->getIContextAudio()->disconnect(this); // break down signal / slots
@@ -216,25 +216,25 @@ void SwiftGuiStd::ps_loginRequested()
bool SwiftGuiStd::isContextNetworkAvailableCheck()
{
if (this->m_contextNetworkAvailable) return true;
if (m_contextNetworkAvailable) return true;
CLogMessage(this).error("Network context not available, no updates this time");
return false;
}
bool SwiftGuiStd::isContextAudioAvailableCheck()
{
if (this->m_contextAudioAvailable) return true;
if (m_contextAudioAvailable) return true;
CLogMessage(this).error("Audio context not available");
return false;
}
void SwiftGuiStd::ps_displayStatusMessageInGui(const CStatusMessage &statusMessage)
{
if (!this->m_init) { return; }
if (!m_init) { return; }
// used with log subscriber
if (statusMessage.wasHandledBy(this)) { return; }
statusMessage.markAsHandledBy(this);
this->m_statusBar.displayStatusMessage(statusMessage);
m_statusBar.displayStatusMessage(statusMessage);
// main info areas
ui->comp_MainInfoArea->displayStatusMessage(statusMessage);
@@ -287,27 +287,27 @@ void SwiftGuiStd::ps_handleTimerBasedUpdates()
void SwiftGuiStd::setContextAvailability()
{
const bool corePreviouslyAvailable = this->m_coreAvailable;
const bool corePreviouslyAvailable = m_coreAvailable;
if (sGui &&
sGui->getIContextApplication() &&
!sGui->isShuttingDown() &&
!sGui->getIContextApplication()->isEmptyObject())
{
// ping to check if core is still alive
this->m_coreAvailable = this->isMyIdentifier(sGui->getIContextApplication()->registerApplication(getCurrentTimestampIdentifier()));
m_coreAvailable = this->isMyIdentifier(sGui->getIContextApplication()->registerApplication(getCurrentTimestampIdentifier()));
}
else
{
this->m_coreAvailable = false;
m_coreAvailable = false;
}
this->m_contextNetworkAvailable = this->m_coreAvailable && sGui->getIContextNetwork() && !sGui->getIContextNetwork()->isEmptyObject();
this->m_contextAudioAvailable = this->m_coreAvailable && sGui->getIContextAudio() && !sGui->getIContextAudio()->isEmptyObject();
m_contextNetworkAvailable = m_coreAvailable && sGui->getIContextNetwork() && !sGui->getIContextNetwork()->isEmptyObject();
m_contextAudioAvailable = m_coreAvailable && sGui->getIContextAudio() && !sGui->getIContextAudio()->isEmptyObject();
// react to a change in core's availability
if (this->m_coreAvailable != corePreviouslyAvailable)
if (m_coreAvailable != corePreviouslyAvailable)
{
if (this->m_coreAvailable)
if (m_coreAvailable)
{
// core has just become available (startup)
sGui->getIContextApplication()->synchronizeLogSubscriptions();
@@ -320,7 +320,7 @@ void SwiftGuiStd::updateGuiStatusInformation()
{
const QString now = QDateTime::currentDateTimeUtc().toString("yyyy-MM-dd HH:mm:ss");
QString network("unavailable");
if (this->m_contextNetworkAvailable)
if (m_contextNetworkAvailable)
{
bool dbus = !sGui->getIContextNetwork()->isUsingImplementingObject();
network = dbus ? now : "local";
@@ -429,7 +429,7 @@ void SwiftGuiStd::ps_sharedInfoObjectsLoaded()
void SwiftGuiStd::playNotifcationSound(CNotificationSounds::Notification notification) const
{
if (!this->m_contextAudioAvailable) { return; }
if (!m_contextAudioAvailable) { return; }
if (!ui->comp_MainInfoArea->getSettingsComponent()->playNotificationSounds()) { return; }
sGui->getIContextAudio()->playNotification(notification, true);
}