Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
PIM
Akonadi Calendar
Commits
2a79e3a3
Commit
2a79e3a3
authored
Sep 02, 2020
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Modernize code
parent
8a71c419
Pipeline
#32747
passed with stage
in 23 minutes and 55 seconds
Changes
13
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
10 additions
and
30 deletions
+10
-30
src/calendarbase.cpp
src/calendarbase.cpp
+0
-3
src/calendarclipboard.cpp
src/calendarclipboard.cpp
+0
-1
src/calfilterpartstatusproxymodel_p.cpp
src/calfilterpartstatusproxymodel_p.cpp
+1
-2
src/etmcalendar.cpp
src/etmcalendar.cpp
+0
-7
src/etmcalendar_p.h
src/etmcalendar_p.h
+1
-1
src/fetchjobcalendar.cpp
src/fetchjobcalendar.cpp
+0
-1
src/fetchjobcalendar_p.h
src/fetchjobcalendar_p.h
+1
-1
src/freebusydownloadjob_p.h
src/freebusydownloadjob_p.h
+1
-1
src/incidencefetchjob_p.cpp
src/incidencefetchjob_p.cpp
+0
-1
src/itiphandler_p.cpp
src/itiphandler_p.cpp
+1
-3
src/standardcalendaractionmanager.cpp
src/standardcalendaractionmanager.cpp
+1
-1
src/todopurger.cpp
src/todopurger.cpp
+1
-5
src/todopurger_p.h
src/todopurger_p.h
+3
-3
No files found.
src/calendarbase.cpp
View file @
2a79e3a3
...
...
@@ -38,9 +38,6 @@ static QString itemToString(const Akonadi::Item &item)
CalendarBasePrivate
::
CalendarBasePrivate
(
CalendarBase
*
qq
)
:
QObject
()
,
mIncidenceChanger
(
new
IncidenceChanger
())
,
mBatchInsertionCancelled
(
false
)
,
mListensForNewItems
(
false
)
,
mLastCreationCancelled
(
false
)
,
q
(
qq
)
{
connect
(
mIncidenceChanger
,
&
IncidenceChanger
::
createFinished
,
...
...
src/calendarclipboard.cpp
View file @
2a79e3a3
...
...
@@ -20,7 +20,6 @@ CalendarClipboard::Private::Private(const Akonadi::CalendarBase::Ptr &calendar,
:
QObject
(
qq
)
,
m_calendar
(
calendar
)
,
m_changer
(
changer
)
,
m_abortCurrentOperation
(
false
)
,
q
(
qq
)
{
Q_ASSERT
(
m_calendar
);
...
...
src/calfilterpartstatusproxymodel_p.cpp
View file @
2a79e3a3
...
...
@@ -25,12 +25,11 @@ class Q_DECL_HIDDEN CalFilterPartStatusProxyModel::Private
public:
explicit
Private
()
:
mIdentityManager
(
KIdentityManagement
::
IdentityManager
::
self
())
,
mFilterVirtual
(
false
)
{
}
QList
<
KCalendarCore
::
Attendee
::
PartStat
>
mBlockedStatusList
;
KIdentityManagement
::
IdentityManager
*
mIdentityManager
=
nullptr
;
KIdentityManagement
::
IdentityManager
*
const
mIdentityManager
;
bool
mFilterVirtual
=
false
;
};
...
...
src/etmcalendar.cpp
View file @
2a79e3a3
...
...
@@ -35,13 +35,6 @@ using namespace KCalendarCore;
ETMCalendarPrivate
::
ETMCalendarPrivate
(
ETMCalendar
*
qq
)
:
CalendarBasePrivate
(
qq
)
,
mETM
(
nullptr
)
,
mFilteredETM
(
nullptr
)
,
mCheckableProxyModel
(
nullptr
)
,
mCollectionProxyModel
(
nullptr
)
,
mCalFilterProxyModel
(
nullptr
)
,
mCalFilterPartStatusProxyModel
(
nullptr
)
,
mSelectionProxy
(
nullptr
)
,
mCollectionFilteringEnabled
(
true
)
,
q
(
qq
)
{
mListensForNewItems
=
true
;
...
...
src/etmcalendar_p.h
View file @
2a79e3a3
...
...
@@ -119,7 +119,7 @@ public:
//filter out all invitations and declined events
Akonadi
::
CalFilterPartStatusProxyModel
*
mCalFilterPartStatusProxyModel
=
nullptr
;
KSelectionProxyModel
*
mSelectionProxy
=
nullptr
;
bool
mCollectionFilteringEnabled
;
bool
mCollectionFilteringEnabled
=
true
;
QSet
<
Akonadi
::
Collection
::
Id
>
mPopulatedCollectionIds
;
QStringList
mMimeTypes
;
private:
...
...
src/fetchjobcalendar.cpp
View file @
2a79e3a3
...
...
@@ -17,7 +17,6 @@ using namespace KCalendarCore;
FetchJobCalendarPrivate
::
FetchJobCalendarPrivate
(
FetchJobCalendar
*
qq
)
:
CalendarBasePrivate
(
qq
)
,
m_isLoaded
(
false
)
,
q
(
qq
)
{
IncidenceFetchJob
*
job
=
new
IncidenceFetchJob
();
...
...
src/fetchjobcalendar_p.h
View file @
2a79e3a3
...
...
@@ -26,7 +26,7 @@ public Q_SLOTS:
void
slotFetchJobFinished
();
public:
bool
m_isLoaded
;
bool
m_isLoaded
=
false
;
private:
FetchJobCalendar
*
const
q
;
...
...
src/freebusydownloadjob_p.h
View file @
2a79e3a3
...
...
@@ -35,7 +35,7 @@ private Q_SLOTS:
private:
QUrl
mUrl
;
QByteArray
mFreeBusyData
;
QWidget
*
mParent
=
nullptr
;
QWidget
*
const
mParent
;
};
}
...
...
src/incidencefetchjob_p.cpp
View file @
2a79e3a3
...
...
@@ -17,7 +17,6 @@
using
namespace
Akonadi
;
Akonadi
::
IncidenceFetchJob
::
IncidenceFetchJob
(
QObject
*
parent
)
:
Job
(
parent
)
,
m_jobCount
(
0
)
{
m_mimeTypeChecker
.
addWantedMimeType
(
QStringLiteral
(
"text/calendar"
));
}
...
...
src/itiphandler_p.cpp
View file @
2a79e3a3
...
...
@@ -13,14 +13,12 @@
using
namespace
Akonadi
;
ITIPHandler
::
Private
::
Private
(
ITIPHandlerComponentFactory
*
factory
,
ITIPHandler
*
qq
)
:
m_calendarLoadError
(
false
)
,
m_factory
(
factory
?
factory
:
new
ITIPHandlerComponentFactory
(
this
))
:
m_factory
(
factory
?
factory
:
new
ITIPHandlerComponentFactory
(
this
))
,
m_scheduler
(
new
MailScheduler
(
m_factory
,
qq
))
,
m_method
(
KCalendarCore
::
iTIPNoMethod
)
,
m_helper
(
new
ITIPHandlerHelper
(
m_factory
))
,
m_currentOperation
(
OperationNone
)
,
m_uiDelegate
(
nullptr
)
,
m_showDialogsOnError
(
true
)
,
q
(
qq
)
{
m_helper
->
setParent
(
this
);
...
...
src/standardcalendaractionmanager.cpp
View file @
2a79e3a3
...
...
@@ -521,7 +521,7 @@ public:
QItemSelectionModel
*
mItemSelectionModel
=
nullptr
;
QHash
<
StandardCalendarActionManager
::
Type
,
QAction
*>
mActions
;
QSet
<
StandardCalendarActionManager
::
Type
>
mInterceptedActions
;
StandardCalendarActionManager
*
mParent
=
nullptr
;
StandardCalendarActionManager
*
const
mParent
;
};
Akonadi
::
StandardCalendarActionManager
::
StandardCalendarActionManager
(
KActionCollection
*
actionCollection
,
QWidget
*
parent
)
...
...
src/todopurger.cpp
View file @
2a79e3a3
...
...
@@ -15,11 +15,7 @@
using
namespace
Akonadi
;
TodoPurger
::
Private
::
Private
(
TodoPurger
*
q
)
:
m_changer
(
nullptr
)
,
m_currentChangeId
(
-
1
)
,
m_ignoredItems
(
0
)
,
m_calendarOwnership
(
true
)
,
q
(
q
)
:
q
(
q
)
{
}
...
...
src/todopurger_p.h
View file @
2a79e3a3
...
...
@@ -24,9 +24,9 @@ public:
IncidenceChanger
*
m_changer
=
nullptr
;
QString
m_lastError
;
CalendarBase
::
Ptr
m_calendar
;
int
m_currentChangeId
;
int
m_ignoredItems
;
bool
m_calendarOwnership
;
// If false it's not ours.
int
m_currentChangeId
=
-
1
;
int
m_ignoredItems
=
0
;
bool
m_calendarOwnership
=
true
;
// If false it's not ours.
void
deleteTodos
();
Q_REQUIRED_RESULT
bool
treeIsDeletable
(
const
KCalendarCore
::
Todo
::
Ptr
&
todo
);
...
...
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