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
PIM Messagelib
Commits
3a0c1880
Commit
3a0c1880
authored
Apr 02, 2016
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename method
parent
dae0ae58
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
12 deletions
+12
-12
messageviewer/src/viewer/webengine/mailwebengineview.cpp
messageviewer/src/viewer/webengine/mailwebengineview.cpp
+1
-1
messageviewer/src/webengine/networkmanager/networkaccessmanagerwebengine.cpp
...ebengine/networkmanager/networkaccessmanagerwebengine.cpp
+2
-2
messageviewer/src/webengine/networkmanager/networkaccessmanagerwebengine.h
.../webengine/networkmanager/networkaccessmanagerwebengine.h
+1
-1
messageviewer/src/webengine/urlinterceptor/networkpluginurlinterceptorinterface.cpp
...e/urlinterceptor/networkpluginurlinterceptorinterface.cpp
+1
-1
messageviewer/src/webengine/urlinterceptor/networkpluginurlinterceptorinterface.h
...ine/urlinterceptor/networkpluginurlinterceptorinterface.h
+1
-1
messageviewer/src/webengine/urlinterceptor/networkurlinterceptormanager.cpp
...webengine/urlinterceptor/networkurlinterceptormanager.cpp
+5
-5
messageviewer/src/webengine/urlinterceptor/networkurlinterceptormanager.h
...c/webengine/urlinterceptor/networkurlinterceptormanager.h
+1
-1
No files found.
messageviewer/src/viewer/webengine/mailwebengineview.cpp
View file @
3a0c1880
...
...
@@ -343,7 +343,7 @@ void MailWebEngineView::setAllowExternalContent(bool b)
QList
<
QAction
*>
MailWebEngineView
::
interceptorUrlActions
(
const
MessageViewer
::
WebHitTestResult
&
result
)
const
{
return
d
->
mNetworkAccessManager
->
a
ctions
(
result
);
return
d
->
mNetworkAccessManager
->
interceptorUrlA
ctions
(
result
);
}
void
MailWebEngineView
::
slotLoadFinished
()
...
...
messageviewer/src/webengine/networkmanager/networkaccessmanagerwebengine.cpp
View file @
3a0c1880
...
...
@@ -60,11 +60,11 @@ void NetworkAccessManagerWebEngine::addInterceptor(MessageViewer::NetworkPluginU
d
->
mNetworkUrlInterceptor
->
addInterceptor
(
interceptor
);
}
QList
<
QAction
*>
NetworkAccessManagerWebEngine
::
a
ctions
(
const
MessageViewer
::
WebHitTestResult
&
result
)
const
QList
<
QAction
*>
NetworkAccessManagerWebEngine
::
interceptorUrlA
ctions
(
const
MessageViewer
::
WebHitTestResult
&
result
)
const
{
QList
<
QAction
*>
actions
;
Q_FOREACH
(
MessageViewer
::
NetworkPluginUrlInterceptorInterface
*
interface
,
d
->
mManager
->
interfaceList
())
{
actions
.
append
(
interface
->
a
ctions
(
result
));
actions
.
append
(
interface
->
interceptorUrlA
ctions
(
result
));
}
return
actions
;
}
...
...
messageviewer/src/webengine/networkmanager/networkaccessmanagerwebengine.h
View file @
3a0c1880
...
...
@@ -37,7 +37,7 @@ public:
explicit
NetworkAccessManagerWebEngine
(
QWebEngineView
*
webEngine
,
KActionCollection
*
ac
,
QObject
*
parent
=
Q_NULLPTR
);
~
NetworkAccessManagerWebEngine
();
void
addInterceptor
(
MessageViewer
::
NetworkPluginUrlInterceptorInterface
*
interceptor
);
QList
<
QAction
*>
a
ctions
(
const
MessageViewer
::
WebHitTestResult
&
result
)
const
;
QList
<
QAction
*>
interceptorUrlA
ctions
(
const
MessageViewer
::
WebHitTestResult
&
result
)
const
;
QVector
<
MessageViewer
::
NetworkPluginUrlInterceptorConfigureWidgetSetting
>
configureInterceptorList
(
QWidget
*
parent
=
Q_NULLPTR
)
const
;
private:
NetworkAccessManagerWebEnginePrivate
*
const
d
;
...
...
messageviewer/src/webengine/urlinterceptor/networkpluginurlinterceptorinterface.cpp
View file @
3a0c1880
...
...
@@ -35,7 +35,7 @@ void NetworkPluginUrlInterceptorInterface::createActions(KActionCollection *ac)
Q_UNUSED
(
ac
);
}
QList
<
QAction
*>
NetworkPluginUrlInterceptorInterface
::
a
ctions
(
const
MessageViewer
::
WebHitTestResult
&
result
)
const
QList
<
QAction
*>
NetworkPluginUrlInterceptorInterface
::
interceptorUrlA
ctions
(
const
MessageViewer
::
WebHitTestResult
&
result
)
const
{
Q_UNUSED
(
result
);
return
{};
...
...
messageviewer/src/webengine/urlinterceptor/networkpluginurlinterceptorinterface.h
View file @
3a0c1880
...
...
@@ -34,7 +34,7 @@ public:
~
NetworkPluginUrlInterceptorInterface
();
virtual
void
createActions
(
KActionCollection
*
ac
);
virtual
QList
<
QAction
*>
a
ctions
(
const
MessageViewer
::
WebHitTestResult
&
result
)
const
;
virtual
QList
<
QAction
*>
interceptorUrlA
ctions
(
const
MessageViewer
::
WebHitTestResult
&
result
)
const
;
virtual
bool
interceptRequest
(
QWebEngineUrlRequestInfo
&
info
)
=
0
;
};
...
...
messageviewer/src/webengine/urlinterceptor/networkurlinterceptormanager.cpp
View file @
3a0c1880
...
...
@@ -32,18 +32,18 @@ public:
createInterfaces
(
webEngine
,
ac
);
}
QList
<
QAction
*>
a
ctions
(
const
MessageViewer
::
WebHitTestResult
&
result
)
const
;
QList
<
QAction
*>
interceptorUrlA
ctions
(
const
MessageViewer
::
WebHitTestResult
&
result
)
const
;
QVector
<
NetworkPluginUrlInterceptorConfigureWidgetSetting
>
configureInterceptorList
(
QWidget
*
parent
)
const
;
void
createInterfaces
(
QWebEngineView
*
webEngine
,
KActionCollection
*
ac
);
QVector
<
MessageViewer
::
NetworkPluginUrlInterceptorInterface
*>
mListInterface
;
NetworkUrlInterceptorManager
*
q
;
};
QList
<
QAction
*>
NetworkUrlInterceptorManagerPrivate
::
a
ctions
(
const
MessageViewer
::
WebHitTestResult
&
result
)
const
QList
<
QAction
*>
NetworkUrlInterceptorManagerPrivate
::
interceptorUrlA
ctions
(
const
MessageViewer
::
WebHitTestResult
&
result
)
const
{
QList
<
QAction
*>
lstActions
;
Q_FOREACH
(
MessageViewer
::
NetworkPluginUrlInterceptorInterface
*
interface
,
mListInterface
)
{
lstActions
.
append
(
interface
->
a
ctions
(
result
));
lstActions
.
append
(
interface
->
interceptorUrlA
ctions
(
result
));
}
return
lstActions
;
}
...
...
@@ -85,9 +85,9 @@ QVector<MessageViewer::NetworkPluginUrlInterceptorInterface *> NetworkUrlInterce
return
d
->
mListInterface
;
}
QList
<
QAction
*>
NetworkUrlInterceptorManager
::
a
ctions
(
const
MessageViewer
::
WebHitTestResult
&
result
)
const
QList
<
QAction
*>
NetworkUrlInterceptorManager
::
interceptorUrlA
ctions
(
const
MessageViewer
::
WebHitTestResult
&
result
)
const
{
return
d
->
a
ctions
(
result
);
return
d
->
interceptorUrlA
ctions
(
result
);
}
QVector
<
NetworkPluginUrlInterceptorConfigureWidgetSetting
>
NetworkUrlInterceptorManager
::
configureInterceptorList
(
QWidget
*
parent
)
const
...
...
messageviewer/src/webengine/urlinterceptor/networkurlinterceptormanager.h
View file @
3a0c1880
...
...
@@ -35,7 +35,7 @@ public:
~
NetworkUrlInterceptorManager
();
QVector
<
NetworkPluginUrlInterceptorInterface
*>
interfaceList
()
const
;
QList
<
QAction
*>
a
ctions
(
const
MessageViewer
::
WebHitTestResult
&
result
)
const
;
QList
<
QAction
*>
interceptorUrlA
ctions
(
const
MessageViewer
::
WebHitTestResult
&
result
)
const
;
QVector
<
NetworkPluginUrlInterceptorConfigureWidgetSetting
>
configureInterceptorList
(
QWidget
*
parent
)
const
;
private:
NetworkUrlInterceptorManagerPrivate
*
const
d
;
...
...
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