summaryrefslogtreecommitdiffstats
path: root/src/corelib/plugin
diff options
context:
space:
mode:
authorVenugopal Shivashankar <Venugopal.Shivashankar@qt.io>2019-03-28 16:06:16 +0100
committerChristian Ehrlicher <ch.ehrlicher@gmx.de>2019-04-02 08:14:07 +0000
commit05d9195669216038569aff7cf2901bd8e7a71ceb (patch)
treee345ef8013a03110ec85ace71777c1b9c8edb705 /src/corelib/plugin
parenta65800cc687a603f72385580332ad74e5e2ff565 (diff)
Doc: Use the \nullptr macro instead of 0
This enables overriding the macro so that it translates to 'None' in the Qt for Python context. Change-Id: Ib3cecf57eeb0405a1929309b71e9f012a07f11cf Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Diffstat (limited to 'src/corelib/plugin')
-rw-r--r--src/corelib/plugin/qlibrary.cpp8
-rw-r--r--src/corelib/plugin/qpluginloader.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
index aa63ed1a6b..29ef697fe8 100644
--- a/src/corelib/plugin/qlibrary.cpp
+++ b/src/corelib/plugin/qlibrary.cpp
@@ -999,7 +999,7 @@ void QLibrary::setFileNameAndVersion(const QString &fileName, const QString &ver
/*!
Returns the address of the exported symbol \a symbol. The library is
- loaded if necessary. The function returns 0 if the symbol could
+ loaded if necessary. The function returns \nullptr if the symbol could
not be resolved or if the library could not be loaded.
Example:
@@ -1032,7 +1032,7 @@ QFunctionPointer QLibrary::resolve(const char *symbol)
include the platform-specific file suffix; (see \l{fileName}). The
library remains loaded until the application exits.
- The function returns 0 if the symbol could not be resolved or if
+ The function returns \nullptr if the symbol could not be resolved or if
the library could not be loaded.
\sa resolve()
@@ -1052,7 +1052,7 @@ QFunctionPointer QLibrary::resolve(const QString &fileName, const char *symbol)
(see \l{fileName}). The library remains loaded until the application exits.
\a verNum is ignored on Windows.
- The function returns 0 if the symbol could not be resolved or if
+ The function returns \nullptr if the symbol could not be resolved or if
the library could not be loaded.
\sa resolve()
@@ -1073,7 +1073,7 @@ QFunctionPointer QLibrary::resolve(const QString &fileName, int verNum, const ch
(see \l{fileName}). The library remains loaded until the application exits.
\a version is ignored on Windows.
- The function returns 0 if the symbol could not be resolved or if
+ The function returns \nullptr if the symbol could not be resolved or if
the library could not be loaded.
\sa resolve()
diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
index 0f94bb6adf..00480198bd 100644
--- a/src/corelib/plugin/qpluginloader.cpp
+++ b/src/corelib/plugin/qpluginloader.cpp
@@ -174,7 +174,7 @@ QPluginLoader::~QPluginLoader()
/*!
Returns the root component object of the plugin. The plugin is
- loaded if necessary. The function returns 0 if the plugin could
+ loaded if necessary. The function returns \nullptr if the plugin could
not be loaded or if the root component object could not be
instantiated.