From 507ee19e077da272c4e3562ad752f7fb1ee025bf Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 4 Mar 2013 20:51:04 +0100 Subject: moc: Remove VC6 workaround Change-Id: I9022eee72235309303ca384f2d52fc24256af6ec Reviewed-by: Simon Hausmann --- src/tools/moc/generator.cpp | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/tools') 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()); } -- cgit v1.2.3