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
KAlarm
Commits
e5acd2ea
Commit
e5acd2ea
authored
Oct 21, 2011
by
David Jarvie
Browse files
Fix build for KResources
parent
c8bbcc53
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
e5acd2ea
...
...
@@ -15,6 +15,9 @@ option(KALARM_USE_KRESOURCES "Build to use KResources" OFF)
set
(
USE_KRESOURCES false
)
if
(
KALARM_USE_KRESOURCES AND NOT KDEPIM_NO_KRESOURCES
)
set
(
USE_KRESOURCES true
)
add_definitions
(
-DUSE_KRESOURCES
)
add_definitions
(
-DWANT_DEPRECATED_KCAL_API
)
add_definitions
(
-DWANT_DEPRECATED_KRESOURCE_API
)
endif
(
KALARM_USE_KRESOURCES AND NOT KDEPIM_NO_KRESOURCES
)
########### next target ###############
...
...
kaevent.cpp
View file @
e5acd2ea
...
...
@@ -23,7 +23,7 @@
#include "kaevent.h"
#ifdef USE_KRESOURCES
#include "alarmresource.h"
//
#include "alarmresource.h"
#endif
#include "alarmtext.h"
#include "identities.h"
...
...
@@ -40,6 +40,7 @@ using namespace KHolidays;
#include <ksystemtimezone.h>
#include <klocale.h>
#ifdef USE_KRESOURCES
#include <kglobal.h>
#include <kconfiggroup.h>
#endif
#include <kdebug.h>
...
...
@@ -4001,7 +4002,7 @@ void KAEvent::Private::dumpDebug() const
{
kDebug
()
<<
"KAEvent dump:"
;
#ifdef USE_KRESOURCES
if
(
mResource
)
{
kDebug
()
<<
"-- mResource:"
<<
mResource
->
resourceName
()
;
}
if
(
mResource
)
{
kDebug
()
<<
"-- mResource:"
<<
(
void
*
)
mResource
;
}
#endif
kDebug
()
<<
"-- mEventID:"
<<
mEventID
;
kDebug
()
<<
"-- mActionSubType:"
<<
(
mActionSubType
==
MESSAGE
?
"MESSAGE"
:
mActionSubType
==
FILE
?
"FILE"
:
mActionSubType
==
COMMAND
?
"COMMAND"
:
mActionSubType
==
EMAIL
?
"EMAIL"
:
mActionSubType
==
AUDIO
?
"AUDIO"
:
"??"
);
...
...
Write
Preview
Markdown
is supported
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