qtbindings 4.6.3.1 → 4.6.3.2

data/lib/Qt/qtruby4.rb

@@ -2533,14 +2533,13 @@ module Qt
     end
 
     def Internal.checkarg(argtype, typename)
-      puts "      #{typename} (#{argtype})" if debug_level >= DebugLevel::High
       const_point = typename =~ /^const\s+/ ? -1 : 0
       if argtype == 'i'
         if typename =~ /^int&?$|^signed int&?$|^signed$|^qint32&?$/
           return 6 + const_point
         elsif typename =~ /^quint32&?$/
           return 4 + const_point         
-        elsif typename =~ /^(?:short|ushort|unsigned short int|unsigned short|uchar||unsigned char|uint|long|ulong|unsigned long int|unsigned|float|double|WId|HBITMAP__\*|HDC__\*|HFONT__\*|HICON__\*|HINSTANCE__\*|HPALETTE__\*|HRGN__\*|HWND__\*|Q_PID|^quint16&?$|^qint16&?$)$/
+        elsif typename =~ /^(?:short|ushort|unsigned short int|unsigned short|uchar|char|unsigned char|uint|long|ulong|unsigned long int|unsigned|float|double|WId|HBITMAP__\*|HDC__\*|HFONT__\*|HICON__\*|HINSTANCE__\*|HPALETTE__\*|HRGN__\*|HWND__\*|Q_PID|^quint16&?$|^qint16&?$)$/
           return 4 + const_point
         elsif typename =~ /^(quint|qint|qulong|qlong|qreal)/
           return 4 + const_point
@@ -2741,11 +2740,9 @@ module Qt
 
       # Debugging output for method lookup
       if debug_level >= DebugLevel::High
-        puts "classname    == #{classname}"
-        puts ":: method == #{method}"
+        puts "Searching for #{classname}##{method}"
         puts "Munged method names:"
-        methods.each {|meth| puts "  #{meth}"}
-        puts "-> methodIds == #{methodIds.inspect}"
+        methods.each {|meth| puts "        #{meth}"}
         puts "candidate list:"
         prototypes = dumpCandidates(methodIds).split("\n")
         line_len = (prototypes.collect { |p| p.length }).max
@@ -2764,24 +2761,24 @@ module Qt
           current_match = (isConstMethod(id) ? 1 : 0)
           (0...args.length).each do
             |i|
-            current_match += checkarg(get_value_type(args[i]), get_arg_type_name(id, i))
+            typename = get_arg_type_name(id, i)
+            argtype = get_value_type(args[i])
+            score = checkarg(argtype, typename)
+            current_match += score
+            puts "        #{typename} (#{argtype}) score: #{score}" if debug_level >= DebugLevel::High
           end
           
           # Note that if current_match > best_match, then chosen must be nil
           if current_match > best_match
             best_match = current_match
             chosen = id
-          # Multiple matches are an error; the equality test below _cannot_ be commented out.
-          # If ambiguous matches occur the problem must be fixed be adjusting the relative
-          # ranking of the arg types involved in checkarg().
+          # Ties are bad - but it is better to chose something than to fail
           elsif current_match == best_match && id.smoke == chosen.smoke
-            puts "multiple methods matching, this is an error" if debug_level >= DebugLevel::Minimal
-            chosen = nil
+            puts " ****** warning: multiple methods with the same score of #{current_match}: #{chosen.index} and #{id.index}" if debug_level >= DebugLevel::Minimal
+            chosen = id
           end
-          puts "match => #{id.index} score: #{current_match} chosen: #{chosen}" if debug_level >= DebugLevel::High
+          puts "        match => smoke: #{id.smoke} index: #{id.index} score: #{current_match} chosen: #{chosen ? chosen.index : nil}" if debug_level >= DebugLevel::High
         end
-          
-        puts "Resolved to id: #{chosen.index}" if !chosen.nil? && debug_level >= DebugLevel::High
       end
 
       # Additional debugging output

data/lib/qtbindings_version.rb

