qtbindings 4.6.3.0-x86-mingw32 → 4.6.3.1-x86-mingw32

data/examples/widgets/movie/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'movieplayer.rb'
+require './movieplayer.rb'
 
 app = Qt::Application.new(ARGV)
 player = MoviePlayer.new

data/examples/widgets/screenshot/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'screenshot.rb'
+require './screenshot.rb'
 
 app = Qt::Application.new(ARGV)
 screenshot = Screenshot.new

data/examples/widgets/scribble/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'mainwindow.rb'
+require './mainwindow.rb'
 
 app = Qt::Application.new(ARGV)
 mainWin = MainWindow.new

data/examples/widgets/scribble/mainwindow.rb

@@ -23,7 +23,7 @@
 ** Translated to QtRuby by Richard Dale
 =end
 
-require 'scribblearea.rb'
+require './scribblearea.rb'
 
 class MainWindow < Qt::MainWindow
 

data/examples/widgets/sliders/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'window.rb'
+require './window.rb'
 
 app = Qt::Application.new(ARGV)
 window = Window.new

data/examples/widgets/sliders/slidersgroup.rb

@@ -71,7 +71,7 @@ class SlidersGroup < Qt::GroupBox
         @slider.value = value
     end
     
-    def minimum=(value)
+    def setMinimum(value)
         @slider.minimum = value
         @scrollBar.minimum = value
         @dial.minimum = value

data/examples/widgets/sliders/window.rb

@@ -23,7 +23,7 @@
 ** Translated to QtRuby by Richard Dale
 =end
 
-require 'slidersgroup.rb'
+require './slidersgroup.rb'
 
 class Window < Qt::Widget
     
@@ -39,11 +39,11 @@ class Window < Qt::Widget
         createControls(tr("Controls"))
     
         connect(@horizontalSliders, SIGNAL('valueChanged(int)'),
-                @verticalSliders, SLOT('setValue(int)'))
+                @verticalSliders, SLOT('value=(int)'))
         connect(@verticalSliders, SIGNAL('valueChanged(int)'),
                 @valueSpinBox, SLOT('setValue(int)'))
         connect(@valueSpinBox, SIGNAL('valueChanged(int)'),
-                @horizontalSliders, SLOT('setValue(int)'))
+                @horizontalSliders, SLOT('value=(int)'))
     
         layout = Qt::HBoxLayout.new do |l|
             l.addWidget(@controlsGroup)

data/examples/widgets/spinboxes/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'window.rb'
+require './window.rb'
 
 app = Qt::Application.new(ARGV)
 window = Window.new

data/examples/widgets/tetrix/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'tetrixwindow.rb'
+require './tetrixwindow.rb'
 
 app = Qt::Application.new(ARGV)
 window = TetrixWindow.new

data/examples/widgets/tetrix/tetrixboard.rb

@@ -23,7 +23,7 @@
 ** Translated to QtRuby by Richard Dale
 =end
     
-require 'tetrixpiece.rb'
+require './tetrixpiece.rb'
 
 class TetrixBoard < Qt::Frame
     
@@ -153,17 +153,17 @@ class TetrixBoard < Qt::Frame
         end
     
         case event.key
-        when Qt::Key_Left:
+        when Qt::Key_Left
             tryMove(@curPiece, @curX - 1, @curY)
-        when Qt::Key_Right:
+        when Qt::Key_Right
             tryMove(@curPiece, @curX + 1, @curY)
-        when Qt::Key_Down:
+        when Qt::Key_Down
             tryMove(@curPiece.rotatedRight, @curX, @curY)
-        when Qt::Key_Up:
+        when Qt::Key_Up
             tryMove(@curPiece.rotatedLeft, @curX, @curY)
-        when Qt::Key_Space:
+        when Qt::Key_Space
             dropDown()
-        when Qt::Key_D:
+        when Qt::Key_D
             oneLineDown()
         else
             super(event)

data/examples/widgets/tetrix/tetrixwindow.rb

@@ -23,7 +23,7 @@
 ** Translated to QtRuby by Richard Dale
 =end
     
