diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2017-06-14 16:04:01 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2017-08-14 09:08:58 +0000 |
| commit | d186096dd9dd26ebbd0d0f8bb699eee8f331250f (patch) | |
| tree | a493c077313d08ac214f293381da6176ef28cfa6 /tools | |
| parent | d86efa19632c4f92d72b721c4b671f0f37104580 (diff) | |
Remove unneeded member and dead code
Change-Id: I62b214add022b4725a81297217616d8548db5c7e
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qscxmlc/generator.cpp | 5 | ||||
| -rw-r--r-- | tools/qscxmlc/moc.h | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/tools/qscxmlc/generator.cpp b/tools/qscxmlc/generator.cpp index 02e41c8..048cf3e 100644 --- a/tools/qscxmlc/generator.cpp +++ b/tools/qscxmlc/generator.cpp @@ -1505,10 +1505,7 @@ void Generator::generateSignal(FunctionDef *def,int index) if (def->normalizedType == "void") { fprintf(out, "Q_NULLPTR"); } else { - if (def->returnTypeIsVolatile) - fprintf(out, "const_cast<void*>(reinterpret_cast<const volatile void*>(&_t0))"); - else - fprintf(out, "const_cast<void*>(reinterpret_cast<const void*>(&_t0))"); + fprintf(out, "const_cast<void*>(reinterpret_cast<const void*>(&_t0))"); } int i; for (i = 1; i < offset; ++i) diff --git a/tools/qscxmlc/moc.h b/tools/qscxmlc/moc.h index a2ecb88..56aedad 100644 --- a/tools/qscxmlc/moc.h +++ b/tools/qscxmlc/moc.h @@ -75,7 +75,7 @@ struct ArgumentDef struct FunctionDef { - FunctionDef(): returnTypeIsVolatile(false), access(Private), isConst(false), isVirtual(false), isStatic(false), + FunctionDef(): access(Private), isConst(false), isVirtual(false), isStatic(false), inlineCode(false), wasCloned(false), isCompat(false), isInvokable(false), isScriptable(false), isSlot(false), isSignal(false), isPrivateSignal(false), isConstructor(false), isDestructor(false), isAbstract(false), revision(0), implementation(0) {} @@ -84,7 +84,6 @@ struct FunctionDef QByteArray tag; QByteArray name; QByteArray mangledName; - bool returnTypeIsVolatile; QList<ArgumentDef> arguments; |