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
KAlarm
Commits
2ed48511
Commit
2ed48511
authored
Jun 06, 2013
by
David Jarvie
Browse files
Fix KResources build
parent
9c92373b
Changes
1
Hide whitespace changes
Inline
Side-by-side
kaevent.cpp
View file @
2ed48511
...
...
@@ -37,6 +37,7 @@ using namespace KHolidays;
#include
<ksystemtimezone.h>
#include
<klocalizedstring.h>
#ifdef KALARMCAL_USE_KRESOURCES
#include
<ksharedconfig.h>
#include
<kglobal.h>
#include
<kconfiggroup.h>
#endif
...
...
@@ -211,7 +212,7 @@ class KAEventPrivate : public QSharedData
bool
setDisplaying
(
const
KAEventPrivate
&
,
KAAlarm
::
Type
,
const
QString
&
resourceID
,
const
KDateTime
&
dt
,
bool
showEdit
,
bool
showDefer
);
void
reinstateFromDisplaying
(
const
KCal
::
Event
*
,
QString
&
resourceID
,
bool
&
showEdit
,
bool
&
showDefer
);
void
setCommandError
(
const
QString
&
configString
);
void
setCommandError
(
CmdErrType
,
bool
writeConfig
)
const
;
void
setCommandError
(
KAEvent
::
CmdErrType
,
bool
writeConfig
)
const
;
#endif
void
startChanges
()
{
++
mChangeCount
;
}
void
endChanges
();
...
...
@@ -2116,10 +2117,10 @@ void KAEventPrivate::setCommandError(KAEvent::CmdErrType error, bool writeConfig
QString
errtext
;
switch
(
mCommandError
)
{
case
CMD_ERROR
:
errtext
=
CMD_ERROR_VALUE
;
break
;
case
CMD_ERROR_PRE
:
errtext
=
CMD_ERROR_PRE_VALUE
;
break
;
case
CMD_ERROR_POST
:
errtext
=
CMD_ERROR_POST_VALUE
;
break
;
case
CMD_ERROR_PRE_POST
:
case
KAEvent
::
CMD_ERROR
:
errtext
=
CMD_ERROR_VALUE
;
break
;
case
KAEvent
::
CMD_ERROR_PRE
:
errtext
=
CMD_ERROR_PRE_VALUE
;
break
;
case
KAEvent
::
CMD_ERROR_POST
:
errtext
=
CMD_ERROR_POST_VALUE
;
break
;
case
KAEvent
::
CMD_ERROR_PRE_POST
:
errtext
=
CMD_ERROR_PRE_VALUE
+
','
+
CMD_ERROR_POST_VALUE
;
break
;
default:
...
...
@@ -2144,13 +2145,13 @@ void KAEventPrivate::setCommandError(const QString& configString)
mCommandError
=
KAEvent
::
CMD_NO_ERROR
;
const
QStringList
errs
=
configString
.
split
(
','
);
if
(
errs
.
indexOf
(
CMD_ERROR_VALUE
)
>=
0
)
mCommandError
=
CMD_ERROR
;
mCommandError
=
KAEvent
::
CMD_ERROR
;
else
{
if
(
errs
.
indexOf
(
CMD_ERROR_PRE_VALUE
)
>=
0
)
mCommandError
=
CMD_ERROR_PRE
;
mCommandError
=
KAEvent
::
CMD_ERROR_PRE
;
if
(
errs
.
indexOf
(
CMD_ERROR_POST_VALUE
)
>=
0
)
mCommandError
=
static_cast
<
KAEvent
::
CmdErrType
>
(
mCommandError
|
CMD_ERROR_POST
);
mCommandError
=
static_cast
<
KAEvent
::
CmdErrType
>
(
mCommandError
|
KAEvent
::
CMD_ERROR_POST
);
}
}
...
...
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