diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2013-03-04 20:51:04 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-06 19:40:04 +0100 |
commit | 507ee19e077da272c4e3562ad752f7fb1ee025bf (patch) | |
tree | e00efce273ca5b8219f076466a624653d4cb0a17 /src/tools/moc | |
parent | aa2d10750ad8cdb6a86d519063664c2924b2a635 (diff) |
moc: Remove VC6 workaround
Change-Id: I9022eee72235309303ca384f2d52fc24256af6ec
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/tools/moc')
-rw-r--r-- | src/tools/moc/generator.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index 4957f7de67..e6ffbe157a 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -523,11 +523,6 @@ void Generator::generateCode() } if (!purestSuperClass.isEmpty() && !isQObject) { QByteArray superClass = purestSuperClass; - // workaround for VC6 - if (superClass.contains("::")) { - fprintf(out, " typedef %s QMocSuperClass;\n", superClass.constData()); - superClass = "QMocSuperClass"; - } fprintf(out, " return %s::qt_metacast(_clname);\n", superClass.constData()); } else { fprintf(out, " return 0;\n"); @@ -849,11 +844,6 @@ void Generator::generateMetacall() if (!purestSuperClass.isEmpty() && !isQObject) { QByteArray superClass = purestSuperClass; - // workaround for VC6 - if (superClass.contains("::")) { - fprintf(out, " typedef %s QMocSuperClass;\n", superClass.constData()); - superClass = "QMocSuperClass"; - } fprintf(out, " _id = %s::qt_metacall(_c, _id, _a);\n", superClass.constData()); } |