Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
PIM Calendar Support
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PIM
PIM Calendar Support
Commits
56b0a719
Commit
56b0a719
authored
Jan 02, 2017
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
GIT_SILENT: use nullptr now
parent
90b6ac7e
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
28 additions
and
28 deletions
+28
-28
src/archivedialog.h
src/archivedialog.h
+1
-1
src/attachmenthandler.cpp
src/attachmenthandler.cpp
+5
-5
src/calendarutils.cpp
src/calendarutils.cpp
+2
-2
src/calendarutils.h
src/calendarutils.h
+1
-1
src/categoryconfig.h
src/categoryconfig.h
+1
-1
src/collectionselection.h
src/collectionselection.h
+1
-1
src/eventarchiver.h
src/eventarchiver.h
+1
-1
src/freebusymodel/autotests/modeltest.h
src/freebusymodel/autotests/modeltest.h
+1
-1
src/freebusymodel/freebusycalendar.cpp
src/freebusymodel/freebusycalendar.cpp
+1
-1
src/freebusymodel/freebusyitemmodel.cpp
src/freebusymodel/freebusyitemmodel.cpp
+1
-1
src/identitymanager.h
src/identitymanager.h
+1
-1
src/incidenceattachmentmodel.cpp
src/incidenceattachmentmodel.cpp
+1
-1
src/incidenceattachmentmodel.h
src/incidenceattachmentmodel.h
+3
-3
src/kcalmodel.h
src/kcalmodel.h
+1
-1
src/messagewidget.h
src/messagewidget.h
+1
-1
src/next/incidenceviewer.cpp
src/next/incidenceviewer.cpp
+3
-3
src/utils.cpp
src/utils.cpp
+2
-2
src/utils.h
src/utils.h
+1
-1
No files found.
src/archivedialog.h
View file @
56b0a719
...
...
@@ -52,7 +52,7 @@ class CALENDARSUPPORT_EXPORT ArchiveDialog : public QDialog
public:
ArchiveDialog
(
const
Akonadi
::
ETMCalendar
::
Ptr
&
calendar
,
Akonadi
::
IncidenceChanger
*
changer
,
QWidget
*
parent
=
Q_NULLPTR
);
QWidget
*
parent
=
nullptr
);
~
ArchiveDialog
();
Q_SIGNALS:
...
...
src/attachmenthandler.cpp
View file @
56b0a719
...
...
@@ -143,7 +143,7 @@ Attachment::Ptr AttachmentHandler::find(const QString &attachmentName,
return
find
(
attachmentName
,
incidence
);
}
static
QTemporaryFile
*
s_tempFile
=
Q_NULLPTR
;
static
QTemporaryFile
*
s_tempFile
=
nullptr
;
static
QUrl
tempFileForAttachment
(
const
Attachment
::
Ptr
&
attachment
)
{
...
...
@@ -165,7 +165,7 @@ static QUrl tempFileForAttachment(const Attachment::Ptr &attachment)
if
(
tf
.
size
()
!=
attachment
->
size
())
{
//whoops. failed to write the entire attachment. return an invalid URL.
delete
s_tempFile
;
s_tempFile
=
Q_NULLPTR
;
s_tempFile
=
nullptr
;
return
url
;
}
...
...
@@ -186,7 +186,7 @@ bool AttachmentHandler::view(const Attachment::Ptr &attachment)
// put the attachment in a temporary file and launch it
QUrl
tempUrl
=
tempFileForAttachment
(
attachment
);
if
(
tempUrl
.
isValid
())
{
stat
=
KRun
::
runUrl
(
tempUrl
,
attachment
->
mimeType
(),
Q_NULLPTR
,
true
);
stat
=
KRun
::
runUrl
(
tempUrl
,
attachment
->
mimeType
(),
nullptr
,
true
);
}
else
{
stat
=
false
;
KMessageBox
::
error
(
...
...
@@ -194,7 +194,7 @@ bool AttachmentHandler::view(const Attachment::Ptr &attachment)
i18n
(
"Unable to create a temporary file for the attachment."
));
}
delete
s_tempFile
;
s_tempFile
=
Q_NULLPTR
;
s_tempFile
=
nullptr
;
}
return
stat
;
}
...
...
@@ -257,7 +257,7 @@ bool AttachmentHandler::saveAs(const Attachment::Ptr &attachment)
i18n
(
"Unable to create a temporary file for the attachment."
));
}
delete
s_tempFile
;
s_tempFile
=
Q_NULLPTR
;
s_tempFile
=
nullptr
;
}
return
stat
;
}
...
...
src/calendarutils.cpp
View file @
56b0a719
...
...
@@ -152,7 +152,7 @@ bool CalendarUtilsPrivate::purgeCompletedSubTodos(const KCalCore::Todo::Ptr &tod
if
(
deleteThisTodo
)
{
if
(
todo
->
isCompleted
())
{
if
(
!
mChanger
->
deleteIncidence
(
mCalendar
->
item
(
todo
),
Q_NULLPTR
))
{
if
(
!
mChanger
->
deleteIncidence
(
mCalendar
->
item
(
todo
),
nullptr
))
{
allPurged
=
false
;
}
}
else
{
...
...
@@ -259,7 +259,7 @@ void CalendarUtils::purgeCompletedTodos()
// endMultiModify();
if
(
!
allDeleted
)
{
KMessageBox
::
information
(
Q_NULLPTR
,
nullptr
,
i18nc
(
"@info"
,
"Unable to purge to-dos with uncompleted children."
),
i18nc
(
"@title:window"
,
"Delete To-do"
),
...
...
src/calendarutils.h
View file @
56b0a719
...
...
@@ -50,7 +50,7 @@ public:
* Creates a new CalendarUtils instance. The instance does not take owner ship
* over the Calendar.
*/
explicit
CalendarUtils
(
const
Akonadi
::
ETMCalendar
::
Ptr
&
calendar
,
QObject
*
parent
=
Q_NULLPTR
);
explicit
CalendarUtils
(
const
Akonadi
::
ETMCalendar
::
Ptr
&
calendar
,
QObject
*
parent
=
nullptr
);
~
CalendarUtils
();
...
...
src/categoryconfig.h
View file @
56b0a719
...
...
@@ -35,7 +35,7 @@ class CALENDARSUPPORT_EXPORT CategoryConfig : public QObject
{
Q_OBJECT
public:
explicit
CategoryConfig
(
KCoreConfigSkeleton
*
cfg
,
QObject
*
parent
=
Q_NULLPTR
);
explicit
CategoryConfig
(
KCoreConfigSkeleton
*
cfg
,
QObject
*
parent
=
nullptr
);
~
CategoryConfig
();
QStringList
customCategories
()
const
;
void
setCustomCategories
(
const
QStringList
&
categories
);
...
...
src/collectionselection.h
View file @
56b0a719
...
...
@@ -40,7 +40,7 @@ class CALENDARSUPPORT_EXPORT CollectionSelection : public QObject
{
Q_OBJECT
public:
explicit
CollectionSelection
(
QItemSelectionModel
*
selectionModel
,
QObject
*
parent
=
Q_NULLPTR
);
explicit
CollectionSelection
(
QItemSelectionModel
*
selectionModel
,
QObject
*
parent
=
nullptr
);
~
CollectionSelection
();
QItemSelectionModel
*
model
()
const
;
...
...
src/eventarchiver.h
View file @
56b0a719
...
...
@@ -56,7 +56,7 @@ class CALENDARSUPPORT_EXPORT EventArchiver : public QObject
{
Q_OBJECT
public:
explicit
EventArchiver
(
QObject
*
parent
=
Q_NULLPTR
);
explicit
EventArchiver
(
QObject
*
parent
=
nullptr
);
virtual
~
EventArchiver
();
/**
...
...
src/freebusymodel/autotests/modeltest.h
View file @
56b0a719
...
...
@@ -33,7 +33,7 @@ class ModelTest : public QObject
{
Q_OBJECT
public:
explicit
ModelTest
(
QAbstractItemModel
*
model
,
QObject
*
parent
=
Q_NULLPTR
);
explicit
ModelTest
(
QAbstractItemModel
*
model
,
QObject
*
parent
=
nullptr
);
private
Q_SLOTS
:
void
nonDestructiveBasicTest
();
...
...
src/freebusymodel/freebusycalendar.cpp
View file @
56b0a719
...
...
@@ -38,7 +38,7 @@ class CalendarSupport::FreeBusyCalendarPrivate
{
public:
FreeBusyCalendarPrivate
()
:
mModel
(
Q_NULLPTR
)
:
mModel
(
nullptr
)
{
}
...
...
src/freebusymodel/freebusyitemmodel.cpp
View file @
56b0a719
...
...
@@ -83,7 +83,7 @@ class CalendarSupport::FreeBusyItemModelPrivate
public:
FreeBusyItemModelPrivate
()
:
mForceDownload
(
false
),
mRootData
(
Q_NULLPTR
)
mRootData
(
nullptr
)
{
}
~
FreeBusyItemModelPrivate
()
...
...
src/identitymanager.h
View file @
56b0a719
...
...
@@ -33,7 +33,7 @@ class CALENDARSUPPORT_EXPORT IdentityManager : public KIdentityManagement::Ident
{
Q_OBJECT
public:
explicit
IdentityManager
(
QObject
*
parent
=
Q_NULLPTR
,
const
char
*
name
=
Q_NULLPTR
)
explicit
IdentityManager
(
QObject
*
parent
=
nullptr
,
const
char
*
name
=
nullptr
)
:
KIdentityManagement
::
IdentityManager
(
true
/*readonly*/
,
parent
,
name
)
{}
protected:
...
...
src/incidenceattachmentmodel.cpp
View file @
56b0a719
...
...
@@ -36,7 +36,7 @@ class IncidenceAttachmentModelPrivate
IncidenceAttachmentModelPrivate
(
IncidenceAttachmentModel
*
qq
,
const
QPersistentModelIndex
&
modelIndex
,
const
Akonadi
::
Item
&
item
=
Akonadi
::
Item
())
:
q_ptr
(
qq
),
m_modelIndex
(
modelIndex
),
m_item
(
item
),
m_monitor
(
Q_NULLPTR
)
:
q_ptr
(
qq
),
m_modelIndex
(
modelIndex
),
m_item
(
item
),
m_monitor
(
nullptr
)
{
if
(
modelIndex
.
isValid
())
{
QObject
::
connect
(
modelIndex
.
model
(),
SIGNAL
(
dataChanged
(
QModelIndex
,
QModelIndex
)),
...
...
src/incidenceattachmentmodel.h
View file @
56b0a719
...
...
@@ -53,11 +53,11 @@ public:
};
explicit
IncidenceAttachmentModel
(
const
QPersistentModelIndex
&
modelIndex
,
QObject
*
parent
=
Q_NULLPTR
);
QObject
*
parent
=
nullptr
);
explicit
IncidenceAttachmentModel
(
const
Akonadi
::
Item
&
item
,
QObject
*
parent
=
Q_NULLPTR
);
explicit
IncidenceAttachmentModel
(
const
Akonadi
::
Item
&
item
,
QObject
*
parent
=
nullptr
);
explicit
IncidenceAttachmentModel
(
QObject
*
parent
=
Q_NULLPTR
);
explicit
IncidenceAttachmentModel
(
QObject
*
parent
=
nullptr
);
~
IncidenceAttachmentModel
();
...
...
src/kcalmodel.h
View file @
56b0a719
...
...
@@ -35,7 +35,7 @@ public:
Type
};
explicit
KCalModel
(
QObject
*
parent
=
Q_NULLPTR
);
explicit
KCalModel
(
QObject
*
parent
=
nullptr
);
virtual
~
KCalModel
();
...
...
src/messagewidget.h
View file @
56b0a719
...
...
@@ -40,7 +40,7 @@ class CALENDARSUPPORT_EXPORT MessageWidget : public KMessageWidget
{
Q_OBJECT
public:
explicit
MessageWidget
(
QWidget
*
parent
=
Q_NULLPTR
);
explicit
MessageWidget
(
QWidget
*
parent
=
nullptr
);
~
MessageWidget
();
bool
eventFilter
(
QObject
*
watched
,
QEvent
*
event
)
Q_DECL_OVERRIDE
;
void
showEvent
(
QShowEvent
*
event
)
Q_DECL_OVERRIDE
;
...
...
src/next/incidenceviewer.cpp
View file @
56b0a719
...
...
@@ -70,8 +70,8 @@ class Q_DECL_HIDDEN IncidenceViewer::Private
{
public:
Private
(
IncidenceViewer
*
parent
)
:
mCalendar
(
Q_NULLPTR
),
mParent
(
parent
),
mParentCollectionFetchJob
(
Q_NULLPTR
),
mAttachmentModel
(
Q_NULLPTR
),
mDelayedClear
(
false
)
:
mCalendar
(
nullptr
),
mParent
(
parent
),
mParentCollectionFetchJob
(
nullptr
),
mAttachmentModel
(
nullptr
),
mDelayedClear
(
false
)
{
mAttachmentHandler
=
new
AttachmentHandler
(
parent
);
mBrowser
=
new
TextBrowser
;
...
...
@@ -144,7 +144,7 @@ IncidenceViewer::IncidenceViewer(Akonadi::ETMCalendar *calendar, QWidget *parent
IncidenceViewer
::
IncidenceViewer
(
QWidget
*
parent
)
:
QWidget
(
parent
),
d
(
new
Private
(
this
))
{
d
->
mCalendar
=
Q_NULLPTR
;
d
->
mCalendar
=
nullptr
;
init
();
}
...
...
src/utils.cpp
View file @
56b0a719
...
...
@@ -196,7 +196,7 @@ QMimeData *CalendarSupport::createMimeData(const Akonadi::Item::List &items,
const
KDateTime
::
Spec
&
timeSpec
)
{
if
(
items
.
isEmpty
())
{
return
Q_NULLPTR
;
return
nullptr
;
}
KCalCore
::
MemoryCalendar
::
Ptr
cal
(
new
KCalCore
::
MemoryCalendar
(
timeSpec
));
...
...
@@ -215,7 +215,7 @@ QMimeData *CalendarSupport::createMimeData(const Akonadi::Item::List &items,
}
if
(
incidencesFound
==
0
)
{
return
Q_NULLPTR
;
return
nullptr
;
}
std
::
unique_ptr
<
QMimeData
>
mimeData
(
new
QMimeData
);
...
...
src/utils.h
View file @
56b0a719
...
...
@@ -254,7 +254,7 @@ CALENDARSUPPORT_EXPORT QList<QDate> workDays(const QDate &start, const QDate &en
CALENDARSUPPORT_EXPORT
QStringList
holiday
(
const
QDate
&
date
);
CALENDARSUPPORT_EXPORT
void
saveAttachments
(
const
Akonadi
::
Item
&
item
,
QWidget
*
widget
=
Q_NULLPTR
);
QWidget
*
widget
=
nullptr
);
CALENDARSUPPORT_EXPORT
QStringList
categories
(
const
KCalCore
::
Incidence
::
List
&
incidences
);
...
...
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