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
eca54ba8
Commit
eca54ba8
authored
Mar 31, 2014
by
Laurent Montel
Browse files
Port kDebug/kWarning/kFatal to qDebug/qWarning...
parent
89a039bd
Changes
5
Hide whitespace changes
Inline
Side-by-side
collectionattribute.cpp
View file @
eca54ba8
...
...
@@ -189,13 +189,13 @@ QByteArray CollectionAttribute::serialized() const
+
QByteArray
::
number
(
d
->
mBackgroundColour
.
green
())
+
' '
+
QByteArray
::
number
(
d
->
mBackgroundColour
.
blue
())
+
' '
+
QByteArray
::
number
(
d
->
mBackgroundColour
.
alpha
());
k
Debug
()
<<
v
;
q
Debug
()
<<
v
;
return
v
;
}
void
CollectionAttribute
::
deserialize
(
const
QByteArray
&
data
)
{
k
Debug
()
<<
data
;
q
Debug
()
<<
data
;
// Set default values
d
->
mEnabled
=
CalEvent
::
EMPTY
;
...
...
@@ -214,7 +214,7 @@ void CollectionAttribute::deserialize(const QByteArray& data)
c
[
0
]
=
items
[
index
++
].
toInt
(
&
ok
);
if
(
!
ok
||
(
c
[
0
]
&
~
(
CalEvent
::
ACTIVE
|
CalEvent
::
ARCHIVED
|
CalEvent
::
TEMPLATE
)))
{
kError
()
<<
"Invalid alarm types:"
<<
c
[
0
];
qCritical
()
<<
"Invalid alarm types:"
<<
c
[
0
];
return
;
}
d
->
mEnabled
=
static_cast
<
CalEvent
::
Types
>
(
c
[
0
]);
...
...
@@ -225,7 +225,7 @@ void CollectionAttribute::deserialize(const QByteArray& data)
c
[
0
]
=
items
[
index
++
].
toInt
(
&
ok
);
if
(
!
ok
||
(
c
[
0
]
&
~
(
CalEvent
::
ACTIVE
|
CalEvent
::
ARCHIVED
|
CalEvent
::
TEMPLATE
)))
{
kError
()
<<
"Invalid alarm types:"
<<
c
[
0
];
qCritical
()
<<
"Invalid alarm types:"
<<
c
[
0
];
return
;
}
if
(
d
->
mEnabled
)
...
...
@@ -249,7 +249,7 @@ void CollectionAttribute::deserialize(const QByteArray& data)
{
if
(
count
<
index
+
4
)
{
kError
()
<<
"Invalid number of background color elements"
;
qCritical
()
<<
"Invalid number of background color elements"
;
return
;
}
// 4-7: background color elements
...
...
compatibilityattribute.cpp
View file @
eca54ba8
...
...
@@ -104,13 +104,13 @@ QByteArray CompatibilityAttribute::serialized() const
{
QByteArray
v
=
QByteArray
::
number
(
d
->
mCompatibility
)
+
' '
+
QByteArray
::
number
(
d
->
mVersion
);
k
Debug
()
<<
v
;
q
Debug
()
<<
v
;
return
v
;
}
void
CompatibilityAttribute
::
deserialize
(
const
QByteArray
&
data
)
{
k
Debug
()
<<
data
;
q
Debug
()
<<
data
;
// Set default values
d
->
mCompatibility
=
KACalendar
::
Incompatible
;
...
...
@@ -127,7 +127,7 @@ void CompatibilityAttribute::deserialize(const QByteArray& data)
KACalendar
::
Compat
AllCompat
(
KACalendar
::
Current
|
KACalendar
::
Converted
|
KACalendar
::
Convertible
|
KACalendar
::
Incompatible
|
KACalendar
::
Unknown
);
if
(
!
ok
||
(
c
&
AllCompat
)
!=
c
)
{
kError
()
<<
"Invalid compatibility:"
<<
c
;
qCritical
()
<<
"Invalid compatibility:"
<<
c
;
return
;
}
d
->
mCompatibility
=
static_cast
<
KACalendar
::
Compat
>
(
c
);
...
...
@@ -138,7 +138,7 @@ void CompatibilityAttribute::deserialize(const QByteArray& data)
int
c
=
items
[
index
++
].
toInt
(
&
ok
);
if
(
!
ok
)
{
kError
()
<<
"Invalid version:"
<<
c
;
qCritical
()
<<
"Invalid version:"
<<
c
;
return
;
}
d
->
mVersion
=
c
;
...
...
eventattribute.cpp
View file @
eca54ba8
...
...
@@ -85,13 +85,13 @@ EventAttribute* EventAttribute::clone() const
QByteArray
EventAttribute
::
serialized
()
const
{
QByteArray
v
=
QByteArray
::
number
(
d
->
mCommandError
);
k
Debug
()
<<
v
;
q
Debug
()
<<
v
;
return
v
;
}
void
EventAttribute
::
deserialize
(
const
QByteArray
&
data
)
{
k
Debug
()
<<
data
;
q
Debug
()
<<
data
;
// Set default values
d
->
mCommandError
=
KAEvent
::
CMD_NO_ERROR
;
...
...
kacalendar.cpp
View file @
eca54ba8
...
...
@@ -152,10 +152,10 @@ int updateVersion(CalendarLocal& calendar, const QString& localFile, QString& ve
// case it is the KDE 3.0.0 version, which needs adjustment of summer times.
if
(
isUTC
(
localFile
))
ver
=
-
version
;
k
Debug
()
<<
"KAlarm version 0.5.7 ("
<<
(
ver
<
0
?
""
:
"non-"
)
<<
"UTC)"
;
q
Debug
()
<<
"KAlarm version 0.5.7 ("
<<
(
ver
<
0
?
""
:
"non-"
)
<<
"UTC)"
;
}
else
k
Debug
()
<<
"KAlarm version"
<<
version
;
q
Debug
()
<<
"KAlarm version"
<<
version
;
// Convert events to current KAlarm format for when/if the calendar is saved
#ifndef KALARMCAL_USE_KRESOURCES
...
...
@@ -185,7 +185,7 @@ int Private::readKAlarmVersion(CalendarLocal& calendar, const QString& localFile
#ifndef KALARMCAL_USE_KRESOURCES
Calendar
::
Ptr
calendar
=
fileStorage
->
calendar
();
versionString
=
calendar
->
customProperty
(
KACalendar
::
APPNAME
,
VERSION_PROPERTY
);
k
Debug
()
<<
"File="
<<
fileStorage
->
fileName
()
<<
", version="
<<
versionString
;
q
Debug
()
<<
"File="
<<
fileStorage
->
fileName
()
<<
", version="
<<
versionString
;
#else
versionString
=
calendar
.
customProperty
(
KACalendar
::
APPNAME
,
VERSION_PROPERTY
);
...
...
kaevent.cpp
View file @
eca54ba8
...
...
@@ -2112,7 +2112,7 @@ void KAEvent::setCommandError(CmdErrType t, bool writeConfig) const
void
KAEventPrivate
::
setCommandError
(
KAEvent
::
CmdErrType
error
,
bool
writeConfig
)
const
{
k
Debug
()
<<
mEventID
<<
","
<<
error
;
q
Debug
()
<<
mEventID
<<
","
<<
error
;
if
(
error
==
mCommandError
)
return
;
mCommandError
=
error
;
...
...
@@ -2480,7 +2480,7 @@ void KAEventPrivate::activateReminderAfter(const DateTime& mainAlarmTime)
&&
reminderTime
>=
next
)
return
;
// the reminder time is after the next occurrence of the main alarm
k
Debug
()
<<
"Setting reminder at"
<<
reminderTime
.
effectiveKDateTime
().
dateTime
();
q
Debug
()
<<
"Setting reminder at"
<<
reminderTime
.
effectiveKDateTime
().
dateTime
();
activate_reminder
(
true
);
mReminderAfterTime
=
reminderTime
;
}
...
...
@@ -3683,7 +3683,7 @@ bool KAEventPrivate::setDisplaying(const KAEventPrivate& event, KAAlarm::Type al
||
alarmType
==
KAAlarm
::
DEFERRED_ALARM
||
alarmType
==
KAAlarm
::
AT_LOGIN_ALARM
))
{
//
k
Debug()<<event.id()<<","<<(alarmType==KAAlarm::MAIN_ALARM?"MAIN":alarmType==KAAlarm::REMINDER_ALARM?"REMINDER":alarmType==KAAlarm::DEFERRED_REMINDER_ALARM?"REMINDER_DEFERRAL":alarmType==KAAlarm::DEFERRED_ALARM?"DEFERRAL":"LOGIN")<<"): time="<<repeatAtLoginTime.toString();
//
q
Debug()<<event.id()<<","<<(alarmType==KAAlarm::MAIN_ALARM?"MAIN":alarmType==KAAlarm::REMINDER_ALARM?"REMINDER":alarmType==KAAlarm::DEFERRED_REMINDER_ALARM?"REMINDER_DEFERRAL":alarmType==KAAlarm::DEFERRED_ALARM?"DEFERRAL":"LOGIN")<<"): time="<<repeatAtLoginTime.toString();
KAAlarm
al
=
event
.
alarm
(
alarmType
);
if
(
al
.
isValid
())
{
...
...
@@ -4047,129 +4047,129 @@ void KAEvent::dumpDebug() const
#ifndef KDE_NO_DEBUG_OUTPUT
void
KAEventPrivate
::
dumpDebug
()
const
{
k
Debug
()
<<
"KAEvent dump:"
;
q
Debug
()
<<
"KAEvent dump:"
;
#ifdef KALARMCAL_USE_KRESOURCES
if
(
mResource
)
{
k
Debug
()
<<
"-- mResource:"
<<
(
void
*
)
mResource
;
}
if
(
mResource
)
{
q
Debug
()
<<
"-- mResource:"
<<
(
void
*
)
mResource
;
}
#endif
k
Debug
()
<<
"-- mEventID:"
<<
mEventID
;
k
Debug
()
<<
"-- mActionSubType:"
<<
(
mActionSubType
==
KAEvent
::
MESSAGE
?
"MESSAGE"
:
mActionSubType
==
KAEvent
::
FILE
?
"FILE"
:
mActionSubType
==
KAEvent
::
COMMAND
?
"COMMAND"
:
mActionSubType
==
KAEvent
::
EMAIL
?
"EMAIL"
:
mActionSubType
==
KAEvent
::
AUDIO
?
"AUDIO"
:
"??"
);
k
Debug
()
<<
"-- mNextMainDateTime:"
<<
mNextMainDateTime
.
toString
();
k
Debug
()
<<
"-- mCommandError:"
<<
mCommandError
;
k
Debug
()
<<
"-- mAllTrigger:"
<<
mAllTrigger
.
toString
();
k
Debug
()
<<
"-- mMainTrigger:"
<<
mMainTrigger
.
toString
();
k
Debug
()
<<
"-- mAllWorkTrigger:"
<<
mAllWorkTrigger
.
toString
();
k
Debug
()
<<
"-- mMainWorkTrigger:"
<<
mMainWorkTrigger
.
toString
();
k
Debug
()
<<
"-- mCategory:"
<<
mCategory
;
q
Debug
()
<<
"-- mEventID:"
<<
mEventID
;
q
Debug
()
<<
"-- mActionSubType:"
<<
(
mActionSubType
==
KAEvent
::
MESSAGE
?
"MESSAGE"
:
mActionSubType
==
KAEvent
::
FILE
?
"FILE"
:
mActionSubType
==
KAEvent
::
COMMAND
?
"COMMAND"
:
mActionSubType
==
KAEvent
::
EMAIL
?
"EMAIL"
:
mActionSubType
==
KAEvent
::
AUDIO
?
"AUDIO"
:
"??"
);
q
Debug
()
<<
"-- mNextMainDateTime:"
<<
mNextMainDateTime
.
toString
();
q
Debug
()
<<
"-- mCommandError:"
<<
mCommandError
;
q
Debug
()
<<
"-- mAllTrigger:"
<<
mAllTrigger
.
toString
();
q
Debug
()
<<
"-- mMainTrigger:"
<<
mMainTrigger
.
toString
();
q
Debug
()
<<
"-- mAllWorkTrigger:"
<<
mAllWorkTrigger
.
toString
();
q
Debug
()
<<
"-- mMainWorkTrigger:"
<<
mMainWorkTrigger
.
toString
();
q
Debug
()
<<
"-- mCategory:"
<<
mCategory
;
if
(
!
mTemplateName
.
isEmpty
())
{
k
Debug
()
<<
"-- mTemplateName:"
<<
mTemplateName
;
k
Debug
()
<<
"-- mTemplateAfterTime:"
<<
mTemplateAfterTime
;
q
Debug
()
<<
"-- mTemplateName:"
<<
mTemplateName
;
q
Debug
()
<<
"-- mTemplateAfterTime:"
<<
mTemplateAfterTime
;
}
k
Debug
()
<<
"-- mText:"
<<
mText
;
q
Debug
()
<<
"-- mText:"
<<
mText
;
if
(
mActionSubType
==
KAEvent
::
MESSAGE
||
mActionSubType
==
KAEvent
::
FILE
)
{
k
Debug
()
<<
"-- mBgColour:"
<<
mBgColour
.
name
();
k
Debug
()
<<
"-- mFgColour:"
<<
mFgColour
.
name
();
k
Debug
()
<<
"-- mUseDefaultFont:"
<<
mUseDefaultFont
;
q
Debug
()
<<
"-- mBgColour:"
<<
mBgColour
.
name
();
q
Debug
()
<<
"-- mFgColour:"
<<
mFgColour
.
name
();
q
Debug
()
<<
"-- mUseDefaultFont:"
<<
mUseDefaultFont
;
if
(
!
mUseDefaultFont
)
k
Debug
()
<<
"-- mFont:"
<<
mFont
.
toString
();
k
Debug
()
<<
"-- mSpeak:"
<<
mSpeak
;
k
Debug
()
<<
"-- mAudioFile:"
<<
mAudioFile
;
k
Debug
()
<<
"-- mPreAction:"
<<
mPreAction
;
k
Debug
()
<<
"-- mExecPreActOnDeferral:"
<<
(
mExtraActionOptions
&
KAEvent
::
ExecPreActOnDeferral
);
k
Debug
()
<<
"-- mCancelOnPreActErr:"
<<
(
mExtraActionOptions
&
KAEvent
::
CancelOnPreActError
);
k
Debug
()
<<
"-- mDontShowPreActErr:"
<<
(
mExtraActionOptions
&
KAEvent
::
DontShowPreActError
);
k
Debug
()
<<
"-- mPostAction:"
<<
mPostAction
;
k
Debug
()
<<
"-- mLateCancel:"
<<
mLateCancel
;
k
Debug
()
<<
"-- mAutoClose:"
<<
mAutoClose
;
q
Debug
()
<<
"-- mFont:"
<<
mFont
.
toString
();
q
Debug
()
<<
"-- mSpeak:"
<<
mSpeak
;
q
Debug
()
<<
"-- mAudioFile:"
<<
mAudioFile
;
q
Debug
()
<<
"-- mPreAction:"
<<
mPreAction
;
q
Debug
()
<<
"-- mExecPreActOnDeferral:"
<<
(
mExtraActionOptions
&
KAEvent
::
ExecPreActOnDeferral
);
q
Debug
()
<<
"-- mCancelOnPreActErr:"
<<
(
mExtraActionOptions
&
KAEvent
::
CancelOnPreActError
);
q
Debug
()
<<
"-- mDontShowPreActErr:"
<<
(
mExtraActionOptions
&
KAEvent
::
DontShowPreActError
);
q
Debug
()
<<
"-- mPostAction:"
<<
mPostAction
;
q
Debug
()
<<
"-- mLateCancel:"
<<
mLateCancel
;
q
Debug
()
<<
"-- mAutoClose:"
<<
mAutoClose
;
}
else
if
(
mActionSubType
==
KAEvent
::
COMMAND
)
{
k
Debug
()
<<
"-- mCommandScript:"
<<
mCommandScript
;
k
Debug
()
<<
"-- mCommandXterm:"
<<
mCommandXterm
;
k
Debug
()
<<
"-- mCommandDisplay:"
<<
mCommandDisplay
;
k
Debug
()
<<
"-- mLogFile:"
<<
mLogFile
;
q
Debug
()
<<
"-- mCommandScript:"
<<
mCommandScript
;
q
Debug
()
<<
"-- mCommandXterm:"
<<
mCommandXterm
;
q
Debug
()
<<
"-- mCommandDisplay:"
<<
mCommandDisplay
;
q
Debug
()
<<
"-- mLogFile:"
<<
mLogFile
;
}
else
if
(
mActionSubType
==
KAEvent
::
EMAIL
)
{
k
Debug
()
<<
"-- mEmail: FromKMail:"
<<
mEmailFromIdentity
;
k
Debug
()
<<
"-- Addresses:"
<<
mEmailAddresses
.
join
(
QLatin1String
(
","
));
k
Debug
()
<<
"-- Subject:"
<<
mEmailSubject
;
k
Debug
()
<<
"-- Attachments:"
<<
mEmailAttachments
.
join
(
QLatin1String
(
","
));
k
Debug
()
<<
"-- Bcc:"
<<
mEmailBcc
;
q
Debug
()
<<
"-- mEmail: FromKMail:"
<<
mEmailFromIdentity
;
q
Debug
()
<<
"-- Addresses:"
<<
mEmailAddresses
.
join
(
QLatin1String
(
","
));
q
Debug
()
<<
"-- Subject:"
<<
mEmailSubject
;
q
Debug
()
<<
"-- Attachments:"
<<
mEmailAttachments
.
join
(
QLatin1String
(
","
));
q
Debug
()
<<
"-- Bcc:"
<<
mEmailBcc
;
}
else
if
(
mActionSubType
==
KAEvent
::
AUDIO
)
k
Debug
()
<<
"-- mAudioFile:"
<<
mAudioFile
;
k
Debug
()
<<
"-- mBeep:"
<<
mBeep
;
q
Debug
()
<<
"-- mAudioFile:"
<<
mAudioFile
;
q
Debug
()
<<
"-- mBeep:"
<<
mBeep
;
if
(
mActionSubType
==
KAEvent
::
AUDIO
||
!
mAudioFile
.
isEmpty
())
{
if
(
mSoundVolume
>=
0
)
{
k
Debug
()
<<
"-- mSoundVolume:"
<<
mSoundVolume
;
q
Debug
()
<<
"-- mSoundVolume:"
<<
mSoundVolume
;
if
(
mFadeVolume
>=
0
)
{
k
Debug
()
<<
"-- mFadeVolume:"
<<
mFadeVolume
;
k
Debug
()
<<
"-- mFadeSeconds:"
<<
mFadeSeconds
;
q
Debug
()
<<
"-- mFadeVolume:"
<<
mFadeVolume
;
q
Debug
()
<<
"-- mFadeSeconds:"
<<
mFadeSeconds
;
}
else
k
Debug
()
<<
"-- mFadeVolume:-:"
;
q
Debug
()
<<
"-- mFadeVolume:-:"
;
}
else
k
Debug
()
<<
"-- mSoundVolume:-:"
;
k
Debug
()
<<
"-- mRepeatSoundPause:"
<<
mRepeatSoundPause
;
}
k
Debug
()
<<
"-- mKMailSerialNumber:"
<<
mKMailSerialNumber
;
k
Debug
()
<<
"-- mCopyToKOrganizer:"
<<
mCopyToKOrganizer
;
k
Debug
()
<<
"-- mExcludeHolidays:"
<<
(
bool
)
mExcludeHolidays
;
k
Debug
()
<<
"-- mWorkTimeOnly:"
<<
mWorkTimeOnly
;
k
Debug
()
<<
"-- mStartDateTime:"
<<
mStartDateTime
.
toString
();
//
k
Debug() << "-- mCreatedDateTime:" << mCreatedDateTime;
k
Debug
()
<<
"-- mRepeatAtLogin:"
<<
mRepeatAtLogin
;
q
Debug
()
<<
"-- mSoundVolume:-:"
;
q
Debug
()
<<
"-- mRepeatSoundPause:"
<<
mRepeatSoundPause
;
}
q
Debug
()
<<
"-- mKMailSerialNumber:"
<<
mKMailSerialNumber
;
q
Debug
()
<<
"-- mCopyToKOrganizer:"
<<
mCopyToKOrganizer
;
q
Debug
()
<<
"-- mExcludeHolidays:"
<<
(
bool
)
mExcludeHolidays
;
q
Debug
()
<<
"-- mWorkTimeOnly:"
<<
mWorkTimeOnly
;
q
Debug
()
<<
"-- mStartDateTime:"
<<
mStartDateTime
.
toString
();
//
q
Debug() << "-- mCreatedDateTime:" << mCreatedDateTime;
q
Debug
()
<<
"-- mRepeatAtLogin:"
<<
mRepeatAtLogin
;
// if (mRepeatAtLogin)
//
k
Debug() << "-- mAtLoginDateTime:" << mAtLoginDateTime;
k
Debug
()
<<
"-- mArchiveRepeatAtLogin:"
<<
mArchiveRepeatAtLogin
;
k
Debug
()
<<
"-- mConfirmAck:"
<<
mConfirmAck
;
k
Debug
()
<<
"-- mEnabled:"
<<
mEnabled
;
//
q
Debug() << "-- mAtLoginDateTime:" << mAtLoginDateTime;
q
Debug
()
<<
"-- mArchiveRepeatAtLogin:"
<<
mArchiveRepeatAtLogin
;
q
Debug
()
<<
"-- mConfirmAck:"
<<
mConfirmAck
;
q
Debug
()
<<
"-- mEnabled:"
<<
mEnabled
;
#ifndef KALARMCAL_USE_KRESOURCES
k
Debug
()
<<
"-- mItemId:"
<<
mItemId
;
k
Debug
()
<<
"-- mCollectionId:"
<<
mCollectionId
;
k
Debug
()
<<
"-- mCompatibility:"
<<
mCompatibility
;
k
Debug
()
<<
"-- mReadOnly:"
<<
mReadOnly
;
q
Debug
()
<<
"-- mItemId:"
<<
mItemId
;
q
Debug
()
<<
"-- mCollectionId:"
<<
mCollectionId
;
q
Debug
()
<<
"-- mCompatibility:"
<<
mCompatibility
;
q
Debug
()
<<
"-- mReadOnly:"
<<
mReadOnly
;
#endif
if
(
mReminderMinutes
)
{
k
Debug
()
<<
"-- mReminderMinutes:"
<<
mReminderMinutes
;
k
Debug
()
<<
"-- mReminderActive:"
<<
(
mReminderActive
==
ACTIVE_REMINDER
?
"active"
:
mReminderActive
==
HIDDEN_REMINDER
?
"hidden"
:
"no"
);
k
Debug
()
<<
"-- mReminderOnceOnly:"
<<
mReminderOnceOnly
;
q
Debug
()
<<
"-- mReminderMinutes:"
<<
mReminderMinutes
;
q
Debug
()
<<
"-- mReminderActive:"
<<
(
mReminderActive
==
ACTIVE_REMINDER
?
"active"
:
mReminderActive
==
HIDDEN_REMINDER
?
"hidden"
:
"no"
);
q
Debug
()
<<
"-- mReminderOnceOnly:"
<<
mReminderOnceOnly
;
}
else
if
(
mDeferral
>
0
)
{
k
Debug
()
<<
"-- mDeferral:"
<<
(
mDeferral
==
NORMAL_DEFERRAL
?
"normal"
:
"reminder"
);
k
Debug
()
<<
"-- mDeferralTime:"
<<
mDeferralTime
.
toString
();
q
Debug
()
<<
"-- mDeferral:"
<<
(
mDeferral
==
NORMAL_DEFERRAL
?
"normal"
:
"reminder"
);
q
Debug
()
<<
"-- mDeferralTime:"
<<
mDeferralTime
.
toString
();
}
k
Debug
()
<<
"-- mDeferDefaultMinutes:"
<<
mDeferDefaultMinutes
;
q
Debug
()
<<
"-- mDeferDefaultMinutes:"
<<
mDeferDefaultMinutes
;
if
(
mDeferDefaultMinutes
)
k
Debug
()
<<
"-- mDeferDefaultDateOnly:"
<<
mDeferDefaultDateOnly
;
q
Debug
()
<<
"-- mDeferDefaultDateOnly:"
<<
mDeferDefaultDateOnly
;
if
(
mDisplaying
)
{
k
Debug
()
<<
"-- mDisplayingTime:"
<<
mDisplayingTime
.
toString
();
k
Debug
()
<<
"-- mDisplayingFlags:"
<<
mDisplayingFlags
;
k
Debug
()
<<
"-- mDisplayingDefer:"
<<
mDisplayingDefer
;
k
Debug
()
<<
"-- mDisplayingEdit:"
<<
mDisplayingEdit
;
q
Debug
()
<<
"-- mDisplayingTime:"
<<
mDisplayingTime
.
toString
();
q
Debug
()
<<
"-- mDisplayingFlags:"
<<
mDisplayingFlags
;
q
Debug
()
<<
"-- mDisplayingDefer:"
<<
mDisplayingDefer
;
q
Debug
()
<<
"-- mDisplayingEdit:"
<<
mDisplayingEdit
;
}
k
Debug
()
<<
"-- mRevision:"
<<
mRevision
;
k
Debug
()
<<
"-- mRecurrence:"
<<
mRecurrence
;
q
Debug
()
<<
"-- mRevision:"
<<
mRevision
;
q
Debug
()
<<
"-- mRecurrence:"
<<
mRecurrence
;
if
(
!
mRepetition
)
k
Debug
()
<<
"-- mRepetition: 0"
;
q
Debug
()
<<
"-- mRepetition: 0"
;
else
if
(
mRepetition
.
isDaily
())
k
Debug
()
<<
"-- mRepetition: count:"
<<
mRepetition
.
count
()
<<
", interval:"
<<
mRepetition
.
intervalDays
()
<<
"days"
;
q
Debug
()
<<
"-- mRepetition: count:"
<<
mRepetition
.
count
()
<<
", interval:"
<<
mRepetition
.
intervalDays
()
<<
"days"
;
else
k
Debug
()
<<
"-- mRepetition: count:"
<<
mRepetition
.
count
()
<<
", interval:"
<<
mRepetition
.
intervalMinutes
()
<<
"minutes"
;
k
Debug
()
<<
"-- mNextRepeat:"
<<
mNextRepeat
;
k
Debug
()
<<
"-- mAlarmCount:"
<<
mAlarmCount
;
k
Debug
()
<<
"-- mMainExpired:"
<<
mMainExpired
;
k
Debug
()
<<
"-- mDisplaying:"
<<
mDisplaying
;
k
Debug
()
<<
"KAEvent dump end"
;
q
Debug
()
<<
"-- mRepetition: count:"
<<
mRepetition
.
count
()
<<
", interval:"
<<
mRepetition
.
intervalMinutes
()
<<
"minutes"
;
q
Debug
()
<<
"-- mNextRepeat:"
<<
mNextRepeat
;
q
Debug
()
<<
"-- mAlarmCount:"
<<
mAlarmCount
;
q
Debug
()
<<
"-- mMainExpired:"
<<
mMainExpired
;
q
Debug
()
<<
"-- mDisplaying:"
<<
mDisplaying
;
q
Debug
()
<<
"KAEvent dump end"
;
}
#endif
...
...
@@ -4472,7 +4472,7 @@ void KAEventPrivate::readAlarm(const Alarm* alarm, AlarmData& data, bool audioMa
else
if
(
data
.
type
==
DISPLAYING_ALARM
)
data
.
displayingFlags
=
KAEvent
::
REPEAT_AT_LOGIN
;
}
//
k
Debug()<<"text="<<alarm->text()<<", time="<<alarm->time().toString()<<", valid time="<<alarm->time().isValid();
//
q
Debug()<<"text="<<alarm->text()<<", time="<<alarm->time().toString()<<", valid time="<<alarm->time().isValid();
}
/******************************************************************************
...
...
@@ -4608,7 +4608,7 @@ void KAEventPrivate::calcTriggerTimes() const
*/
void
KAEventPrivate
::
calcNextWorkingTime
(
const
DateTime
&
nextTrigger
)
const
{
k
Debug
()
<<
"next="
<<
nextTrigger
.
kDateTime
().
dateTime
();
q
Debug
()
<<
"next="
<<
nextTrigger
.
kDateTime
().
dateTime
();
mMainWorkTrigger
=
mAllWorkTrigger
=
DateTime
();
for
(
int
i
=
0
;
;
++
i
)
...
...
@@ -4950,7 +4950,7 @@ void KAEventPrivate::calcNextWorkingTime(const DateTime& nextTrigger) const
}
kdt
=
kdtRecur
;
}
//
k
Debug()<<"-----exit loop: count="<<limit<<endl;
//
q
Debug()<<"-----exit loop: count="<<limit<<endl;
return
;
// too many iterations
}
...
...
@@ -5285,7 +5285,7 @@ bool KAEvent::convertKCalEvents(CalendarLocal& calendar, int calendarVersion)
if
(
calendarVersion
>=
currentCalendarVersion
())
return
false
;
k
Debug
()
<<
"Adjusting version"
<<
calendarVersion
;
q
Debug
()
<<
"Adjusting version"
<<
calendarVersion
;
const
bool
pre_0_7
=
(
calendarVersion
<
Version
(
0
,
7
,
0
));
const
bool
pre_0_9
=
(
calendarVersion
<
Version
(
0
,
9
,
0
));
const
bool
pre_0_9_2
=
(
calendarVersion
<
Version
(
0
,
9
,
2
));
...
...
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