-require 'tetrixboard.rb'
+require './tetrixboard.rb'
     
 class TetrixWindow < Qt::Widget
     

data/examples/widgets/tooltips/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'sortingbox.rb'
+require './sortingbox.rb'
 
 app = Qt::Application.new(ARGV)
 sortingBox = SortingBox.new

data/examples/widgets/tooltips/sortingbox.rb

@@ -23,7 +23,7 @@
 ** Translated to QtRuby by Richard Dale
 =end
 
-require 'shapeitem.rb'
+require './shapeitem.rb'
 
 class SortingBox < Qt::Widget
 	

data/examples/widgets/wiggly/dialog.rb

@@ -23,7 +23,7 @@
 ** Translated to QtRuby by Richard Dale
 =end
 
-require 'wigglywidget.rb'
+require './wigglywidget.rb'
 
 class Dialog < Qt::Dialog
     def initialize(parent = nil)
@@ -45,4 +45,4 @@ class Dialog < Qt::Dialog
         setWindowTitle(tr("Wiggly"))
         resize(360, 145)
     end
-end
+end

data/examples/widgets/wiggly/main.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'Qt'
-require 'dialog.rb'
+require './dialog.rb'
 
 app = Qt::Application.new(ARGV)
 dialog = Dialog.new

data/examples/widgets/windowflags/controllerwindow.rb

@@ -23,7 +23,7 @@
 ** Translated to QtRuby by Richard Dale
 =end
     
-require 'previewwindow.rb'
+require './previewwindow.rb'
 
 class ControllerWindow < Qt::Widget
     

data/examples/widgets/windowflags/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'controllerwindow.rb'
+require './controllerwindow.rb'
 
 app = Qt::Application.new(ARGV)
 controller = ControllerWindow.new

data/examples/xml/dombookmarks/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'mainwindow.rb'
+require './mainwindow.rb'
 
 $KCODE = 'u'
 

data/examples/xml/dombookmarks/mainwindow.rb

@@ -23,7 +23,7 @@
 ** Translated to QtRuby by Richard Dale
 =end
 
-require 'xbeltree.rb'
+require './xbeltree.rb'
 	
 class MainWindow < Qt::MainWindow
 		

data/examples/xml/saxbookmarks/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'mainwindow.rb'
+require './mainwindow.rb'
 
 $KCODE = 'u'
 

data/examples/xml/saxbookmarks/mainwindow.rb

@@ -23,7 +23,7 @@
 ** Translated to QtRuby by Richard Dale
 =end
 	
-require 'xbelhandler.rb'
+require './xbelhandler.rb'
 	
 class MainWindow < Qt::MainWindow
 		

data/examples/xml/saxbookmarks/xbelhandler.rb

@@ -23,7 +23,7 @@
 ** Translated to QtRuby by Richard Dale
 =end
 		
-require 'xbelgenerator.rb'
+require './xbelgenerator.rb'
 
 class XbelHandler < Qt::XmlDefaultHandler
 	

data/ext/cmake/modules/MacroOptionalAddBindings.cmake

@@ -27,7 +27,7 @@ macro(MACRO_OPTIONAL_ADD_BINDINGS _component_found _component_name)
     else(${_component_found} AND NOT DISABLE_${_component_name})
         list(APPEND ${_PREFIX}_DISABLED ${_component_name})
     endif(${_component_found} AND NOT DISABLE_${_component_name})
-    unset(_PREFIX)
+    set(_PREFIX)
 endmacro(MACRO_OPTIONAL_ADD_BINDINGS)
 
 # Show bindings summary
@@ -43,5 +43,5 @@ macro(MACRO_DISPLAY_BINDINGS_LOG)
     endif (${_PREFIX}_DISABLED)
     message(STATUS "Build ${_PREFIX} bindings: ${${_PREFIX}_ENABLED}")
     message(STATUS "Skip ${_PREFIX} bindings: ${${_PREFIX}_DISABLED}")
-    unset(_PREFIX)
+    set(_PREFIX)
 endmacro(MACRO_DISPLAY_BINDINGS_LOG)

