[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [libksieve] src/ksieveui/autocreatescripts: Use directly SieveEditorGraphicalModeWidgetAbstract
From:       Montel Laurent <null () kde ! org>
Date:       2017-05-15 4:56:38
Message-ID: E1dA83i-0006ie-Q3 () code ! kde ! org
[Download RAW message or body]

Git commit fb73c50381aaa4dfea74c4c2f5996d21447e005b by Montel Laurent.
Committed on 15/05/2017 at 04:56.
Pushed by mlaurent into branch 'master'.

Use directly SieveEditorGraphicalModeWidgetAbstract

M  +1    -1    src/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidget.cpp
M  +6    -6    src/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidget.h
M  +2    -2    src/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidgetabstract.h


https://commits.kde.org/libksieve/fb73c50381aaa4dfea74c4c2f5996d21447e005b

diff --git a/src/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidget.cpp \
b/src/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidget.cpp index \
                4cacf27..43086e1 100644
--- a/src/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidget.cpp
+++ b/src/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidget.cpp
@@ -38,7 +38,7 @@
 using namespace KSieveUi;
 
 SieveEditorGraphicalModeWidget::SieveEditorGraphicalModeWidget(QWidget *parent)
-    : SieveEditorAbstractWidget(parent)
+    : SieveEditorGraphicalModeWidgetAbstract::SieveEditorGraphicalModeWidgetAbstract(parent)
  {
     QVBoxLayout *vlay = new QVBoxLayout(this);
     vlay->setMargin(0);
diff --git a/src/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidget.h \
b/src/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidget.h index \
                94fe076..7016085 100644
--- a/src/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidget.h
+++ b/src/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidget.h
@@ -20,7 +20,7 @@
 #ifndef SIEVEEDITORGRAPHICALMODEWIDGET_H
 #define SIEVEEDITORGRAPHICALMODEWIDGET_H
 
-#include "editor/sieveeditorabstractwidget.h"
+#include "sieveeditorgraphicalmodewidgetabstract.h"
 #include "util/sieveimapaccountsettings.h"
 #include "ksieveui_private_export.h"
 class QSplitter;
@@ -31,19 +31,19 @@ namespace KSieveUi {
 class SieveScriptPage;
 class SieveScriptListBox;
 class SieveEditorParsingMissingFeatureWarning;
-class KSIEVEUI_TESTS_EXPORT SieveEditorGraphicalModeWidget : public \
SieveEditorAbstractWidget +class KSIEVEUI_TESTS_EXPORT SieveEditorGraphicalModeWidget \
: public SieveEditorGraphicalModeWidgetAbstract::SieveEditorGraphicalModeWidgetAbstract
  {
     Q_OBJECT
 public:
     explicit SieveEditorGraphicalModeWidget(QWidget *parent = nullptr);
     ~SieveEditorGraphicalModeWidget();
 
-    QString script(QString &requires) const;
+    QString script(QString &requires) const Q_DECL_OVERRIDE;
 
-    void setSieveCapabilities(const QStringList &capabilities);
-    QStringList sieveCapabilities();
+    void setSieveCapabilities(const QStringList &capabilities) Q_DECL_OVERRIDE;
+    QStringList sieveCapabilities() Q_DECL_OVERRIDE;
 
-    void loadScript(const QDomDocument &doc, QString &error);
+    void loadScript(const QDomDocument &doc, QString &error) Q_DECL_OVERRIDE;
 
     QString currentscript() Q_DECL_OVERRIDE;
     void setImportScript(const QString &) Q_DECL_OVERRIDE;
diff --git a/src/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidgetabstract.h \
b/src/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidgetabstract.h index \
                fffbe52..303e714 100644
--- a/src/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidgetabstract.h
+++ b/src/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidgetabstract.h
@@ -21,11 +21,11 @@
 #define SIEVEEDITORGRAPHICALMODEWIDGETABSTRACT_H
 
 #include <editor/sieveeditorabstractwidget.h>
-
+#include "ksieveui_private_export.h"
 class QDomDocument;
 namespace KSieveUi
 {
-class SieveEditorGraphicalModeWidgetAbstract : public \
KSieveUi::SieveEditorAbstractWidget +class KSIEVEUI_TESTS_EXPORT \
SieveEditorGraphicalModeWidgetAbstract : public KSieveUi::SieveEditorAbstractWidget  \
{  Q_OBJECT
 public:


[prev in list] [next in list] [prev in thread] [next in thread]