summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2012-09-28 14:16:36 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-29 06:12:32 (GMT)
commitd65dbb5d508d4cdbc383686428430035c205b21c (patch)
tree35457ae8b8cb93fdae295ac28c78d221091b98d9 /tools
parent66e7e69f00a08664f0c0a6ed62a37a6918eaf8f3 (diff)
downloadQt-d65dbb5d508d4cdbc383686428430035c205b21c.zip
Qt-d65dbb5d508d4cdbc383686428430035c205b21c.tar.gz
Qt-d65dbb5d508d4cdbc383686428430035c205b21c.tar.bz2
Fix g++/MinGW compiler warnings.
- Assigned/Unused variables. - Unsigned comparison >= 0 is always true. - Constructor initialization order. - Signed/Unsigned comparisons. Change-Id: I1f9edab0506573420ed0bf3055252ba48625c8eb Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/activeqt/dumpcpp/main.cpp1
-rw-r--r--tools/assistant/tools/assistant/bookmarkmodel.cpp2
-rw-r--r--tools/porting/src/port.cpp2
-rw-r--r--tools/porting/src/semantic.cpp16
-rw-r--r--tools/qdoc3/codemarker.cpp2
-rw-r--r--tools/qdoc3/ditaxmlgenerator.cpp4
-rw-r--r--tools/qdoc3/htmlgenerator.cpp2
-rw-r--r--tools/qdoc3/qmlcodeparser.cpp2
-rw-r--r--tools/qdoc3/qmlvisitor.cpp2
9 files changed, 11 insertions, 22 deletions
diff --git a/tools/activeqt/dumpcpp/main.cpp b/tools/activeqt/dumpcpp/main.cpp
index e97067a..208fd4f 100644
--- a/tools/activeqt/dumpcpp/main.cpp
+++ b/tools/activeqt/dumpcpp/main.cpp
@@ -371,7 +371,6 @@ void generateClassDecl(QTextStream &out, const QString &controlID, const QMetaOb
if (property.isWritable()) {
QByteArray setter(propertyName);
- QChar firstChar = QLatin1Char(setter.at(0));
if (isupper(setter.at(0))) {
setter = "Set" + setter;
} else {
diff --git a/tools/assistant/tools/assistant/bookmarkmodel.cpp b/tools/assistant/tools/assistant/bookmarkmodel.cpp
index a50f696..a813044 100644
--- a/tools/assistant/tools/assistant/bookmarkmodel.cpp
+++ b/tools/assistant/tools/assistant/bookmarkmodel.cpp
@@ -48,7 +48,7 @@
#include <QtGui/QStyle>
#include <QtGui/QTreeView>
-const quint32 VERSION = 0xe53798;
+const qint32 VERSION = 0xe53798;
const QLatin1String MIMETYPE("application/bookmarks.assistant");
BookmarkModel::BookmarkModel()
diff --git a/tools/porting/src/port.cpp b/tools/porting/src/port.cpp
index 6b5bcff..394f3ac 100644
--- a/tools/porting/src/port.cpp
+++ b/tools/porting/src/port.cpp
@@ -144,7 +144,6 @@ int runPort(int argc, char**argv)
bool enableCppParsing = true;
bool useBuildtinQt3Headers = true;
bool showMissingFilesWarnings = false;
- bool alwaysOverwrite = false;
int currentArg = 1;
const Option helpOption(QLatin1String("-h"), QLatin1String("Display this help."));
@@ -205,7 +204,6 @@ int runPort(int argc, char**argv)
} else if (missingFileWarningsOption.checkArgument(argText)) {
showMissingFilesWarnings = true;
} else if (alwaysOverwriteOption.checkArgument(argText)) {
- alwaysOverwrite = true;
FileWriter::instance()->setOverwriteFiles(FileWriter::AlwaysOverWrite);
} else if (argText[0] == QLatin1Char('-')) {
printf("Unknown option %s\n", argText.toLocal8Bit().constData());
diff --git a/tools/porting/src/semantic.cpp b/tools/porting/src/semantic.cpp
index 6268102..62aafce 100644
--- a/tools/porting/src/semantic.cpp
+++ b/tools/porting/src/semantic.cpp
@@ -344,27 +344,27 @@ void Semantic::parseDeclaration(AST *funSpec, AST *storageSpec, TypeSpecifierAST
void Semantic::parseFunctionDeclaration(AST *funSpec, AST *storageSpec,
TypeSpecifierAST * typeSpec, InitDeclaratorAST * initDeclarator)
{
- bool isFriend = false;
bool isVirtual = false;
bool isStatic = false;
- bool isInline = false;
bool isPure = initDeclarator->initializer() != 0;
if (funSpec){
List<AST*> l = *funSpec->children();
foreach (AST *current, l) {
- QByteArray text = textOf(current);
- if (text == "virtual") isVirtual = true;
- else if (text == "inline") isInline = true;
+ if (textOf(current) == "virtual") {
+ isVirtual = true;
+ break;
+ }
}
}
if (storageSpec){
List<AST*> l = *storageSpec->children();
foreach (AST *current, l) {
- QByteArray text = textOf(current);
- if (text == "friend") isFriend = true;
- else if (text == "static") isStatic = true;
+ if (textOf(current) == "static") {
+ isStatic = true;
+ break;
+ }
}
}
DeclaratorAST *declarator = initDeclarator->declarator();
diff --git a/tools/qdoc3/codemarker.cpp b/tools/qdoc3/codemarker.cpp
index 87c55d0..9fa6b59 100644
--- a/tools/qdoc3/codemarker.cpp
+++ b/tools/qdoc3/codemarker.cpp
@@ -527,7 +527,6 @@ QStringList CodeMarker::macRefsForNode(Node *node)
break;
case Node::Function:
{
- bool isMacro = false;
const FunctionNode *func = static_cast<const FunctionNode *>(node);
// overloads are too clever for the Xcode documentation browser
@@ -537,7 +536,6 @@ QStringList CodeMarker::macRefsForNode(Node *node)
if (func->metaness() == FunctionNode::MacroWithParams
|| func->metaness() == FunctionNode::MacroWithoutParams) {
result += QLatin1String("macro/");
- isMacro = true;
#if 0
}
else if (!func->templateStuff().isEmpty()) {
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index f87f03b..720c25c 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -3447,7 +3447,6 @@ void DitaXmlGenerator::writeText(const QString& markedCode,
for (int i = 0, n = src.size(); i < n;) {
if (src.at(i) == charLangle && src.at(i + 1) == charAt) {
i += 2;
- bool handled = false;
for (int k = 0; k != 6; ++k) {
if (parseArg(src, markTags[k], &i, n, &arg, &par1)) {
const Node* n = 0;
@@ -3502,7 +3501,6 @@ void DitaXmlGenerator::writeText(const QString& markedCode,
addLink(link, arg);
}
}
- handled = true;
break;
}
}
@@ -4526,12 +4524,10 @@ QString DitaXmlGenerator::fullQualification(const Node* n)
void DitaXmlGenerator::writeDerivations(const ClassNode* cn, CodeMarker* marker)
{
QList<RelatedClass>::ConstIterator r;
- int index;
if (!cn->baseClasses().isEmpty()) {
writeStartTag(DT_cxxClassDerivations);
r = cn->baseClasses().begin();
- index = 0;
while (r != cn->baseClasses().end()) {
writeStartTag(DT_cxxClassDerivation);
writeStartTag(DT_cxxClassDerivationAccessSpecifier);
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 770f4df..2684fdf 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1109,13 +1109,11 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
QList<Section>::ConstIterator s;
const ClassNode *classe = 0;
- const NamespaceNode *namespasse = 0;
QString title;
QString rawTitle;
QString fullTitle;
if (inner->type() == Node::Namespace) {
- namespasse = static_cast<const NamespaceNode *>(inner);
rawTitle = marker->plainName(inner);
fullTitle = marker->plainFullName(inner);
title = rawTitle + " Namespace";
diff --git a/tools/qdoc3/qmlcodeparser.cpp b/tools/qdoc3/qmlcodeparser.cpp
index 66401ae..40ebf79 100644
--- a/tools/qdoc3/qmlcodeparser.cpp
+++ b/tools/qdoc3/qmlcodeparser.cpp
@@ -137,7 +137,7 @@ void QmlCodeParser::parseSourceFile(const Location& location,
}
}
-void QmlCodeParser::doneParsingSourceFiles(Tree *tree)
+void QmlCodeParser::doneParsingSourceFiles(Tree *)
{
}
diff --git a/tools/qdoc3/qmlvisitor.cpp b/tools/qdoc3/qmlvisitor.cpp
index 7045300..fdd9851 100644
--- a/tools/qdoc3/qmlvisitor.cpp
+++ b/tools/qdoc3/qmlvisitor.cpp
@@ -227,7 +227,7 @@ void QmlDocVisitor::endVisit(QDeclarativeJS::AST::UiPublicMember *definition)
lastEndOffset = definition->lastSourceLocation().end();
}
-bool QmlDocVisitor::visit(QDeclarativeJS::AST::IdentifierPropertyName *idproperty)
+bool QmlDocVisitor::visit(QDeclarativeJS::AST::IdentifierPropertyName *)
{
return true;
}