diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2015-11-19 11:57:32 +0100 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2015-11-19 11:57:32 +0100 |
| commit | 8f27f3b6308a351cd20c756a198eb7616c9ac9e6 (patch) | |
| tree | 9cff1157bf8eba129112fa3c0d53f69f3195f0da | |
| parent | 52940373276a2cbaae7c2e536e75aff5326b3a3e (diff) | |
| download | glibmm-8f27f3b6308a351cd20c756a198eb7616c9ac9e6.tar.gz | |
Use nullptr intead of 0 in some generated code.
| -rw-r--r-- | glib/src/signalproxy.h.m4 | 4 | ||||
| -rw-r--r-- | tools/pm/Output.pm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/glib/src/signalproxy.h.m4 b/glib/src/signalproxy.h.m4 index af02e7fc..8752624f 100644 --- a/glib/src/signalproxy.h.m4 +++ b/glib/src/signalproxy.h.m4 @@ -60,8 +60,8 @@ public: { const auto pConnectionNode = static_cast<SignalProxyConnectionNode*>(data); - // Return 0 if the connection is blocked. - return (!pConnectionNode->slot_.blocked()) ? &pConnectionNode->slot_ : 0; + // Return nullptr if the connection is blocked. + return (!pConnectionNode->slot_.blocked()) ? &pConnectionNode->slot_ : nullptr; } #endif /* DOXYGEN_SHOULD_SKIP_THIS */ diff --git a/tools/pm/Output.pm b/tools/pm/Output.pm index 587d06ba..71c2cebc 100644 --- a/tools/pm/Output.pm +++ b/tools/pm/Output.pm @@ -1208,7 +1208,7 @@ sub convert_args_cpp_to_c($$$$$) my $initialization = ""; if($cOutputParamType =~ /\*$/) { - $initialization = " = 0"; + $initialization = " = nullptr"; } else { |