Commit 4d7da71f authored by Laurent Montel's avatar Laurent Montel 😁

Move in own directory

parent a240df09
set(messageviewer_webengineurlinterceptor_adblock_SRCS
adblockinterceptorinterface.cpp
adblockpluginurlinterceptor.cpp
adblockpluginurlinterceptorconfigurewidget.cpp
)
ecm_qt_declare_logging_category(messageviewer_webengineurlinterceptor_adblock_SRCS HEADER adblockinterceptor_debug.h IDENTIFIER ADBLOCKINTERCEPTOR_LOG CATEGORY_NAME log_adblockinterceptor)
......
......@@ -47,8 +47,8 @@ bool AdblockPluginUrlInterceptor::hasConfigureSupport() const
MessageViewer::NetworkPluginUrlInterceptorConfigureWidget *AdblockPluginUrlInterceptor::createConfigureWidget(QWidget *parent)
{
AdblockPluginUrlInterceptorConfigureWidget *configureWidget = new AdblockPluginUrlInterceptorConfigureWidget(parent);
connect(configureWidget, &AdblockPluginUrlInterceptorConfigureWidget::configChanged, AdBlock::AdblockManager::self(), &AdBlock::AdblockManager::reloadConfig);
AdBlock::AdblockPluginUrlInterceptorConfigureWidget *configureWidget = new AdBlock::AdblockPluginUrlInterceptorConfigureWidget(parent);
connect(configureWidget, &AdBlock::AdblockPluginUrlInterceptorConfigureWidget::configChanged, AdBlock::AdblockManager::self(), &AdBlock::AdblockManager::reloadConfig);
return configureWidget;
}
......
......@@ -8,21 +8,8 @@ ecm_add_test(adblockmanagertest.cpp ${messageviewer_adblock_test_common_SRCS}
)
set( adblockpluginurlinterceptortest_SRCS ${messageviewer_adblock_test_common_SRCS} adblockpluginurlinterceptortest.cpp ../adblockpluginurlinterceptor.cpp ../adblockinterceptorinterface.cpp ../adblockpluginurlinterceptorconfigurewidget.cpp)
set( adblockpluginurlinterceptortest_SRCS ${messageviewer_adblock_test_common_SRCS} adblockpluginurlinterceptortest.cpp ../adblockpluginurlinterceptor.cpp ../adblockinterceptorinterface.cpp )
add_executable( adblockpluginurlinterceptortest ${adblockpluginurlinterceptortest_SRCS})
add_test(adblockpluginurlinterceptortest adblockpluginurlinterceptortest)
ecm_mark_as_test(adblockpluginurlinterceptortest)
target_link_libraries( adblockpluginurlinterceptortest Qt5::Test Qt5::Widgets adblocklibprivate KF5::MessageViewer Qt5::WebEngine Qt5::WebEngineWidgets KF5::ItemViews KF5::KIOWidgets KF5::XmlGui)
set( adblockpluginurlinterceptorconfigurewidgettest_SRCS ${messageviewer_adblock_test_common_SRCS} adblockpluginurlinterceptorconfigurewidgettest.cpp ../adblockpluginurlinterceptorconfigurewidget.cpp)
add_executable( adblockpluginurlinterceptorconfigurewidgettest ${adblockpluginurlinterceptorconfigurewidgettest_SRCS})
add_test(adblockpluginurlinterceptorconfigurewidgettest adblockpluginurlinterceptorconfigurewidgettest)
ecm_mark_as_test(adblockpluginurlinterceptorconfigurewidgettest)
target_link_libraries( adblockpluginurlinterceptorconfigurewidgettest adblocklibprivate Qt5::Test Qt5::Widgets KF5::MessageViewer KF5::ItemViews Qt5::WebEngine Qt5::WebEngineWidgets KF5::KIOWidgets)
set( adblockblockableitemsdialogtest_SRCS ${messageviewer_adblock_test_common_SRCS} adblockblockableitemsdialogtest.cpp)
add_executable( adblockblockableitemsdialogtest ${adblockblockableitemsdialogtest_SRCS})
add_test(adblockblockableitemsdialogtest adblockblockableitemsdialogtest)
ecm_mark_as_test(adblockblockableitemsdialogtest)
target_link_libraries( adblockblockableitemsdialogtest adblocklibprivate Qt5::Test Qt5::Widgets KF5::I18n KF5::MessageViewer KF5::PimCommon KF5::ItemViews Qt5::WebEngine Qt5::WebEngineWidgets KF5::ConfigCore KF5::KIOWidgets)
......@@ -5,6 +5,7 @@ set(adblocklibprivate_widget_SRCS
adblockblockableitemsdialog.cpp
adblockblockableitemswidget.cpp
adblockcreatefilterdialog.cpp
adblockpluginurlinterceptorconfigurewidget.cpp
)
set(adblocklibprivate_SRCS
adblockmanager.cpp
......
......@@ -20,6 +20,8 @@
#include <KLocalizedString>
#include <QHBoxLayout>
using namespace AdBlock;
AdblockPluginUrlInterceptorConfigureWidget::AdblockPluginUrlInterceptorConfigureWidget(QWidget *parent)
: MessageViewer::NetworkPluginUrlInterceptorConfigureWidget(parent)
{
......
......@@ -19,11 +19,15 @@
#define ADBLOCKPLUGINURLINTERCEPTORCONFIGUREWIDGET_H
#include <MessageViewer/NetworkPluginUrlInterceptorConfigureWidget>
#include "adblocklib_export.h"
namespace MessageViewer
{
class AdBlockSettingWidget;
}
class AdblockPluginUrlInterceptorConfigureWidget : public MessageViewer::NetworkPluginUrlInterceptorConfigureWidget
namespace AdBlock
{
class ADBLOCKLIB_EXPORT AdblockPluginUrlInterceptorConfigureWidget : public MessageViewer::NetworkPluginUrlInterceptorConfigureWidget
{
Q_OBJECT
public:
......@@ -40,5 +44,5 @@ private:
MessageViewer::AdBlockSettingWidget *mConfigureWidget;
};
}
#endif // ADBLOCKPLUGINURLINTERCEPTORCONFIGUREWIDGET_H
set(messageviewer_adblock_test_common_SRCS)
ecm_qt_declare_logging_category(messageviewer_adblock_test_common_SRCS HEADER adblockinterceptor_debug.h IDENTIFIER ADBLOCKINTERCEPTOR_LOG CATEGORY_NAME log_adblockinterceptor)
set( adblockpluginurlinterceptorconfigurewidgettest_SRCS ${messageviewer_adblock_test_common_SRCS} adblockpluginurlinterceptorconfigurewidgettest.cpp ../adblockpluginurlinterceptorconfigurewidget.cpp)
add_executable( adblockpluginurlinterceptorconfigurewidgettest ${adblockpluginurlinterceptorconfigurewidgettest_SRCS})
add_test(adblockpluginurlinterceptorconfigurewidgettest adblockpluginurlinterceptorconfigurewidgettest)
ecm_mark_as_test(adblockpluginurlinterceptorconfigurewidgettest)
target_link_libraries( adblockpluginurlinterceptorconfigurewidgettest adblocklibprivate Qt5::Test Qt5::Widgets KF5::MessageViewer KF5::ItemViews Qt5::WebEngine Qt5::WebEngineWidgets KF5::KIOWidgets)
set( adblockblockableitemsdialogtest_SRCS ${messageviewer_adblock_test_common_SRCS} adblockblockableitemsdialogtest.cpp)
add_executable( adblockblockableitemsdialogtest ${adblockblockableitemsdialogtest_SRCS})
add_test(adblockblockableitemsdialogtest adblockblockableitemsdialogtest)
ecm_mark_as_test(adblockblockableitemsdialogtest)
target_link_libraries( adblockblockableitemsdialogtest adblocklibprivate Qt5::Test Qt5::Widgets KF5::I18n KF5::MessageViewer KF5::PimCommon KF5::ItemViews Qt5::WebEngine Qt5::WebEngineWidgets KF5::ConfigCore KF5::KIOWidgets)
......@@ -33,7 +33,7 @@ AdblockPluginUrlInterceptorConfigureWidgetTest::~AdblockPluginUrlInterceptorConf
void AdblockPluginUrlInterceptorConfigureWidgetTest::shouldHaveDefaultValue()
{
AdblockPluginUrlInterceptorConfigureWidget w;
AdBlock::AdblockPluginUrlInterceptorConfigureWidget w;
MessageViewer::AdBlockSettingWidget *configurewidget = w.findChild<MessageViewer::AdBlockSettingWidget *>(QStringLiteral("configurewidget"));
QVERIFY(configurewidget);
......
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