Commit 9655d449 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Make it compile without deprecated method

parent f51d1889
Pipeline #41231 canceled with stage
in 5 minutes and 45 seconds
......@@ -90,7 +90,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_definitions(-DQT_NO_FOREACH)
add_definitions(-DQT_NO_KEYWORDS)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00)
add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054C00)
add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054D00)
if (TARGET KUserFeedbackWidgets)
add_definitions(-DWITH_KUSERFEEDBACK)
endif()
......
......@@ -11,6 +11,7 @@
#include "akregator_debug.h"
#include <MessageViewer/MessageViewerSettings>
#include "akregatorconfig.h"
#include "aboutdata.h"
#include "actionmanagerimpl.h"
......@@ -202,7 +203,7 @@ Part::Part(QWidget *parentWidget, QObject *parent, const QVariantList &)
if (Settings::showTrayIcon() && !TrayIcon::getInstance()) {
initializeTrayIcon();
QWidget *const notificationParent = isTrayIconEnabled() ? m_mainWidget->window() : nullptr;
NotificationManager::self()->setWidget(notificationParent, componentData().componentName());
NotificationManager::self()->setWidget(notificationParent, componentName());
}
connect(qApp, &QCoreApplication::aboutToQuit, this, &Part::slotOnShutdown);
......@@ -294,8 +295,7 @@ void Part::slotSettingsChanged()
UnityServiceManager::instance()->slotSetUnread(0);
}
NotificationManager::self()->setWidget(isTrayIconEnabled() ? m_mainWidget->window() : nullptr, componentData().componentName());
NotificationManager::self()->setWidget(isTrayIconEnabled() ? m_mainWidget->window() : nullptr, componentName());
if (Settings::showTrayIcon()) {
if (!TrayIcon::getInstance()) {
initializeTrayIcon();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment