summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-11-04 11:59:28 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-11-11 13:11:33 +0100
commita842bc95e6660cf8a5b59d0c92a0d56b79fcdf95 (patch)
tree8180fef48912e00a5793d0a20fd5909aec43eed8 /examples
parent78d56d0630c78c391cc17b8ab552cf6079b3a15e (diff)
Qt Designer: Clean up the SDK headers
- Use "= default" for constructors/destructors - Disable copy/move for non-QObject type interfaces and add constructors were needed - Remove duplicated disable copy for QObject type interfaces - Fix some formatting - Remove default implementation of QDesignerContainerExtension::canAddWidget()/canRemoveWidget() - Remove Qt 6 fixme comments Task-number: QTBUG-79896 Change-Id: If9521910c6488c081817e2ccdbf42de578cb16ad Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/designer/containerextension/multipagewidgetcontainerextension.cpp11
-rw-r--r--examples/designer/containerextension/multipagewidgetcontainerextension.h2
-rw-r--r--examples/designer/doc/src/containerextension.qdoc2
3 files changed, 15 insertions, 0 deletions
diff --git a/examples/designer/containerextension/multipagewidgetcontainerextension.cpp b/examples/designer/containerextension/multipagewidgetcontainerextension.cpp
index ca9e79d78..2c8eff6bd 100644
--- a/examples/designer/containerextension/multipagewidgetcontainerextension.cpp
+++ b/examples/designer/containerextension/multipagewidgetcontainerextension.cpp
@@ -61,6 +61,11 @@ MultiPageWidgetContainerExtension::MultiPageWidgetContainerExtension(MultiPageWi
//! [0]
//! [1]
+bool MultiPageWidgetContainerExtension::canAddWidget() const
+{
+ return true;
+}
+
void MultiPageWidgetContainerExtension::addWidget(QWidget *widget)
{
myWidget->addPage(widget);
@@ -89,6 +94,12 @@ void MultiPageWidgetContainerExtension::insertWidget(int index, QWidget *widget)
//! [4]
//! [5]
+bool MultiPageWidgetContainerExtension::canRemove(int index) const
+{
+ Q_UNUSED(index);
+ return true;
+}
+
void MultiPageWidgetContainerExtension::remove(int index)
{
myWidget->removePage(index);
diff --git a/examples/designer/containerextension/multipagewidgetcontainerextension.h b/examples/designer/containerextension/multipagewidgetcontainerextension.h
index 7813aee9e..47814c692 100644
--- a/examples/designer/containerextension/multipagewidgetcontainerextension.h
+++ b/examples/designer/containerextension/multipagewidgetcontainerextension.h
@@ -68,10 +68,12 @@ class MultiPageWidgetContainerExtension: public QObject,
public:
explicit MultiPageWidgetContainerExtension(MultiPageWidget *widget, QObject *parent);
+ bool canAddWidget() const override;
void addWidget(QWidget *widget) override;
int count() const override;
int currentIndex() const override;
void insertWidget(int index, QWidget *widget) override;
+ bool canRemove(int index) const override;
void remove(int index) override;
void setCurrentIndex(int index) override;
QWidget *widget(int index) const override;
diff --git a/examples/designer/doc/src/containerextension.qdoc b/examples/designer/doc/src/containerextension.qdoc
index ce5d161ff..53d595729 100644
--- a/examples/designer/doc/src/containerextension.qdoc
+++ b/examples/designer/doc/src/containerextension.qdoc
@@ -429,6 +429,7 @@
\snippet containerextension/multipagewidgetcontainerextension.cpp 3
You must reimplement \l
+ {QDesignerContainerExtension::canAddWidget()}{canAddWidget()} and \l
{QDesignerContainerExtension::addWidget()}{addWidget()} adding a
given page to the container, \l
{QDesignerContainerExtension::count()}{count()} returning the
@@ -447,6 +448,7 @@
You must reimplement \l
{QDesignerContainerExtension::insertWidget()}{insertWidget()}
adding a given page to the container at a given index, \l
+ {QDesignerContainerExtension::canRemove()}{canRemove()} and \l
{QDesignerContainerExtension::remove()}{remove()} deleting the
page at a given index, \l
{QDesignerContainerExtension::setCurrentIndex()}{setCurrentIndex()}