diff options
Diffstat (limited to 'qtruby/rubylib')
| -rw-r--r-- | qtruby/rubylib/qtruby/handlers.cpp | 12 | ||||
| -rw-r--r-- | qtruby/rubylib/qtruby/lib/Qt/qtruby.rb | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp index e85f47df..703c9d03 100644 --- a/qtruby/rubylib/qtruby/handlers.cpp +++ b/qtruby/rubylib/qtruby/handlers.cpp @@ -1894,16 +1894,16 @@ TypeHandler Qt_handlers[] = { { "TQStrList*", marshall_TQStrList }, { "long long int", marshall_longlong }, { "long long int&", marshall_longlong }, - { "TQ_INT64", marshall_longlong }, - { "TQ_INT64&", marshall_longlong }, - { "TQ_LLONG", marshall_longlong }, - { "TQ_LLONG&", marshall_longlong }, + { "TTQ_INT64", marshall_longlong }, + { "TTQ_INT64&", marshall_longlong }, + { "TTQ_LLONG", marshall_longlong }, + { "TTQ_LLONG&", marshall_longlong }, { "KIO::filesize_t", marshall_longlong }, { "DOM::DOMTimeStamp", marshall_ulonglong }, { "unsigned long long int", marshall_ulonglong }, { "unsigned long long int&", marshall_ulonglong }, - { "TQ_UINT64", marshall_ulonglong }, - { "TQ_UINT64&", marshall_ulonglong }, + { "TTQ_UINT64", marshall_ulonglong }, + { "TTQ_UINT64&", marshall_ulonglong }, { "TQ_ULLONG", marshall_ulonglong }, { "TQ_ULLONG&", marshall_ulonglong }, { "signed int&", marshall_intR }, diff --git a/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb b/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb index e6a1cc82..a8bb72a0 100644 --- a/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb +++ b/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb @@ -1382,9 +1382,9 @@ module Qt def Internal.checkarg(argtype, typename) puts " #{typename} (#{argtype})" if debug_level >= DebugLevel::High if argtype == 'i' - if typename =~ /^int&?$|^signed int&?$|^signed$|^Q_INT32&?$/ + if typename =~ /^int&?$|^signed int&?$|^signed$|^TQ_INT32&?$/ return 1 - elsif typename =~ /^(?:short|ushort|unsigned short int|uchar|uint|long|ulong|unsigned long int|unsigned|float|double|Q_UINT32|Q_UINT16|Q_INT16)$/ + elsif typename =~ /^(?:short|ushort|unsigned short int|uchar|uint|long|ulong|unsigned long int|unsigned|float|double|TQ_UINT32|TQ_UINT16|TQ_INT16)$/ return 0 else t = typename.sub(/^const\s+/, '') @@ -1459,7 +1459,7 @@ module Qt elsif classIsa(argtype, t) return 0 elsif isEnum(argtype) and - (t =~ /int|Q_INT32|uint|Q_UINT32|long|ulong/ or isEnum(t)) + (t =~ /int|TQ_INT32|uint|TQ_UINT32|long|ulong/ or isEnum(t)) return 0 end end |