@@ -1,2 +1,2 @@
-QTBINDINGS_VERSION = '4.6.3.1'
-QTBINDINGS_RELEASE_DATE = 'Tue Oct 12 20:10:40 -0600 2010'
+QTBINDINGS_VERSION = '4.6.3.2'
+QTBINDINGS_RELEASE_DATE = '2010-12-06 07:43:59 -0700'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qtbindings
 version: !ruby/object:Gem::Version 
-  hash: 49
   prerelease: false
   segments: 
   - 4
   - 6
   - 3
-  - 1
-  version: 4.6.3.1
+  - 2
+  version: 4.6.3.2
 platform: ruby
 authors: 
 - Richard Dale
@@ -18,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 -06:00
+date: 2010-12-06 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -325,7 +324,6 @@ files:
 - examples/ruboids/ruboids/WorldWindow.rb
 - examples/ruboids/TODO
 - examples/run_all.rb
-- examples/textedit/textedit.rb
 - examples/tutorial/t1/t1.rb
 - examples/tutorial/t10/cannon.rb
 - examples/tutorial/t10/lcdrange.rb
@@ -598,7 +596,6 @@ files:
 - ext/ruby/qtruby/rails_support/CMakeLists.txt
 - ext/ruby/qtruby/README
 - ext/ruby/qtruby/src/CMakeLists.txt
-- ext/ruby/qtruby/src/extconf.rb
 - ext/ruby/qtruby/src/handlers.cpp
 - ext/ruby/qtruby/src/marshall.h
 - ext/ruby/qtruby/src/marshall_basetypes.h
@@ -705,6 +702,11 @@ files:
 - ext/smoke/qtgui/qtgui_includes.h
 - ext/smoke/qtgui/smokeconfig.xml
 - ext/smoke/qtgui_smoke.h
+- ext/smoke/qthelp/CMakeLists.txt
+- ext/smoke/qthelp/config.xml.cmake
+- ext/smoke/qthelp/qthelp_includes.h
+- ext/smoke/qthelp/smokeconfig.xml
+- ext/smoke/qthelp_smoke.h
 - ext/smoke/qtmultimedia/CMakeLists.txt
 - ext/smoke/qtmultimedia/config.xml.cmake
 - ext/smoke/qtmultimedia/qtmultimedia_includes.h
@@ -791,7 +793,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -800,7 +801,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

data/examples/textedit/textedit.rb

