qt 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be7294fb17e8d0cd4eeb66cc86fe6ee91940a95d5a6f3afaf9dfa44fb54445ba
-  data.tar.gz: 20683a100daf8ca9299a2227ae2605acbde2393e2444d020625c058cbc76993c
+  metadata.gz: 5b47b66563f703c260222b8ac0e38f2bf27e4ee654dd3152181bb8866e93e182
+  data.tar.gz: 797218dab7d7ce473510b05bd500c8151503b0ebc018648c5d82a5e5abb7e8f0
 SHA512:
-  metadata.gz: 151a6423964153f8e5f54cba0cc7c54d1ff6b4a7fbd10b003d2a19f6263831493d18ed6fbaeabf88d5791d3e3326e356ba50e0d5332e212c75341bf6ea3c2f50
-  data.tar.gz: 9e7542fc4bc481b7c3110f4b55aa4b33dd327babbe4aaad3dc4078ce2bd404a97a90022f1e49d97bd3ae05cb805e4db8fd0aef13e368974505dc361d29edfdd9
+  metadata.gz: 37e94ba0242411ddd9f46d6858f397f53e2d2d62e38ba7ccba9a15fc517f86291b015d82dd359dfe0eb5ce12a011ebeb379d95a23c607c1be299883d5c24ed2a
+  data.tar.gz: 5fc3cc069da9615f8efb690d2888f5ec7f5c02422885e070331b4e271381405a082993c705d100c9e30b6ceb5661471701769c81e5ff6ff072024fe34c7b9c15

data/lib/qt/object_wrapper.rb

@@ -65,7 +65,6 @@ module Qt
       klass = Qt.const_get(normalized_qt_class, false)
       return nil unless klass.is_a?(Class)
       return nil unless klass.const_defined?(:QT_CLASS, false)
-      return nil unless klass <= Qt::QObject
 
       klass
     rescue NameError
@@ -87,6 +86,7 @@ module Qt
 
       pointer = wrapper.handle
       return wrapper if null_pointer?(pointer)
+      return wrapper unless qobject_wrapper?(wrapper.class)
 
       cached = cached_wrapper_for(pointer)
       return cached if cached
@@ -157,6 +157,10 @@ module Qt
       depth
     end
 
+    def qobject_wrapper?(klass)
+      klass.is_a?(Class) && klass <= Qt::QObject
+    end
+
     def normalize_expected_qt_class(expected_qt_class)
       return nil if expected_qt_class.nil?
 

data/lib/qt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Qt
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/scripts/generate_bridge/auto_methods.rb

@@ -52,6 +52,7 @@ def map_cpp_arg_type(type_name, qt_class: nil, int_cast_types: nil)
   return { ffi: :string, cast: :qdate_from_utf8 } if type == 'QDate'
   return { ffi: :string, cast: :qtime_from_utf8 } if type == 'QTime'
   return { ffi: :string, cast: :qkeysequence_from_utf8 } if type == 'QKeySequence'
+  return { ffi: :int, cast: :qcursor_shape } if type == 'QCursor'
   return { ffi: :pointer, cast: :qicon_ref } if type == 'QIcon'
   return { ffi: :string, cast: :qany_string_view } if type == 'QAnyStringView'
   return { ffi: :string, cast: :qvariant_from_utf8 } if type == 'QVariant'
@@ -95,7 +96,7 @@ def map_pointer_cpp_return_type(type, ast: nil)
 
   info = { ffi_return: :pointer }
   base_type = type.sub(/\s*\*\z/, '').strip
-  if ast && class_inherits?(ast, base_type, 'QObject')
+  if ast && ast_class_index(ast)[:methods_by_class].key?(base_type)
     info[:pointer_class] = base_type
   end
 

data/scripts/generate_bridge/ffi_api.rb

@@ -19,6 +19,8 @@ def all_ffi_functions(specs, free_function_specs:)
 end
 
 def append_constructor_ffi_function(fns, spec)
