AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moc: Remove VC6 workaround

Browse Source 
Change-Id: I9022eee72235309303ca384f2d52fc24256af6ec
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
This commit is contained in:
Olivier Goffart 2013-03-04 20:51:04 +01:00 committed by The Qt Project
parent aa2d10750a
commit 507ee19e07
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools/moc/generator.cpp
View File

@ -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());
}