@@ -1,150 +0,0 @@
-#!/usr/bin/ruby -w
-
-require 'Qt'
-require 'rexml/document'
-
-require '../base/rui.rb'
-
-class MyTextEditor < Qt::TextEdit
-   signals 'saved()'
-   slots 'insert_icon()', 'new()', 'open()', 'save_as()'
-   def initialize(w = nil)
-      super(w)
-      @images = {}
-      @@next_image_id = 0
-      self.setTextFormat(Qt::RichText)
-   end
-   def insert_richtext(richtext)
-      # todo, use a rand string
-      unique_string = '000___xxx123456789xxx___xxx123456789xxx___000'
-      insert(unique_string)
-      txt = self.text().gsub(unique_string, richtext)
-      self.setText(txt)
-   end
-   def next_image_id
-      @@next_image_id += 1
-   end
-   def load_image(fname, image_id)
-      pixmap = Qt::Pixmap.new(fname)
-      msfactory = Qt::MimeSourceFactory.defaultFactory
-      msfactory.setPixmap(image_id, pixmap)
-      @images[image_id] = fname
-      image_id
-   end
-   def insert_icon
-      fname = Qt::FileDialog.getOpenFileName
-      return if fname.nil?
-      image_id = "image_#{next_image_id}"
-      load_image(fname, image_id)
-      insert_richtext('<qt><img source="'+image_id+'"></qt>')
-   end
-   def createPopupMenu(pos) # virtual
-      pm = Qt::PopupMenu.new
-      pm.insertItem("Insert Image!", self, SLOT('insert_icon()'))
-      pm
-   end
-   def has_metadata
-      !@images.empty?
-   end
-   def metadata_fname(fname)
-      "#{fname}.metadata.xml"
-   end
-   def attempt_metadata_load(fname)
-      return unless File.exists?(metadata_fname(fname))
-      file = File.open(metadata_fname(fname))
-      @xmldoc = REXML::Document.new file
-      @xmldoc.root.elements.each("image") {
-         |image|
-         image_id = image.attributes["ident"]
-         img_fname = image.attributes["filename"]
-         load_image(img_fname, image_id)
-      }
-   end
-   def metadata_save_if_has(fname)
-      return if not has_metadata
-      metadata_doc = REXML::Document.new '<metadata/>'
-      @images.each {
-         |id, img_fname|
-         metadata_doc.root.add_element("image", {"filename"=>img_fname, "ident"=>id})
-      }
-      file = File.new(metadata_fname(fname), "w")
-      file.puts(metadata_doc)
-      file.close
-   end
-   def metadata_clear
-      @images = {}
-   end
-   def new(txt = "")
-      metadata_clear
-      self.setText(txt)
-   end
-   def open
-      fname = Qt::FileDialog.getOpenFileName
-      return if fname.nil?
-      unless File.exists?(fname)
-         Qt::MessageBox.critical(self, "File Does Not Exist", "Sorry, unable to find the requested file!")
-         return
-      end
-      return if fname.nil?
-      txt = File.open(fname).gets(nil)
-      metadata_clear
-      attempt_metadata_load(fname)
-      self.setText(txt)
-   end
-   def save_as
-      fname = Qt::FileDialog.getSaveFileName
-      return if fname.nil?
-      if File.exists?(fname)
-         Qt::MessageBox.critical(self, "File Already Exists", "Sorry, file already exists. Please choose a non-existing filename!")
-         return save_as
-      end
-      file = File.new(fname, "w")
-      file.puts(text())
-      file.close
-      metadata_save_if_has(fname)
-      emit saved()
-   end
-end
-
-class MyWidget < Qt::MainWindow
-   slots 'text_changed()', 'saved()'
-   def initialize()
-      super
-      @editor = MyTextEditor.new(self)
-      connect(@editor, SIGNAL('textChanged()'), self, SLOT('text_changed()'))
-      connect(@editor, SIGNAL('saved()'), self, SLOT('saved()'))
-
-      fileTools = Qt::ToolBar.new(self, "file operations")
-      fileMenu = Qt::PopupMenu.new(self)
-
-      actions = [
-         RAction.new("&New",  Icons::FILE_NEW, @editor, SLOT('new()'), [fileTools, fileMenu]),
-         RAction.new("&Open...", Icons::FILE_OPEN, @editor, SLOT('open()'), [fileTools, fileMenu]),
-         @save = RAction.new("Save &As...", Icons::FILE_SAVE_AS, @editor, SLOT('save_as()'), [fileTools, fileMenu]),
-         RSeperator.new([fileMenu]),
-         RAction.new("E&xit", Icons::EXIT, $qApp, SLOT('quit()'), [fileMenu])
-      ]
-
-      build_actions(actions)
-
-      menubar = Qt::MenuBar.new(self)
-      menubar.insertItem("&File", fileMenu)
-
-      self.setCentralWidget(@editor)
-   end
-   def saved
-      @save.action.setEnabled(false)
-   end
-   def text_changed
-      @save.action.setEnabled(true)
-   end
-end
-
-a = Qt::Application.new(ARGV)
-
-w = MyWidget.new
-w.show
-
-a.setMainWidget(w)
-a.exec()
-exit

data/ext/ruby/qtruby/src/extconf.rb

@@ -1,11 +0,0 @@
-require 'mkmf'
-dir_config('smoke')
-dir_config('qt')
-
-# For Linux, BSD*, Mac OS X etc:
-$LOCAL_LIBS += '-lsmokeqt -lQtCore -lQtGui -lQtNetwork -lQtOpenGL -lQtSql -lQtXml -lstdc++'
-
-# For Windows the Qt library names end in '4':
-# $LOCAL_LIBS += '-lsmokeqt -lQtCore4 -lQtGui4 -lQtNetwork4 -lQtOpenGL4 -lQtSql4 -lQtXml4 -lstdc++'
-
-create_makefile("qtruby4")