qtbindings 4.8.6.1 → 4.8.6.2

data/ext/ruby/qtruby/src/qtruby.cpp

@@ -1344,14 +1344,21 @@ initialize_qt(int argc, VALUE * argv, VALUE self)
 {
 	VALUE retval = Qnil;
 	VALUE temp_obj;
-
+  static VALUE mainThread = Qnil;
+  if (mainThread == Qnil) {
+    mainThread = rb_thread_main();
+  }
 	if (TYPE(self) == T_DATA) {
 		// If a ruby block was passed then run that now
 		if (rb_block_given_p()) {
 			rb_funcall(qt_internal_module, rb_intern("run_initializer_block"), 2, self, rb_block_proc());
 		}
 		return self;
-	}
+	} else {
+    if (rb_thread_current() != mainThread) {
+      rb_raise(rb_eRuntimeError, "Qt methods cannot be called from outside of the main thread");
+    }
+  }
 
 	VALUE klass = rb_funcall(self, rb_intern("class"), 0);
 	VALUE constructor_name = rb_str_new2("new");

data/lib/Qt/qtruby4.rb

@@ -241,7 +241,7 @@ module Qt
       Qt::Internal::getAllParents(classid, ids)
       ids << classid
       ids.each { |c| Qt::Internal::findAllMethodNames(meths, c, flags) }
-      return meths.uniq
+      return meths.uniq.map! {|a| a.intern}
     end
   end # Qt::Base
 
@@ -2505,6 +2505,8 @@ module Qt
     @@classes   = {}
     @@cpp_names = {}
     @@idclass   = []
+    # Initialize all instances to false since nil can be a valid entry
+    @@method_lookup_cache = Hash.new(false)
 
     @@normalize_procs = []
 
@@ -2577,7 +2579,7 @@ module Qt
 
     def Internal.checkarg(argtype, typename)
       const_point = typename =~ /^const\s+/ ? -1 : 0
-      if argtype == 'i'
+      if argtype == 'i'.freeze
         if typename =~ /^int&?$|^signed int&?$|^signed$|^qint32&?$/
           return 6 + const_point
         elsif typename =~ /^quint32&?$/
@@ -2593,7 +2595,7 @@ module Qt
             return 2
           end
         end
-      elsif argtype == 'n'
+      elsif argtype == 'n'.freeze
         if typename =~ /^double$|^qreal$/
           return 6 + const_point
         elsif typename =~ /^float$/
@@ -2609,11 +2611,11 @@ module Qt
             return 2 + const_point
           end
         end
-      elsif argtype == 'B'
+      elsif argtype == 'B'.freeze
         if typename =~ /^(?:bool)[*&]?$/
           return 2 + const_point
         end
-      elsif argtype == 's'
+      elsif argtype == 's'.freeze
         if typename =~ /^(const )?((QChar)[*&]?)$/
           return 6 + const_point
         elsif typename =~ /^(?:(u(nsigned )?)?char\*)$/
@@ -2623,7 +2625,7 @@ module Qt
         elsif typename =~ /^(?:(?:const )?(QString)[*&]?)$/
           return 8 + const_point
         end
-      elsif argtype == 'a'
+      elsif argtype == 'a'.freeze
         # FIXME: shouldn't be hardcoded. Installed handlers should tell what ruby type they expect.
         if typename =~ /^(?:
             const\ QCOORD\*|
@@ -2637,7 +2639,7 @@ module Qt
                   )$/x
           return 2 + const_point
         end
-      elsif argtype == 'u'
+      elsif argtype == 'u'.freeze
         # Give nil matched against string types a higher score than anything else
         if typename =~ /^(?:u?char\*|const u?char\*|(?:const )?((Q(C?)String))[*&]?)$/
           return 4 + const_point
@@ -2647,7 +2649,7 @@ module Qt
         else
           return 2 + const_point
         end
-      elsif argtype == 'U'
+      elsif argtype == 'U'.freeze
         if typename =~ /QStringList/
           return 4 + const_point
         else
@@ -2724,10 +2726,17 @@ module Qt
           end
         end
       end
