From f19af38356d8ffea131af18db87c93c7772daad0 Mon Sep 17 00:00:00 2001 From: drewski207 Date: Sat, 24 Sep 2011 21:19:28 +0000 Subject: [PATCH] Fixed overzealous type conversion of guchar git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2005 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- applications/gobject-introspection/girnamespaces.pas | 2 +- applications/gobject-introspection/girpascalwriter.pas | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/applications/gobject-introspection/girnamespaces.pas b/applications/gobject-introspection/girnamespaces.pas index b94721976..dcf312724 100644 --- a/applications/gobject-introspection/girnamespaces.pas +++ b/applications/gobject-introspection/girnamespaces.pas @@ -471,7 +471,7 @@ begin NS := Self; // some basic fixes PlainCType:=StringReplace(StripPointers(ACType, @PointerLevel), ' ', '_', [rfReplaceAll]); - if (PlainCType = 'gchar') or (PlainCType = 'guchar') or (PlainCType = 'char') then + if (PlainCType = 'gchar') or {(PlainCType = 'guchar') or} (PlainCType = 'char') then AName := 'GLib.utf8'; if (PlainCType = 'GType') {or (AName = 'Type')} or (AName = 'GType')then diff --git a/applications/gobject-introspection/girpascalwriter.pas b/applications/gobject-introspection/girpascalwriter.pas index e1f1da823..31df9efed 100644 --- a/applications/gobject-introspection/girpascalwriter.pas +++ b/applications/gobject-introspection/girpascalwriter.pas @@ -1175,7 +1175,8 @@ var otUnion: Exit; // these will be done on the second pass. this is to avoid duplicate names if they are the same as some function or property. giving the function priority of the original name - otGlibSignal :;// signals are external to the object and not 'part' of them + otGlibSignal : if AObjectType = gtInterface then // signals are external to the object and not 'part' of them + TypeDecl.Add(IndentText(WriteCallBack(TgirCallback(Field),True, UsedNames),4,0)); //WriteFunction(AFunction, AItem, AIsMethod, AWantWrapperForObject, AFunctionList): String; otFunction : TypeFuncs.Add(IndentText(WriteFunction(TgirFunction(Field), AItem, False, True, UnitFuncs, UsedNames),4,0));