summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorChristian Ehrlicher <ch.ehrlicher@gmx.de>2018-10-27 21:41:16 +0200
committerLiang Qi <liang.qi@qt.io>2018-11-19 11:45:29 +0000
commitca3ac2e1c7548f2e66561fb0afe93494416ebf9c (patch)
treefa446ad054c6373e2a17ee81a69091199ff9c97c /src/corelib
parent8ad9bdf9578d2879d7484c61cf9a46a667f642a4 (diff)
Documentation: update Q_DISABLE_COPY documentation
Q_DISABLE_COPY annotates the functions as deleted but this was not mentioned in the documentation. As a drive-by adjust some indentations. Change-Id: I808fe3f1ce9f949d2ba41436661569ab0f2a9f73 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
index c73e782b76..7fdff974c1 100644
--- a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
@@ -595,8 +595,7 @@ namespace QT_NAMESPACE {
//! [43]
class MyClass : public QObject
{
-
- private:
+private:
Q_DISABLE_COPY(MyClass)
};
@@ -605,22 +604,21 @@ class MyClass : public QObject
//! [44]
class MyClass : public QObject
{
-
- private:
- MyClass(const MyClass &);
- MyClass &operator=(const MyClass &);
+private:
+ MyClass(const MyClass &) = delete;
+ MyClass &operator=(const MyClass &) = delete;
};
//! [44]
//! [45]
- QWidget w = QWidget();
+QWidget w = QWidget();
//! [45]
//! [46]
- // Instead of comparing with 0.0
- qFuzzyCompare(0.0,1.0e-200); // This will return false
- // Compare adding 1 to both values will fix the problem
- qFuzzyCompare(1 + 0.0, 1 + 1.0e-200); // This will return true
+// Instead of comparing with 0.0
+qFuzzyCompare(0.0, 1.0e-200); // This will return false
+// Compare adding 1 to both values will fix the problem
+qFuzzyCompare(1 + 0.0, 1 + 1.0e-200); // This will return true
//! [46]
//! [47]