+      lookup_str = "#{classname}::#{method}::#{args.collect {|arg| arg.class.to_s} }"
+      lookup = @@method_lookup_cache[lookup_str]
+      # @@method_lookup_cache is initialized to return false values on a cache miss
+      if lookup != false
+        setCurrentMethod(lookup) if lookup
+        return nil
+      end
 
       # Modify constructor method name from new to the name of the Qt class
       # and remove any namespacing
-      if method == "new"
+      if method == "new".freeze
         method = classname.dup
         method.gsub!(/^.*::/,"")
       end
@@ -2737,7 +2746,7 @@ module Qt
       method = "operator" + method.sub("@","") if method !~ /[a-zA-Z]+/
 
       # Change foobar= to setFoobar()
-      method = 'set' + method[0,1].upcase + method[1,method.length].sub("=", "") if method =~ /.*[^-+%\/|=]=$/ && method != 'operator='
+      method = 'set' + method[0,1].upcase + method[1,method.length].sub("=", "") if method =~ /.*[^-+%\/|=]=$/ && method != 'operator='.freeze
 
       # Build list of munged method names which is the methodname followed
       # by symbols that indicate the basic type of the method's arguments
@@ -2843,6 +2852,7 @@ module Qt
       end
 
       # Select the chosen method
+      @@method_lookup_cache[lookup_str] = chosen
       setCurrentMethod(chosen) if chosen
       return nil
     end
@@ -3253,6 +3263,6 @@ class Module
     end
     ids << classid
     ids.each { |c| Qt::Internal::findAllMethodNames(meths, c, flags) }
-    return meths.uniq
+    return meths.uniq.map! {|a| a.intern}
   end
 end

data/lib/qtbindings_version.rb

@@ -1,2 +1,2 @@
-QTBINDINGS_VERSION = '4.8.6.1'
-QTBINDINGS_RELEASE_DATE = '2015-03-26 11:48:16 -0600'
+QTBINDINGS_VERSION = '4.8.6.2'
+QTBINDINGS_RELEASE_DATE = '2015-05-08 08:23:33 -0600'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qtbindings
 version: !ruby/object:Gem::Version
-  version: 4.8.6.1
+  version: 4.8.6.2
 platform: ruby
 authors:
 - Ryan Melton
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies: []
 description: qtbindings provides ruby bindings to QT4.x. It is derived from the kdebindings
   project.
@@ -26,12 +26,15 @@ extensions:
 - extconf.rb
 extra_rdoc_files: []
 files:
-- CHANGELOG.txt
-- COPYING.LIB.txt
-- COPYING.txt
-- KNOWN_ISSUES.txt
-- Rakefile
-- TODO.txt
+- lib/Qt/qtruby4.rb
+- lib/Qt.rb
+- lib/Qt4.rb
+- lib/qtbindings_version.rb
+- lib/qtdeclarative/qtdeclarative.rb
+- lib/qtscript/qtscript.rb
+- lib/qttest/qttest.rb
+- lib/qtuitools/qtuitools.rb
+- lib/qtwebkit/qtwebkit.rb
 - bin/rbqtapi
 - bin/rbrcc
 - bin/rbuic4
@@ -116,8 +119,8 @@ files:
 - examples/itemviews/chart/qtdata.cht
 - examples/itemviews/dirview/main.rb
 - examples/itemviews/pixelator/imagemodel.rb
-- examples/itemviews/pixelator/images.qrc
 - examples/itemviews/pixelator/images/qt.png
+- examples/itemviews/pixelator/images.qrc
 - examples/itemviews/pixelator/main.rb
 - examples/itemviews/pixelator/mainwindow.rb
 - examples/itemviews/pixelator/makefile
@@ -287,13 +290,12 @@ files:
 - examples/richtext/syntaxhighlighter/highlighter.rb
 - examples/richtext/syntaxhighlighter/main.rb
 - examples/richtext/syntaxhighlighter/mainwindow.rb
-- examples/ruboids/LICENSE.txt
-- examples/ruboids/Manifest
-- examples/ruboids/README
-- examples/ruboids/TODO
 - examples/ruboids/boids.properties
 - examples/ruboids/generateManifest.rb
 - examples/ruboids/index.html
