diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fdb0a723..3bb5ea6d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ ecm_setup_version(${AKONADI_CONTACTS_VERSION} VARIABLE_PREFIX CONTACTEDITOR ) set(QT_REQUIRED_VERSION "5.7.0") -find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test WebEngine WebEngineWidgets) +find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test) ########### Find packages ########### find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED) diff --git a/src/contact-editor/CMakeLists.txt b/src/contact-editor/CMakeLists.txt index c26423397..291fe3d39 100644 --- a/src/contact-editor/CMakeLists.txt +++ b/src/contact-editor/CMakeLists.txt @@ -78,10 +78,6 @@ set(contacteditor_editor_generalinfo_SRCS ${contacteditor_editor_generalinfo_mail_SRCS} ) -set(contacteditor_addresslocation_web_editor_SRCS - editor/addresseditor/webengine/addresseslocationengineviewer.cpp - editor/addresseditor/webengine/addresseslocationenginepage.cpp - ) set(contacteditor_addresslocation_editor_SRCS ${contacteditor_addresslocation_web_editor_SRCS} @@ -215,8 +211,6 @@ target_link_libraries(KF5ContactEditor KF5::WidgetsAddons KF5::XmlGui Grantlee5::Templates - Qt5::WebEngine - Qt5::WebEngineWidgets ) if(KF5Prison_FOUND) diff --git a/src/contact-editor/editor/addresseditor/addresseslocationwidget.cpp b/src/contact-editor/editor/addresseditor/addresseslocationwidget.cpp index d76d8f692..ae718aff8 100644 --- a/src/contact-editor/editor/addresseditor/addresseslocationwidget.cpp +++ b/src/contact-editor/editor/addresseditor/addresseslocationwidget.cpp @@ -21,7 +21,6 @@ */ #include "addresseslocationwidget.h" -#include "webengine/addresseslocationengineviewer.h" #include "addresslocationwidget.h" using namespace Akonadi; @@ -32,13 +31,6 @@ AddressesLocationWidget::AddressesLocationWidget(QWidget *parent) mAddressLocationWidget = new AddressLocationWidget(this); mAddressLocationWidget->setObjectName(QStringLiteral("addresslocationwidget")); addWidget(mAddressLocationWidget); - mAddressesLocationViewer = new AddressesLocationEngineViewer(this); - mAddressesLocationViewer->setObjectName(QStringLiteral("addresseslocationviewer")); - addWidget(mAddressesLocationViewer); - connect(mAddressesLocationViewer, &AddressesLocationEngineViewer::modifyAddress, mAddressLocationWidget, &AddressLocationWidget::slotModifyAddress); - connect(mAddressLocationWidget, &AddressLocationWidget::addNewAddress, mAddressesLocationViewer, &AddressesLocationEngineViewer::addAddress); - connect(mAddressLocationWidget, &AddressLocationWidget::updateAddressCanceled, mAddressesLocationViewer, &AddressesLocationEngineViewer::updateAddressCanceled); - connect(mAddressLocationWidget, &AddressLocationWidget::updateAddress, mAddressesLocationViewer, &AddressesLocationEngineViewer::replaceAddress); setSizes(QList<int>() << 400 << 300); } @@ -49,7 +41,6 @@ AddressesLocationWidget::~AddressesLocationWidget() void AddressesLocationWidget::loadContact(const KContacts::Addressee &contact) { - mAddressesLocationViewer->setAddresses(contact.addresses()); } void AddressesLocationWidget::storeContact(KContacts::Addressee &contact) const @@ -60,20 +51,9 @@ void AddressesLocationWidget::storeContact(KContacts::Addressee &contact) const for (int i = 0; i < numberOfOldAddresses; ++i) { contact.removeAddress(oldAddresses.at(i)); } - - const KContacts::Address::List addressList = mAddressesLocationViewer->addresses(); - // insert the new ones - const int numberOfAddress(addressList.count()); - for (int i = 0; i < numberOfAddress; ++i) { - const KContacts::Address address(addressList.at(i)); - if (!address.isEmpty()) { - contact.insertAddress(address); - } - } } void AddressesLocationWidget::setReadOnly(bool readOnly) { - mAddressesLocationViewer->setReadOnly(readOnly); mAddressLocationWidget->setReadOnly(readOnly); } diff --git a/src/contact-editor/editor/addresseditor/addresseslocationwidget.h b/src/contact-editor/editor/addresseditor/addresseslocationwidget.h index 61697482f..9614f5a5d 100644 --- a/src/contact-editor/editor/addresseditor/addresseslocationwidget.h +++ b/src/contact-editor/editor/addresseditor/addresseslocationwidget.h @@ -29,7 +29,6 @@ namespace Akonadi { class AddressLocationWidget; -class AddressesLocationEngineViewer; class AddressesLocationWidget : public QSplitter { Q_OBJECT @@ -42,7 +41,6 @@ public: void setReadOnly(bool readOnly); private: - AddressesLocationEngineViewer *mAddressesLocationViewer; AddressLocationWidget *mAddressLocationWidget; }; } diff --git a/src/contact-editor/editor/addresseditor/autotests/CMakeLists.txt b/src/contact-editor/editor/addresseditor/autotests/CMakeLists.txt index 0a224925b..a17962210 100644 --- a/src/contact-editor/editor/addresseditor/autotests/CMakeLists.txt +++ b/src/contact-editor/editor/addresseditor/autotests/CMakeLists.txt @@ -1,11 +1,5 @@ include(ECMMarkAsTest) -set(contacteditor_addresslocation_web_editor_SRCS - ../webengine/addresseslocationengineviewer.cpp - ../webengine/addresseslocationenginepage.cpp - ) -set(contacteditor_webengine_LIB Qt5::WebEngine Qt5::WebEngineWidgets) - ecm_qt_declare_logging_category(contacteditor_addresslocation_web_editor_SRCS HEADER contacteditor_debug.h IDENTIFIER CONTACTEDITOR_LOG CATEGORY_NAME org.kde.pim.contacteditor) set(addresseslocationviewer_SRCS addresseslocationviewertest.cpp ${contacteditor_addresslocation_web_editor_SRCS} ../addresseslocationgrantleeformater.cpp @@ -13,7 +7,7 @@ set(addresseslocationviewer_SRCS addresseslocationviewertest.cpp ${akonadicontac add_executable(addresseslocationviewer ${addresseslocationviewer_SRCS}) add_test(addresseslocationviewer addresseslocationviewer) ecm_mark_as_test(addresseslocationviewer) -target_link_libraries(addresseslocationviewer Qt5::Test Qt5::Widgets KF5::ContactEditor KF5::Contacts KF5::I18n ${contacteditor_webengine_LIB} Grantlee5::Templates +target_link_libraries(addresseslocationviewer Qt5::Test Qt5::Widgets KF5::ContactEditor KF5::Contacts KF5::I18n Grantlee5::Templates KF5::IconThemes KF5::WidgetsAddons) set(addresslocationwidget_SRCS addresslocationwidgettest.cpp ../addresslocationwidget.cpp ../selectaddresstypecombobox.cpp ../addresstypedialog.cpp) @@ -27,5 +21,5 @@ set(addresseslocationwidget_SRCS addresseslocationwidgettest.cpp ../addressesloc add_executable(addresseslocationwidget ${addresseslocationwidget_SRCS}) add_test(addresseslocationwidget addresseslocationwidget) ecm_mark_as_test(addresseslocationwidget) -target_link_libraries(addresseslocationwidget Qt5::Test Qt5::Widgets KF5::ContactEditor KF5::Contacts KF5::I18n KF5::Completion ${contacteditor_webengine_LIB} +target_link_libraries(addresseslocationwidget Qt5::Test Qt5::Widgets KF5::ContactEditor KF5::Contacts KF5::I18n KF5::Completion Grantlee5::Templates KF5::IconThemes KF5::WidgetsAddons) diff --git a/src/contact-editor/editor/addresseditor/autotests/addresseslocationviewertest.cpp b/src/contact-editor/editor/addresseditor/autotests/addresseslocationviewertest.cpp index e10b85d2d..4f509d841 100644 --- a/src/contact-editor/editor/addresseditor/autotests/addresseslocationviewertest.cpp +++ b/src/contact-editor/editor/addresseditor/autotests/addresseslocationviewertest.cpp @@ -22,7 +22,6 @@ #include "addresseslocationviewertest.h" #include "config-contact-editor.h" -#include "../webengine/addresseslocationengineviewer.h" #include <QTest> using namespace Akonadi; AddressesLocationViewerTest::AddressesLocationViewerTest(QObject *parent) diff --git a/src/contact-editor/editor/addresseditor/autotests/addresseslocationwidgettest.cpp b/src/contact-editor/editor/addresseditor/autotests/addresseslocationwidgettest.cpp index 1bd29a7a3..4339db282 100644 --- a/src/contact-editor/editor/addresseditor/autotests/addresseslocationwidgettest.cpp +++ b/src/contact-editor/editor/addresseditor/autotests/addresseslocationwidgettest.cpp @@ -22,7 +22,6 @@ #include "addresseslocationwidgettest.h" #include "config-contact-editor.h" -#include "../webengine/addresseslocationengineviewer.h" #include "../addresseslocationwidget.h" #include <QTest> diff --git a/src/contact-editor/editor/addresseditor/tests/CMakeLists.txt b/src/contact-editor/editor/addresseditor/tests/CMakeLists.txt index 3cdee489e..7b7531e53 100644 --- a/src/contact-editor/editor/addresseditor/tests/CMakeLists.txt +++ b/src/contact-editor/editor/addresseditor/tests/CMakeLists.txt @@ -1,9 +1,3 @@ -set(akonadicontact_addresslocation_web_editor_SRCS - ../webengine/addresseslocationengineviewer.cpp - ../webengine/addresseslocationenginepage.cpp - ) -set(akonadicontact_webengine_LIB Qt5::WebEngine Qt5::WebEngineWidgets) - ecm_qt_declare_logging_category(akonadicontact_addresslocation_web_editor_SRCS HEADER contacteditor_debug.h IDENTIFIER CONTACTEDITOR_LOG CATEGORY_NAME org.kde.pim.akonadi_contact) set(addresseditor_SRCS @@ -29,6 +23,5 @@ target_link_libraries(addresseditortest Grantlee5::Templates KF5::IconThemes KF5::WidgetsAddons - ${akonadicontact_webengine_LIB} )