Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KDE PIM Runtime
Commits
22d6c435
Commit
22d6c435
authored
Jul 11, 2021
by
Volker Krause
Browse files
Port away from deprecated API in KIO 5.84
parent
a23bab06
Pipeline
#69958
canceled with stage
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
kioslave/pop3/pop3.cpp
View file @
22d6c435
...
...
@@ -25,8 +25,6 @@ extern "C" {
#include
<QSslSocket>
#include
"kio_version.h"
#include
<KTcpSocket>
#include
<kio/slaveinterface.h>
#include
<string.h>
...
...
@@ -611,15 +609,9 @@ bool POP3Protocol::pop3_open()
if
(
!
hasMetaData
(
QStringLiteral
(
"useProxy"
))
||
metaData
(
QStringLiteral
(
"useProxy"
))
!=
QLatin1String
(
"on"
))
{
qCDebug
(
POP3_LOG
)
<<
"requested to use no proxy"
;
// the KTcpSocket branch can be removed once we can require KF >= 5.65 as TCPSlaveBase will
// use QSslSocket internally
QNetworkProxy
proxy
;
proxy
.
setType
(
QNetworkProxy
::
NoProxy
);
//#if KIO_VERSION < QT_VERSION_CHECK(5, 83, 0)
if
(
auto
sock
=
qobject_cast
<
QSslSocket
*>
(
socket
()))
{
//#else
// if (auto sock = qobject_cast<QSslSocket *>(tcpSocket())) {
//#endif
if
(
auto
sock
=
tcpSocket
())
{
sock
->
setProxy
(
proxy
);
}
else
{
qCWarning
(
POP3_LOG
)
<<
"no socket, cannot set no proxy"
;
...
...
resources/openxchange/oxa/davmanager.cpp
View file @
22d6c435
...
...
@@ -48,7 +48,7 @@ KIO::DavJob *DavManager::createFindJob(const QString &path, const QDomDocument &
QUrl
url
(
mBaseUrl
);
url
.
setPath
(
path
);
return
KIO
::
davPropFind
(
url
,
document
,
QStringLiteral
(
"0"
),
KIO
::
HideProgressInfo
);
return
KIO
::
davPropFind
(
url
,
document
.
toString
()
,
QStringLiteral
(
"0"
),
KIO
::
HideProgressInfo
);
}
KIO
::
DavJob
*
DavManager
::
createPatchJob
(
const
QString
&
path
,
const
QDomDocument
&
document
)
const
...
...
@@ -56,5 +56,5 @@ KIO::DavJob *DavManager::createPatchJob(const QString &path, const QDomDocument
QUrl
url
(
mBaseUrl
);
url
.
setPath
(
path
);
return
KIO
::
davPropPatch
(
url
,
document
,
KIO
::
HideProgressInfo
);
return
KIO
::
davPropPatch
(
url
,
document
.
toString
()
,
KIO
::
HideProgressInfo
);
}
Write
Preview
Supports
Markdown
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