From 5aac3bf7c25ec890031f243a3707e4699dc9b0d6 Mon Sep 17 00:00:00 2001 From: Mauro Iazzi Date: Thu, 4 Feb 2010 10:01:23 +0100 Subject: [PATCH] Fixes for Qt 4.6 do not mistake friends for members skip troublesome classes and non native styles --- generator/generator.lua | 3 ++- generator/qt_internal.lua | 23 +++++++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/generator/generator.lua b/generator/generator.lua index 9010e8d..b651fe8 100644 --- a/generator/generator.lua +++ b/generator/generator.lua @@ -316,7 +316,8 @@ local distinguish_methods = function(index) destruct = f else if (not string.match(f.xarg.name, '^operator%W')) - and (not f.xarg.member_template_parameters) then + and (not f.xarg.member_template_parameters) + and (not f.xarg.friend) then table.insert(normal, f) end end diff --git a/generator/qt_internal.lua b/generator/qt_internal.lua index 8d2d872..84c0363 100644 --- a/generator/qt_internal.lua +++ b/generator/qt_internal.lua @@ -30,14 +30,33 @@ for c in pairs(classes) do or c.xarg.fullname=='QWindowsXPStyle' or c.xarg.fullname=='QWindowsVistaStyle' or c.xarg.fullname=='QMacStyle' + or c.xarg.fullname=='QS60Style' + or c.xarg.fullname=='QS60MainApplication' + or c.xarg.fullname=='QS60MainAppUI' + or c.xarg.fullname=='QS60MainDocument' + or c.xarg.fullname=='QWSCalibratedMouseHandler' + or c.xarg.fullname=='QWSClient' + or c.xarg.fullname=='QWSEmbedWidget' + or c.xarg.fullname=='QWSEvent' + or c.xarg.fullname=='QWSGLWindowSurface' + or c.xarg.fullname=='QWSInputMethod' + or c.xarg.fullname=='QWSKeyboardHandler' + or c.xarg.fullname=='QWSMouseHandler' + or c.xarg.fullname=='QWSPointerCalibrationData' + or c.xarg.fullname=='QWSScreenSaver' + or c.xarg.fullname=='QWSServer' + or c.xarg.fullname=='QWSWindow' + or c.xarg.fullname=='QXmlNodeModelIndex' -- a method "name" is public but is not part of the documented API + or c.xarg.fullname=='QXmlName' -- a method "localName" is public but is not part of the documented API -- binding bugs or c.xarg.fullname=='QThreadStorageData' -- binding error (function pointer) or c.xarg.fullname=='QForeachContainerBase' -- "was not declared in this scope" or c.xarg.fullname=='QtConcurrent::Exception' -- GCC throw() in destructor base declaration or c.xarg.fullname=='QtConcurrent::UnhandledException' -- GCC throw() in destructor base declaration - - + or c.xarg.fullname=='QHashData' -- not in the docs at all. free_helper is not present during compilation + or c.xarg.fullname=='QEasingCurve' -- wrapper for function: function pointer parsing problem + or string.match(c.xarg.fullname, '^QtConcurrent') -- does not make sense anyway, because we should duplicate the lua_State ) then ret1[c] = true -- 2.11.4.GIT