+- examples/ruboids/LICENSE.txt
+- examples/ruboids/Manifest
+- examples/ruboids/README
 - examples/ruboids/release.rb
 - examples/ruboids/ruboids/Boid.rb
 - examples/ruboids/ruboids/BoidView.rb
@@ -304,15 +306,16 @@ files:
 - examples/ruboids/ruboids/CloudView.rb
 - examples/ruboids/ruboids/Flock.rb
 - examples/ruboids/ruboids/Graphics.rb
+- examples/ruboids/ruboids/info.rb
 - examples/ruboids/ruboids/Params.rb
 - examples/ruboids/ruboids/Point.rb
+- examples/ruboids/ruboids/ruboids.rb
 - examples/ruboids/ruboids/Thing.rb
 - examples/ruboids/ruboids/Triangle.rb
 - examples/ruboids/ruboids/View.rb
 - examples/ruboids/ruboids/World.rb
 - examples/ruboids/ruboids/WorldWindow.rb
-- examples/ruboids/ruboids/info.rb
-- examples/ruboids/ruboids/ruboids.rb
+- examples/ruboids/TODO
 - examples/run_all.rb
 - examples/threading/main_thread.rb
 - examples/tutorial/t1/t1.rb
@@ -426,18 +429,17 @@ files:
 - examples/xml/saxbookmarks/mainwindow.rb
 - examples/xml/saxbookmarks/xbelgenerator.rb
 - examples/xml/saxbookmarks/xbelhandler.rb
-- ext/CMakeLists.txt
 - ext/cmake/modules/BasicFindPackageVersion.cmake.in
+- ext/cmake/modules/CheckCXXSourceCompiles.cmake
 - ext/cmake/modules/CMakeCSharpCompiler.cmake.in
 - ext/cmake/modules/CMakeCSharpInformation.cmake
 - ext/cmake/modules/CMakeDetermineCSharpCompiler.cmake
 - ext/cmake/modules/CMakeTestCSharpCompiler.cmake
-- ext/cmake/modules/CheckCXXSourceCompiles.cmake
 - ext/cmake/modules/FindLibraryWithDebug.cmake
 - ext/cmake/modules/FindMono.cmake
-- ext/cmake/modules/FindPHP5.cmake
 - ext/cmake/modules/FindPerlMore.cmake
 - ext/cmake/modules/FindPhonon.cmake
+- ext/cmake/modules/FindPHP5.cmake
 - ext/cmake/modules/FindQImageBlitz.cmake
 - ext/cmake/modules/FindQScintilla.cmake
 - ext/cmake/modules/FindQt4.cmake
@@ -453,7 +455,7 @@ files:
 - ext/cmake/modules/Qt4ConfigDependentSettings.cmake
 - ext/cmake/modules/Qt4Macros.cmake
 - ext/cmake/modules/SmokeConfig.cmake.in
-- ext/generator/CMakeLists.txt
+- ext/CMakeLists.txt
 - ext/generator/cmake/BasicFindPackageVersion.cmake.in
 - ext/generator/cmake/CMakeLists.txt
 - ext/generator/cmake/FindLibraryWithDebug.cmake
@@ -467,6 +469,7 @@ files:
 - ext/generator/cmake/MacroOptionalFindPackage.cmake
 - ext/generator/cmake/MacroWriteBasicCMakeVersionFile.cmake
 - ext/generator/cmake/SmokeConfig.cmake.in
+- ext/generator/CMakeLists.txt
 - ext/generator/config.h
 - ext/generator/generator_export.h
 - ext/generator/generatorenvironment.cpp
@@ -489,10 +492,10 @@ files:
 - ext/generator/name_compiler.h
 - ext/generator/options.cpp
 - ext/generator/options.h
-- ext/generator/parser/CMakeLists.txt
 - ext/generator/parser/ast.cpp
 - ext/generator/parser/ast.h
 - ext/generator/parser/astutilities.h
