Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Akregator
Commits
9655d449
Commit
9655d449
authored
Nov 16, 2020
by
Laurent Montel
😁
Browse files
Make it compile without deprecated method
parent
f51d1889
Pipeline
#41231
canceled with stage
in 5 minutes and 45 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
9655d449
...
...
@@ -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=0x054
C
00
)
add_definitions
(
-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054
D
00
)
if
(
TARGET KUserFeedbackWidgets
)
add_definitions
(
-DWITH_KUSERFEEDBACK
)
endif
()
...
...
src/akregator_part.cpp
View file @
9655d449
...
...
@@ -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
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment