summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-22 06:58:04 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-22 06:58:04 (GMT)
commita43aa28413227322cc74209cc19fbcaf55c33c74 (patch)
tree3230878a345f2a21917a4ab5614bde90e11278b7
parentae36c72023b5728be1a00ae325371433ad93443e (diff)
Move method to plugins directly
-rw-r--r--CMakeLists.txt2
-rw-r--r--messagecomposer/src/plugineditor/plugineditor.cpp15
-rw-r--r--messagecomposer/src/plugineditor/plugineditor.h3
-rw-r--r--messagecomposer/src/plugineditor/plugineditorinterface.cpp15
-rw-r--r--messagecomposer/src/plugineditor/plugineditorinterface.h3
5 files changed, 19 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3cb9d1..9388031 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
include(ECMAddTests)
-set(PIM_VERSION "5.3.59")
+set(PIM_VERSION "5.3.60")
set(MESSAGELIB_LIB_VERSION ${PIM_VERSION})
set(AKONADIMIME_LIB_VERSION "5.3.40")
diff --git a/messagecomposer/src/plugineditor/plugineditor.cpp b/messagecomposer/src/plugineditor/plugineditor.cpp
index 14210b8..381a966 100644
--- a/messagecomposer/src/plugineditor/plugineditor.cpp
+++ b/messagecomposer/src/plugineditor/plugineditor.cpp
@@ -53,3 +53,18 @@ int PluginEditor::order() const
{
return d->order;
}
+
+bool PluginEditor::hasPopupMenuSupport() const
+{
+ return false;
+}
+
+bool PluginEditor::hasConfigureDialog() const
+{
+ return false;
+}
+
+bool PluginEditor::hasToolBarSupport() const
+{
+ return false;
+}
diff --git a/messagecomposer/src/plugineditor/plugineditor.h b/messagecomposer/src/plugineditor/plugineditor.h
index 597583f..8308e78 100644
--- a/messagecomposer/src/plugineditor/plugineditor.h
+++ b/messagecomposer/src/plugineditor/plugineditor.h
@@ -37,6 +37,9 @@ public:
virtual PluginEditorInterface *createInterface(KActionCollection *ac, QObject *parent = Q_NULLPTR) = 0;
int order() const;
+ virtual bool hasPopupMenuSupport() const;
+ virtual bool hasConfigureDialog() const;
+ virtual bool hasToolBarSupport() const;
private:
PluginEditorPrivate *const d;
diff --git a/messagecomposer/src/plugineditor/plugineditorinterface.cpp b/messagecomposer/src/plugineditor/plugineditorinterface.cpp
index fe8b4ed..41d786d 100644
--- a/messagecomposer/src/plugineditor/plugineditorinterface.cpp
+++ b/messagecomposer/src/plugineditor/plugineditorinterface.cpp
@@ -112,21 +112,6 @@ void PluginEditorInterface::setRichTextEditor(KPIMTextEdit::RichTextEditor *rich
d->mRichTextEditor = richTextEditor;
}
-bool PluginEditorInterface::hasPopupMenuSupport() const
-{
- return false;
-}
-
-bool PluginEditorInterface::hasConfigureDialog() const
-{
- return false;
-}
-
-bool MessageComposer::PluginEditorInterface::hasToolBarSupport() const
-{
- return false;
-}
-
void PluginEditorInterface::showConfigureDialog(QWidget *parentWidget)
{
Q_UNUSED(parentWidget);
diff --git a/messagecomposer/src/plugineditor/plugineditorinterface.h b/messagecomposer/src/plugineditor/plugineditorinterface.h
index e846578..14eaf5c 100644
--- a/messagecomposer/src/plugineditor/plugineditorinterface.h
+++ b/messagecomposer/src/plugineditor/plugineditorinterface.h
@@ -79,9 +79,6 @@ public:
KPIMTextEdit::RichTextEditor *richTextEditor() const;
void setRichTextEditor(KPIMTextEdit::RichTextEditor *richTextEditor);
- virtual bool hasPopupMenuSupport() const;
- virtual bool hasConfigureDialog() const;
- virtual bool hasToolBarSupport() const;
virtual void showConfigureDialog(QWidget *parentWidget = Q_NULLPTR);
static QString actionXmlExtension(ActionType::Type type);