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
Kalendar
Commits
3580da59
Commit
3580da59
authored
Aug 07, 2022
by
Volker Krause
Browse files
Use non-deprecated API to check the calendar loading state
parent
ae7cea29
Pipeline
#214163
failed with stage
in 2 minutes and 17 seconds
Changes
4
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
3580da59
...
...
@@ -13,7 +13,7 @@ set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_
project
(
kalendar VERSION
${
RELEASE_SERVICE_VERSION
}
)
set
(
QT_MIN_VERSION
"5.15.2"
)
set
(
KF5_MIN_VERSION
"5.9
2
.0"
)
set
(
KF5_MIN_VERSION
"5.9
6
.0"
)
set
(
PIM_VERSION
"5.19.0"
)
include
(
FeatureSummary
)
...
...
autotests/incidenceoccurrencemodeltest.cpp
View file @
3580da59
...
...
@@ -60,7 +60,7 @@ private Q_SLOTS:
loadedCheckTimer
.
setInterval
(
300
);
loadedCheckTimer
.
setSingleShot
(
true
);
connect
(
&
loadedCheckTimer
,
&
QTimer
::
timeout
,
this
,
[
&
]()
{
if
(
calendar
->
isLoad
ed
())
{
if
(
!
calendar
->
isLoad
ing
())
{
Q_EMIT
calendarLoaded
();
}
else
{
loadedCheckTimer
.
start
();
...
...
@@ -74,7 +74,7 @@ private Q_SLOTS:
void
testAddCalendar
()
{
QVERIFY
(
calendar
->
isLoad
ed
());
QVERIFY
(
!
calendar
->
isLoad
ing
());
QVERIFY
(
calendar
->
items
().
count
()
>
0
);
QSignalSpy
fetchFinished
(
&
model
,
&
QAbstractItemModel
::
modelReset
);
...
...
autotests/todosortfilterproxymodeltest.cpp
View file @
3580da59
...
...
@@ -60,7 +60,7 @@ private Q_SLOTS:
loadedCheckTimer
.
setInterval
(
300
);
loadedCheckTimer
.
setSingleShot
(
true
);
connect
(
&
loadedCheckTimer
,
&
QTimer
::
timeout
,
this
,
[
&
]()
{
if
(
calendar
->
isLoad
ed
())
{
if
(
!
calendar
->
isLoad
ing
())
{
Q_EMIT
calendarLoaded
();
}
else
{
loadedCheckTimer
.
start
();
...
...
@@ -77,7 +77,7 @@ private Q_SLOTS:
void
testAddCalendar
()
{
QVERIFY
(
calendar
->
isLoad
ed
());
QVERIFY
(
!
calendar
->
isLoad
ing
());
QVERIFY
(
calendar
->
items
().
count
()
>
0
);
QSignalSpy
fetchFinished
(
&
model
,
&
QAbstractItemModel
::
modelReset
);
...
...
src/calendarmanager.cpp
View file @
3580da59
...
...
@@ -328,7 +328,7 @@ void CalendarManager::refreshEnabledTodoCollections()
bool
CalendarManager
::
loading
()
const
{
return
!
m_calendar
->
isLoad
ed
();
return
m_calendar
->
isLoad
ing
();
}
void
CalendarManager
::
setCollectionSelectionProxyModel
(
KCheckableProxyModel
*
m
)
...
...
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