diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2017-11-18 19:07:25 +0300 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2017-11-20 21:03:07 +0000 |
commit | 7494bf59c28570dcc6ed6019f979e5625956c8af (patch) | |
tree | 3fb1e7fab1d064ebda1e78ffb21b06bd83e5107f /src/plugins | |
parent | 95c1e81382246f5235322eeb6876f77f65b22c19 (diff) |
Use nullptr to initialize the pointers
Change-Id: I59d743f585410cb5c00d36a7b6f9a3e9d696d19e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins')
29 files changed, 52 insertions, 52 deletions
diff --git a/src/plugins/generator/visualstudio/msbuild/imsbuildgroup.h b/src/plugins/generator/visualstudio/msbuild/imsbuildgroup.h index b57011e13..848c855ef 100644 --- a/src/plugins/generator/visualstudio/msbuild/imsbuildgroup.h +++ b/src/plugins/generator/visualstudio/msbuild/imsbuildgroup.h @@ -44,7 +44,7 @@ class IMSBuildGroup : public QObject { Q_OBJECT public: - explicit IMSBuildGroup(MSBuildProject *parent = 0); + explicit IMSBuildGroup(MSBuildProject *parent = nullptr); virtual ~IMSBuildGroup(); QString condition() const; @@ -58,7 +58,7 @@ class IMSBuildItemGroup : public IMSBuildGroup { Q_OBJECT public: - explicit IMSBuildItemGroup(MSBuildProject *parent = 0); + explicit IMSBuildItemGroup(MSBuildProject *parent = nullptr); }; } // namespace qbs diff --git a/src/plugins/generator/visualstudio/msbuild/imsbuildproperty.h b/src/plugins/generator/visualstudio/msbuild/imsbuildproperty.h index a6032c729..2e9405dfa 100644 --- a/src/plugins/generator/visualstudio/msbuild/imsbuildproperty.h +++ b/src/plugins/generator/visualstudio/msbuild/imsbuildproperty.h @@ -44,7 +44,7 @@ class IMSBuildProperty : public QObject { Q_OBJECT protected: - explicit IMSBuildProperty(QObject *parent = 0); + explicit IMSBuildProperty(QObject *parent = nullptr); public: virtual ~IMSBuildProperty(); diff --git a/src/plugins/generator/visualstudio/msbuild/items/msbuildclcompile.h b/src/plugins/generator/visualstudio/msbuild/items/msbuildclcompile.h index 745c3ed7f..8c326a036 100644 --- a/src/plugins/generator/visualstudio/msbuild/items/msbuildclcompile.h +++ b/src/plugins/generator/visualstudio/msbuild/items/msbuildclcompile.h @@ -40,7 +40,7 @@ class MSBuildClCompile : public MSBuildFileItem Q_OBJECT Q_DISABLE_COPY(MSBuildClCompile) public: - explicit MSBuildClCompile(IMSBuildItemGroup *parent = 0); + explicit MSBuildClCompile(IMSBuildItemGroup *parent = nullptr); }; } // namespace qbs diff --git a/src/plugins/generator/visualstudio/msbuild/items/msbuildclinclude.h b/src/plugins/generator/visualstudio/msbuild/items/msbuildclinclude.h index cfe31022f..77d8e0ff2 100644 --- a/src/plugins/generator/visualstudio/msbuild/items/msbuildclinclude.h +++ b/src/plugins/generator/visualstudio/msbuild/items/msbuildclinclude.h @@ -40,7 +40,7 @@ class MSBuildClInclude : public MSBuildFileItem Q_OBJECT Q_DISABLE_COPY(MSBuildClInclude) public: - explicit MSBuildClInclude(IMSBuildItemGroup *parent = 0); + explicit MSBuildClInclude(IMSBuildItemGroup *parent = nullptr); }; } // namespace qbs diff --git a/src/plugins/generator/visualstudio/msbuild/items/msbuildfileitem.h b/src/plugins/generator/visualstudio/msbuild/items/msbuildfileitem.h index 820fc7f42..df1fc8201 100644 --- a/src/plugins/generator/visualstudio/msbuild/items/msbuildfileitem.h +++ b/src/plugins/generator/visualstudio/msbuild/items/msbuildfileitem.h @@ -49,7 +49,7 @@ public: void setFilterName(const QString &filterName); protected: - explicit MSBuildFileItem(const QString &name, IMSBuildItemGroup *parent = 0); + explicit MSBuildFileItem(const QString &name, IMSBuildItemGroup *parent = nullptr); private: std::unique_ptr<MSBuildFileItemPrivate> d; diff --git a/src/plugins/generator/visualstudio/msbuild/items/msbuildfilter.h b/src/plugins/generator/visualstudio/msbuild/items/msbuildfilter.h index a47b1a85c..59be8d5fe 100644 --- a/src/plugins/generator/visualstudio/msbuild/items/msbuildfilter.h +++ b/src/plugins/generator/visualstudio/msbuild/items/msbuildfilter.h @@ -42,9 +42,9 @@ class MSBuildFilter : public MSBuildItem { Q_OBJECT public: - explicit MSBuildFilter(IMSBuildItemGroup *parent = 0); + explicit MSBuildFilter(IMSBuildItemGroup *parent = nullptr); MSBuildFilter(const QString &name, const QList<QString> &extensions, - IMSBuildItemGroup *parent = 0); + IMSBuildItemGroup *parent = nullptr); ~MSBuildFilter(); QUuid identifier() const; diff --git a/src/plugins/generator/visualstudio/msbuild/items/msbuildlink.h b/src/plugins/generator/visualstudio/msbuild/items/msbuildlink.h index caf125440..3d7a3ab44 100644 --- a/src/plugins/generator/visualstudio/msbuild/items/msbuildlink.h +++ b/src/plugins/generator/visualstudio/msbuild/items/msbuildlink.h @@ -41,7 +41,7 @@ class MSBuildLink : public MSBuildItem { Q_OBJECT public: - explicit MSBuildLink(IMSBuildItemGroup *parent = 0); + explicit MSBuildLink(IMSBuildItemGroup *parent = nullptr); }; } // namespace qbs diff --git a/src/plugins/generator/visualstudio/msbuild/items/msbuildnone.h b/src/plugins/generator/visualstudio/msbuild/items/msbuildnone.h index 98dac7a76..3779da04f 100644 --- a/src/plugins/generator/visualstudio/msbuild/items/msbuildnone.h +++ b/src/plugins/generator/visualstudio/msbuild/items/msbuildnone.h @@ -40,7 +40,7 @@ class MSBuildNone : public MSBuildFileItem Q_OBJECT Q_DISABLE_COPY(MSBuildNone) public: - explicit MSBuildNone(IMSBuildItemGroup *parent = 0); + explicit MSBuildNone(IMSBuildItemGroup *parent = nullptr); }; } // namespace qbs diff --git a/src/plugins/generator/visualstudio/msbuild/msbuildimportgroup.h b/src/plugins/generator/visualstudio/msbuild/msbuildimportgroup.h index ec306886a..829f5dd08 100644 --- a/src/plugins/generator/visualstudio/msbuild/msbuildimportgroup.h +++ b/src/plugins/generator/visualstudio/msbuild/msbuildimportgroup.h @@ -49,7 +49,7 @@ class MSBuildImportGroup : public IMSBuildGroup, public IMSBuildNode Q_OBJECT Q_DISABLE_COPY(MSBuildImportGroup) public: - explicit MSBuildImportGroup(MSBuildProject *parent = 0); + explicit MSBuildImportGroup(MSBuildProject *parent = nullptr); virtual ~MSBuildImportGroup(); QString label() const; diff --git a/src/plugins/generator/visualstudio/msbuild/msbuilditem.h b/src/plugins/generator/visualstudio/msbuild/msbuilditem.h index ee4b53888..48c07f9e7 100644 --- a/src/plugins/generator/visualstudio/msbuild/msbuilditem.h +++ b/src/plugins/generator/visualstudio/msbuild/msbuilditem.h @@ -52,7 +52,7 @@ class MSBuildItem : public QObject, public IMSBuildNode { Q_OBJECT public: - explicit MSBuildItem(const QString &name, IMSBuildItemGroup *parent = 0); + explicit MSBuildItem(const QString &name, IMSBuildItemGroup *parent = nullptr); virtual ~MSBuildItem(); QString name() const; diff --git a/src/plugins/generator/visualstudio/msbuild/msbuilditemdefinitiongroup.h b/src/plugins/generator/visualstudio/msbuild/msbuilditemdefinitiongroup.h index a96f0fff8..4fb95c4c6 100644 --- a/src/plugins/generator/visualstudio/msbuild/msbuilditemdefinitiongroup.h +++ b/src/plugins/generator/visualstudio/msbuild/msbuilditemdefinitiongroup.h @@ -48,7 +48,7 @@ class MSBuildItemDefinitionGroup : public IMSBuildItemGroup, public IMSBuildNode { Q_OBJECT public: - explicit MSBuildItemDefinitionGroup(MSBuildProject *parent = 0); + explicit MSBuildItemDefinitionGroup(MSBuildProject *parent = nullptr); ~MSBuildItemDefinitionGroup(); void accept(IMSBuildNodeVisitor *visitor) const; diff --git a/src/plugins/generator/visualstudio/msbuild/msbuilditemgroup.h b/src/plugins/generator/visualstudio/msbuild/msbuilditemgroup.h index 74ce4168c..a77e55e57 100644 --- a/src/plugins/generator/visualstudio/msbuild/msbuilditemgroup.h +++ b/src/plugins/generator/visualstudio/msbuild/msbuilditemgroup.h @@ -51,7 +51,7 @@ class MSBuildItemGroup : public IMSBuildItemGroup, public IMSBuildNode Q_OBJECT Q_DISABLE_COPY(MSBuildItemGroup) public: - explicit MSBuildItemGroup(MSBuildProject *parent = 0); + explicit MSBuildItemGroup(MSBuildProject *parent = nullptr); ~MSBuildItemGroup(); QString label() const; diff --git a/src/plugins/generator/visualstudio/msbuild/msbuilditemmetadata.h b/src/plugins/generator/visualstudio/msbuild/msbuilditemmetadata.h index 7a42f1736..f1768b286 100644 --- a/src/plugins/generator/visualstudio/msbuild/msbuilditemmetadata.h +++ b/src/plugins/generator/visualstudio/msbuild/msbuilditemmetadata.h @@ -48,9 +48,9 @@ class MSBuildItemMetadata : public IMSBuildProperty, public IMSBuildNode Q_OBJECT Q_DISABLE_COPY(MSBuildItemMetadata) public: - explicit MSBuildItemMetadata(MSBuildItem *parent = 0); + explicit MSBuildItemMetadata(MSBuildItem *parent = nullptr); MSBuildItemMetadata(const QString &name, const QVariant &value = QVariant(), - MSBuildItem *parent = 0); + MSBuildItem *parent = nullptr); void accept(IMSBuildNodeVisitor *visitor) const; }; diff --git a/src/plugins/generator/visualstudio/msbuild/msbuildproject.h b/src/plugins/generator/visualstudio/msbuild/msbuildproject.h index 00e28bcf8..820c0ecbd 100644 --- a/src/plugins/generator/visualstudio/msbuild/msbuildproject.h +++ b/src/plugins/generator/visualstudio/msbuild/msbuildproject.h @@ -50,7 +50,7 @@ class MSBuildProject : public QObject, public IMSBuildNode Q_OBJECT Q_DISABLE_COPY(MSBuildProject) public: - explicit MSBuildProject(QObject *parent = 0); + explicit MSBuildProject(QObject *parent = nullptr); ~MSBuildProject(); QString defaultTargets() const; diff --git a/src/plugins/generator/visualstudio/msbuild/msbuildproperty.h b/src/plugins/generator/visualstudio/msbuild/msbuildproperty.h index 310fcc044..f1382406c 100644 --- a/src/plugins/generator/visualstudio/msbuild/msbuildproperty.h +++ b/src/plugins/generator/visualstudio/msbuild/msbuildproperty.h @@ -47,9 +47,9 @@ class MSBuildProperty : public IMSBuildProperty, public IMSBuildNode { Q_OBJECT public: - explicit MSBuildProperty(MSBuildPropertyGroup *parent = 0); + explicit MSBuildProperty(MSBuildPropertyGroup *parent = nullptr); MSBuildProperty(const QString &name, const QVariant &value = QVariant(), - MSBuildPropertyGroup *parent = 0); + MSBuildPropertyGroup *parent = nullptr); void accept(IMSBuildNodeVisitor *visitor) const; }; diff --git a/src/plugins/generator/visualstudio/msbuild/msbuildpropertygroup.h b/src/plugins/generator/visualstudio/msbuild/msbuildpropertygroup.h index 6617a4a59..c3289457c 100644 --- a/src/plugins/generator/visualstudio/msbuild/msbuildpropertygroup.h +++ b/src/plugins/generator/visualstudio/msbuild/msbuildpropertygroup.h @@ -49,7 +49,7 @@ class MSBuildPropertyGroup : public IMSBuildGroup, public IMSBuildNode Q_OBJECT Q_DISABLE_COPY(MSBuildPropertyGroup) public: - explicit MSBuildPropertyGroup(MSBuildProject *parent = 0); + explicit MSBuildPropertyGroup(MSBuildProject *parent = nullptr); ~MSBuildPropertyGroup(); QString label() const; diff --git a/src/plugins/generator/visualstudio/msbuildfiltersproject.cpp b/src/plugins/generator/visualstudio/msbuildfiltersproject.cpp index 45a09236a..0897c929e 100644 --- a/src/plugins/generator/visualstudio/msbuildfiltersproject.cpp +++ b/src/plugins/generator/visualstudio/msbuildfiltersproject.cpp @@ -73,7 +73,7 @@ static QStringList headerFileExtensions() << QStringLiteral("h++"); } -static std::vector<MSBuildFilter *> defaultItemGroupFilters(IMSBuildItemGroup *parent = 0) +static std::vector<MSBuildFilter *> defaultItemGroupFilters(IMSBuildItemGroup *parent = nullptr) { const auto sourceFilter = new MSBuildFilter(QStringLiteral("Source Files"), sourceFileExtensions(), parent); const auto headerFilter = new MSBuildFilter(QStringLiteral("Header Files"), headerFileExtensions(), parent); diff --git a/src/plugins/generator/visualstudio/msbuildfiltersproject.h b/src/plugins/generator/visualstudio/msbuildfiltersproject.h index 521a6e610..5d67bfaa8 100644 --- a/src/plugins/generator/visualstudio/msbuildfiltersproject.h +++ b/src/plugins/generator/visualstudio/msbuildfiltersproject.h @@ -46,7 +46,7 @@ class MSBuildFiltersProject : public MSBuildProject Q_DISABLE_COPY(MSBuildFiltersProject) public: explicit MSBuildFiltersProject(const GeneratableProductData &product, - QObject *parent = 0); + QObject *parent = nullptr); }; } // namespace qbs diff --git a/src/plugins/generator/visualstudio/msbuildqbsgenerateproject.h b/src/plugins/generator/visualstudio/msbuildqbsgenerateproject.h index 433bd31a1..8c5ef80c4 100644 --- a/src/plugins/generator/visualstudio/msbuildqbsgenerateproject.h +++ b/src/plugins/generator/visualstudio/msbuildqbsgenerateproject.h @@ -45,7 +45,7 @@ class MSBuildQbsGenerateProject : public MSBuildTargetProject public: MSBuildQbsGenerateProject(const GeneratableProject &project, const Internal::VisualStudioVersionInfo &versionInfo, - VisualStudioGenerator *parent = 0); + VisualStudioGenerator *parent = nullptr); }; } // namespace qbs diff --git a/src/plugins/generator/visualstudio/msbuildqbsproductproject.cpp b/src/plugins/generator/visualstudio/msbuildqbsproductproject.cpp index fc9187ae2..91dc77d77 100644 --- a/src/plugins/generator/visualstudio/msbuildqbsproductproject.cpp +++ b/src/plugins/generator/visualstudio/msbuildqbsproductproject.cpp @@ -337,7 +337,7 @@ void MSBuildQbsProductProject::addItemDefGroup(const Project &project, } static MSBuildFileItem *fileItemForFileTags(const QList<QString> &fileTags, - IMSBuildItemGroup *parent = 0) + IMSBuildItemGroup *parent = nullptr) { const auto fileTagsSet = Internal::Set<QString>::fromList(fileTags); if (fileTagsSet.intersects( diff --git a/src/plugins/generator/visualstudio/msbuildqbsproductproject.h b/src/plugins/generator/visualstudio/msbuildqbsproductproject.h index 7fb9e2a39..4d386508f 100644 --- a/src/plugins/generator/visualstudio/msbuildqbsproductproject.h +++ b/src/plugins/generator/visualstudio/msbuildqbsproductproject.h @@ -53,7 +53,7 @@ public: MSBuildQbsProductProject(const GeneratableProject &project, const GeneratableProductData &product, const Internal::VisualStudioVersionInfo &versionInfo, - VisualStudioGenerator *parent = 0); + VisualStudioGenerator *parent = nullptr); private: typedef QHash<QString, Internal::Set<Project>> ProjectConfigurations; diff --git a/src/plugins/generator/visualstudio/msbuildtargetproject.h b/src/plugins/generator/visualstudio/msbuildtargetproject.h index bf7e9f65f..647f0dc91 100644 --- a/src/plugins/generator/visualstudio/msbuildtargetproject.h +++ b/src/plugins/generator/visualstudio/msbuildtargetproject.h @@ -50,7 +50,7 @@ class MSBuildTargetProject : public MSBuildProject protected: MSBuildTargetProject(const GeneratableProject &project, const Internal::VisualStudioVersionInfo &versionInfo, - VisualStudioGenerator *parent = 0); + VisualStudioGenerator *parent = nullptr); public: ~MSBuildTargetProject(); diff --git a/src/plugins/generator/visualstudio/solution/ivisualstudiosolutionproject.h b/src/plugins/generator/visualstudio/solution/ivisualstudiosolutionproject.h index fecb3f244..b53f39ee1 100644 --- a/src/plugins/generator/visualstudio/solution/ivisualstudiosolutionproject.h +++ b/src/plugins/generator/visualstudio/solution/ivisualstudiosolutionproject.h @@ -45,7 +45,7 @@ class IVisualStudioSolutionProject : public QObject { Q_OBJECT protected: - explicit IVisualStudioSolutionProject(QObject *parent = 0); + explicit IVisualStudioSolutionProject(QObject *parent = nullptr); public: virtual ~IVisualStudioSolutionProject(); diff --git a/src/plugins/generator/visualstudio/solution/visualstudiosolution.h b/src/plugins/generator/visualstudio/solution/visualstudiosolution.h index 072bdd8f1..67fcbbe01 100644 --- a/src/plugins/generator/visualstudio/solution/visualstudiosolution.h +++ b/src/plugins/generator/visualstudio/solution/visualstudiosolution.h @@ -54,7 +54,7 @@ class VisualStudioSolution : public QObject Q_DISABLE_COPY(VisualStudioSolution) public: explicit VisualStudioSolution(const Internal::VisualStudioVersionInfo &versionInfo, - QObject *parent = 0); + QObject *parent = nullptr); ~VisualStudioSolution(); Internal::VisualStudioVersionInfo versionInfo() const; diff --git a/src/plugins/generator/visualstudio/solution/visualstudiosolutionfileproject.h b/src/plugins/generator/visualstudio/solution/visualstudiosolutionfileproject.h index 7d2677e97..22848b8fb 100644 --- a/src/plugins/generator/visualstudio/solution/visualstudiosolutionfileproject.h +++ b/src/plugins/generator/visualstudio/solution/visualstudiosolutionfileproject.h @@ -44,7 +44,7 @@ class VisualStudioSolutionFileProject : public IVisualStudioSolutionProject { Q_OBJECT public: - explicit VisualStudioSolutionFileProject(const QString &filePath, QObject *parent = 0); + explicit VisualStudioSolutionFileProject(const QString &filePath, QObject *parent = nullptr); ~VisualStudioSolutionFileProject(); QString name() const override; diff --git a/src/plugins/generator/visualstudio/solution/visualstudiosolutionglobalsection.h b/src/plugins/generator/visualstudio/solution/visualstudiosolutionglobalsection.h index 6bcaa517e..3cc8a8702 100644 --- a/src/plugins/generator/visualstudio/solution/visualstudiosolutionglobalsection.h +++ b/src/plugins/generator/visualstudio/solution/visualstudiosolutionglobalsection.h @@ -44,7 +44,7 @@ class VisualStudioSolutionGlobalSection : public QObject Q_OBJECT Q_DISABLE_COPY(VisualStudioSolutionGlobalSection) public: - explicit VisualStudioSolutionGlobalSection(const QString &name, QObject *parent = 0); + explicit VisualStudioSolutionGlobalSection(const QString &name, QObject *parent = nullptr); ~VisualStudioSolutionGlobalSection(); QString name() const; diff --git a/src/plugins/scanner/cpp/Token.cpp b/src/plugins/scanner/cpp/Token.cpp index ee125652c..f8b017fdb 100644 --- a/src/plugins/scanner/cpp/Token.cpp +++ b/src/plugins/scanner/cpp/Token.cpp @@ -114,7 +114,7 @@ static const char *token_names[] = { }; Token::Token() : - flags(0), offset(0), ptr(0) + flags(0), offset(0), ptr(nullptr) { } @@ -126,7 +126,7 @@ void Token::reset() { flags = 0; offset = 0; - ptr = 0; + ptr = nullptr; } const char *Token::name(int kind) diff --git a/src/plugins/scanner/cpp/cppscanner.cpp b/src/plugins/scanner/cpp/cppscanner.cpp index 9e7b3c690..84bda61b6 100644 --- a/src/plugins/scanner/cpp/cppscanner.cpp +++ b/src/plugins/scanner/cpp/cppscanner.cpp @@ -83,7 +83,7 @@ struct Opaq fd(0), mapl(0), #endif - fileContent(0), + fileContent(nullptr), fileType(FT_UNKNOWN), hasQObjectMacro(false), hasPluginMetaDataMacro(false), @@ -223,29 +223,29 @@ static void *openScanner(const unsigned short *filePath, const char *fileTags, i opaque->fd = open(qPrintable(filePathS), O_RDONLY); if (opaque->fd == -1) { opaque->fd = 0; - return 0; + return nullptr; } struct stat s; int r = fstat(opaque->fd, &s); if (r != 0) - return 0; + return nullptr; mapl = s.st_size; opaque->mapl = mapl; void *vmap = mmap(0, s.st_size, PROT_READ, MAP_PRIVATE, opaque->fd, 0); if (vmap == MAP_FAILED) - return 0; + return nullptr; #else opaque->file.setFileName(opaque->fileName); if (!opaque->file.open(QFile::ReadOnly)) - return 0; + return nullptr; uchar *vmap = opaque->file.map(0, opaque->file.size()); mapl = opaque->file.size(); #endif if (!vmap) - return 0; + return nullptr; opaque->fileContent = reinterpret_cast<char *>(vmap); CPlusPlus::Lexer lex(opaque->fileContent, opaque->fileContent + mapl); @@ -271,7 +271,7 @@ static const char *next(void *opaq, int *size, int *flags) } *size = 0; *flags = 0; - return 0; + return nullptr; } static const char **additionalFileTags(void *opaq, int *size) @@ -295,7 +295,7 @@ static const char **additionalFileTags(void *opaq, int *size) } } *size = 0; - return 0; + return nullptr; } ScannerPlugin includeScanner = diff --git a/src/plugins/scanner/qt/qtscanner.cpp b/src/plugins/scanner/qt/qtscanner.cpp index 04de23fe6..10947e61c 100644 --- a/src/plugins/scanner/qt/qtscanner.cpp +++ b/src/plugins/scanner/qt/qtscanner.cpp @@ -81,10 +81,10 @@ struct OpaqQrc #ifdef Q_OS_UNIX : fd (0), #else - : file(0), + : file(nullptr), #endif - map(0), - xml(0) + map(nullptr), + xml(nullptr) {} ~OpaqQrc() @@ -112,26 +112,26 @@ static void *openScannerQrc(const unsigned short *filePath, const char *fileTags opaque->fd = open(qPrintable(filePathS), O_RDONLY); if (opaque->fd == -1) { opaque->fd = 0; - return 0; + return nullptr; } struct stat s; int r = fstat(opaque->fd, &s); if (r != 0) - return 0; + return nullptr; opaque->mapl = s.st_size; void *map = mmap(0, s.st_size, PROT_READ, MAP_PRIVATE, opaque->fd, 0); - if (map == 0) - return 0; + if (map == nullptr) + return nullptr; #else opaque->file = new QFile(QString::fromUtf16(filePath)); if (!opaque->file->open(QFile::ReadOnly)) - return 0; + return nullptr; uchar *map = opaque->file->map(0, opaque->file->size()); if (!map) - return 0; + return nullptr; #endif opaque->map = reinterpret_cast<char *>(map); @@ -161,18 +161,18 @@ static const char *nextQrc(void *opaq, int *size, int *flags) } break; case QXmlStreamReader::EndDocument: - return 0; + return nullptr; default: break; } } - return 0; + return nullptr; } static const char **additionalFileTagsQrc(void *, int *size) { *size = 0; - return 0; + return nullptr; } ScannerPlugin qrcScanner = |