Commit a92d7b07 authored by Laurent Montel's avatar Laurent Montel 😁

Move in own directory/rename

parent 3fb94a39
......@@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
include(ECMAddTests)
set(MESSAGELIB_LIB_VERSION "5.1.70")
set(MESSAGELIB_LIB_VERSION "5.1.71")
set(KF5_VERSION "5.19.0")
set(KDEPIMLIBS_LIB_VERSION "5.1.42")
......
......@@ -79,7 +79,6 @@ if (QTWEBENGINE_EXPERIMENTAL_OPTION)
viewer/webengine/mailwebengineview.cpp
viewer/webengine/mailwebenginepage.cpp
viewer/webengine/mailwebengineaccesskey.cpp
viewer/webengine/mailwebhittestresult.cpp
${libmessageviewer_mailviewer_SRCS}
findbar/findbarwebengineview.cpp
)
......@@ -92,6 +91,7 @@ if (QTWEBENGINE_EXPERIMENTAL_OPTION)
webengine/urlinterceptor/networkpluginurlinterceptor.cpp
webengine/urlinterceptor/networkurlinterceptormanager.cpp
webengine/urlinterceptor/networkpluginurlinterceptorconfigurewidget.cpp
webengine/webhittestresult.cpp
)
set(libmessageviewer_web_LIB Qt5::WebEngine Qt5::WebEngineWidgets ${libmessageviewer_web_LIB})
endif()
......@@ -331,7 +331,6 @@ ecm_generate_headers(MessageViewer_Camelcasewebviewer_HEADERS
if (QTWEBENGINE_EXPERIMENTAL_OPTION)
ecm_generate_headers(MessageViewer_Camelcasewebengine_HEADERS
HEADER_NAMES
MailWebHitTestResult
MailWebEnginePage
MailWebEngineAccessKey
MailWebEngineView
......@@ -359,6 +358,13 @@ if (QTWEBENGINE_EXPERIMENTAL_OPTION)
PREFIX MessageViewer
RELATIVE webengine/networkmanager
)
ecm_generate_headers(MessageViewer_Camelcasewebengine_misc_HEADERS
HEADER_NAMES
WebHitTestResult
REQUIRED_HEADERS MessageViewer_webengine_misc_HEADERS
PREFIX MessageViewer
RELATIVE webengine/
)
endif()
ecm_generate_headers(MessageViewer_Camelcaseviewer_HEADERS
......@@ -533,6 +539,7 @@ ecm_generate_pri_file(BASE_NAME MessageViewer
install(FILES
${MessageViewer_Camelcasewebengine_misc_HEADERS}
${MessageViewer_Camelcasewebengine_manager_HEADERS}
${MessageViewer_Camelcasewebengine_urlinterceptor_HEADERS}
${MessageViewer_Camelcasewebengine_HEADERS}
......@@ -557,6 +564,7 @@ install(FILES
)
install(FILES
${MessageViewer_webengine_misc_HEADERS}
${MessageViewer_webengine_manager_HEADERS}
${MessageViewer_webengine_urlinterceptor_HEADERS}
${MessageViewer_webengine_HEADERS}
......
......@@ -32,7 +32,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* ============================================================ */
#include "mailwebhittestresult.h"
#include "webhittestresult.h"
#include <QEventLoop>
#include <QPointer>
#include <QTimer>
......@@ -40,7 +40,7 @@
using namespace MessageViewer;
MailWebHitTestResult::MailWebHitTestResult(QWebEnginePage *page, const QPoint &pos)
WebHitTestResult::WebHitTestResult(QWebEnginePage *page, const QPoint &pos)
: m_isNull(true)
, m_isContentEditable(false)
, m_isContentSelected(false)
......@@ -106,7 +106,7 @@ MailWebHitTestResult::MailWebHitTestResult(QWebEnginePage *page, const QPoint &p
init(page->url(), execJavaScript(page, js).toMap());
}
QVariant MailWebHitTestResult::execJavaScript(QWebEnginePage *page, const QString &scriptSource, int timeout)
QVariant WebHitTestResult::execJavaScript(QWebEnginePage *page, const QString &scriptSource, int timeout)
{
QPointer<QEventLoop> loop = new QEventLoop;
QVariant result;
......@@ -125,72 +125,72 @@ QVariant MailWebHitTestResult::execJavaScript(QWebEnginePage *page, const QStrin
return result;
}
QString MailWebHitTestResult::alternateText() const
QString WebHitTestResult::alternateText() const
{
return m_alternateText;
}
QRect MailWebHitTestResult::boundingRect() const
QRect WebHitTestResult::boundingRect() const
{
return m_boundingRect;
}
QUrl MailWebHitTestResult::imageUrl() const
QUrl WebHitTestResult::imageUrl() const
{
return m_imageUrl;
}
bool MailWebHitTestResult::isContentEditable() const
bool WebHitTestResult::isContentEditable() const
{
return m_isContentEditable;
}
bool MailWebHitTestResult::isContentSelected() const
bool WebHitTestResult::isContentSelected() const
{
return m_isContentSelected;
}
bool MailWebHitTestResult::isNull() const
bool WebHitTestResult::isNull() const
{
return m_isNull;
}
QString MailWebHitTestResult::linkTitle() const
QString WebHitTestResult::linkTitle() const
{
return m_linkTitle;
}
QUrl MailWebHitTestResult::linkUrl() const
QUrl WebHitTestResult::linkUrl() const
{
return m_linkUrl;
}
QUrl MailWebHitTestResult::mediaUrl() const
QUrl WebHitTestResult::mediaUrl() const
{
return m_mediaUrl;
}
bool MailWebHitTestResult::mediaPaused() const
bool WebHitTestResult::mediaPaused() const
{
return m_mediaPaused;
}
bool MailWebHitTestResult::mediaMuted() const
bool WebHitTestResult::mediaMuted() const
{
return m_mediaMuted;
}
QPoint MailWebHitTestResult::pos() const
QPoint WebHitTestResult::pos() const
{
return m_pos;
}
QString MailWebHitTestResult::tagName() const
QString WebHitTestResult::tagName() const
{
return m_tagName;
}
void MailWebHitTestResult::init(const QUrl &url, const QVariantMap &map)
void WebHitTestResult::init(const QUrl &url, const QVariantMap &map)
{
if (map.isEmpty()) {
return;
......
......@@ -32,8 +32,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* ============================================================ */
#ifndef MAILWEBHITTESTRESULT_H
#define MAILWEBHITTESTRESULT_H
#ifndef WebHitTestResult_H
#define WebHitTestResult_H
#include "messageviewer_export.h"
#include <QUrl>
......@@ -44,10 +44,10 @@
class QWebEnginePage;
namespace MessageViewer
{
class MESSAGEVIEWER_EXPORT MailWebHitTestResult
class MESSAGEVIEWER_EXPORT WebHitTestResult
{
public:
explicit MailWebHitTestResult(QWebEnginePage *page, const QPoint &pos);
explicit WebHitTestResult(QWebEnginePage *page, const QPoint &pos);
QString alternateText() const;
QRect boundingRect() const;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment