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
07cdf05b
Commit
07cdf05b
authored
Dec 03, 2018
by
Kevin Funk
☕
Browse files
Minor: Use more nullptr
parent
f794abfa
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/kacalendar.cpp
View file @
07cdf05b
...
...
@@ -415,7 +415,7 @@ Type type(const QString &mimeType)
Types
types
(
const
QStringList
&
mimeTypes
)
{
Types
types
=
0
;
Types
types
=
nullptr
;
for
(
const
QString
&
type
:
mimeTypes
)
{
if
(
type
==
MIME_ACTIVE
)
{
types
|=
ACTIVE
;
...
...
src/kadatetime.h
View file @
07cdf05b
...
...
@@ -1153,7 +1153,7 @@ public:
* @return KADateTime value, or an invalid KADateTime if either parameter is invalid
* @see setFromStringDefault(), toString(), QString::fromString()
*/
static
KADateTime
fromString
(
const
QString
&
string
,
TimeFormat
format
=
ISODate
,
bool
*
negZero
=
0
);
static
KADateTime
fromString
(
const
QString
&
string
,
TimeFormat
format
=
ISODate
,
bool
*
negZero
=
nullptr
);
/**
* Returns the KADateTime represented by @p string, using the @p format
...
...
@@ -1288,7 +1288,7 @@ public:
* @see setFromStringDefault(), toString()
*/
static
KADateTime
fromString
(
const
QString
&
string
,
const
QString
&
format
,
const
QList
<
QTimeZone
>*
zones
=
0
,
bool
offsetIfAmbiguous
=
true
);
const
QList
<
QTimeZone
>*
zones
=
nullptr
,
bool
offsetIfAmbiguous
=
true
);
/**
* Sets the default time specification for use by fromString() when no time
...
...
src/kaevent.cpp
View file @
07cdf05b
...
...
@@ -865,7 +865,7 @@ void KAEventPrivate::set(const Event::Ptr &event)
mRepeatAtLogin
=
false
;
mDisplaying
=
false
;
mCommandScript
=
false
;
mExtraActionOptions
=
0
;
mExtraActionOptions
=
nullptr
;
mDeferral
=
NO_DEFERRAL
;
mSoundVolume
=
-
1
;
mFadeVolume
=
-
1
;
...
...
@@ -1186,7 +1186,7 @@ void KAEventPrivate::set(const KADateTime &dateTime, const QString &text, const
mDisplayingEdit
=
false
;
mArchive
=
false
;
mReminderAfterTime
=
DateTime
();
mExtraActionOptions
=
0
;
mExtraActionOptions
=
nullptr
;
mCompatibility
=
KACalendar
::
Current
;
mReadOnly
=
false
;
mCommandError
=
KAEvent
::
CMD_NO_ERROR
;
...
...
@@ -1689,7 +1689,7 @@ KAEvent::Flags KAEvent::flags() const
KAEvent
::
Flags
KAEventPrivate
::
flags
()
const
{
KAEvent
::
Flags
result
(
0
);
KAEvent
::
Flags
result
(
nullptr
);
if
(
mBeep
)
{
result
|=
KAEvent
::
BEEP
;
}
...
...
@@ -3983,7 +3983,7 @@ void KAEventPrivate::readAlarm(const Alarm::Ptr &alarm, AlarmData &data, bool au
}
data
.
cleanText
+=
alarm
->
programArguments
();
}
data
.
extraActionOptions
=
0
;
data
.
extraActionOptions
=
nullptr
;
if
(
flags
.
contains
(
KAEventPrivate
::
EXEC_ON_DEFERRAL_FLAG
))
{
data
.
extraActionOptions
|=
KAEvent
::
ExecPreActOnDeferral
;
}
...
...
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