From 32097dc723ffbfa0dffddb17a188e5539974262a Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 16 Apr 2024 03:24:54 +0300 Subject: [PATCH] generic: adjust to KMessageWidget changes Signed-off-by: Ivailo Monev --- kate/part/search/katesearchbar.cpp | 2 +- kate/part/view/katemessagewidget.cpp | 3 --- kate/tests/messagetest.cpp | 4 ++-- kwin/kcmkwin/kwincompositing/main.ui | 6 ------ 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/kate/part/search/katesearchbar.cpp b/kate/part/search/katesearchbar.cpp index 1fed5863..aaf07cbd 100644 --- a/kate/part/search/katesearchbar.cpp +++ b/kate/part/search/katesearchbar.cpp @@ -302,7 +302,7 @@ void KateSearchBar::updateMessage(QPointer& message, bool void KateSearchBar::showInfoMessage(const QString& text) { typedef KTextEditor::Message KTEM; - updateMessage(m_infoMessage, true, text, KTEM::Positive, KTEM::BottomInView, KTEM::AfterUserInteraction, 3000, false); + updateMessage(m_infoMessage, true, text, KTEM::Information, KTEM::BottomInView, KTEM::AfterUserInteraction, 3000, false); } void KateSearchBar::highlightMatch(const Range & range) { diff --git a/kate/part/view/katemessagewidget.cpp b/kate/part/view/katemessagewidget.cpp index 66839a17..a7370d56 100644 --- a/kate/part/view/katemessagewidget.cpp +++ b/kate/part/view/katemessagewidget.cpp @@ -99,9 +99,6 @@ void KateMessageWidget::showNextMessage() // the enums values do not necessarily match, hence translate with switch switch (m_currentMessage->messageType()) { - case KTextEditor::Message::Positive: - m_messageWidget->setMessageType(KMessageWidget::Positive); - break; case KTextEditor::Message::Information: m_messageWidget->setMessageType(KMessageWidget::Information); break; diff --git a/kate/tests/messagetest.cpp b/kate/tests/messagetest.cpp index 6f7604b7..17424c1b 100644 --- a/kate/tests/messagetest.cpp +++ b/kate/tests/messagetest.cpp @@ -217,7 +217,7 @@ void MessageTest::testPriority() // - m1 should be hidden in favour of m2 // - changing text of m1 while m2 is displayed should not change the displayed text // - QPointer m1 = new Message("m1", Message::Positive); + QPointer m1 = new Message("m1", Message::Information); m1->setPosition(Message::TopInView); QVERIFY(m1->priority() == 0); @@ -273,7 +273,7 @@ void MessageTest::testCreateView() // - verify that both views get the message // - verify that, once the message is deleted, both views hide the message // - QPointer m1 = new Message("message", Message::Positive); + QPointer m1 = new Message("message", Message::Information); m1->setPosition(Message::TopInView); QVERIFY(m1->priority() == 0); diff --git a/kwin/kcmkwin/kwincompositing/main.ui b/kwin/kcmkwin/kwincompositing/main.ui index f68fb441..0145af27 100644 --- a/kwin/kcmkwin/kwincompositing/main.ui +++ b/kwin/kcmkwin/kwincompositing/main.ui @@ -13,12 +13,6 @@ - - QFrame::StyledPanel - - - QFrame::Raised -