diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:27:38 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:56 +0100 |
commit | 9690dcc42e996dd993fe8cacca5694ddc0d84feb (patch) | |
tree | ba051fbc46023d2a2f4768f4bddb526eed7cb0e5 /unodevtools/source/skeletonmaker | |
parent | 715cabb4d4bdaa5d764ee9461345a02b527b9f5a (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: Ic89c5fb56e1f11fa17f6014a8c9722592b144337
Diffstat (limited to 'unodevtools/source/skeletonmaker')
5 files changed, 12 insertions, 12 deletions
diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx index 488440e1b9a1..dc49eb8bb5bd 100644 --- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx +++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx @@ -584,7 +584,7 @@ void generateMemberInitialization(std::ostream& o, i != members.end(); ++i) { sal_Int32 rank; - if ((manager->decompose(i->type, true, 0, &rank, 0, 0) + if ((manager->decompose(i->type, true, nullptr, &rank, nullptr, nullptr) <= codemaker::UnoType::SORT_CHAR) && rank == 0) { @@ -993,7 +993,7 @@ void generateSkeleton(ProgramOptions const & options, OString compFileName; OString tmpFileName; - std::ostream* pofs = NULL; + std::ostream* pofs = nullptr; bool standardout = getOutputStream(options, ".cxx", &pofs, compFileName, tmpFileName); @@ -1154,7 +1154,7 @@ void generateCalcAddin(ProgramOptions const & options, OString compFileName; OString tmpFileName; - std::ostream* pofs = NULL; + std::ostream* pofs = nullptr; bool standardout = getOutputStream(options, ".cxx", &pofs, compFileName, tmpFileName); diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx index 02c356697764..4472f3f943f1 100644 --- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx +++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx @@ -747,7 +747,7 @@ void printMapsToCppType( rtl::Reference< unoidl::Entity > const & entity, const char * cppTypeSort) { o << "maps to C++ "; - if (cppTypeSort != 0) + if (cppTypeSort != nullptr) o << cppTypeSort << ' '; o << "type \""; @@ -768,7 +768,7 @@ void generateDocumentation(std::ostream & o, OUString nucleus; sal_Int32 rank; codemaker::UnoType::Sort sort = manager->decompose( - b2u(type), false, &nucleus, &rank, 0, 0); + b2u(type), false, &nucleus, &rank, nullptr, nullptr); bool comment = true; if (!delegate.isEmpty()) { @@ -862,7 +862,7 @@ void generateDocumentation(std::ostream & o, } else if (sort <= codemaker::UnoType::SORT_ANY) { if (comment) { printMapsToCppType( - o, options, manager, sort, nucleus, rank, arguments, entity, 0); + o, options, manager, sort, nucleus, rank, arguments, entity, nullptr); o << '\n'; } } else { diff --git a/unodevtools/source/skeletonmaker/javacompskeleton.cxx b/unodevtools/source/skeletonmaker/javacompskeleton.cxx index f51de585365b..cd978050e65f 100644 --- a/unodevtools/source/skeletonmaker/javacompskeleton.cxx +++ b/unodevtools/source/skeletonmaker/javacompskeleton.cxx @@ -888,7 +888,7 @@ void generateSkeleton(ProgramOptions const & options, OString compFileName; OString tmpFileName; - std::ostream* pofs = NULL; + std::ostream* pofs = nullptr; bool standardout = getOutputStream(options, ".java", &pofs, compFileName, tmpFileName); diff --git a/unodevtools/source/skeletonmaker/javatypemaker.cxx b/unodevtools/source/skeletonmaker/javatypemaker.cxx index 6a5aaab79a5e..20c1c8c47d2c 100644 --- a/unodevtools/source/skeletonmaker/javatypemaker.cxx +++ b/unodevtools/source/skeletonmaker/javatypemaker.cxx @@ -117,7 +117,7 @@ void printType( sal_Int32 rank; std::vector< OUString > arguments; codemaker::UnoType::Sort sort = manager->decompose( - name, true, &nucleus, &rank, &arguments, 0); + name, true, &nucleus, &rank, &arguments, nullptr); printType( o, options, manager, sort, nucleus, rank, arguments, referenceType, defaultvalue); @@ -662,7 +662,7 @@ void printMapsToJavaType( std::vector< OUString > const & arguments, const char * javaTypeSort) { o << "maps to Java 1.5 "; - if (javaTypeSort != 0) { + if (javaTypeSort != nullptr) { o << javaTypeSort << ' '; } o << "type \""; @@ -682,7 +682,7 @@ void generateDocumentation(std::ostream & o, OUString nucleus; sal_Int32 rank; codemaker::UnoType::Sort sort = manager->decompose( - b2u(type), false, &nucleus, &rank, 0, 0); + b2u(type), false, &nucleus, &rank, nullptr, nullptr); bool comment = true; if (!delegate.isEmpty()) { @@ -772,7 +772,7 @@ void generateDocumentation(std::ostream & o, o << '\n'; } else if (sort <= codemaker::UnoType::SORT_ANY) { printMapsToJavaType( - o, options, manager, sort, nucleus, rank, arguments, 0); + o, options, manager, sort, nucleus, rank, arguments, nullptr); o << '\n'; } else { switch (sort) { diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.cxx b/unodevtools/source/skeletonmaker/skeletoncommon.cxx index a4efa32dd943..65997afc976a 100644 --- a/unodevtools/source/skeletonmaker/skeletoncommon.cxx +++ b/unodevtools/source/skeletonmaker/skeletoncommon.cxx @@ -459,7 +459,7 @@ bool checkAddinType(rtl::Reference< TypeManager > const & manager, assert(manager.is()); sal_Int32 rank; codemaker::UnoType::Sort sort = manager->decompose( - type, true, 0, &rank, 0, 0); + type, true, nullptr, &rank, nullptr, nullptr); if ( sort == codemaker::UnoType::SORT_LONG || sort == codemaker::UnoType::SORT_DOUBLE || |