Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KOrganizer
Commits
6db10677
Commit
6db10677
authored
Apr 26, 2021
by
Laurent Montel
Browse files
Make it compiles with last kf5
parent
0d1239bf
Pipeline
#59779
canceled with stage
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
korgac/alarmdialog.cpp
View file @
6db10677
...
...
@@ -1000,7 +1000,7 @@ void AlarmDialog::keyPressEvent(QKeyEvent *e)
bool
AlarmDialog
::
openIncidenceEditorThroughKOrganizer
(
const
Incidence
::
Ptr
&
incidence
)
{
if
(
!
QDBusConnection
::
sessionBus
().
interface
()
->
isServiceRegistered
(
QStringLiteral
(
"org.kde.korganizer"
)))
{
if
(
KToolInvocation
::
startServiceByDesktopNam
e
(
QStringLiteral
(
"org.kde.korganizer"
)
,
QString
()
))
{
if
(
!
QDBusConnection
::
sessionBus
().
interface
()
->
startServic
e
(
QStringLiteral
(
"org.kde.korganizer"
)
).
isValid
(
))
{
KMessageBox
::
error
(
this
,
i18nc
(
"@info"
,
"Could not start KOrganizer so editing is not possible."
));
return
false
;
}
...
...
korgac/alarmdockwindow.cpp
View file @
6db10677
...
...
@@ -18,6 +18,8 @@
#include
<KMessageBox>
#include
<KSharedConfig>
#include
<KToolInvocation>
#include
<QDBusConnection>
#include
<QDBusConnectionInterface>
#include
<QMenu>
AlarmDockWindow
::
AlarmDockWindow
()
...
...
@@ -154,7 +156,7 @@ void AlarmDockWindow::enableAutostart(bool enable)
void
AlarmDockWindow
::
activate
(
const
QPoint
&
pos
)
{
Q_UNUSED
(
pos
)
KToolInvocation
::
startServiceByDesktopNam
e
(
QStringLiteral
(
"org.kde.korganizer"
)
,
QString
()
);
QDBusConnection
::
sessionBus
().
interface
()
->
startServic
e
(
QStringLiteral
(
"org.kde.korganizer"
));
}
void
AlarmDockWindow
::
slotQuit
()
...
...
src/dialog/koeventviewerdialog.cpp
View file @
6db10677
...
...
@@ -85,7 +85,7 @@ void KOEventViewerDialog::editIncidence()
// make sure korganizer is running or the part is shown
const
QString
desktopFile
=
QStandardPaths
::
locate
(
QStandardPaths
::
ApplicationsLocation
,
QStringLiteral
(
"org.kde.korganizer.desktop"
));
QString
error
;
if
(
KToolInvocation
::
startServiceByDesktopPath
(
desktopFile
,
QStringList
(),
&
error
)
==
0
)
{
if
(
!
QDBusConnection
::
sessionBus
().
interface
()
->
startService
(
desktopFile
).
isValid
()
)
{
OrgKdeKorganizerKorganizerInterface
korganizerIface
(
QStringLiteral
(
"org.kde.korganizer"
),
QStringLiteral
(
"/Korganizer"
),
QDBusConnection
::
sessionBus
());
...
...
@@ -104,7 +104,7 @@ void KOEventViewerDialog::showIncidenceContext()
// make sure korganizer is running or the part is shown
const
QString
desktopFile
=
QStandardPaths
::
locate
(
QStandardPaths
::
ApplicationsLocation
,
QStringLiteral
(
"org.kde.korganizer.desktop"
));
QString
error
;
if
(
KToolInvocation
::
startServiceByDesktopPath
(
desktopFile
,
QStringList
(),
&
error
)
==
0
)
{
if
(
!
QDBusConnection
::
sessionBus
().
interface
()
->
startService
(
desktopFile
).
isValid
()
)
{
OrgKdeKorganizerKorganizerInterface
korganizerIface
(
QStringLiteral
(
"org.kde.korganizer"
),
QStringLiteral
(
"/Korganizer"
),
QDBusConnection
::
sessionBus
());
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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