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
fe40cfb9
Commit
fe40cfb9
authored
Aug 15, 2015
by
Sergio Martins
Browse files
Avoid QLatin1String wherever it allocates heap memory
parent
defd8b35
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/alarmtext.cpp
View file @
fe40cfb9
...
...
@@ -92,11 +92,11 @@ void AlarmText::Private::initialise()
{
if
(
!
mInitialised
)
{
mInitialised
=
true
;
mFromPrefixEn
=
Q
Latin1
String
(
"From:"
);
mToPrefixEn
=
Q
Latin1
String
(
"To:"
);
mCcPrefixEn
=
Q
Latin1
String
(
"Cc:"
);
mDatePrefixEn
=
Q
Latin1
String
(
"Date:"
);
mSubjectPrefixEn
=
Q
Latin1
String
(
"Subject:"
);
mFromPrefixEn
=
QString
Literal
(
"From:"
);
mToPrefixEn
=
QString
Literal
(
"To:"
);
mCcPrefixEn
=
QString
Literal
(
"Cc:"
);
mDatePrefixEn
=
QString
Literal
(
"Date:"
);
mSubjectPrefixEn
=
QString
Literal
(
"Subject:"
);
}
}
...
...
@@ -316,7 +316,7 @@ unsigned long AlarmText::kmailSerialNumber() const
*/
QString
AlarmText
::
summary
(
const
KAEvent
&
event
,
int
maxLines
,
bool
*
truncated
)
{
static
const
QRegExp
localfile
(
Q
Latin1
String
(
"^file:/+"
));
static
const
QRegExp
localfile
(
QString
Literal
(
"^file:/+"
));
QString
text
;
switch
(
event
.
actionSubType
())
{
case
KAEvent
::
AUDIO
:
...
...
src/kacalendar.cpp
View file @
fe40cfb9
...
...
@@ -158,7 +158,7 @@ int Private::readKAlarmVersion(const FileStorage::Ptr &fileStorage, QString &sub
}
// Find the KAlarm identifier
QString
progname
=
Q
Latin1
String
(
" KAlarm "
);
QString
progname
=
QString
Literal
(
" KAlarm "
);
int
i
=
prodid
.
indexOf
(
progname
,
0
,
Qt
::
CaseInsensitive
);
if
(
i
<
0
)
{
// Older versions used KAlarm's translated name in the product ID, which
...
...
@@ -242,13 +242,13 @@ namespace CalEvent
struct
StaticStrings
{
StaticStrings
()
:
STATUS_PROPERTY
(
"TYPE"
),
ACTIVE_STATUS
(
Q
Latin1
String
(
"ACTIVE"
)),
TEMPLATE_STATUS
(
Q
Latin1
String
(
"TEMPLATE"
)),
ARCHIVED_STATUS
(
Q
Latin1
String
(
"ARCHIVED"
)),
DISPLAYING_STATUS
(
Q
Latin1
String
(
"DISPLAYING"
)),
ARCHIVED_UID
(
Q
Latin1
String
(
"-exp-"
)),
DISPLAYING_UID
(
Q
Latin1
String
(
"-disp-"
)),
TEMPLATE_UID
(
Q
Latin1
String
(
"-tmpl-"
))
ACTIVE_STATUS
(
QString
Literal
(
"ACTIVE"
)),
TEMPLATE_STATUS
(
QString
Literal
(
"TEMPLATE"
)),
ARCHIVED_STATUS
(
QString
Literal
(
"ARCHIVED"
)),
DISPLAYING_STATUS
(
QString
Literal
(
"DISPLAYING"
)),
ARCHIVED_UID
(
QString
Literal
(
"-exp-"
)),
DISPLAYING_UID
(
QString
Literal
(
"-disp-"
)),
TEMPLATE_UID
(
QString
Literal
(
"-tmpl-"
))
{}
// Event custom properties.
// Note that all custom property names are prefixed with X-KDE-KALARM- in the calendar file.
...
...
@@ -300,7 +300,7 @@ QString uid(const QString &id, Type status)
case
ACTIVE
:
case
TEMPLATE
:
case
EMPTY
:
default:
part
=
Q
Latin1
String
(
"-"
);
break
;
default:
part
=
QString
Literal
(
"-"
);
break
;
}
result
.
replace
(
i
,
len
,
part
);
}
...
...
src/kaevent.cpp
View file @
fe40cfb9
...
...
@@ -392,64 +392,64 @@ int KAEvent::currentCalendarVersion()
// Event properties
const
QByteArray
KAEventPrivate
::
FLAGS_PROPERTY
(
"FLAGS"
);
// X-KDE-KALARM-FLAGS property
const
QString
KAEventPrivate
::
DATE_ONLY_FLAG
=
Q
Latin1
String
(
"DATE"
);
const
QString
KAEventPrivate
::
EMAIL_BCC_FLAG
=
Q
Latin1
String
(
"BCC"
);
const
QString
KAEventPrivate
::
CONFIRM_ACK_FLAG
=
Q
Latin1
String
(
"ACKCONF"
);
const
QString
KAEventPrivate
::
KORGANIZER_FLAG
=
Q
Latin1
String
(
"KORG"
);
const
QString
KAEventPrivate
::
EXCLUDE_HOLIDAYS_FLAG
=
Q
Latin1
String
(
"EXHOLIDAYS"
);
const
QString
KAEventPrivate
::
WORK_TIME_ONLY_FLAG
=
Q
Latin1
String
(
"WORKTIME"
);
const
QString
KAEventPrivate
::
REMINDER_ONCE_FLAG
=
Q
Latin1
String
(
"ONCE"
);
const
QString
KAEventPrivate
::
DEFER_FLAG
=
Q
Latin1
String
(
"DEFER"
);
// default defer interval for this alarm
const
QString
KAEventPrivate
::
LATE_CANCEL_FLAG
=
Q
Latin1
String
(
"LATECANCEL"
);
const
QString
KAEventPrivate
::
AUTO_CLOSE_FLAG
=
Q
Latin1
String
(
"LATECLOSE"
);
const
QString
KAEventPrivate
::
TEMPL_AFTER_TIME_FLAG
=
Q
Latin1
String
(
"TMPLAFTTIME"
);
const
QString
KAEventPrivate
::
KMAIL_SERNUM_FLAG
=
Q
Latin1
String
(
"KMAIL"
);
const
QString
KAEventPrivate
::
ARCHIVE_FLAG
=
Q
Latin1
String
(
"ARCHIVE"
);
const
QString
KAEventPrivate
::
DATE_ONLY_FLAG
=
QString
Literal
(
"DATE"
);
const
QString
KAEventPrivate
::
EMAIL_BCC_FLAG
=
QString
Literal
(
"BCC"
);
const
QString
KAEventPrivate
::
CONFIRM_ACK_FLAG
=
QString
Literal
(
"ACKCONF"
);
const
QString
KAEventPrivate
::
KORGANIZER_FLAG
=
QString
Literal
(
"KORG"
);
const
QString
KAEventPrivate
::
EXCLUDE_HOLIDAYS_FLAG
=
QString
Literal
(
"EXHOLIDAYS"
);
const
QString
KAEventPrivate
::
WORK_TIME_ONLY_FLAG
=
QString
Literal
(
"WORKTIME"
);
const
QString
KAEventPrivate
::
REMINDER_ONCE_FLAG
=
QString
Literal
(
"ONCE"
);
const
QString
KAEventPrivate
::
DEFER_FLAG
=
QString
Literal
(
"DEFER"
);
// default defer interval for this alarm
const
QString
KAEventPrivate
::
LATE_CANCEL_FLAG
=
QString
Literal
(
"LATECANCEL"
);
const
QString
KAEventPrivate
::
AUTO_CLOSE_FLAG
=
QString
Literal
(
"LATECLOSE"
);
const
QString
KAEventPrivate
::
TEMPL_AFTER_TIME_FLAG
=
QString
Literal
(
"TMPLAFTTIME"
);
const
QString
KAEventPrivate
::
KMAIL_SERNUM_FLAG
=
QString
Literal
(
"KMAIL"
);
const
QString
KAEventPrivate
::
ARCHIVE_FLAG
=
QString
Literal
(
"ARCHIVE"
);
const
QByteArray
KAEventPrivate
::
NEXT_RECUR_PROPERTY
(
"NEXTRECUR"
);
// X-KDE-KALARM-NEXTRECUR property
const
QByteArray
KAEventPrivate
::
REPEAT_PROPERTY
(
"REPEAT"
);
// X-KDE-KALARM-REPEAT property
const
QByteArray
KAEventPrivate
::
LOG_PROPERTY
(
"LOG"
);
// X-KDE-KALARM-LOG property
const
QString
KAEventPrivate
::
xtermURL
=
Q
Latin1
String
(
"xterm:"
);
const
QString
KAEventPrivate
::
displayURL
=
Q
Latin1
String
(
"display:"
);
const
QString
KAEventPrivate
::
xtermURL
=
QString
Literal
(
"xterm:"
);
const
QString
KAEventPrivate
::
displayURL
=
QString
Literal
(
"display:"
);
// - General alarm properties
const
QByteArray
KAEventPrivate
::
TYPE_PROPERTY
(
"TYPE"
);
// X-KDE-KALARM-TYPE property
const
QString
KAEventPrivate
::
FILE_TYPE
=
Q
Latin1
String
(
"FILE"
);
const
QString
KAEventPrivate
::
AT_LOGIN_TYPE
=
Q
Latin1
String
(
"LOGIN"
);
const
QString
KAEventPrivate
::
REMINDER_TYPE
=
Q
Latin1
String
(
"REMINDER"
);
const
QString
KAEventPrivate
::
TIME_DEFERRAL_TYPE
=
Q
Latin1
String
(
"DEFERRAL"
);
const
QString
KAEventPrivate
::
DATE_DEFERRAL_TYPE
=
Q
Latin1
String
(
"DATE_DEFERRAL"
);
const
QString
KAEventPrivate
::
DISPLAYING_TYPE
=
Q
Latin1
String
(
"DISPLAYING"
);
// used only in displaying calendar
const
QString
KAEventPrivate
::
PRE_ACTION_TYPE
=
Q
Latin1
String
(
"PRE"
);
const
QString
KAEventPrivate
::
POST_ACTION_TYPE
=
Q
Latin1
String
(
"POST"
);
const
QString
KAEventPrivate
::
SOUND_REPEAT_TYPE
=
Q
Latin1
String
(
"SOUNDREPEAT"
);
const
QString
KAEventPrivate
::
FILE_TYPE
=
QString
Literal
(
"FILE"
);
const
QString
KAEventPrivate
::
AT_LOGIN_TYPE
=
QString
Literal
(
"LOGIN"
);
const
QString
KAEventPrivate
::
REMINDER_TYPE
=
QString
Literal
(
"REMINDER"
);
const
QString
KAEventPrivate
::
TIME_DEFERRAL_TYPE
=
QString
Literal
(
"DEFERRAL"
);
const
QString
KAEventPrivate
::
DATE_DEFERRAL_TYPE
=
QString
Literal
(
"DATE_DEFERRAL"
);
const
QString
KAEventPrivate
::
DISPLAYING_TYPE
=
QString
Literal
(
"DISPLAYING"
);
// used only in displaying calendar
const
QString
KAEventPrivate
::
PRE_ACTION_TYPE
=
QString
Literal
(
"PRE"
);
const
QString
KAEventPrivate
::
POST_ACTION_TYPE
=
QString
Literal
(
"POST"
);
const
QString
KAEventPrivate
::
SOUND_REPEAT_TYPE
=
QString
Literal
(
"SOUNDREPEAT"
);
const
QByteArray
KAEventPrivate
::
NEXT_REPEAT_PROPERTY
(
"NEXTREPEAT"
);
// X-KDE-KALARM-NEXTREPEAT property
const
QString
KAEventPrivate
::
HIDDEN_REMINDER_FLAG
=
Q
Latin1
String
(
"HIDE"
);
const
QString
KAEventPrivate
::
HIDDEN_REMINDER_FLAG
=
QString
Literal
(
"HIDE"
);
// - Display alarm properties
const
QByteArray
KAEventPrivate
::
FONT_COLOUR_PROPERTY
(
"FONTCOLOR"
);
// X-KDE-KALARM-FONTCOLOR property
// - Email alarm properties
const
QString
KAEventPrivate
::
EMAIL_ID_FLAG
=
Q
Latin1
String
(
"EMAILID"
);
const
QString
KAEventPrivate
::
EMAIL_ID_FLAG
=
QString
Literal
(
"EMAILID"
);
// - Audio alarm properties
const
QByteArray
KAEventPrivate
::
VOLUME_PROPERTY
(
"VOLUME"
);
// X-KDE-KALARM-VOLUME property
const
QString
KAEventPrivate
::
SPEAK_FLAG
=
Q
Latin1
String
(
"SPEAK"
);
const
QString
KAEventPrivate
::
SPEAK_FLAG
=
QString
Literal
(
"SPEAK"
);
// - Command alarm properties
const
QString
KAEventPrivate
::
EXEC_ON_DEFERRAL_FLAG
=
Q
Latin1
String
(
"EXECDEFER"
);
const
QString
KAEventPrivate
::
CANCEL_ON_ERROR_FLAG
=
Q
Latin1
String
(
"ERRCANCEL"
);
const
QString
KAEventPrivate
::
DONT_SHOW_ERROR_FLAG
=
Q
Latin1
String
(
"ERRNOSHOW"
);
const
QString
KAEventPrivate
::
EXEC_ON_DEFERRAL_FLAG
=
QString
Literal
(
"EXECDEFER"
);
const
QString
KAEventPrivate
::
CANCEL_ON_ERROR_FLAG
=
QString
Literal
(
"ERRCANCEL"
);
const
QString
KAEventPrivate
::
DONT_SHOW_ERROR_FLAG
=
QString
Literal
(
"ERRNOSHOW"
);
// Event status strings
const
QString
KAEventPrivate
::
DISABLED_STATUS
=
Q
Latin1
String
(
"DISABLED"
);
const
QString
KAEventPrivate
::
DISABLED_STATUS
=
QString
Literal
(
"DISABLED"
);
// Displaying event ID identifier
const
QString
KAEventPrivate
::
DISP_DEFER
=
Q
Latin1
String
(
"DEFER"
);
const
QString
KAEventPrivate
::
DISP_EDIT
=
Q
Latin1
String
(
"EDIT"
);
const
QString
KAEventPrivate
::
DISP_DEFER
=
QString
Literal
(
"DEFER"
);
const
QString
KAEventPrivate
::
DISP_EDIT
=
QString
Literal
(
"EDIT"
);
// Command error strings
const
QString
KAEventPrivate
::
CMD_ERROR_VALUE
=
Q
Latin1
String
(
"MAIN"
);
const
QString
KAEventPrivate
::
CMD_ERROR_PRE_VALUE
=
Q
Latin1
String
(
"PRE"
);
const
QString
KAEventPrivate
::
CMD_ERROR_POST_VALUE
=
Q
Latin1
String
(
"POST"
);
const
QString
KAEventPrivate
::
CMD_ERROR_VALUE
=
QString
Literal
(
"MAIN"
);
const
QString
KAEventPrivate
::
CMD_ERROR_PRE_VALUE
=
QString
Literal
(
"PRE"
);
const
QString
KAEventPrivate
::
CMD_ERROR_POST_VALUE
=
QString
Literal
(
"POST"
);
const
QString
KAEventPrivate
::
SC
=
Q
Latin1
String
(
";"
);
const
QString
KAEventPrivate
::
SC
=
QString
Literal
(
";"
);
QFont
KAEventPrivate
::
mDefaultFont
;
const
KHolidays
::
HolidayRegion
*
KAEventPrivate
::
mHolidays
=
Q_NULLPTR
;
...
...
@@ -1337,7 +1337,7 @@ bool KAEventPrivate::updateKCalEvent(const Event::Ptr &ev, KAEvent::UidAction ui
if
(
!
archived
&&
checkRecur
()
!=
KARecurrence
::
NO_RECUR
)
{
QDateTime
dt
=
mNextMainDateTime
.
kDateTime
().
toTimeSpec
(
mStartDateTime
.
timeSpec
()).
dateTime
();
ev
->
setCustomProperty
(
KACalendar
::
APPNAME
,
NEXT_RECUR_PROPERTY
,
dt
.
toString
(
mNextMainDateTime
.
isDateOnly
()
?
Q
Latin1
String
(
"yyyyMMdd"
)
:
Q
Latin1
String
(
"yyyyMMddThhmmss"
)));
dt
.
toString
(
mNextMainDateTime
.
isDateOnly
()
?
QString
Literal
(
"yyyyMMdd"
)
:
QString
Literal
(
"yyyyMMddThhmmss"
)));
}
// Add the main alarm
initKCalAlarm
(
ev
,
0
,
QStringList
(),
MAIN_ALARM
);
...
...
@@ -1598,7 +1598,7 @@ Alarm::Ptr KAEventPrivate::initKCalAlarm(const Event::Ptr &event, int startOffse
}
alltypes
+=
types
;
if
(
!
alltypes
.
isEmpty
())
{
alarm
->
setCustomProperty
(
KACalendar
::
APPNAME
,
TYPE_PROPERTY
,
alltypes
.
join
(
Q
Latin1
String
(
","
)));
alarm
->
setCustomProperty
(
KACalendar
::
APPNAME
,
TYPE_PROPERTY
,
alltypes
.
join
(
QString
Literal
(
","
)));
}
if
(
!
flags
.
isEmpty
())
{
alarm
->
setCustomProperty
(
KACalendar
::
APPNAME
,
FLAGS_PROPERTY
,
flags
.
join
(
SC
));
...
...
@@ -3746,9 +3746,9 @@ void KAEventPrivate::dumpDebug() const
qCDebug
(
KALARMCAL_LOG
)
<<
"-- mLogFile:"
<<
mLogFile
;
}
else
if
(
mActionSubType
==
KAEvent
::
EMAIL
)
{
qCDebug
(
KALARMCAL_LOG
)
<<
"-- mEmail: FromKMail:"
<<
mEmailFromIdentity
;
qCDebug
(
KALARMCAL_LOG
)
<<
"-- Addresses:"
<<
mEmailAddresses
.
join
(
Q
Latin1
String
(
","
));
qCDebug
(
KALARMCAL_LOG
)
<<
"-- Addresses:"
<<
mEmailAddresses
.
join
(
QString
Literal
(
","
));
qCDebug
(
KALARMCAL_LOG
)
<<
"-- Subject:"
<<
mEmailSubject
;
qCDebug
(
KALARMCAL_LOG
)
<<
"-- Attachments:"
<<
mEmailAttachments
.
join
(
Q
Latin1
String
(
","
));
qCDebug
(
KALARMCAL_LOG
)
<<
"-- Attachments:"
<<
mEmailAttachments
.
join
(
QString
Literal
(
","
));
qCDebug
(
KALARMCAL_LOG
)
<<
"-- Bcc:"
<<
mEmailBcc
;
}
else
if
(
mActionSubType
==
KAEvent
::
AUDIO
)
{
qCDebug
(
KALARMCAL_LOG
)
<<
"-- mAudioFile:"
<<
mAudioFile
;
...
...
@@ -4836,43 +4836,43 @@ bool KAEvent::convertKCalEvents(const Calendar::Ptr &calendar, int calendarVersi
static
const
QChar
LATE_CANCEL_CODE
=
QLatin1Char
(
'C'
);
static
const
QChar
AT_LOGIN_CODE
=
QLatin1Char
(
'L'
);
// subsidiary alarm at every login
static
const
QChar
DEFERRAL_CODE
=
QLatin1Char
(
'D'
);
// extra deferred alarm
static
const
QString
TEXT_PREFIX
=
Q
Latin1
String
(
"TEXT:"
);
static
const
QString
FILE_PREFIX
=
Q
Latin1
String
(
"FILE:"
);
static
const
QString
COMMAND_PREFIX
=
Q
Latin1
String
(
"CMD:"
);
static
const
QString
TEXT_PREFIX
=
QString
Literal
(
"TEXT:"
);
static
const
QString
FILE_PREFIX
=
QString
Literal
(
"FILE:"
);
static
const
QString
COMMAND_PREFIX
=
QString
Literal
(
"CMD:"
);
// KAlarm pre-0.9.2 codes held in the event's CATEGORY property
static
const
QString
BEEP_CATEGORY
=
Q
Latin1
String
(
"BEEP"
);
static
const
QString
BEEP_CATEGORY
=
QString
Literal
(
"BEEP"
);
// KAlarm pre-1.1.1 LATECANCEL category with no parameter
static
const
QString
LATE_CANCEL_CAT
=
Q
Latin1
String
(
"LATECANCEL"
);
static
const
QString
LATE_CANCEL_CAT
=
QString
Literal
(
"LATECANCEL"
);
// KAlarm pre-1.3.0 TMPLDEFTIME category with no parameter
static
const
QString
TEMPL_DEF_TIME_CAT
=
Q
Latin1
String
(
"TMPLDEFTIME"
);
static
const
QString
TEMPL_DEF_TIME_CAT
=
QString
Literal
(
"TMPLDEFTIME"
);
// KAlarm pre-1.3.1 XTERM category
static
const
QString
EXEC_IN_XTERM_CAT
=
Q
Latin1
String
(
"XTERM"
);
static
const
QString
EXEC_IN_XTERM_CAT
=
QString
Literal
(
"XTERM"
);
// KAlarm pre-1.9.0 categories
static
const
QString
DATE_ONLY_CATEGORY
=
Q
Latin1
String
(
"DATE"
);
static
const
QString
EMAIL_BCC_CATEGORY
=
Q
Latin1
String
(
"BCC"
);
static
const
QString
CONFIRM_ACK_CATEGORY
=
Q
Latin1
String
(
"ACKCONF"
);
static
const
QString
KORGANIZER_CATEGORY
=
Q
Latin1
String
(
"KORG"
);
static
const
QString
DEFER_CATEGORY
=
Q
Latin1
String
(
"DEFER;"
);
static
const
QString
ARCHIVE_CATEGORY
=
Q
Latin1
String
(
"SAVE"
);
static
const
QString
ARCHIVE_CATEGORIES
=
Q
Latin1
String
(
"SAVE:"
);
static
const
QString
LATE_CANCEL_CATEGORY
=
Q
Latin1
String
(
"LATECANCEL;"
);
static
const
QString
AUTO_CLOSE_CATEGORY
=
Q
Latin1
String
(
"LATECLOSE;"
);
static
const
QString
TEMPL_AFTER_TIME_CATEGORY
=
Q
Latin1
String
(
"TMPLAFTTIME;"
);
static
const
QString
KMAIL_SERNUM_CATEGORY
=
Q
Latin1
String
(
"KMAIL:"
);
static
const
QString
LOG_CATEGORY
=
Q
Latin1
String
(
"LOG:"
);
static
const
QString
DATE_ONLY_CATEGORY
=
QString
Literal
(
"DATE"
);
static
const
QString
EMAIL_BCC_CATEGORY
=
QString
Literal
(
"BCC"
);
static
const
QString
CONFIRM_ACK_CATEGORY
=
QString
Literal
(
"ACKCONF"
);
static
const
QString
KORGANIZER_CATEGORY
=
QString
Literal
(
"KORG"
);
static
const
QString
DEFER_CATEGORY
=
QString
Literal
(
"DEFER;"
);
static
const
QString
ARCHIVE_CATEGORY
=
QString
Literal
(
"SAVE"
);
static
const
QString
ARCHIVE_CATEGORIES
=
QString
Literal
(
"SAVE:"
);
static
const
QString
LATE_CANCEL_CATEGORY
=
QString
Literal
(
"LATECANCEL;"
);
static
const
QString
AUTO_CLOSE_CATEGORY
=
QString
Literal
(
"LATECLOSE;"
);
static
const
QString
TEMPL_AFTER_TIME_CATEGORY
=
QString
Literal
(
"TMPLAFTTIME;"
);
static
const
QString
KMAIL_SERNUM_CATEGORY
=
QString
Literal
(
"KMAIL:"
);
static
const
QString
LOG_CATEGORY
=
QString
Literal
(
"LOG:"
);
// KAlarm pre-1.5.0/1.9.9 properties
static
const
QByteArray
KMAIL_ID_PROPERTY
(
"KMAILID"
);
// X-KDE-KALARM-KMAILID property
// KAlarm pre-2.6.0 properties
static
const
QByteArray
ARCHIVE_PROPERTY
(
"ARCHIVE"
);
// X-KDE-KALARM-ARCHIVE property
static
const
QString
ARCHIVE_REMINDER_ONCE_TYPE
=
Q
Latin1
String
(
"ONCE"
);
static
const
QString
REMINDER_ONCE_TYPE
=
Q
Latin1
String
(
"REMINDER_ONCE"
);
static
const
QString
ARCHIVE_REMINDER_ONCE_TYPE
=
QString
Literal
(
"ONCE"
);
static
const
QString
REMINDER_ONCE_TYPE
=
QString
Literal
(
"REMINDER_ONCE"
);
static
const
QByteArray
EMAIL_ID_PROPERTY
(
"EMAILID"
);
// X-KDE-KALARM-EMAILID property
static
const
QByteArray
SPEAK_PROPERTY
(
"SPEAK"
);
// X-KDE-KALARM-SPEAK property
static
const
QByteArray
CANCEL_ON_ERROR_PROPERTY
(
"ERRCANCEL"
);
// X-KDE-KALARM-ERRCANCEL property
...
...
@@ -5019,7 +5019,7 @@ bool KAEvent::convertKCalEvents(const Calendar::Ptr &calendar, int calendarVersi
addLateCancel
=
true
;
}
if
(
types
.
count
()
>
0
)
{
alarm
->
setCustomProperty
(
KACalendar
::
APPNAME
,
KAEventPrivate
::
TYPE_PROPERTY
,
types
.
join
(
Q
Latin1
String
(
","
)));
alarm
->
setCustomProperty
(
KACalendar
::
APPNAME
,
KAEventPrivate
::
TYPE_PROPERTY
,
types
.
join
(
QString
Literal
(
","
)));
}
if
(
pre_0_7
&&
alarm
->
repeatCount
()
>
0
&&
alarm
->
snoozeTime
().
value
()
>
0
)
{
...
...
@@ -5145,7 +5145,7 @@ bool KAEvent::convertKCalEvents(const Calendar::Ptr &calendar, int calendarVersi
int
i
;
while
((
i
=
cats
.
indexOf
(
TEMPL_DEF_TIME_CAT
))
>=
0
)
{
cats
.
removeAt
(
i
);
(
flags
+=
KAEventPrivate
::
TEMPL_AFTER_TIME_FLAG
)
+=
Q
Latin1
String
(
"0"
);
(
flags
+=
KAEventPrivate
::
TEMPL_AFTER_TIME_FLAG
)
+=
QString
Literal
(
"0"
);
}
}
...
...
@@ -5189,7 +5189,7 @@ bool KAEvent::convertKCalEvents(const Calendar::Ptr &calendar, int calendarVersi
}
else
if
(
cat
.
startsWith
(
KMAIL_SERNUM_CATEGORY
))
{
(
flags
+=
KAEventPrivate
::
KMAIL_SERNUM_FLAG
)
+=
cat
.
mid
(
KMAIL_SERNUM_CATEGORY
.
length
());
}
else
if
(
cat
==
ARCHIVE_CATEGORY
)
{
event
->
setCustomProperty
(
KACalendar
::
APPNAME
,
ARCHIVE_PROPERTY
,
Q
Latin1
String
(
"0"
));
event
->
setCustomProperty
(
KACalendar
::
APPNAME
,
ARCHIVE_PROPERTY
,
QString
Literal
(
"0"
));
}
else
if
(
cat
.
startsWith
(
ARCHIVE_CATEGORIES
))
{
event
->
setCustomProperty
(
KACalendar
::
APPNAME
,
ARCHIVE_PROPERTY
,
cat
.
mid
(
ARCHIVE_CATEGORIES
.
length
()));
}
else
if
(
cat
.
startsWith
(
LOG_CATEGORY
))
{
...
...
@@ -5212,7 +5212,7 @@ bool KAEvent::convertKCalEvents(const Calendar::Ptr &calendar, int calendarVersi
}
if
(
addLateCancel
)
{
(
flags
+=
KAEventPrivate
::
LATE_CANCEL_FLAG
)
+=
Q
Latin1
String
(
"1"
);
(
flags
+=
KAEventPrivate
::
LATE_CANCEL_FLAG
)
+=
QString
Literal
(
"1"
);
}
if
(
!
flags
.
isEmpty
())
{
event
->
setCustomProperty
(
KACalendar
::
APPNAME
,
KAEventPrivate
::
FLAGS_PROPERTY
,
flags
.
join
(
KAEventPrivate
::
SC
));
...
...
@@ -5274,7 +5274,7 @@ bool KAEvent::convertKCalEvents(const Calendar::Ptr &calendar, int calendarVersi
if
(
nextMainDateTime
!=
startDateTime
)
{
QDateTime
dt
=
nextMainDateTime
.
dateTime
();
event
->
setCustomProperty
(
KACalendar
::
APPNAME
,
KAEventPrivate
::
NEXT_RECUR_PROPERTY
,
dt
.
toString
(
dateOnly
?
Q
Latin1
String
(
"yyyyMMdd"
)
:
Q
Latin1
String
(
"yyyyMMddThhmmss"
)));
dt
.
toString
(
dateOnly
?
QString
Literal
(
"yyyyMMdd"
)
:
QString
Literal
(
"yyyyMMddThhmmss"
)));
}
}
alarm
->
setStartOffset
(
0
);
...
...
src/karecurrence.cpp
View file @
fe40cfb9
...
...
@@ -266,7 +266,7 @@ bool KARecurrence::Private::init(RecurrenceRule::PeriodType recurType, int freq,
*/
bool
KARecurrence
::
set
(
const
QString
&
icalRRULE
)
{
static
const
QString
RRULE
=
Q
Latin1
String
(
"RRULE:"
);
static
const
QString
RRULE
=
QString
Literal
(
"RRULE:"
);
d
->
clear
();
if
(
icalRRULE
.
isEmpty
())
{
return
true
;
...
...
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