+  return if spec[:constructor][:mode] == :wrap_only
+
   ctor_args = constructor_ffi_args(spec)
   fns << { name: ctor_function_name(spec), ffi_return: :pointer, args: ctor_args }
 end

data/scripts/generate_bridge/spec_discovery.rb

@@ -160,7 +160,7 @@ def related_value_class_candidate?(ast, qt_class, all_classes, template_classes)
   return false if abstract_class?(ast, qt_class)
   return false if class_inherits?(ast, qt_class, 'QObject')
 
-  constructor_usable_for_codegen?(ast, qt_class)
+  true
 end
 
 def related_qt_type_names(ast, qt_class)
@@ -178,11 +178,12 @@ end
 
 def append_related_qt_types_from_decl(out, parsed, method_name)
   candidates = []
-  candidates << normalized_cpp_type_name(parsed[:return_type]).to_s if parsed[:return_type]
-  parsed[:params].each { |param| candidates << normalized_cpp_type_name(param[:type]).to_s }
-  candidates.each do |candidate|
+  candidates << [related_qt_type_name(parsed[:return_type]), parsed[:return_type].to_s] if parsed[:return_type]
+  parsed[:params].each { |param| candidates << [related_qt_type_name(param[:type]), param[:type].to_s] }
+  candidates.each do |candidate, raw_type|
     next if candidate.empty? || !candidate.start_with?('Q')
-    next unless related_type_name_matches_method?(candidate, method_name)
+    next unless related_type_name_matches_method?(candidate, method_name) ||
+                (qt_pointer_type?(raw_type) && candidate.end_with?('Item'))
 
     out << candidate
   end
@@ -195,6 +196,14 @@ def related_type_name_matches_method?(qt_type, method_name)
   method_name.to_s.downcase.include?(token)
 end
 
+def qt_pointer_type?(raw_type)
+  raw_type.to_s.strip.end_with?('*')
+end
+
+def related_qt_type_name(raw_type)
+  normalized_cpp_type_name(raw_type).to_s.delete_suffix('*')
+end
+
 def discover_target_qt_classes(ast, scope)
   all_classes = q_class_names(ast)
   template_classes = template_qt_classes(ast)
@@ -220,9 +229,24 @@ def widget_target_qt_class?(ast, qt_class)
 
   class_inherits?(ast, qt_class, 'QWidget') ||
     class_inherits?(ast, qt_class, 'QLayout') ||
+    widget_item_target_qt_class?(ast, qt_class) ||
     qt_class == 'QTableWidgetItem'
 end
 
+def widget_item_target_qt_class?(ast, qt_class)
+  return false unless qt_class.end_with?('Item')
+  return false if class_inherits?(ast, qt_class, 'QObject')
+
+  collect_constructor_decls(ast, qt_class).any? do |decl|
+    parsed = parse_method_signature(decl)
+    next false unless parsed
+
+    parsed[:params].any? do |param|
+      normalized_cpp_type_name(param[:type]).to_s.match?(/\AQ\w*Widget\*\z/)
+    end
+  end
+end
+
 def qobject_target_qt_class?(ast, qt_class)
   return false if qt_class.end_with?('Private')
   return false if qt_class == 'QApplication'
@@ -264,8 +288,10 @@ def build_base_spec_for_qt_class(ast, qt_class)
       parent_constructor_for_type(parent_type, widget_child)
     elsif string_path_cast
       string_path_constructor(string_path_cast)
-    else
+    elsif ctor_decls.any? { |decl| constructor_supports_no_args?(decl) }
       { parent: false }
+    else
+      { parent: false, mode: :wrap_only }
     end
   base_spec_hash(qt_class, parent_ctor)
 end

data/scripts/generate_bridge.rb

@@ -246,6 +246,7 @@ def arg_expr(arg)
   when :qdate_from_utf8 then "qdate_from_bridge_value(#{arg[:name]})"
   when :qtime_from_utf8 then "qtime_from_bridge_value(#{arg[:name]})"
   when :qkeysequence_from_utf8 then "QKeySequence(as_qstring(#{arg[:name]}))"
