aboutsummaryrefslogtreecommitdiffstats
path: root/sources/shiboken2/doc/ownership.rst
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-04-26 08:03:54 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-04-26 08:04:41 +0200
commit9b01aae7777c7ccde9eed1a8c55aead1524e00e5 (patch)
treec62834ca412f290485dd96d2a7522809b8fce6e1 /sources/shiboken2/doc/ownership.rst
parent2156651b39fbb6717ed936c94dcd28295436e0a4 (diff)
parent0b842db3a95a44fbda3379d2093cb52f8ae2a1ff (diff)
Merge remote-tracking branch 'origin/5.9' into 5.11
Diffstat (limited to 'sources/shiboken2/doc/ownership.rst')
-rw-r--r--sources/shiboken2/doc/ownership.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/sources/shiboken2/doc/ownership.rst b/sources/shiboken2/doc/ownership.rst
index 69791f855..f3744a537 100644
--- a/sources/shiboken2/doc/ownership.rst
+++ b/sources/shiboken2/doc/ownership.rst
@@ -35,7 +35,7 @@ Invalidating objects
====================
To prevent segfaults and double frees, the wrapper objects are invalidated.
-An invalidated can't be passed as argument or have an attributte or method accessed.
+An invalidated can't be passed as argument or have an attribute or method accessed.
Trying to do this will raise RuntimeError.
The following situations can invalidate an object:
@@ -48,7 +48,7 @@ C++ taking ownership
:ref:`virtual destructor <ownership-virt-method>` or the transfer is due to the special case
of :ref:`parent ownership <ownership-parent>`.
- Besides being passed as argument, the callee object can have its ownership changed, like
+ Besides being passed as argument, the called object can have its ownership changed, like
the `setParent` method in Qt's `QObject`.
Invalidate after use
@@ -69,7 +69,7 @@ Objects with virtual methods
any derived class in Python also override it.
If the class has a virtual destructor (and C++ classes with virtual methods should have), this
- C++ instance invalidates the wrapper only when the overriden destructor is called.
+ C++ instance invalidates the wrapper only when the overridden destructor is called.
One exception to this rule is when the object is created in C++, like in a
factory method. This way the wrapped object is a C++ instance of the native
@@ -128,7 +128,7 @@ Not saving unowned objects references
-------------------------------------
Sometimes when you pass an instance as argument to a method and the receiving
- instance will need that object to live indifinitely, but will not take ownership
+ instance will need that object to live indefinitely, but will not take ownership
of the argument instance. In this case, you should hold a reference to the argument
instance.