+- ext/generator/parser/CMakeLists.txt
 - ext/generator/parser/codegenerator.cpp
 - ext/generator/parser/codegenerator.h
 - ext/generator/parser/codemodel_fwd.h
@@ -524,14 +527,14 @@ files:
 - ext/generator/parser/parsesession.cpp
 - ext/generator/parser/parsesession.h
 - ext/generator/parser/problem.h
-- ext/generator/parser/rpp/CMakeLists.txt
-- ext/generator/parser/rpp/Makefile.am
 - ext/generator/parser/rpp/anchor.h
 - ext/generator/parser/rpp/appendedlist.h
 - ext/generator/parser/rpp/chartools.cpp
 - ext/generator/parser/rpp/chartools.h
+- ext/generator/parser/rpp/CMakeLists.txt
 - ext/generator/parser/rpp/macrorepository.cpp
 - ext/generator/parser/rpp/macrorepository.h
+- ext/generator/parser/rpp/Makefile.am
 - ext/generator/parser/rpp/pp-configuration
 - ext/generator/parser/rpp/pp-engine.cpp
 - ext/generator/parser/rpp/pp-engine.h
@@ -597,20 +600,18 @@ files:
 - ext/ruby/qtdeclarative/qtdeclarative.rb
 - ext/ruby/qtdeclarative/qtdeclarativehandlers.cpp
 - ext/ruby/qtruby/AUTHORS
+- ext/ruby/qtruby/bin/CMakeLists.txt
+- ext/ruby/qtruby/bin/rbqtapi
+- ext/ruby/qtruby/ChangeLog
 - ext/ruby/qtruby/CMakeLists.txt
 - ext/ruby/qtruby/COPYING
 - ext/ruby/qtruby/COPYING.LIB
-- ext/ruby/qtruby/ChangeLog
 - ext/ruby/qtruby/INSTALL
-- ext/ruby/qtruby/README
-- ext/ruby/qtruby/TODO
-- ext/ruby/qtruby/bin/CMakeLists.txt
-- ext/ruby/qtruby/bin/rbqtapi
-- ext/ruby/qtruby/rails_support/CMakeLists.txt
 - ext/ruby/qtruby/rails_support/active_item_model.rb
 - ext/ruby/qtruby/rails_support/active_table_model.rb
+- ext/ruby/qtruby/rails_support/CMakeLists.txt
+- ext/ruby/qtruby/README
 - ext/ruby/qtruby/src/CMakeLists.txt
-- ext/ruby/qtruby/src/Qt.cpp
 - ext/ruby/qtruby/src/handlers.cpp
 - ext/ruby/qtruby/src/marshall.h
 - ext/ruby/qtruby/src/marshall_basetypes.h
@@ -619,22 +620,21 @@ files:
 - ext/ruby/qtruby/src/marshall_primitives.h
 - ext/ruby/qtruby/src/marshall_types.cpp
 - ext/ruby/qtruby/src/marshall_types.h
+- ext/ruby/qtruby/src/Qt.cpp
 - ext/ruby/qtruby/src/qtruby.cpp
 - ext/ruby/qtruby/src/qtruby.h
 - ext/ruby/qtruby/src/smokeruby.h
 - ext/ruby/qtruby/test/opoverloading.rb
 - ext/ruby/qtruby/test/unittests.rb
+- ext/ruby/qtruby/TODO
 - ext/ruby/qtruby/tools/CMakeLists.txt
 - ext/ruby/qtruby/tools/rbrcc/CMakeLists.txt
-- ext/ruby/qtruby/tools/rbrcc/Messages.sh
 - ext/ruby/qtruby/tools/rbrcc/main.cpp
+- ext/ruby/qtruby/tools/rbrcc/Messages.sh
 - ext/ruby/qtruby/tools/rbrcc/rbrcc.pro
 - ext/ruby/qtruby/tools/rbrcc/rcc.cpp
 - ext/ruby/qtruby/tools/rbrcc/rcc.h
 - ext/ruby/qtruby/tools/rbuic/CMakeLists.txt
