summaryrefslogtreecommitdiffstats
path: root/tools/porting
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/porting
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/porting')
-rw-r--r--tools/porting/src/port.cpp2
-rw-r--r--tools/porting/src/semantic.cpp16
2 files changed, 8 insertions, 10 deletions
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();