summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-22 06:58:23 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-22 06:58:23 (GMT)
commit874345e9789f292bbf2fcac3ced9961e351555f7 (patch)
tree1c5c4cc68ab117fa5df15e55155d87684f980e3b
parentb4d27019657478381dbb735982f6f976a257afab (diff)
Adapt to new api
-rw-r--r--CMakeLists.txt2
-rw-r--r--kmail/editorplugins/autocorrection/autotests/autocorrectionplugineditorinterfacetest.cpp4
-rw-r--r--kmail/editorplugins/autocorrection/autotests/autocorrectionplugineditortest.cpp3
-rw-r--r--kmail/editorplugins/changecase/autotests/changecaseplugineditorinterfacetest.cpp4
-rw-r--r--kmail/editorplugins/changecase/autotests/changecaseplugineditortest.cpp3
-rw-r--r--kmail/editorplugins/changecase/changecaseplugineditor.cpp5
-rw-r--r--kmail/editorplugins/changecase/changecaseplugineditor.h1
-rw-r--r--kmail/editorplugins/changecase/changecaseplugineditorinterface.cpp5
-rw-r--r--kmail/editorplugins/changecase/changecaseplugineditorinterface.h1
-rw-r--r--kmail/editorplugins/insertspecialcharacter/autotests/insertspecialcharacterplugineditorinterfacetest.cpp4
-rw-r--r--kmail/editorplugins/insertspecialcharacter/autotests/insertspecialcharacterplugineditortest.cpp3
-rw-r--r--kmail/editorplugins/nonbreakingspace/autotests/nonbreakingspaceplugineditorinterfacetest.cpp4
-rw-r--r--kmail/editorplugins/nonbreakingspace/autotests/nonbreakingspaceplugineditortest.cpp4
-rw-r--r--kmail/editorplugins/zoomtext/autotests/zoomtextplugineditorinterfacetest.cpp4
-rw-r--r--kmail/editorplugins/zoomtext/autotests/zoomtextplugineditortest.cpp3
-rw-r--r--kmail/editorplugins/zoomtext/zoomtextplugineditor.cpp6
-rw-r--r--kmail/editorplugins/zoomtext/zoomtextplugineditor.h2
-rw-r--r--kmail/editorplugins/zoomtext/zoomtextplugineditorinterface.cpp5
-rw-r--r--kmail/editorplugins/zoomtext/zoomtextplugineditorinterface.h1
19 files changed, 31 insertions, 33 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b57d58..2eba27b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,7 +68,7 @@ set(LIBKLEO_LIB_VERSION "5.3.40")
set(AKONADI_LIB_VERSION "5.3.45")
set(INCIDENCEEDITOR_LIB_VERSION "5.3.40")
set(KTNEF_LIB_VERSION "5.3.40")
-set(MESSAGELIB_LIB_VERSION "5.3.52")
+set(MESSAGELIB_LIB_VERSION "5.3.60")
set(AKONADICALENDAR_LIB_VERSION "5.3.40")
set(CALENDAR_UTILS_VERSION "5.3.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.3.42")
diff --git a/kmail/editorplugins/autocorrection/autotests/autocorrectionplugineditorinterfacetest.cpp b/kmail/editorplugins/autocorrection/autotests/autocorrectionplugineditorinterfacetest.cpp
index 00964fd..3c66a47 100644
--- a/kmail/editorplugins/autocorrection/autotests/autocorrectionplugineditorinterfacetest.cpp
+++ b/kmail/editorplugins/autocorrection/autotests/autocorrectionplugineditorinterfacetest.cpp
@@ -34,10 +34,6 @@ AutoCorrectionPluginEditorInterfaceTest::~AutoCorrectionPluginEditorInterfaceTes
void AutoCorrectionPluginEditorInterfaceTest::shouldHaveDefaultValue()
{
- AutoCorrectionPluginEditorInterface interface;
- QVERIFY(!interface.hasConfigureDialog());
- QVERIFY(!interface.hasPopupMenuSupport());
- QVERIFY(!interface.hasToolBarSupport());
}
QTEST_MAIN(AutoCorrectionPluginEditorInterfaceTest)
diff --git a/kmail/editorplugins/autocorrection/autotests/autocorrectionplugineditortest.cpp b/kmail/editorplugins/autocorrection/autotests/autocorrectionplugineditortest.cpp
index 536bfc7..cfe5fbb 100644
--- a/kmail/editorplugins/autocorrection/autotests/autocorrectionplugineditortest.cpp
+++ b/kmail/editorplugins/autocorrection/autotests/autocorrectionplugineditortest.cpp
@@ -37,6 +37,9 @@ void AutoCorrectionPluginEditorTest::shouldHaveDefaultValue()
{
AutoCorrectionPluginEditor plugin;
QVERIFY(plugin.createInterface(new KActionCollection(this)));
+ QVERIFY(!plugin.hasConfigureDialog());
+ QVERIFY(!plugin.hasPopupMenuSupport());
+ QVERIFY(!plugin.hasToolBarSupport());
}
QTEST_MAIN(AutoCorrectionPluginEditorTest)
diff --git a/kmail/editorplugins/changecase/autotests/changecaseplugineditorinterfacetest.cpp b/kmail/editorplugins/changecase/autotests/changecaseplugineditorinterfacetest.cpp
index 2956edd..6fe2cd3 100644
--- a/kmail/editorplugins/changecase/autotests/changecaseplugineditorinterfacetest.cpp
+++ b/kmail/editorplugins/changecase/autotests/changecaseplugineditorinterfacetest.cpp
@@ -34,10 +34,6 @@ ChangeCasePluginEditorInterfaceTest::~ChangeCasePluginEditorInterfaceTest()
void ChangeCasePluginEditorInterfaceTest::shouldHaveDefaultValues()
{
- ChangeCasePluginEditorInterface interface;
- QVERIFY(interface.hasPopupMenuSupport());
- QVERIFY(!interface.hasConfigureDialog());
- QVERIFY(!interface.hasToolBarSupport());
}
QTEST_MAIN(ChangeCasePluginEditorInterfaceTest)
diff --git a/kmail/editorplugins/changecase/autotests/changecaseplugineditortest.cpp b/kmail/editorplugins/changecase/autotests/changecaseplugineditortest.cpp
index a58418c..272cbf3 100644
--- a/kmail/editorplugins/changecase/autotests/changecaseplugineditortest.cpp
+++ b/kmail/editorplugins/changecase/autotests/changecaseplugineditortest.cpp
@@ -37,6 +37,9 @@ void ChangeCasePluginEditorTest::shouldHaveDefaultValue()
{
ChangeCasePluginEditor plugin;
QVERIFY(plugin.createInterface(new KActionCollection(this)));
+ QVERIFY(plugin.hasPopupMenuSupport());
+ QVERIFY(!plugin.hasConfigureDialog());
+ QVERIFY(!plugin.hasToolBarSupport());
}
QTEST_MAIN(ChangeCasePluginEditorTest)
diff --git a/kmail/editorplugins/changecase/changecaseplugineditor.cpp b/kmail/editorplugins/changecase/changecaseplugineditor.cpp
index 9dfd468..51d8dc6 100644
--- a/kmail/editorplugins/changecase/changecaseplugineditor.cpp
+++ b/kmail/editorplugins/changecase/changecaseplugineditor.cpp
@@ -34,6 +34,11 @@ ChangeCasePluginEditor::~ChangeCasePluginEditor()
}
+bool ChangeCasePluginEditor::hasPopupMenuSupport() const
+{
+ return true;
+}
+
MessageComposer::PluginEditorInterface *ChangeCasePluginEditor::createInterface(KActionCollection *ac, QObject *parent)
{
ChangeCasePluginEditorInterface *interface = new ChangeCasePluginEditorInterface(parent);
diff --git a/kmail/editorplugins/changecase/changecaseplugineditor.h b/kmail/editorplugins/changecase/changecaseplugineditor.h
index 4db3ab4..6848a63 100644
--- a/kmail/editorplugins/changecase/changecaseplugineditor.h
+++ b/kmail/editorplugins/changecase/changecaseplugineditor.h
@@ -33,6 +33,7 @@ public:
~ChangeCasePluginEditor();
MessageComposer::PluginEditorInterface *createInterface(KActionCollection *ac, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE;
+ bool hasPopupMenuSupport() const Q_DECL_OVERRIDE;
};
#endif
diff --git a/kmail/editorplugins/changecase/changecaseplugineditorinterface.cpp b/kmail/editorplugins/changecase/changecaseplugineditorinterface.cpp
index 5a231fc..701d17c 100644
--- a/kmail/editorplugins/changecase/changecaseplugineditorinterface.cpp
+++ b/kmail/editorplugins/changecase/changecaseplugineditorinterface.cpp
@@ -37,11 +37,6 @@ ChangeCasePluginEditorInterface::~ChangeCasePluginEditorInterface()
}
-bool ChangeCasePluginEditorInterface::hasPopupMenuSupport() const
-{
- return true;
-}
-
void ChangeCasePluginEditorInterface::createAction(KActionCollection *ac)
{
PimCommon::KActionMenuChangeCase *ChangeCaseMenu = new PimCommon::KActionMenuChangeCase(this);
diff --git a/kmail/editorplugins/changecase/changecaseplugineditorinterface.h b/kmail/editorplugins/changecase/changecaseplugineditorinterface.h
index da21c86..1e2bbe0 100644
--- a/kmail/editorplugins/changecase/changecaseplugineditorinterface.h
+++ b/kmail/editorplugins/changecase/changecaseplugineditorinterface.h
@@ -31,7 +31,6 @@ public:
void createAction(KActionCollection *ac) Q_DECL_OVERRIDE;
void exec() Q_DECL_OVERRIDE;
- bool hasPopupMenuSupport() const Q_DECL_OVERRIDE;
private:
void slotUpperCase();
diff --git a/kmail/editorplugins/insertspecialcharacter/autotests/insertspecialcharacterplugineditorinterfacetest.cpp b/kmail/editorplugins/insertspecialcharacter/autotests/insertspecialcharacterplugineditorinterfacetest.cpp
index 6ceade0..e73fccb 100644
--- a/kmail/editorplugins/insertspecialcharacter/autotests/insertspecialcharacterplugineditorinterfacetest.cpp
+++ b/kmail/editorplugins/insertspecialcharacter/autotests/insertspecialcharacterplugineditorinterfacetest.cpp
@@ -34,10 +34,6 @@ InsertSpecialCharacterPluginEditorInterfaceTest::~InsertSpecialCharacterPluginEd
void InsertSpecialCharacterPluginEditorInterfaceTest::shouldHaveDefaultValue()
{
- InsertSpecialCharacterPluginEditorInterface interface;
- QVERIFY(!interface.hasConfigureDialog());
- QVERIFY(!interface.hasPopupMenuSupport());
- QVERIFY(!interface.hasToolBarSupport());
}
QTEST_MAIN(InsertSpecialCharacterPluginEditorInterfaceTest)
diff --git a/kmail/editorplugins/insertspecialcharacter/autotests/insertspecialcharacterplugineditortest.cpp b/kmail/editorplugins/insertspecialcharacter/autotests/insertspecialcharacterplugineditortest.cpp
index 0310735..56e10d9 100644
--- a/kmail/editorplugins/insertspecialcharacter/autotests/insertspecialcharacterplugineditortest.cpp
+++ b/kmail/editorplugins/insertspecialcharacter/autotests/insertspecialcharacterplugineditortest.cpp
@@ -37,6 +37,9 @@ void InsertSpecialCharacterPluginEditorTest::shouldHaveDefaultValue()
{
InsertSpecialCharacterPluginEditor plugin;
QVERIFY(plugin.createInterface(new KActionCollection(this)));
+ QVERIFY(!plugin.hasConfigureDialog());
+ QVERIFY(!plugin.hasPopupMenuSupport());
+ QVERIFY(!plugin.hasToolBarSupport());
}
QTEST_MAIN(InsertSpecialCharacterPluginEditorTest)
diff --git a/kmail/editorplugins/nonbreakingspace/autotests/nonbreakingspaceplugineditorinterfacetest.cpp b/kmail/editorplugins/nonbreakingspace/autotests/nonbreakingspaceplugineditorinterfacetest.cpp
index f7eef32..31edbdd 100644
--- a/kmail/editorplugins/nonbreakingspace/autotests/nonbreakingspaceplugineditorinterfacetest.cpp
+++ b/kmail/editorplugins/nonbreakingspace/autotests/nonbreakingspaceplugineditorinterfacetest.cpp
@@ -34,10 +34,6 @@ NonBreakingSpacePluginEditorInterfaceTest::~NonBreakingSpacePluginEditorInterfac
void NonBreakingSpacePluginEditorInterfaceTest::shouldHaveDefaultValue()
{
- NonBreakingSpacePluginEditorInterface interface;
- QVERIFY(!interface.hasConfigureDialog());
- QVERIFY(!interface.hasPopupMenuSupport());
- QVERIFY(!interface.hasToolBarSupport());
}
QTEST_MAIN(NonBreakingSpacePluginEditorInterfaceTest)
diff --git a/kmail/editorplugins/nonbreakingspace/autotests/nonbreakingspaceplugineditortest.cpp b/kmail/editorplugins/nonbreakingspace/autotests/nonbreakingspaceplugineditortest.cpp
index d1e0199..4ec8e4b 100644
--- a/kmail/editorplugins/nonbreakingspace/autotests/nonbreakingspaceplugineditortest.cpp
+++ b/kmail/editorplugins/nonbreakingspace/autotests/nonbreakingspaceplugineditortest.cpp
@@ -37,6 +37,10 @@ void NonBreakingSpacePluginEditorTest::shouldHaveDefaultValue()
{
NonBreakingSpacePluginEditor plugin;
QVERIFY(plugin.createInterface(new KActionCollection(this)));
+ QVERIFY(!plugin.hasConfigureDialog());
+ QVERIFY(!plugin.hasPopupMenuSupport());
+ QVERIFY(!plugin.hasToolBarSupport());
+
}
QTEST_MAIN(NonBreakingSpacePluginEditorTest)
diff --git a/kmail/editorplugins/zoomtext/autotests/zoomtextplugineditorinterfacetest.cpp b/kmail/editorplugins/zoomtext/autotests/zoomtextplugineditorinterfacetest.cpp
index 71f6016..22cf29c 100644
--- a/kmail/editorplugins/zoomtext/autotests/zoomtextplugineditorinterfacetest.cpp
+++ b/kmail/editorplugins/zoomtext/autotests/zoomtextplugineditorinterfacetest.cpp
@@ -34,10 +34,6 @@ ZoomTextPluginEditorInterfaceTest::~ZoomTextPluginEditorInterfaceTest()
void ZoomTextPluginEditorInterfaceTest::shouldHaveDefaultValue()
{
- ZoomTextPluginEditorInterface interface;
- QVERIFY(!interface.hasConfigureDialog());
- QVERIFY(!interface.hasPopupMenuSupport());
- QVERIFY(!interface.hasToolBarSupport());
}
QTEST_MAIN(ZoomTextPluginEditorInterfaceTest)
diff --git a/kmail/editorplugins/zoomtext/autotests/zoomtextplugineditortest.cpp b/kmail/editorplugins/zoomtext/autotests/zoomtextplugineditortest.cpp
index 82cec91..f2b38f3 100644
--- a/kmail/editorplugins/zoomtext/autotests/zoomtextplugineditortest.cpp
+++ b/kmail/editorplugins/zoomtext/autotests/zoomtextplugineditortest.cpp
@@ -37,6 +37,9 @@ void ZoomTextPluginEditorTest::shouldHaveDefaultValue()
{
ZoomTextPluginEditor plugin;
QVERIFY(plugin.createInterface(new KActionCollection(this)));
+ QVERIFY(!plugin.hasConfigureDialog());
+ QVERIFY(!plugin.hasPopupMenuSupport());
+ QVERIFY(!plugin.hasToolBarSupport());
}
QTEST_MAIN(ZoomTextPluginEditorTest)
diff --git a/kmail/editorplugins/zoomtext/zoomtextplugineditor.cpp b/kmail/editorplugins/zoomtext/zoomtextplugineditor.cpp
index 169825a..73c57ff 100644
--- a/kmail/editorplugins/zoomtext/zoomtextplugineditor.cpp
+++ b/kmail/editorplugins/zoomtext/zoomtextplugineditor.cpp
@@ -41,4 +41,10 @@ MessageComposer::PluginEditorInterface *ZoomTextPluginEditor::createInterface(KA
return interface;
}
+bool ZoomTextPluginEditor::hasPopupMenuSupport() const
+{
+ return false;
+}
+
+
#include "zoomtextplugineditor.moc"
diff --git a/kmail/editorplugins/zoomtext/zoomtextplugineditor.h b/kmail/editorplugins/zoomtext/zoomtextplugineditor.h
index 4c436e7..58fb24a 100644
--- a/kmail/editorplugins/zoomtext/zoomtextplugineditor.h
+++ b/kmail/editorplugins/zoomtext/zoomtextplugineditor.h
@@ -33,6 +33,8 @@ public:
~ZoomTextPluginEditor();
MessageComposer::PluginEditorInterface *createInterface(KActionCollection *ac, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE;
+ bool hasPopupMenuSupport() const Q_DECL_OVERRIDE;
+
};
#endif
diff --git a/kmail/editorplugins/zoomtext/zoomtextplugineditorinterface.cpp b/kmail/editorplugins/zoomtext/zoomtextplugineditorinterface.cpp
index 8dec6d1..3aefd45 100644
--- a/kmail/editorplugins/zoomtext/zoomtextplugineditorinterface.cpp
+++ b/kmail/editorplugins/zoomtext/zoomtextplugineditorinterface.cpp
@@ -37,11 +37,6 @@ ZoomTextPluginEditorInterface::~ZoomTextPluginEditorInterface()
}
-bool ZoomTextPluginEditorInterface::hasPopupMenuSupport() const
-{
- return false;
-}
-
void ZoomTextPluginEditorInterface::createAction(KActionCollection *ac)
{
KActionMenu *zoomMenu = new KActionMenu(i18n("Zoom..."), this);
diff --git a/kmail/editorplugins/zoomtext/zoomtextplugineditorinterface.h b/kmail/editorplugins/zoomtext/zoomtextplugineditorinterface.h
index 80bc854..fe48dda 100644
--- a/kmail/editorplugins/zoomtext/zoomtextplugineditorinterface.h
+++ b/kmail/editorplugins/zoomtext/zoomtextplugineditorinterface.h
@@ -31,7 +31,6 @@ public:
void createAction(KActionCollection *ac) Q_DECL_OVERRIDE;
void exec() Q_DECL_OVERRIDE;
- bool hasPopupMenuSupport() const Q_DECL_OVERRIDE;
private:
void slotZoomOut();