diff options
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/moc/utils.h | 4 | ||||
-rw-r--r-- | src/tools/rcc/main.cpp | 4 | ||||
-rw-r--r-- | src/tools/rcc/rcc.h | 4 | ||||
-rw-r--r-- | src/tools/uic/cpp/cppwriteincludes.cpp | 6 | ||||
-rw-r--r-- | src/tools/uic/driver.cpp | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/tools/moc/utils.h b/src/tools/moc/utils.h index a2c65e4b2a..0dfd0999f4 100644 --- a/src/tools/moc/utils.h +++ b/src/tools/moc/utils.h @@ -112,10 +112,10 @@ inline const char *skipQuote(const char *data) } ++data; } - + if (*data) //Skip last quote ++data; - return data; + return data; } QT_END_NAMESPACE diff --git a/src/tools/rcc/main.cpp b/src/tools/rcc/main.cpp index b6d5965dae..c0ed7401bc 100644 --- a/src/tools/rcc/main.cpp +++ b/src/tools/rcc/main.cpp @@ -216,7 +216,7 @@ int runRcc(int argc, char *argv[]) } QFile errorDevice; errorDevice.open(stderr, QIODevice::WriteOnly|QIODevice::Text); - + if (library.verbose()) errorDevice.write("Qt resource compiler\n"); @@ -251,7 +251,7 @@ int runRcc(int argc, char *argv[]) out.write("\n"); } return 0; - } + } return library.output(out, errorDevice) ? 0 : 1; } diff --git a/src/tools/rcc/rcc.h b/src/tools/rcc/rcc.h index cd9828fc35..7e16fe038d 100644 --- a/src/tools/rcc/rcc.h +++ b/src/tools/rcc/rcc.h @@ -95,10 +95,10 @@ public: void setResourceRoot(const QString &root) { m_resourceRoot = root; } QString resourceRoot() const { return m_resourceRoot; } - + void setUseNameSpace(bool v) { m_useNameSpace = v; } bool useNameSpace() const { return m_useNameSpace; } - + QStringList failedResources() const { return m_failedResources; } private: diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp index 44049409de..c473566e3a 100644 --- a/src/tools/uic/cpp/cppwriteincludes.cpp +++ b/src/tools/uic/cpp/cppwriteincludes.cpp @@ -88,8 +88,8 @@ WriteIncludes::WriteIncludes(Uic *uic) // and create a re-mapping of the old header "qclass.h" to it. Do not do this // for the "Phonon::Someclass" classes, however. const QString namespaceDelimiter = QLatin1String("::"); - const ClassInfoEntry *classLibEnd = qclass_lib_map + sizeof(qclass_lib_map)/sizeof(ClassInfoEntry); - for(const ClassInfoEntry *it = qclass_lib_map; it < classLibEnd; ++it) { + const ClassInfoEntry *classLibEnd = qclass_lib_map + sizeof(qclass_lib_map)/sizeof(ClassInfoEntry); + for (const ClassInfoEntry *it = qclass_lib_map; it < classLibEnd; ++it) { const QString klass = QLatin1String(it->klass); const QString module = QLatin1String(it->module); QLatin1String header = QLatin1String(it->header); @@ -173,7 +173,7 @@ void WriteIncludes::insertIncludeForClass(const QString &className, QString head if (!header.isEmpty()) break; - // Known class + // Known class const StringMap::const_iterator it = m_classToHeader.constFind(className); if (it != m_classToHeader.constEnd()) { header = it.value(); diff --git a/src/tools/uic/driver.cpp b/src/tools/uic/driver.cpp index 9fc1a649ef..5c99ffb208 100644 --- a/src/tools/uic/driver.cpp +++ b/src/tools/uic/driver.cpp @@ -304,7 +304,7 @@ bool Driver::uic(const QString &fileName, QTextStream *out) m_output = out; } else { #ifdef Q_OS_WIN - // As one might also redirect the output to a file on win, + // As one might also redirect the output to a file on win, // we should not create the textstream with QFile::Text flag. // The redirected file is opened in TextMode and this will // result in broken line endings as writing will replace \n again. |