summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2016-04-03 16:30:10 +0200
committerMontel Laurent <[email protected]>2016-04-03 20:39:37 +0200
commit3e6f3178d5561722328f41563f33fd0dff361231 (patch)
treec436c7750f3272c368cb08b67ccba8c2bb927f72
parentf8bea2e4d48f501ad25ed685ecc3f383baf3fe8b (diff)
Adapt to new api
-rw-r--r--CMakeLists.txt2
-rw-r--r--plugins/messageviewerwebengineurlinterceptor/adblock/adblockpluginurlinterceptor.cpp2
-rw-r--r--plugins/messageviewerwebengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfigurewidget.cpp2
-rw-r--r--plugins/messageviewerwebengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfigurewidget.h2
4 files changed, 3 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b19546..9150c15 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,7 +74,7 @@ set(KDEPIMLIBS_LIB_VERSION "5.2.40")
set(GRAVATAR_LIB_VERSION "5.2.40")
set(INCIDENCEEDITOR_LIB_VERSION "5.2.40")
set(KTNEF_LIB_VERSION "5.2.40")
-set(MESSAGELIB_LIB_VERSION "5.2.51")
+set(MESSAGELIB_LIB_VERSION "5.2.52")
find_package(KF5MailCommon ${MAILCOMMN_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5KaddressbookGrantlee ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MessageViewer ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED)
diff --git a/plugins/messageviewerwebengineurlinterceptor/adblock/adblockpluginurlinterceptor.cpp b/plugins/messageviewerwebengineurlinterceptor/adblock/adblockpluginurlinterceptor.cpp
index 58e114f..5b986e3 100644
--- a/plugins/messageviewerwebengineurlinterceptor/adblock/adblockpluginurlinterceptor.cpp
+++ b/plugins/messageviewerwebengineurlinterceptor/adblock/adblockpluginurlinterceptor.cpp
@@ -52,7 +52,7 @@ MessageViewer::NetworkPluginUrlInterceptorConfigureWidgetSetting AdblockPluginUr
settings.name = i18n("AdBlock");
AdBlock::AdblockPluginUrlInterceptorConfigureWidget *configureWidget = new AdBlock::AdblockPluginUrlInterceptorConfigureWidget(parent);
- connect(configureWidget, &AdBlock::AdblockPluginUrlInterceptorConfigureWidget::configChanged, AdBlock::AdblockManager::self(), &AdBlock::AdblockManager::reloadConfig);
+ connect(configureWidget, &AdBlock::AdblockPluginUrlInterceptorConfigureWidget::configureChanged, AdBlock::AdblockManager::self(), &AdBlock::AdblockManager::reloadConfig);
settings.configureWidget = configureWidget;
return settings;
}
diff --git a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfigurewidget.cpp b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfigurewidget.cpp
index c6b4e17..6eb3682 100644
--- a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfigurewidget.cpp
+++ b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfigurewidget.cpp
@@ -45,7 +45,7 @@ void AdblockPluginUrlInterceptorConfigureWidget::loadSettings()
void AdblockPluginUrlInterceptorConfigureWidget::saveSettings()
{
mConfigureWidget->save();
- Q_EMIT configChanged();
+ Q_EMIT configureChanged();
}
void AdblockPluginUrlInterceptorConfigureWidget::resetSettings()
diff --git a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfigurewidget.h b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfigurewidget.h
index 6b22629..e8b2e6c 100644
--- a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfigurewidget.h
+++ b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfigurewidget.h
@@ -38,8 +38,6 @@ public:
void saveSettings() Q_DECL_OVERRIDE;
void resetSettings() Q_DECL_OVERRIDE;
-Q_SIGNALS:
- void configChanged();
private:
MessageViewer::AdBlockSettingWidget *mConfigureWidget;