+  when :qcursor_shape then "QCursor(static_cast<Qt::CursorShape>(#{arg[:name]}))"
   when :qicon_ref then "*static_cast<QIcon*>(#{arg[:name]})"
   when :qany_string_view then "QAnyStringView(as_qstring(#{arg[:name]}))"
   when :qvariant_from_utf8 then "qvariant_from_bridge_value(#{arg[:name]})"
@@ -385,8 +386,10 @@ def generate_cpp_bridge(specs, free_function_specs)
 end
 
 def append_cpp_spec_methods(lines, spec)
-  generate_cpp_constructor(lines, spec)
-  lines << ''
+  unless spec[:constructor][:mode] == :wrap_only
+    generate_cpp_constructor(lines, spec)
+    lines << ''
+  end
   spec[:methods].each do |method|
     generate_cpp_method(lines, spec, method)
     lines << ''
@@ -717,6 +720,8 @@ def setter_alias_base_name(method)
   return nil unless method[:args].length == 1
   return nil if method[:property]
 
+  return 'cursor' if method[:qt_name] == 'setCursor'
+
   property_name_from_setter(method[:qt_name] || method[:ruby_name].to_s)
 end
 
@@ -747,7 +752,10 @@ def qapplication_singleton_forwarder_names(methods, singleton_setter_aliases)
 end
 
 def append_widget_initializer(lines, spec:, widget_root:, indent:)
-  if spec[:constructor][:mode] == :string_path
+  if spec[:constructor][:mode] == :wrap_only
+    append_wrap_only_initializer(lines, spec, indent)
+    return
+  elsif spec[:constructor][:mode] == :string_path
     append_string_path_initializer(lines, spec, indent)
   elsif spec[:constructor][:mode] == :keysequence_parent
     append_keysequence_parent_initializer(lines, spec, widget_root, indent)
@@ -761,6 +769,12 @@ def append_widget_initializer(lines, spec:, widget_root:, indent:)
   lines << "#{indent}end"
 end
 
+def append_wrap_only_initializer(lines, spec, indent)
+  lines << "#{indent}def initialize(*)"
+  lines << "#{indent}  raise NotImplementedError, '#{spec[:ruby_class]} cannot be directly instantiated yet'"
+  lines << "#{indent}end"
+end
+
 def append_parent_widget_initializer(lines, spec, widget_root, indent)
   lines << "#{indent}def initialize(parent = nil)"
   lines << "#{indent}  @handle = Native.#{spec[:prefix]}_new(parent&.handle)"
@@ -1049,6 +1063,7 @@ def collect_enum_constants_for_scope(ast, target_scope, warnings = [])
     next unless node['kind'] == 'EnumDecl'
     next unless scope == target_scope
 
+    next_value = 0
     Array(node['inner']).each do |entry|
       next unless entry['kind'] == 'EnumConstantDecl'
 
@@ -1058,9 +1073,14 @@ def collect_enum_constants_for_scope(ast, target_scope, warnings = [])
 
       raw_value = ast_extract_first_value(entry)
       value = parse_ast_integer_value(raw_value)
-      next if value.nil?
+      if value.nil?
+        value = next_value
+      else
+        next_value = value
+      end
 
       append_constant_with_conflict_warning(constants, name, value, warnings, target_scope.join('::'))
+      next_value = value + 1
     end
   end
 
@@ -1075,6 +1095,9 @@ def collect_qt_namespace_enum_constants(ast, warnings = [])
 
     append_constant_with_conflict_warning(constants, alias_name, value, warnings, 'Qt::QEventAlias')
   end
+  collect_enum_constants_for_scope(ast, ['QCursor'], warnings).each do |name, value|
+    append_constant_with_conflict_warning(constants, name, value, warnings, 'Qt::QCursorAlias')
+  end
   constants
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qt
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Maksim Veynberg
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.9
 specification_version: 4
 summary: Ruby bindings for Qt 6.4.2+
 test_files: []