summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-26 05:35:49 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-26 05:35:49 (GMT)
commit0f121b9c446db641e3cee4f271d669066343c991 (patch)
treefce655f5dd862db02d0040f6db4ec3dcb0a11d1d
parente75042a98015ac75664318870a3c7a5236471888 (diff)
Adapt to new api
-rw-r--r--CMakeLists.txt2
-rw-r--r--kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfiguredialog.cpp4
-rw-r--r--kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfiguredialog.h2
-rw-r--r--kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfiguredialog.cpp3
-rw-r--r--kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfiguredialog.h2
-rw-r--r--kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguredialog.cpp4
-rw-r--r--kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguredialog.h2
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfiguredialog.cpp3
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfiguredialog.h2
-rw-r--r--plugins/webengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfiguredialog.cpp4
-rw-r--r--plugins/webengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfiguredialog.h2
11 files changed, 11 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79692c9..a1cff13 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,7 @@ find_package(KF5Declarative ${KF5_VERSION} CONFIG REQUIRED)
set(MAILCOMMON_LIB_VERSION "5.3.40")
set(GRAVATAR_LIB_VERSION "5.3.40")
-set(PIMCOMMON_LIB_VERSION "5.3.56")
+set(PIMCOMMON_LIB_VERSION "5.3.57")
set(GRANTLEETHEME_LIB_VERSION "5.3.40")
set(CALENDARSUPPORT_LIB_VERSION "5.3.40")
set(EVENTVIEW_LIB_VERSION "5.3.40")
diff --git a/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfiguredialog.cpp b/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfiguredialog.cpp
index 2b13658..76d9f9b 100644
--- a/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfiguredialog.cpp
+++ b/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfiguredialog.cpp
@@ -55,8 +55,6 @@ void AutomaticAddContactsConfigureDialog::reset()
mConfigureWidget->resetSettings();
}
-QString AutomaticAddContactsConfigureDialog::helpAnchor() const
+void AutomaticAddContactsConfigureDialog::help()
{
- //TODO
- return {};
}
diff --git a/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfiguredialog.h b/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfiguredialog.h
index ba48734..f267529 100644
--- a/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfiguredialog.h
+++ b/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfiguredialog.h
@@ -35,7 +35,7 @@ protected:
void save() Q_DECL_OVERRIDE;
void load() Q_DECL_OVERRIDE;
void reset() Q_DECL_OVERRIDE;
- QString helpAnchor() const Q_DECL_OVERRIDE;
+ void help() Q_DECL_OVERRIDE;
private:
AutomaticAddContactsConfigureWidget *mConfigureWidget;
diff --git a/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfiguredialog.cpp b/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfiguredialog.cpp
index 274bee3..b1af5d5 100644
--- a/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfiguredialog.cpp
+++ b/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfiguredialog.cpp
@@ -54,8 +54,7 @@ void CheckBeforeSendConfigureDialog::reset()
mConfigureWidget->resetSettings();
}
-QString CheckBeforeSendConfigureDialog::helpAnchor() const
+void CheckBeforeSendConfigureDialog::help()
{
//TODO
- return {};
}
diff --git a/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfiguredialog.h b/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfiguredialog.h
index 5c8acea..a3dd16d 100644
--- a/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfiguredialog.h
+++ b/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfiguredialog.h
@@ -34,7 +34,7 @@ protected:
void save() Q_DECL_OVERRIDE;
void load() Q_DECL_OVERRIDE;
void reset() Q_DECL_OVERRIDE;
- QString helpAnchor() const Q_DECL_OVERRIDE;
+ void help() Q_DECL_OVERRIDE;
private:
CheckBeforeSendConfigureWidget *mConfigureWidget;
};
diff --git a/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguredialog.cpp b/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguredialog.cpp
index c0ea475..22d7bbf 100644
--- a/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguredialog.cpp
+++ b/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguredialog.cpp
@@ -55,8 +55,6 @@ void ConfirmAddressConfigureDialog::reset()
mConfigureWidget->resetSettings();
}
-QString ConfirmAddressConfigureDialog::helpAnchor() const
+void ConfirmAddressConfigureDialog::help()
{
- //TODO
- return {};
}
diff --git a/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguredialog.h b/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguredialog.h
index 4f0d439..52d8536 100644
--- a/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguredialog.h
+++ b/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguredialog.h
@@ -34,7 +34,7 @@ protected:
void save() Q_DECL_OVERRIDE;
void load() Q_DECL_OVERRIDE;
void reset() Q_DECL_OVERRIDE;
- QString helpAnchor() const Q_DECL_OVERRIDE;
+ void help() Q_DECL_OVERRIDE;
private:
ConfirmAddressConfigureWidget *mConfigureWidget;
};
diff --git a/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfiguredialog.cpp b/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfiguredialog.cpp
index 30cf4dd..1c609cd 100644
--- a/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfiguredialog.cpp
+++ b/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfiguredialog.cpp
@@ -49,7 +49,6 @@ void ViewerPluginExternalConfigureDialog::reset()
{
}
-QString ViewerPluginExternalConfigureDialog::helpAnchor() const
+void ViewerPluginExternalConfigureDialog::help()
{
- return {};
}
diff --git a/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfiguredialog.h b/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfiguredialog.h
index f6da475..0b36f22 100644
--- a/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfiguredialog.h
+++ b/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfiguredialog.h
@@ -34,7 +34,7 @@ protected:
void save() Q_DECL_OVERRIDE;
void load() Q_DECL_OVERRIDE;
void reset() Q_DECL_OVERRIDE;
- QString helpAnchor() const Q_DECL_OVERRIDE;
+ void help() Q_DECL_OVERRIDE;
};
#endif // VIEWERPLUGINEXTERNALCONFIGUREDIALOG_H
diff --git a/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfiguredialog.cpp b/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfiguredialog.cpp
index fe38291..e63416f 100644
--- a/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfiguredialog.cpp
+++ b/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfiguredialog.cpp
@@ -58,8 +58,6 @@ void AdBlock::AdblockPluginUrlInterceptorConfigureDialog::reset()
mAdblockConfigureWidget->resetSettings();
}
-QString AdBlock::AdblockPluginUrlInterceptorConfigureDialog::helpAnchor() const
+void AdBlock::AdblockPluginUrlInterceptorConfigureDialog::help()
{
- //TODO
- return {};
}
diff --git a/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfiguredialog.h b/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfiguredialog.h
index 8512d10..e646b21 100644
--- a/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfiguredialog.h
+++ b/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockpluginurlinterceptorconfiguredialog.h
@@ -40,7 +40,7 @@ protected:
void save() Q_DECL_OVERRIDE;
void load() Q_DECL_OVERRIDE;
void reset() Q_DECL_OVERRIDE;
- QString helpAnchor() const Q_DECL_OVERRIDE;
+ void help() Q_DECL_OVERRIDE;
private:
AdblockPluginUrlInterceptorConfigureWidget *mAdblockConfigureWidget;