diff options
Diffstat (limited to 'qmake/generators')
-rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 4 | ||||
-rw-r--r-- | qmake/generators/makefile.cpp | 12 | ||||
-rw-r--r-- | qmake/generators/makefile.h | 2 | ||||
-rw-r--r-- | qmake/generators/makefiledeps.cpp | 28 | ||||
-rw-r--r-- | qmake/generators/metamakefile.cpp | 12 | ||||
-rw-r--r-- | qmake/generators/metamakefile.h | 2 | ||||
-rw-r--r-- | qmake/generators/projectgenerator.cpp | 2 | ||||
-rw-r--r-- | qmake/generators/unix/unixmake.cpp | 2 | ||||
-rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 2 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 4 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 2 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 4 | ||||
-rw-r--r-- | qmake/generators/win32/registry.cpp | 6 | ||||
-rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 6 |
14 files changed, 44 insertions, 44 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 13d707a881..72daa97fe4 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -829,7 +829,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) if(!project->isActiveConfig("staticlib")) { //DUMP LIBRARIES ProStringList &libdirs = project->values("QMAKE_PBX_LIBPATHS"), &frameworkdirs = project->values("QMAKE_FRAMEWORKPATH"); - static const char * const libs[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 }; + static const char * const libs[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr }; for (int i = 0; libs[i]; i++) { tmp = project->values(libs[i]); for(int x = 0; x < tmp.count();) { @@ -1422,7 +1422,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) testHost.append("Contents/MacOS/"); testHost.append(targetName); - static const char * const configs[] = { "Debug", "Release", 0 }; + static const char * const configs[] = { "Debug", "Release", nullptr }; for (int i = 0; configs[i]; i++) { QString testBundleBuildConfig = keyFor(pbx_dir + "QMAKE_PBX_TEST_BUNDLE_BUILDCONFIG_" + configs[i]); t << "\t\t" << testBundleBuildConfig << " = {\n" diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index fd8c0a965c..cae179cc93 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -96,7 +96,7 @@ bool MakefileGenerator::mkdir(const QString &in_path) const // ** base makefile generator MakefileGenerator::MakefileGenerator() : - no_io(false), project(0) + no_io(false), project(nullptr) { } @@ -164,7 +164,7 @@ MakefileGenerator::initOutPaths() v["PRECOMPILED_DIR"] = v["OBJECTS_DIR"]; static const char * const dirs[] = { "OBJECTS_DIR", "DESTDIR", "SUBLIBS_DIR", "DLLDESTDIR", - "PRECOMPILED_DIR", 0 }; + "PRECOMPILED_DIR", nullptr }; for (int x = 0; dirs[x]; x++) { const ProKey dkey(dirs[x]); if (v[dkey].isEmpty()) @@ -424,7 +424,7 @@ MakefileGenerator::init() } incs.append(project->specDir()); - const char * const cacheKeys[] = { "_QMAKE_STASH_", "_QMAKE_SUPER_CACHE_", 0 }; + const char * const cacheKeys[] = { "_QMAKE_STASH_", "_QMAKE_SUPER_CACHE_", nullptr }; for (int i = 0; cacheKeys[i]; ++i) { if (v[cacheKeys[i]].isEmpty()) continue; @@ -614,7 +614,7 @@ MakefileGenerator::init() //build up a list of compilers QVector<Compiler> compilers; { - const char *builtins[] = { "OBJECTS", "SOURCES", "PRECOMPILED_HEADER", 0 }; + const char *builtins[] = { "OBJECTS", "SOURCES", "PRECOMPILED_HEADER", nullptr }; for(x = 0; builtins[x]; ++x) { Compiler compiler; compiler.variable_in = builtins[x]; @@ -829,7 +829,7 @@ MakefileGenerator::init() } //fix up the target deps - static const char * const fixpaths[] = { "PRE_TARGETDEPS", "POST_TARGETDEPS", 0 }; + static const char * const fixpaths[] = { "PRE_TARGETDEPS", "POST_TARGETDEPS", nullptr }; for (int path = 0; fixpaths[path]; path++) { ProStringList &l = v[fixpaths[path]]; for (ProStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) { @@ -2790,7 +2790,7 @@ MakefileGenerator::writeMakeQmake(QTextStream &t, bool noDummyQmakeAll) QFileInfo MakefileGenerator::fileInfo(QString file) const { - static QHash<FileInfoCacheKey, QFileInfo> *cache = 0; + static QHash<FileInfoCacheKey, QFileInfo> *cache = nullptr; static QFileInfo noInfo = QFileInfo(); if(!cache) { cache = new QHash<FileInfoCacheKey, QFileInfo>; diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index 2a3edb43eb..b5c150e1cb 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -172,7 +172,7 @@ protected: { int ret; canExecute(cmdline, &ret); return ret; } bool canExecute(const QStringList &cmdline, int *argv0) const; inline bool canExecute(const QString &cmdline) const - { return canExecute(cmdline.split(' '), 0); } + { return canExecute(cmdline.split(' '), nullptr); } bool mkdir(const QString &dir) const; QString mkdir_p_asstring(const QString &dir, bool escape=true) const; diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp index ffccdefbe1..decc1d980c 100644 --- a/qmake/generators/makefiledeps.cpp +++ b/qmake/generators/makefiledeps.cpp @@ -81,7 +81,7 @@ const QString struct SourceDependChildren; struct SourceFile { - SourceFile() : deps(0), type(QMakeSourceFileInfo::TYPE_UNKNOWN), + SourceFile() : deps(nullptr), type(QMakeSourceFileInfo::TYPE_UNKNOWN), mocable(0), traversed(0), exists(1), moc_checked(0), dep_checked(0), included_count(0) { } ~SourceFile(); @@ -95,8 +95,8 @@ struct SourceFile { struct SourceDependChildren { SourceFile **children; int num_nodes, used_nodes; - SourceDependChildren() : children(0), num_nodes(0), used_nodes(0) { } - ~SourceDependChildren() { if(children) free(children); children = 0; } + SourceDependChildren() : children(nullptr), num_nodes(0), used_nodes(0) { } + ~SourceDependChildren() { if (children) free(children); children = nullptr; } void addChild(SourceFile *s) { if(num_nodes <= used_nodes) { num_nodes += 200; @@ -115,10 +115,10 @@ public: SourceFile *lookupFile(const char *); inline SourceFile *lookupFile(const QString &f) { return lookupFile(f.toLatin1().constData()); } inline SourceFile *lookupFile(const QMakeLocalFileName &f) { return lookupFile(f.local().toLatin1().constData()); } - void addFile(SourceFile *, const char *k=0, bool own=true); + void addFile(SourceFile *, const char *k = nullptr, bool own = true); struct SourceFileNode { - SourceFileNode() : key(0), next(0), file(0), own_file(1) { } + SourceFileNode() : key(nullptr), next(nullptr), file(nullptr), own_file(1) { } ~SourceFileNode() { delete [] key; if(own_file) @@ -135,7 +135,7 @@ SourceFiles::SourceFiles() { nodes = (SourceFileNode**)malloc(sizeof(SourceFileNode*)*(num_nodes=3037)); for(int n = 0; n < num_nodes; n++) - nodes[n] = 0; + nodes[n] = nullptr; } SourceFiles::~SourceFiles() @@ -170,7 +170,7 @@ SourceFile *SourceFiles::lookupFile(const char *file) if(!strcmp(p->key, file)) return p->file; } - return 0; + return nullptr; } void SourceFiles::addFile(SourceFile *p, const char *k, bool own_file) @@ -259,11 +259,11 @@ QMakeSourceFileInfo::QMakeSourceFileInfo(const QString &cf) dep_mode = Recursive; //quick project lookups - includes = files = 0; + includes = files = nullptr; files_changed = false; //buffer - spare_buffer = 0; + spare_buffer = nullptr; spare_buffer_size = 0; //cache @@ -281,7 +281,7 @@ QMakeSourceFileInfo::~QMakeSourceFileInfo() //buffer if(spare_buffer) { free(spare_buffer); - spare_buffer = 0; + spare_buffer = nullptr; spare_buffer_size = 0; } @@ -538,7 +538,7 @@ bool QMakeSourceFileInfo::findDeps(SourceFile *file) const QMakeLocalFileName sourceFile = fixPathForFile(file->file, true); struct stat fst; - char *buffer = 0; + char *buffer = nullptr; int buffer_len = 0; { int fd; @@ -588,7 +588,7 @@ bool QMakeSourceFileInfo::findDeps(SourceFile *file) } for (; x < buffer_len; ++x) { bool try_local = true; - char *inc = 0; + char *inc = nullptr; if(file->type == QMakeSourceFileInfo::TYPE_UI) { // skip whitespaces while (x < buffer_len && (buffer[x] == ' ' || buffer[x] == '\t')) @@ -802,7 +802,7 @@ bool QMakeSourceFileInfo::findDeps(SourceFile *file) if (cpp_state == WantName) buffer[clean] = '\0'; else // i.e. malformed - inc = 0; + inc = nullptr; cpp_state = InCode; // hereafter break; @@ -915,7 +915,7 @@ bool QMakeSourceFileInfo::findMocs(SourceFile *file) file->moc_checked = true; int buffer_len = 0; - char *buffer = 0; + char *buffer = nullptr; { struct stat fst; int fd; diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp index 6473934fe3..8ebd0c61ce 100644 --- a/qmake/generators/metamakefile.cpp +++ b/qmake/generators/metamakefile.cpp @@ -138,7 +138,7 @@ BuildsMetaMakefileGenerator::init() bool BuildsMetaMakefileGenerator::write() { - Build *glue = 0; + Build *glue = nullptr; if(!makefiles.isEmpty() && !makefiles.first()->build.isNull()) { glue = new Build; glue->name = name; @@ -228,7 +228,7 @@ MakefileGenerator if (build_proj->read(project->projectFile())) return createMakefileGenerator(build_proj); } - return 0; + return nullptr; } class SubdirsMetaMakefileGenerator : public MetaMakefileGenerator @@ -236,7 +236,7 @@ class SubdirsMetaMakefileGenerator : public MetaMakefileGenerator protected: bool init_flag; struct Subdir { - Subdir() : makefile(0), indent(0) { } + Subdir() : makefile(nullptr), indent(0) { } ~Subdir() { delete makefile; } QString input_dir; QString output_dir, output_file; @@ -336,7 +336,7 @@ SubdirsMetaMakefileGenerator::init() hasError |= !sub->makefile->write(); delete sub; qmakeClearCaches(); - sub = 0; + sub = nullptr; Option::output.setFileName(output_name); } Option::output_dir = old_output_dir; @@ -412,7 +412,7 @@ MetaMakefileGenerator::createMakefileGenerator(QMakeProject *proj, bool noIO) { Option::postProcessProject(proj); - MakefileGenerator *mkfile = NULL; + MakefileGenerator *mkfile = nullptr; if(Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT) { mkfile = new ProjectGenerator; mkfile->setProjectFile(proj); @@ -459,7 +459,7 @@ MetaMakefileGenerator::createMetaGenerator(QMakeProject *proj, const QString &na { Option::postProcessProject(proj); - MetaMakefileGenerator *ret = 0; + MetaMakefileGenerator *ret = nullptr; if ((Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE || Option::qmake_mode == Option::QMAKE_GENERATE_PRL)) { if (proj->first("TEMPLATE").endsWith("subdirs")) diff --git a/qmake/generators/metamakefile.h b/qmake/generators/metamakefile.h index 706bca3363..9337130143 100644 --- a/qmake/generators/metamakefile.h +++ b/qmake/generators/metamakefile.h @@ -49,7 +49,7 @@ public: virtual ~MetaMakefileGenerator(); - static MetaMakefileGenerator *createMetaGenerator(QMakeProject *proj, const QString &name, bool op=true, bool *success = 0); + static MetaMakefileGenerator *createMetaGenerator(QMakeProject *proj, const QString &name, bool op=true, bool *success = nullptr); static MakefileGenerator *createMakefileGenerator(QMakeProject *proj, bool noIO = false); inline QMakeProject *projectFile() const { return project; } diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp index 27b7e9dfdc..f45a90b851 100644 --- a/qmake/generators/projectgenerator.cpp +++ b/qmake/generators/projectgenerator.cpp @@ -229,7 +229,7 @@ ProjectGenerator::init() ProStringList &h = v["HEADERS"]; bool no_qt_files = true; - static const char *srcs[] = { "SOURCES", "YACCSOURCES", "LEXSOURCES", "FORMS", 0 }; + static const char *srcs[] = { "SOURCES", "YACCSOURCES", "LEXSOURCES", "FORMS", nullptr }; for (int i = 0; srcs[i]; i++) { const ProStringList &l = v[srcs[i]]; QMakeSourceFileInfo::SourceFileType type = QMakeSourceFileInfo::TYPE_C; diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 52d34ef513..4fe1a54501 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -420,7 +420,7 @@ UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) libdirs.append(QMakeLocalFileName(dlib.toQString())); frameworkdirs.append(QMakeLocalFileName("/System/Library/Frameworks")); frameworkdirs.append(QMakeLocalFileName("/Library/Frameworks")); - static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 }; + static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr }; for (int i = 0; lflags[i]; i++) { ProStringList &l = project->values(lflags[i]); for (ProStringList::Iterator it = l.begin(); it != l.end(); ) { diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index bda44eaa67..2ed1866584 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -346,7 +346,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) t << mkdir_p_asstring("$(@D)", false) << "\n\t" << "@$(CC) " << cmd << " $< | sed \"s,^\\($(*F).o\\):," << odir << "\\1:,g\" >$@\n\n"; - static const char * const src[] = { "SOURCES", "GENERATED_SOURCES", 0 }; + static const char * const src[] = { "SOURCES", "GENERATED_SOURCES", nullptr }; for (int x = 0; src[x]; x++) { const ProStringList &l = project->values(src[x]); for (ProStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index a1e3c08a7e..fa7ee1b98a 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -499,7 +499,7 @@ void NmakeMakefileGenerator::writeImplicitRulesPart(QTextStream &t) QSet<QString> source_directories; if (useInferenceRules) { source_directories.insert("."); - static const char * const directories[] = { "UI_SOURCES_DIR", "UI_DIR", 0 }; + static const char * const directories[] = { "UI_SOURCES_DIR", "UI_DIR", nullptr }; for (int y = 0; directories[y]; y++) { QString dirTemp = project->first(directories[y]).toQString(); if (dirTemp.endsWith("\\")) @@ -507,7 +507,7 @@ void NmakeMakefileGenerator::writeImplicitRulesPart(QTextStream &t) if(!dirTemp.isEmpty()) source_directories.insert(dirTemp); } - static const char * const srcs[] = { "SOURCES", "GENERATED_SOURCES", 0 }; + static const char * const srcs[] = { "SOURCES", "GENERATED_SOURCES", nullptr }; for (int x = 0; srcs[x]; x++) { const ProStringList &l = project->values(srcs[x]); for (ProStringList::ConstIterator sit = l.begin(); sit != l.end(); ++sit) { diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 300792c5af..0406da584b 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -2185,7 +2185,7 @@ VCConfiguration::VCConfiguration() // VCFilter --------------------------------------------------------- VCFilter::VCFilter() : ParseFiles(unset), - Config(0) + Config(nullptr) { useCustomBuildTool = false; useCompilerTool = false; diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index b812e3a326..b453873344 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -112,7 +112,7 @@ VcprojGenerator::VcprojGenerator() : Win32MakefileGenerator(), is64Bit(false), customBuildToolFilterFileSuffix(QStringLiteral(".cbt")), - projectWriter(0) + projectWriter(nullptr) { } @@ -1100,7 +1100,7 @@ void VcprojGenerator::initLinkerTool() if (!project->values("DEF_FILE").isEmpty()) conf.linker.ModuleDefinitionFile = project->first("DEF_FILE").toQString(); - static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 }; + static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr }; for (int i = 0; lflags[i]; i++) { const auto libs = fixLibFlags(lflags[i]); for (const ProString &lib : libs) { diff --git a/qmake/generators/win32/registry.cpp b/qmake/generators/win32/registry.cpp index 7320cb0551..3391ab9512 100644 --- a/qmake/generators/win32/registry.cpp +++ b/qmake/generators/win32/registry.cpp @@ -77,7 +77,7 @@ QString qt_readRegistryKey(HKEY parentHandle, const QString &rSubkey, unsigned l QString rSubkeyName = keyName(rSubkey); QString rSubkeyPath = keyPath(rSubkey); - HKEY handle = 0; + HKEY handle = nullptr; LONG res = RegOpenKeyEx(parentHandle, (wchar_t*)rSubkeyPath.utf16(), 0, KEY_READ | options, &handle); @@ -87,7 +87,7 @@ QString qt_readRegistryKey(HKEY parentHandle, const QString &rSubkey, unsigned l // get the size and type of the value DWORD dataType; DWORD dataSize; - res = RegQueryValueEx(handle, (wchar_t*)rSubkeyName.utf16(), 0, &dataType, 0, &dataSize); + res = RegQueryValueEx(handle, (wchar_t*)rSubkeyName.utf16(), nullptr, &dataType, nullptr, &dataSize); if (res != ERROR_SUCCESS) { RegCloseKey(handle); return QString(); @@ -95,7 +95,7 @@ QString qt_readRegistryKey(HKEY parentHandle, const QString &rSubkey, unsigned l // get the value QByteArray data(dataSize, 0); - res = RegQueryValueEx(handle, (wchar_t*)rSubkeyName.utf16(), 0, 0, + res = RegQueryValueEx(handle, (wchar_t*)rSubkeyName.utf16(), nullptr, nullptr, reinterpret_cast<unsigned char*>(data.data()), &dataSize); if (res != ERROR_SUCCESS) { RegCloseKey(handle); diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 318ce50661..3c730299be 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -84,7 +84,7 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) if (impexts.isEmpty()) impexts = project->values("QMAKE_EXTENSION_STATICLIB"); QList<QMakeLocalFileName> dirs; - static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 }; + static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr }; for (int i = 0; lflags[i]; i++) { ProStringList &l = project->values(lflags[i]); for (ProStringList::Iterator it = l.begin(); it != l.end();) { @@ -439,7 +439,7 @@ void Win32MakefileGenerator::writeCleanParts(QTextStream &t) { t << "clean: compiler_clean " << depVar("CLEAN_DEPS"); { - const char *clean_targets[] = { "OBJECTS", "QMAKE_CLEAN", "CLEAN_FILES", 0 }; + const char *clean_targets[] = { "OBJECTS", "QMAKE_CLEAN", "CLEAN_FILES", nullptr }; for(int i = 0; clean_targets[i]; ++i) { const ProStringList &list = project->values(clean_targets[i]); const QString del_statement("-$(DEL_FILE)"); @@ -468,7 +468,7 @@ void Win32MakefileGenerator::writeCleanParts(QTextStream &t) t << "distclean: clean " << depVar("DISTCLEAN_DEPS"); { - const char *clean_targets[] = { "QMAKE_DISTCLEAN", 0 }; + const char *clean_targets[] = { "QMAKE_DISTCLEAN", nullptr }; for(int i = 0; clean_targets[i]; ++i) { const ProStringList &list = project->values(clean_targets[i]); const QString del_statement("-$(DEL_FILE)"); |