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
8817e4ae
Commit
8817e4ae
authored
Jan 02, 2017
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use nullptr
parent
56b0a719
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
13 deletions
+13
-13
src/freebusymodel/autotests/testfreebusyitemmodel.cpp
src/freebusymodel/autotests/testfreebusyitemmodel.cpp
+5
-5
src/freebusymodel/freebusycalendar.cpp
src/freebusymodel/freebusycalendar.cpp
+1
-1
src/freebusymodel/freebusyitemmodel.cpp
src/freebusymodel/freebusyitemmodel.cpp
+2
-2
src/next/incidenceviewer.cpp
src/next/incidenceviewer.cpp
+1
-1
src/printing/calprintdefaultplugins.cpp
src/printing/calprintdefaultplugins.cpp
+1
-1
src/printing/calprinter.cpp
src/printing/calprinter.cpp
+1
-1
src/printing/calprintpluginbase.cpp
src/printing/calprintpluginbase.cpp
+2
-2
No files found.
src/freebusymodel/autotests/testfreebusyitemmodel.cpp
View file @
8817e4ae
...
...
@@ -53,7 +53,7 @@ void FreeBusyItemModelTest::testModelValidity()
fb1
->
addPeriod
(
dt1
,
KCalCore
::
Duration
(
60
*
60
));
fb1
->
addPeriod
(
dt2
,
KCalCore
::
Duration
(
60
*
60
));
FreeBusyItem
::
Ptr
item1
(
new
FreeBusyItem
(
a1
,
0
));
FreeBusyItem
::
Ptr
item1
(
new
FreeBusyItem
(
a1
,
nullptr
));
item1
->
setFreeBusy
(
fb1
);
model
->
addItem
(
item1
);
...
...
@@ -119,10 +119,10 @@ void FreeBusyItemModelTest::testModelValidity2()
fb3
->
addPeriod
(
dt2
,
KCalCore
::
Duration
(
60
*
60
));
fb3
->
addPeriod
(
dt4
,
KCalCore
::
Duration
(
60
*
60
*
2
));
FreeBusyItem
::
Ptr
item1
(
new
FreeBusyItem
(
a1
,
0
));
FreeBusyItem
::
Ptr
item1
(
new
FreeBusyItem
(
a1
,
nullptr
));
item1
->
setFreeBusy
(
fb1
);
FreeBusyItem
::
Ptr
item2
(
new
FreeBusyItem
(
a2
,
0
));
FreeBusyItem
::
Ptr
item3
(
new
FreeBusyItem
(
a3
,
0
));
FreeBusyItem
::
Ptr
item2
(
new
FreeBusyItem
(
a2
,
nullptr
));
FreeBusyItem
::
Ptr
item3
(
new
FreeBusyItem
(
a3
,
nullptr
));
model
->
addItem
(
item1
);
model
->
addItem
(
item2
);
...
...
@@ -234,7 +234,7 @@ void FreeBusyItemModelTest::testInsertFreeBusy()
fb2
->
addPeriod
(
dt3
,
KCalCore
::
Duration
(
60
*
60
));
fb2
->
addPeriod
(
dt4
,
KCalCore
::
Duration
(
60
*
60
*
2
));
FreeBusyItem
::
Ptr
item1
(
new
FreeBusyItem
(
a1
,
0
));
FreeBusyItem
::
Ptr
item1
(
new
FreeBusyItem
(
a1
,
nullptr
));
item1
->
setFreeBusy
(
fb1
);
model
->
addItem
(
item1
);
...
...
src/freebusymodel/freebusycalendar.cpp
View file @
8817e4ae
...
...
@@ -76,7 +76,7 @@ void FreeBusyCalendar::setModel(FreeBusyItemModel *model)
{
if
(
model
!=
d
->
mModel
)
{
if
(
d
->
mModel
)
{
disconnect
(
d
->
mModel
,
0
,
0
,
0
);
disconnect
(
d
->
mModel
,
nullptr
,
nullptr
,
nullptr
);
}
d
->
mModel
=
model
;
connect
(
d
->
mModel
,
&
QAbstractItemModel
::
layoutChanged
,
this
,
&
FreeBusyCalendar
::
onLayoutChanged
);
...
...
src/freebusymodel/freebusyitemmodel.cpp
View file @
8817e4ae
...
...
@@ -110,7 +110,7 @@ FreeBusyItemModel::FreeBusyItemModel(QObject *parent)
connect
(
&
d
->
mReloadTimer
,
&
QTimer
::
timeout
,
this
,
&
FreeBusyItemModel
::
autoReload
);
d
->
mReloadTimer
.
setSingleShot
(
true
);
d
->
mRootData
=
new
ItemPrivateData
(
0
);
d
->
mRootData
=
new
ItemPrivateData
(
nullptr
);
}
FreeBusyItemModel
::~
FreeBusyItemModel
()
...
...
@@ -291,7 +291,7 @@ void FreeBusyItemModel::clear()
beginResetModel
();
d
->
mFreeBusyItems
.
clear
();
delete
d
->
mRootData
;
d
->
mRootData
=
new
ItemPrivateData
(
0
);
d
->
mRootData
=
new
ItemPrivateData
(
nullptr
);
endResetModel
();
}
...
...
src/next/incidenceviewer.cpp
View file @
8817e4ae
...
...
@@ -100,7 +100,7 @@ public:
void
slotParentCollectionFetched
(
KJob
*
job
)
{
mParentCollectionFetchJob
=
0
;
mParentCollectionFetchJob
=
nullptr
;
mParentCollection
=
Akonadi
::
Collection
();
if
(
!
job
->
error
())
{
...
...
src/printing/calprintdefaultplugins.cpp
View file @
8817e4ae
...
...
@@ -1647,7 +1647,7 @@ void CalPrintTodos::print(QPainter &p, int width, int height)
mConnectSubTodos
,
mStrikeOutCompleted
,
mIncludeDescription
,
pospriority
,
possummary
,
posdue
,
poscomplete
,
0
,
0
,
mCurrentLinePos
,
width
,
height
,
todoList
,
0
,
0
,
0
,
mCurrentLinePos
,
width
,
height
,
todoList
,
nullptr
,
mExcludeConfidential
,
mExcludePrivate
);
}
}
...
...
src/printing/calprinter.cpp
View file @
8817e4ae
...
...
@@ -312,7 +312,7 @@ PrintPlugin *CalPrintDialog::selectedPlugin()
if
(
mPluginIDs
.
contains
(
id
))
{
return
mPluginIDs
[
id
];
}
else
{
return
0
;
return
nullptr
;
}
}
...
...
src/printing/calprintpluginbase.cpp
View file @
8817e4ae
...
...
@@ -179,7 +179,7 @@ void CalPrintPluginBase::doPrint(QPrinter *printer)
print
(
p
,
pageWidth
,
pageHeight
);
p
.
end
();
mPrinter
=
0
;
mPrinter
=
nullptr
;
}
void
CalPrintPluginBase
::
doLoadConfig
()
...
...
@@ -1512,7 +1512,7 @@ void CalPrintPluginBase::drawTimeTable(QPainter &p,
class
MonthEventStruct
{
public:
MonthEventStruct
()
:
event
(
0
)
{}
MonthEventStruct
()
:
event
(
nullptr
)
{}
MonthEventStruct
(
const
KDateTime
&
s
,
const
KDateTime
&
e
,
const
KCalCore
::
Event
::
Ptr
&
ev
)
{
event
=
ev
;
...
...
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