diff --git a/src/document/katedocument.cpp b/src/document/katedocument.cpp --- a/src/document/katedocument.cpp +++ b/src/document/katedocument.cpp @@ -6060,7 +6060,8 @@ } // also catch if the user manually calls delete message - connect(message, SIGNAL(closed(KTextEditor::Message *)), SLOT(messageDestroyed(KTextEditor::Message *))); + connect(message, &Message::closed, + this, &DocumentPrivate::messageDestroyed); return true; } diff --git a/src/view/katemessagewidget.cpp b/src/view/katemessagewidget.cpp --- a/src/view/katemessagewidget.cpp +++ b/src/view/katemessagewidget.cpp @@ -59,12 +59,14 @@ // create animation controller, and connect widgetHidden() to showNextMessage() m_animation = new KateAnimation(m_messageWidget, applyFadeEffect ? KateAnimation::FadeEffect : KateAnimation::GrowEffect); - connect(m_animation, SIGNAL(widgetHidden()), this, SLOT(showNextMessage())); + connect(m_animation, &KateAnimation::widgetHidden, + this, &KateMessageWidget::showNextMessage); // setup autoHide timer details m_autoHideTimer->setSingleShot(true); - connect(m_messageWidget, SIGNAL(linkHovered(QString)), SLOT(linkHovered(QString))); + connect(m_messageWidget, &KMessageWidget::linkHovered, + this, &KateMessageWidget::linkHovered); } void KateMessageWidget::showNextMessage() @@ -86,8 +88,10 @@ m_messageWidget->setIcon(m_currentMessage->icon()); // connect textChanged() and iconChanged(), so it's possible to change this on the fly - connect(m_currentMessage, SIGNAL(textChanged(QString)), m_messageWidget, SLOT(setText(QString)), Qt::UniqueConnection); - connect(m_currentMessage, SIGNAL(iconChanged(QIcon)), m_messageWidget, SLOT(setIcon(QIcon)), Qt::UniqueConnection); + connect(m_currentMessage, &KTextEditor::Message::textChanged, + m_messageWidget, &KMessageWidget::setText, Qt::UniqueConnection); + connect(m_currentMessage, &KTextEditor::Message::iconChanged, + m_messageWidget, &KMessageWidget::setIcon, Qt::UniqueConnection); // the enums values do not necessarily match, hence translate with switch switch (m_currentMessage->messageType()) { @@ -127,7 +131,8 @@ m_autoHideTime = m_currentMessage->autoHide(); m_autoHideTimer->stop(); if (m_autoHideTime >= 0) { - connect(m_autoHideTimer, SIGNAL(timeout()), m_currentMessage, SLOT(deleteLater()), Qt::UniqueConnection); + connect(m_autoHideTimer, &QTimer::timeout, + m_currentMessage, &QObject::deleteLater, Qt::UniqueConnection); if (m_currentMessage->autoHideMode() == KTextEditor::Message::Immediate) { m_autoHideTimer->start(m_autoHideTime == 0 ? s_defaultAutoHideTime : m_autoHideTime); } @@ -195,24 +200,27 @@ m_messageQueue.insert(i, message); // catch if the message gets deleted - connect(message, SIGNAL(closed(KTextEditor::Message *)), SLOT(messageDestroyed(KTextEditor::Message *))); + connect(message, &KTextEditor::Message::closed, + this, &KateMessageWidget::messageDestroyed); if (i == 0 && !m_animation->isHideAnimationRunning()) { // if message has higher priority than the one currently shown, // then hide the current one and then show the new one. if (m_currentMessage) { // autoHide timer may be running for currently shown message, therefore // simply disconnect autoHide timer to all timeout() receivers - disconnect(m_autoHideTimer, SIGNAL(timeout()), nullptr, nullptr); + disconnect(m_autoHideTimer, &QTimer::timeout, nullptr, nullptr); m_autoHideTimer->stop(); // if there is a current message, the message queue must contain 2 messages Q_ASSERT(m_messageQueue.size() > 1); Q_ASSERT(m_currentMessage == m_messageQueue[1]); // a bit unnice: disconnect textChanged() and iconChanged() signals of previously visible message - disconnect(m_currentMessage, SIGNAL(textChanged(QString)), m_messageWidget, SLOT(setText(QString))); - disconnect(m_currentMessage, SIGNAL(iconChanged(QIcon)), m_messageWidget, SLOT(setIcon(QIcon))); + disconnect(m_currentMessage, &KTextEditor::Message::textChanged, + m_messageWidget, &KMessageWidget::setText); + disconnect(m_currentMessage, &KTextEditor::Message::iconChanged, + m_messageWidget, &KMessageWidget::setIcon); m_currentMessage = nullptr; m_animation->hide();