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
KDE PIM Runtime
Commits
b9ee26c5
Commit
b9ee26c5
authored
Oct 07, 2020
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
const'ify pointer
parent
810da5c9
Pipeline
#36710
failed with stage
in 35 minutes and 21 seconds
Changes
15
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
23 additions
and
33 deletions
+23
-33
resources/dav/resource/davfreebusyhandler.cpp
resources/dav/resource/davfreebusyhandler.cpp
+1
-1
resources/dav/resource/searchdialog.h
resources/dav/resource/searchdialog.h
+4
-4
resources/dav/resource/settings.cpp
resources/dav/resource/settings.cpp
+1
-2
resources/dav/resource/setupwizard.cpp
resources/dav/resource/setupwizard.cpp
+2
-2
resources/dav/resource/urlconfigurationdialog.h
resources/dav/resource/urlconfigurationdialog.h
+1
-1
resources/dav/resource/utils.cpp
resources/dav/resource/utils.cpp
+2
-2
resources/folderarchivesettings/folderarchiveaccountinfo.cpp
resources/folderarchivesettings/folderarchiveaccountinfo.cpp
+0
-8
resources/folderarchivesettings/folderarchiveaccountinfo.h
resources/folderarchivesettings/folderarchiveaccountinfo.h
+4
-4
resources/folderarchivesettings/folderarchivesettingpage.cpp
resources/folderarchivesettings/folderarchivesettingpage.cpp
+0
-1
resources/folderarchivesettings/folderarchivesettingpage.h
resources/folderarchivesettings/folderarchivesettingpage.h
+1
-1
resources/google-groupware/generichandler.h
resources/google-groupware/generichandler.h
+2
-2
resources/google-groupware/googleresource.h
resources/google-groupware/googleresource.h
+1
-1
resources/google-groupware/googleresourcestate.h
resources/google-groupware/googleresourcestate.h
+1
-1
resources/google-groupware/googlesettingsdialog.h
resources/google-groupware/googlesettingsdialog.h
+2
-2
resources/imap/gmailpasswordrequester.h
resources/imap/gmailpasswordrequester.h
+1
-1
No files found.
resources/dav/resource/davfreebusyhandler.cpp
View file @
b9ee26c5
...
...
@@ -70,7 +70,7 @@ void DavFreeBusyHandler::retrieveFreeBusy(const QString &email, const QDateTime
const
QStringList
principalScheduleOutboxFromEmail
=
mPrincipalScheduleOutbox
[
email
];
for
(
const
QString
&
outbox
:
principalScheduleOutboxFromEmail
)
{
++
mRequestsTracker
[
email
].
retrievalJobCount
;
uint
requestId
=
mNextRequestId
++
;
const
uint
requestId
=
mNextRequestId
++
;
QUrl
url
(
outbox
);
KIO
::
StoredTransferJob
*
job
=
KIO
::
storedHttpPost
(
fbData
,
url
);
...
...
resources/dav/resource/searchdialog.h
View file @
b9ee26c5
...
...
@@ -22,15 +22,15 @@ public:
explicit
SearchDialog
(
QWidget
*
parent
=
nullptr
);
~
SearchDialog
()
override
;
bool
useDefaultCredentials
()
const
;
Q_REQUIRED_RESULT
bool
useDefaultCredentials
()
const
;
void
setUsername
(
const
QString
&
user
);
QString
username
()
const
;
Q_REQUIRED_RESULT
QString
username
()
const
;
void
setPassword
(
const
QString
&
password
);
QString
password
()
const
;
Q_REQUIRED_RESULT
QString
password
()
const
;
QStringList
selection
()
const
;
Q_REQUIRED_RESULT
QStringList
selection
()
const
;
private:
void
checkUserInput
();
...
...
resources/dav/resource/settings.cpp
View file @
b9ee26c5
...
...
@@ -41,7 +41,6 @@ class SettingsHelper
{
public:
SettingsHelper
()
:
q
(
nullptr
)
{
}
...
...
@@ -50,7 +49,7 @@ public:
delete
q
;
}
Settings
*
q
;
Settings
*
q
=
nullptr
;
};
Q_GLOBAL_STATIC
(
SettingsHelper
,
s_globalSettings
)
...
...
resources/dav/resource/setupwizard.cpp
View file @
b9ee26c5
...
...
@@ -111,11 +111,11 @@ static QString settingsToUrl(const QWizard *wizard, const QString &protocol)
url
.
setScheme
(
QStringLiteral
(
"http"
));
}
QString
host
=
wizard
->
field
(
QStringLiteral
(
"connectionHost"
)).
toString
();
const
QString
host
=
wizard
->
field
(
QStringLiteral
(
"connectionHost"
)).
toString
();
if
(
host
.
isEmpty
())
{
return
QString
();
}
QStringList
hostParts
=
host
.
split
(
QLatin1Char
(
':'
));
const
QStringList
hostParts
=
host
.
split
(
QLatin1Char
(
':'
));
url
.
setHost
(
hostParts
.
at
(
0
));
url
.
setPath
(
pathPattern
);
...
...
resources/dav/resource/urlconfigurationdialog.h
View file @
b9ee26c5
...
...
@@ -63,7 +63,7 @@ private:
QString
mDefaultUsername
;
QString
mDefaultPassword
;
QPushButton
*
mOkButton
=
nullptr
;
QButtonGroup
*
mRemoteProtocolGroup
=
nullptr
;
QButtonGroup
*
const
mRemoteProtocolGroup
;
};
#endif
resources/dav/resource/utils.cpp
View file @
b9ee26c5
...
...
@@ -166,13 +166,13 @@ bool Utils::parseDavData(const KDAV::DavItem &source, Akonadi::Item &target, Ako
for
(
const
IncidencePtr
&
exception
:
qAsConst
(
exceptions
))
{
if
(
exception
->
status
()
==
KCalendarCore
::
Incidence
::
StatusCanceled
)
{
QDateTime
exDateTime
(
exception
->
recurrenceId
());
const
QDateTime
exDateTime
(
exception
->
recurrenceId
());
mainIncidence
->
recurrence
()
->
addExDateTime
(
exDateTime
);
}
else
{
// The exception remote id will contain a fragment pointing to
// its instance identifier to distinguish it from the main
// event.
QString
rid
=
target
.
remoteId
()
+
QLatin1String
(
"#"
)
+
exception
->
instanceIdentifier
();
const
QString
rid
=
target
.
remoteId
()
+
QLatin1String
(
"#"
)
+
exception
->
instanceIdentifier
();
qCDebug
(
DAVRESOURCE_LOG
)
<<
"Extra incidence at"
<<
rid
;
Akonadi
::
Item
extraItem
=
target
;
extraItem
.
setRemoteId
(
rid
);
...
...
resources/folderarchivesettings/folderarchiveaccountinfo.cpp
View file @
b9ee26c5
...
...
@@ -9,18 +9,10 @@
#include <KConfigGroup>
FolderArchiveAccountInfo
::
FolderArchiveAccountInfo
()
:
mArchiveType
(
UniqueFolder
)
,
mArchiveTopLevelCollectionId
(
-
1
)
,
mEnabled
(
false
)
,
mKeepExistingStructure
(
false
)
{
}
FolderArchiveAccountInfo
::
FolderArchiveAccountInfo
(
const
KConfigGroup
&
config
)
:
mArchiveType
(
UniqueFolder
)
,
mArchiveTopLevelCollectionId
(
-
1
)
,
mEnabled
(
false
)
,
mKeepExistingStructure
(
false
)
{
readConfig
(
config
);
}
...
...
resources/folderarchivesettings/folderarchiveaccountinfo.h
View file @
b9ee26c5
...
...
@@ -46,11 +46,11 @@ public:
bool
operator
==
(
const
FolderArchiveAccountInfo
&
other
)
const
;
private:
FolderArchiveAccountInfo
::
FolderArchiveType
mArchiveType
;
Akonadi
::
Collection
::
Id
mArchiveTopLevelCollectionId
;
FolderArchiveAccountInfo
::
FolderArchiveType
mArchiveType
=
UniqueFolder
;
Akonadi
::
Collection
::
Id
mArchiveTopLevelCollectionId
=
-
1
;
QString
mInstanceName
;
bool
mEnabled
;
bool
mKeepExistingStructure
;
bool
mEnabled
=
false
;
bool
mKeepExistingStructure
=
false
;
};
#endif // FOLDERARCHIVEACCOUNTINFO_H
resources/folderarchivesettings/folderarchivesettingpage.cpp
View file @
b9ee26c5
...
...
@@ -62,7 +62,6 @@ FolderArchiveAccountInfo::FolderArchiveType FolderArchiveComboBox::type() const
FolderArchiveSettingPage
::
FolderArchiveSettingPage
(
const
QString
&
instanceName
,
QWidget
*
parent
)
:
QWidget
(
parent
)
,
mInstanceName
(
instanceName
)
,
mInfo
(
nullptr
)
{
QVBoxLayout
*
lay
=
new
QVBoxLayout
(
this
);
mEnabled
=
new
QCheckBox
(
i18n
(
"Enable"
));
...
...
resources/folderarchivesettings/folderarchivesettingpage.h
View file @
b9ee26c5
...
...
@@ -44,7 +44,7 @@ public:
private:
void
slotEnableChanged
(
bool
enabled
);
QString
mInstanceName
;
const
QString
mInstanceName
;
QCheckBox
*
mEnabled
=
nullptr
;
FolderArchiveComboBox
*
mArchiveNamed
=
nullptr
;
Akonadi
::
CollectionRequester
*
mArchiveFolder
=
nullptr
;
...
...
resources/google-groupware/generichandler.h
View file @
b9ee26c5
...
...
@@ -86,8 +86,8 @@ protected Q_SLOTS:
protected:
void
emitReadyStatus
();
GoogleResourceStateInterface
*
m_iface
=
nullptr
;
GoogleSettings
*
m_settings
=
nullptr
;
GoogleResourceStateInterface
*
const
m_iface
;
GoogleSettings
*
const
m_settings
;
};
#endif // GENERICHANDLER_H
resources/google-groupware/googleresource.h
View file @
b9ee26c5
...
...
@@ -84,7 +84,7 @@ private:
GoogleSettings
*
m_settings
=
nullptr
;
Akonadi
::
Collection
m_rootCollection
;
GoogleResourceState
*
m_iface
;
GoogleResourceState
*
const
m_iface
;
std
::
vector
<
GenericHandler
::
Ptr
>
m_handlers
;
FreeBusyHandler
::
Ptr
m_freeBusyHandler
;
...
...
resources/google-groupware/googleresourcestate.h
View file @
b9ee26c5
...
...
@@ -63,7 +63,7 @@ public:
bool
canPerformTask
()
override
;
bool
handleError
(
KGAPI2
::
Job
*
job
,
bool
_cancelTask
)
override
;
private:
GoogleResource
*
m_resource
=
nullptr
;
GoogleResource
*
const
m_resource
;
};
#endif // GOOGLERESOURCESTATE_H
resources/google-groupware/googlesettingsdialog.h
View file @
b9ee26c5
...
...
@@ -30,8 +30,8 @@ protected:
bool
handleError
(
KGAPI2
::
Job
*
job
);
void
accountChanged
();
private:
GoogleResource
*
m_resource
;
GoogleSettings
*
m_settings
;
GoogleResource
*
const
m_resource
;
GoogleSettings
*
const
m_settings
;
Ui
::
GoogleSettingsDialog
*
m_ui
=
nullptr
;
KGAPI2
::
AccountPtr
m_account
;
private
Q_SLOTS
:
...
...
resources/imap/gmailpasswordrequester.h
View file @
b9ee26c5
...
...
@@ -31,7 +31,7 @@ private Q_SLOTS:
void
onTokenRequestFinished
(
KGAPI2
::
AccountPromise
*
promise
);
private:
ImapResourceBase
*
mResource
=
nullptr
;
ImapResourceBase
*
const
mResource
;
QPointer
<
KGAPI2
::
AccountPromise
>
mPendingPromise
;
};
...
...
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