-- ext/ruby/qtruby/tools/rbuic/LICENSE.GPL
-- ext/ruby/qtruby/tools/rbuic/Messages.sh
-- ext/ruby/qtruby/tools/rbuic/TODO
 - ext/ruby/qtruby/tools/rbuic/customwidgetsinfo.cpp
 - ext/ruby/qtruby/tools/rbuic/customwidgetsinfo.h
 - ext/ruby/qtruby/tools/rbuic/databaseinfo.cpp
@@ -642,7 +642,9 @@ files:
 - ext/ruby/qtruby/tools/rbuic/driver.cpp
 - ext/ruby/qtruby/tools/rbuic/driver.h
 - ext/ruby/qtruby/tools/rbuic/globaldefs.h
+- ext/ruby/qtruby/tools/rbuic/LICENSE.GPL
 - ext/ruby/qtruby/tools/rbuic/main.cpp
+- ext/ruby/qtruby/tools/rbuic/Messages.sh
 - ext/ruby/qtruby/tools/rbuic/option.h
 - ext/ruby/qtruby/tools/rbuic/rbuic.pri
 - ext/ruby/qtruby/tools/rbuic/rbuic4.pro
@@ -659,6 +661,7 @@ files:
 - ext/ruby/qtruby/tools/rbuic/ruby/rbwriteinitialization.cpp
 - ext/ruby/qtruby/tools/rbuic/ruby/rbwriteinitialization.h
 - ext/ruby/qtruby/tools/rbuic/ruby/ruby.pri
+- ext/ruby/qtruby/tools/rbuic/TODO
 - ext/ruby/qtruby/tools/rbuic/treewalker.cpp
 - ext/ruby/qtruby/tools/rbuic/treewalker.h
 - ext/ruby/qtruby/tools/rbuic/ui4.cpp
@@ -673,8 +676,8 @@ files:
 - ext/ruby/qtscript/qtscript.rb
 - ext/ruby/qtscript/qtscripthandlers.cpp
 - ext/ruby/qtscript/smokedata.cpp
-- ext/ruby/qttest/CMakeLists.txt
 - ext/ruby/qttest/ChangeLog
+- ext/ruby/qttest/CMakeLists.txt
 - ext/ruby/qttest/examples/myfirsttest.rb
 - ext/ruby/qttest/qttest.cpp
 - ext/ruby/qttest/qttest.rb
@@ -692,10 +695,10 @@ files:
 - ext/smoke/deptool/main.cpp
 - ext/smoke/qt_smoke.h
 - ext/smoke/qtcore/CMakeLists.txt
-- ext/smoke/qtcore/QtGuess.txt
 - ext/smoke/qtcore/config.xml.cmake
 - ext/smoke/qtcore/qt-config.xml.cmake
 - ext/smoke/qtcore/qtcore_includes.h
+- ext/smoke/qtcore/QtGuess.txt
 - ext/smoke/qtcore/smokeconfig.xml
 - ext/smoke/qtcore/tests/CMakeLists.txt
 - ext/smoke/qtcore/tests/test.cpp
@@ -781,17 +784,14 @@ files:
 - ext/smoke/smokebase/CMakeLists.txt
 - ext/smoke/smokebase/smokebase.cpp
 - ext/smoke/solid_smoke.h
+- CHANGELOG.txt
+- COPYING.LIB.txt
+- COPYING.txt
+- KNOWN_ISSUES.txt
+- TODO.txt
 - extconf.rb
-- lib/Qt.rb
-- lib/Qt/qtruby4.rb
-- lib/Qt4.rb
-- lib/qtbindings_version.rb
-- lib/qtdeclarative/qtdeclarative.rb
-- lib/qtscript/qtscript.rb
-- lib/qttest/qttest.rb
-- lib/qtuitools/qtuitools.rb
-- lib/qtwebkit/qtwebkit.rb
 - qtbindings.gemspec
+- Rakefile
 homepage: http://github.com/ryanmelt/qtbindings
 licenses:
 - LGPLv2.1
@@ -802,18 +802,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - none
 rubyforge_project: qtbindings
-rubygems_version: 2.2.2
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Qt bindings for ruby