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 Add-ons
Commits
f7a578f2
Commit
f7a578f2
authored
Oct 06, 2020
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
const'ify pointer + port deprecated signal
parent
e8a9a0e9
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
8 deletions
+15
-8
kmail/editorplugins/insertshorturl/shorturlengineplugin/isgdshorturlengineplugin/isgdshorturlengineinterface.cpp
.../isgdshorturlengineplugin/isgdshorturlengineinterface.cpp
+4
-0
kmail/editorplugins/insertshorturl/shorturlengineplugin/shorturlengineinterface.cpp
...shorturl/shorturlengineplugin/shorturlengineinterface.cpp
+0
-1
kmail/editorplugins/insertshorturl/shorturlengineplugin/shorturlengineinterface.h
...rtshorturl/shorturlengineplugin/shorturlengineinterface.h
+2
-2
kmail/editorplugins/insertshorturl/shorturlengineplugin/shorturlenginepluginmanager.cpp
...turl/shorturlengineplugin/shorturlenginepluginmanager.cpp
+1
-5
kmail/editorplugins/insertshorturl/shorturlengineplugin/tinyurlengineplugin/tinyurlengineinterface.cpp
...gineplugin/tinyurlengineplugin/tinyurlengineinterface.cpp
+4
-0
kmail/editorplugins/insertshorturl/shorturlengineplugin/triopabshorturlengineplugin/triopabshorturlengineinterface.cpp
...abshorturlengineplugin/triopabshorturlengineinterface.cpp
+4
-0
No files found.
kmail/editorplugins/insertshorturl/shorturlengineplugin/isgdshorturlengineplugin/isgdshorturlengineinterface.cpp
View file @
f7a578f2
...
...
@@ -35,7 +35,11 @@ void IsgdShortUrlEngineInterface::generateShortUrl()
request
.
setHeader
(
QNetworkRequest
::
ContentTypeHeader
,
QStringLiteral
(
"application/json"
));
QNetworkReply
*
reply
=
mNetworkAccessManager
->
get
(
request
);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect
(
reply
,
qOverload
<
QNetworkReply
::
NetworkError
>
(
&
QNetworkReply
::
error
),
this
,
&
IsgdShortUrlEngineInterface
::
slotErrorFound
);
#else
connect
(
reply
,
qOverload
<
QNetworkReply
::
NetworkError
>
(
&
QNetworkReply
::
errorOccurred
),
this
,
&
IsgdShortUrlEngineInterface
::
slotErrorFound
);
#endif
}
void
IsgdShortUrlEngineInterface
::
slotSslErrors
(
QNetworkReply
*
reply
,
const
QList
<
QSslError
>
&
error
)
...
...
kmail/editorplugins/insertshorturl/shorturlengineplugin/shorturlengineinterface.cpp
View file @
f7a578f2
...
...
@@ -13,7 +13,6 @@
ShortUrlEngineInterface
::
ShortUrlEngineInterface
(
ShortUrlEnginePlugin
*
plugin
,
QObject
*
parent
)
:
QObject
(
parent
)
,
mErrorFound
(
false
)
,
mNetworkAccessManager
(
new
QNetworkAccessManager
(
this
))
,
mEnginePlugin
(
plugin
)
{
...
...
kmail/editorplugins/insertshorturl/shorturlengineplugin/shorturlengineinterface.h
View file @
f7a578f2
...
...
@@ -36,7 +36,7 @@ protected:
QString
mOriginalUrl
;
QTextCursor
mTextCursor
;
bool
mErrorFound
=
false
;
QNetworkAccessManager
*
mNetworkAccessManager
=
nullptr
;
ShortUrlEnginePlugin
*
mEnginePlugin
=
nullptr
;
QNetworkAccessManager
*
const
mNetworkAccessManager
;
ShortUrlEnginePlugin
*
const
mEnginePlugin
;
};
#endif // SHORTURLENGINEINTERFACE_H
kmail/editorplugins/insertshorturl/shorturlengineplugin/shorturlenginepluginmanager.cpp
View file @
f7a578f2
...
...
@@ -17,10 +17,6 @@
class
ShortUrlEnginePluginInfo
{
public:
ShortUrlEnginePluginInfo
()
:
plugin
(
nullptr
)
{
}
QString
metaDataFileNameBaseName
;
QString
metaDataFileName
;
...
...
@@ -40,7 +36,7 @@ public:
void
loadPlugin
(
ShortUrlEnginePluginInfo
*
item
);
QVector
<
ShortUrlEnginePlugin
*>
pluginsList
()
const
;
QVector
<
ShortUrlEnginePluginInfo
>
mPluginList
;
ShortUrlEnginePluginManager
*
q
;
ShortUrlEnginePluginManager
*
const
q
;
};
void
ShortUrlEnginePluginManagerPrivate
::
initializePlugins
()
...
...
kmail/editorplugins/insertshorturl/shorturlengineplugin/tinyurlengineplugin/tinyurlengineinterface.cpp
View file @
f7a578f2
...
...
@@ -29,7 +29,11 @@ void TinyUrlEngineInterface::generateShortUrl()
{
const
QString
requestUrl
=
QStringLiteral
(
"https://tinyurl.com/api-create.php?url=%1"
).
arg
(
mOriginalUrl
);
QNetworkReply
*
reply
=
mNetworkAccessManager
->
get
(
QNetworkRequest
(
QUrl
(
requestUrl
)));
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect
(
reply
,
qOverload
<
QNetworkReply
::
NetworkError
>
(
&
QNetworkReply
::
error
),
this
,
&
TinyUrlEngineInterface
::
slotErrorFound
);
#else
connect
(
reply
,
qOverload
<
QNetworkReply
::
NetworkError
>
(
&
QNetworkReply
::
errorOccurred
),
this
,
&
TinyUrlEngineInterface
::
slotErrorFound
);
#endif
}
void
TinyUrlEngineInterface
::
slotShortUrlFinished
(
QNetworkReply
*
reply
)
...
...
kmail/editorplugins/insertshorturl/shorturlengineplugin/triopabshorturlengineplugin/triopabshorturlengineinterface.cpp
View file @
f7a578f2
...
...
@@ -29,7 +29,11 @@ void TripAbShortUrlEngineInterface::generateShortUrl()
{
const
QString
requestUrl
=
QStringLiteral
(
"https://to.ly/api.php?longurl=%1"
).
arg
(
mOriginalUrl
);
QNetworkReply
*
reply
=
mNetworkAccessManager
->
get
(
QNetworkRequest
(
QUrl
(
requestUrl
)));
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect
(
reply
,
qOverload
<
QNetworkReply
::
NetworkError
>
(
&
QNetworkReply
::
error
),
this
,
&
TripAbShortUrlEngineInterface
::
slotErrorFound
);
#else
connect
(
reply
,
qOverload
<
QNetworkReply
::
NetworkError
>
(
&
QNetworkReply
::
errorOccurred
),
this
,
&
TripAbShortUrlEngineInterface
::
slotErrorFound
);
#endif
}
void
TripAbShortUrlEngineInterface
::
slotShortUrlFinished
(
QNetworkReply
*
reply
)
...
...
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