data/ext/generator/generators/smoke/helpers.cpp

@@ -131,10 +131,10 @@ void Util::preparse(QSet<Type*> *usedTypes, QSet<const Class*> *superClasses, co
         // map this method to the function, so we can later retrieve the header it was defined in
         globalFunctionMap[&parent->methods().last()] = &fn;
         
-        int methIndex = parent->methods().length() - 1;
+        int methIndex = parent->methods().size() - 1;
         addOverloads(meth);
         // handle the methods appended by addOverloads()
-        for (int i = parent->methods().length() - 1; i > methIndex; --i)
+        for (int i = parent->methods().size() - 1; i > methIndex; --i)
             globalFunctionMap[&parent->methods()[i]] = &fn;
 
         (*usedTypes) << meth.type();
@@ -617,12 +617,13 @@ void Util::addAccessorMethods(const Field& field, QSet<Type*> *usedTypes)
     // reset
     type = field.type();
     // to avoid copying around more stuff than necessary, convert setFoo(Bar) to setFoo(const Bar&)
-    if (type->pointerDepth() == 0 && type->getClass()) {
+    if (type->pointerDepth() == 0 && type->getClass() && !(ParserOptions::qtMode && type->getClass()->name() == "QFlags")) {
         Type newType = *type;
         newType.setIsRef(true);
         newType.setIsConst(true);
         type = Type::registerType(newType);
     }
+
     (*usedTypes) << type;
     setter.appendParameter(Parameter(QString(), type));
     if (klass->methods().contains(setter))

data/ext/generator/generators/smoke/writeSmokeDataFile.cpp

@@ -115,7 +115,7 @@ QString SmokeDataFile::getTypeFlags(const Type *t, int *classIdx)
         flags += "|Smoke::t_voidp";
     } else if (t->getClass()) {
         if (t->getClass()->isTemplate()) {
-            if (Options::qtMode && t->getClass()->name() == "QFlags") {
+            if (Options::qtMode && t->getClass()->name() == "QFlags" && !t->isRef() && t->pointerDepth() == 0) {
                 flags += "|Smoke::t_uint";
             } else {
                 flags += "|Smoke::t_voidp";

data/ext/ruby/CMakeLists.txt

@@ -21,6 +21,7 @@ SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation
 MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + ${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}")
 
 macro_optional_add_bindings(QT_QTCORE_FOUND "QtRuby" qtruby)
+macro_optional_add_bindings(QT_QTDECLARATIVE_FOUND "QtDeclarative" qtdeclarative)
 macro_optional_add_bindings(QT_QTWEBKIT_FOUND "QtWebKit" qtwebkit)
 macro_optional_add_bindings(QT_QTUITOOLS_FOUND "QtUiTools" qtuitools)
 macro_optional_add_bindings(QT_QTSCRIPT_FOUND "QtScript" qtscript)

data/ext/ruby/qtdeclarative/CMakeLists.txt

@@ -0,0 +1,17 @@
+include_directories( ${CMAKE_SOURCE_DIR}/smoke ${RUBY_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/ruby/qtruby/src)
+INCLUDE_DIRECTORIES (${QT_INCLUDES})
+
+set(rubyqtdeclarative_LIBRARY_SRC qtdeclarative.cpp qtdeclarativehandlers.cpp)
+add_library(rubyqtdeclarative MODULE ${rubyqtdeclarative_LIBRARY_SRC})
+target_link_libraries(rubyqtdeclarative
+    ${QT_QTWEBKIT_LIBRARY}
+    smokeqtdeclarative
+    qtruby4shared
+)
+set_target_properties(rubyqtdeclarative PROPERTIES PREFIX "" OUTPUT_NAME qtdeclarative)
+install(TARGETS rubyqtdeclarative DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
+install(FILES qtdeclarative.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/qtdeclarative)
+
+if (Q_WS_MAC)
+    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${CUSTOM_RUBY_SITE_ARCH_DIR}/qtdeclarative.so\"  \"${CUSTOM_RUBY_SITE_ARCH_DIR}/qtdeclarative.bundle\" )" )
+endif (Q_WS_MAC)

data/ext/ruby/qtdeclarative/qtdeclarative.cpp

@@ -0,0 +1,66 @@
+#include <ruby.h>
+#undef read
+#undef write
+#undef connect
+#undef accept
+
+#include <QHash>
+#include <QList>
+#include <QtDebug>
+
+#include <smoke/qtdeclarative_smoke.h>
+
+#include <qtruby.h>
+
+#include <iostream>
+
+static VALUE getClassList(VALUE /*self*/)
+{
+    VALUE classList = rb_ary_new();
+    for (int i = 1; i <= qtdeclarative_Smoke->numClasses; i++) {
+        if (qtdeclarative_Smoke->classes[i].className && !qtdeclarative_Smoke->classes[i].external) {
+            rb_ary_push(classList, rb_str_new2(qtdeclarative_Smoke->classes[i].className));
+        }
+    }
+    return classList;
+}
+
+const char*
+resolve_classname_qtdeclarative(smokeruby_object * o)
+{
+    return qtruby_modules[o->smoke].binding->className(o->classId);
+}
+
+extern TypeHandler QtDeclarative_handlers[];
+
+extern "C" {
+
+VALUE qtdeclarative_module;
+VALUE qtdeclarative_internal_module;
+
+static QtRuby::Binding binding;
+
+Q_DECL_EXPORT void
+Init_qtdeclarative()
+{
+    init_qtdeclarative_Smoke();
+
+    binding = QtRuby::Binding(qtdeclarative_Smoke);
+
+    smokeList << qtdeclarative_Smoke;
+
+    QtRubyModule module = { "QtDeclarative", resolve_classname_qtdeclarative, 0, &binding };
+    qtruby_modules[qtdeclarative_Smoke] = module;
+
+    install_handlers(QtDeclarative_handlers);
+
+    qtdeclarative_module = rb_define_module("QtDeclarative");
+    qtdeclarative_internal_module = rb_define_module_under(qtdeclarative_module, "Internal");
+
+    rb_define_singleton_method(qtdeclarative_internal_module, "getClassList", (VALUE (*) (...)) getClassList, 0);
+
+    rb_require("qtdeclarative/qtdeclarative.rb");
+    rb_funcall(qtdeclarative_internal_module, rb_intern("init_all_classes"), 0);
+}
+
+}

data/ext/ruby/qtdeclarative/qtdeclarative.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/ruby
+
+module QtDeclarative
+    module Internal
+        def self.init_all_classes
+            getClassList.each do |c|
+                classname = Qt::Internal::normalize_classname(c)
+                id = Qt::Internal::findClass(c);
+                Qt::Internal::insert_pclassid(classname, id)
+                Qt::Internal::cpp_names[classname] = c
+                klass = Qt::Internal::isQObject(c) ? Qt::Internal::create_qobject_class(classname, Qt) \
+                                                    : Qt::Internal::create_qt_class(classname, Qt)
+                Qt::Internal::classes[classname] = klass unless klass.nil?
+            end
+        end
+    end
+end

data/ext/ruby/qtdeclarative/qtdeclarativehandlers.cpp

@@ -0,0 +1,35 @@
+/***************************************************************************
+                          qtdeclarativehandlers.cpp  -  QtDeclarative specific marshallers
+                             -------------------
+    begin                : Thurs Aug 12 2010
+    copyright            : (C) 2010 by Richard Dale
+    email                : richard.j.dale@gmail.com
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include <ruby.h>
+#undef read
+#undef write
+#undef connect
+#undef accept
+
+#include <qtruby.h>
+#include <smokeruby.h>
+#include <marshall_macros.h>
+
+#include <QtDeclarative/QDeclarativeError>
+
+DEF_VALUELIST_MARSHALLER( QDeclarativeErrorList, QList<QDeclarativeError>, QDeclarativeError )
+
+TypeHandler QtDeclarative_handlers[] = {
+    { "QList<QDeclarativeError>", marshall_QDeclarativeErrorList },
+    { 0, 0 }
+};