diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/blackgui/components/textmessagecomponent.cpp index e5c0350d3..7b9787cf8 100644 --- a/src/blackgui/components/textmessagecomponent.cpp +++ b/src/blackgui/components/textmessagecomponent.cpp @@ -68,9 +68,9 @@ namespace BlackGui ui->le_textMessages->setVisible(false); ui->tvp_TextMessagesAll->setResizeMode(CTextMessageView::ResizingAuto); - bool c = connect(ui->le_textMessages, &QLineEdit::returnPressed, this, &CTextMessageComponent::ps_textMessageEntered); + bool c = connect(ui->le_textMessages, &QLineEdit::returnPressed, this, &CTextMessageComponent::textMessageEntered); Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect"); - c = connect(sGui->getIContextOwnAircraft(), &IContextOwnAircraft::changedAircraftCockpit, this, &CTextMessageComponent::ps_onChangedAircraftCockpit); + c = connect(sGui->getIContextOwnAircraft(), &IContextOwnAircraft::changedAircraftCockpit, this, &CTextMessageComponent::onChangedAircraftCockpit); Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect"); c = connect(this, &CTextMessageComponent::commandEntered, sApp->getCoreFacade(), &CCoreFacade::parseCommandLine); Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect"); @@ -83,7 +83,7 @@ namespace BlackGui bool CTextMessageComponent::setParentDockWidgetInfoArea(CDockWidgetInfoArea *parentDockableWidget) { bool c = CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea(parentDockableWidget); - c = c && connect(this->getDockWidgetInfoArea(), &CDockWidgetInfoArea::widgetTopLevelChanged, this, &CTextMessageComponent::ps_topLevelChanged); + c = c && connect(this->getDockWidgetInfoArea(), &CDockWidgetInfoArea::widgetTopLevelChanged, this, &CTextMessageComponent::topLevelChanged); Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect"); return c; } @@ -201,7 +201,7 @@ namespace BlackGui return m_identifier; } - void CTextMessageComponent::ps_onChangedAircraftCockpit() + void CTextMessageComponent::onChangedAircraftCockpit() { this->showCurrentFrequenciesFromCockpit(); } @@ -276,7 +276,7 @@ namespace BlackGui newTab->setLayout(layout); textEdit->setContextMenuPolicy(Qt::CustomContextMenu); const int index = ui->tw_TextMessages->addTab(newTab, tabName); - connect(closeButton, &QPushButton::released, this, &CTextMessageComponent::ps_closeTextMessageTab); + connect(closeButton, &QPushButton::released, this, &CTextMessageComponent::closeTextMessageTab); ui->tw_TextMessages->setCurrentIndex(index); if (sGui && sGui->getIContextNetwork()) @@ -350,7 +350,7 @@ namespace BlackGui return nullptr; } - void CTextMessageComponent::ps_closeTextMessageTab() + void CTextMessageComponent::closeTextMessageTab() { QObject *sender = QObject::sender(); QWidget *parentWidget = qobject_cast(sender->parent()); @@ -365,14 +365,14 @@ namespace BlackGui if (index >= 0) { ui->tw_TextMessages->removeTab(index); } } - void CTextMessageComponent::ps_topLevelChanged(QWidget *widget, bool topLevel) + void CTextMessageComponent::topLevelChanged(QWidget *widget, bool topLevel) { // own input field if floating window Q_UNUSED(widget); ui->le_textMessages->setVisible(topLevel); } - void CTextMessageComponent::ps_textMessageEntered() + void CTextMessageComponent::textMessageEntered() { if (!ui->le_textMessages->isVisible()) { return; } if (!this->isVisible()) { return; } @@ -470,8 +470,8 @@ namespace BlackGui if (originator == componentIdentifier()) { return false; } if (commandLine.isEmpty() || commandLine.startsWith(".")) { return false; } - // non command input - if (!this->isVisibleWidget()) { return false; } // invisble, do ignore + // no "dot" command input + if (!this->isVisibleWidget()) { return false; } // invisible, do ignore this->handleEnteredTextMessage(commandLine); // handle as it was entered by own command line return false; // we never handle the message directly, but forward it diff --git a/src/blackgui/components/textmessagecomponent.h b/src/blackgui/components/textmessagecomponent.h index 2206c6001..d61563977 100644 --- a/src/blackgui/components/textmessagecomponent.h +++ b/src/blackgui/components/textmessagecomponent.h @@ -129,18 +129,17 @@ namespace BlackGui //! Handle a text message entered void handleEnteredTextMessage(const QString &textMessage); - private slots: //! Cockpit values changed, used to updated some components - void ps_onChangedAircraftCockpit(); + void onChangedAircraftCockpit(); //! Close text message tab - void ps_closeTextMessageTab(); + void closeTextMessageTab(); //! Top level was changed (used to enable elements when floating) - void ps_topLevelChanged(QWidget *widget, bool topLevel); + void topLevelChanged(QWidget *widget, bool topLevel); //! Command line entered - void ps_textMessageEntered(); + void textMessageEntered(); }; } // ns } // ns