Commit 874345e9 authored by Laurent Montel's avatar Laurent Montel 😁

Adapt to new api

parent b4d27019
......@@ -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")
......
......@@ -34,10 +34,6 @@ AutoCorrectionPluginEditorInterfaceTest::~AutoCorrectionPluginEditorInterfaceTes
void AutoCorrectionPluginEditorInterfaceTest::shouldHaveDefaultValue()
{
AutoCorrectionPluginEditorInterface interface;
QVERIFY(!interface.hasConfigureDialog());
QVERIFY(!interface.hasPopupMenuSupport());
QVERIFY(!interface.hasToolBarSupport());
}
QTEST_MAIN(AutoCorrectionPluginEditorInterfaceTest)
......@@ -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)
......@@ -34,10 +34,6 @@ ChangeCasePluginEditorInterfaceTest::~ChangeCasePluginEditorInterfaceTest()
void ChangeCasePluginEditorInterfaceTest::shouldHaveDefaultValues()
{
ChangeCasePluginEditorInterface interface;
QVERIFY(interface.hasPopupMenuSupport());
QVERIFY(!interface.hasConfigureDialog());
QVERIFY(!interface.hasToolBarSupport());
}
QTEST_MAIN(ChangeCasePluginEditorInterfaceTest)
......@@ -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)
......@@ -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);
......
......@@ -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
......@@ -37,11 +37,6 @@ ChangeCasePluginEditorInterface::~ChangeCasePluginEditorInterface()
}
bool ChangeCasePluginEditorInterface::hasPopupMenuSupport() const
{
return true;
}
void ChangeCasePluginEditorInterface::createAction(KActionCollection *ac)
{
PimCommon::KActionMenuChangeCase *ChangeCaseMenu = new PimCommon::KActionMenuChangeCase(this);
......
......@@ -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();
......
......@@ -34,10 +34,6 @@ InsertSpecialCharacterPluginEditorInterfaceTest::~InsertSpecialCharacterPluginEd
void InsertSpecialCharacterPluginEditorInterfaceTest::shouldHaveDefaultValue()
{
InsertSpecialCharacterPluginEditorInterface interface;
QVERIFY(!interface.hasConfigureDialog());
QVERIFY(!interface.hasPopupMenuSupport());
QVERIFY(!interface.hasToolBarSupport());
}
QTEST_MAIN(InsertSpecialCharacterPluginEditorInterfaceTest)
......@@ -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)
......@@ -34,10 +34,6 @@ NonBreakingSpacePluginEditorInterfaceTest::~NonBreakingSpacePluginEditorInterfac
void NonBreakingSpacePluginEditorInterfaceTest::shouldHaveDefaultValue()
{
NonBreakingSpacePluginEditorInterface interface;
QVERIFY(!interface.hasConfigureDialog());
QVERIFY(!interface.hasPopupMenuSupport());
QVERIFY(!interface.hasToolBarSupport());
}
QTEST_MAIN(NonBreakingSpacePluginEditorInterfaceTest)
......@@ -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)
......@@ -34,10 +34,6 @@ ZoomTextPluginEditorInterfaceTest::~ZoomTextPluginEditorInterfaceTest()
void ZoomTextPluginEditorInterfaceTest::shouldHaveDefaultValue()
{
ZoomTextPluginEditorInterface interface;
QVERIFY(!interface.hasConfigureDialog());
QVERIFY(!interface.hasPopupMenuSupport());
QVERIFY(!interface.hasToolBarSupport());
}
QTEST_MAIN(ZoomTextPluginEditorInterfaceTest)
......@@ -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)
......@@ -41,4 +41,10 @@ MessageComposer::PluginEditorInterface *ZoomTextPluginEditor::createInterface(KA
return interface;
}
bool ZoomTextPluginEditor::hasPopupMenuSupport() const
{
return false;
}
#include "zoomtextplugineditor.moc"
......@@ -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
......@@ -37,11 +37,6 @@ ZoomTextPluginEditorInterface::~ZoomTextPluginEditorInterface()
}
bool ZoomTextPluginEditorInterface::hasPopupMenuSupport() const
{
return false;
}
void ZoomTextPluginEditorInterface::createAction(KActionCollection *ac)
{
KActionMenu *zoomMenu = new KActionMenu(i18n("Zoom..."), this);
......
......@@ -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();
......
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