qtbindings 4.8.5.2 → 4.8.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bb1a13dfa6a4788219c66e0ed52bd76f4893044
-  data.tar.gz: 78b868e86ad325665e8f6846e2564a1ddad363ed
+  metadata.gz: ac37d8d099cae6f72ab5cea298864f616d32b3c0
+  data.tar.gz: 4ddf1bd802e1f241a3e6f1600f264276e55558d6
 SHA512:
-  metadata.gz: 4d4e339fadc3c63d885d9d6be07a6c74e3358064dfa11f8f58740fa852c95137d4732d1624c1773ecb3053455ca5d3b1892bc39af468a8b474db420eee6b5fab
-  data.tar.gz: 0a0b4ae4916789e898a4cc8c85daacc92710f461c7274f303ff4a3705554abd87514ab5e0d2cd158bf68222770e668ed52f8580fc1fdd693f96ad3f25065f80e
+  metadata.gz: ebeca2402dcdd00ea7dde6ce2df3591672a90b9585ff8fcf4b03ab2967dc8ff443a3b6ebef66c97802a6a0521da1c5c1100927262b10e339fe8a6fa44ec1603d
+  data.tar.gz: 5d105c6cacef2775eb1a6b263f713b87da3d74783ca08f273ee3f79b17a92aa8f703c48f95c4ca44f6e4eabe473b17f9454c818525bb762d3e20f4112d60c7bc

data/README.txt

@@ -10,37 +10,47 @@ Goals
 1. To make it easy to install a Qt binding for Ruby on all platforms using
    RubyGems
 2. To maintain an up-to-date binary gem for Windows that is bundled with
-   the latest version of Qt from http://qt.nokia.com
+   the latest version of Qt
 3. To reduce the scope and maintenance of the bindings to only bind to the
    libraries provided by the Qt SDK.
 4. To increase compatibility with non-linux platforms
 
-Note: This gem only supports Ruby 1.9.3 and Ruby 2.0.0 starting at qtbindings version 4.8.5.0.
+Note: This gem supports Ruby 2.0.0+ starting at qtbindings version 4.8.6.0.
+For Ruby 1.9.3 you should use version 4.8.5.2.
 For Ruby 1.8.x you can try installing version 4.8.3.0, however upgrading Ruby is
 highly recommended.
 
 Usage Notes
 ------------
-Ruby threading is now fully supported out of the box.   All GUI access however must be done
-inside the main thread.  To support updating the GUI using other threads, use the following function
+Ruby threading is now fully supported out of the box. All GUI access however must be done
+inside the main thread. To support updating the GUI using other threads, use the following function
 provided in Qt4.rb:
 
-Qt.execute_in_main_thread(true) do
-  # GUI code here
+Qt.execute_in_main_thread do # block the main thread
+  # GUI code which executes and then allows the main thread to execute
+end
+
+Qt.execute_in_main_thread(false) do # don't block the main thread
+  # GUI code which executes in parallel with the main thread
 end
 
 Tested Environments
 --------------------
-Mac OSX 10.6.8 (Snow Leopard)
-XCode 3.2.6 (gcc 4.2.1)
-Brew - QT 4.8.5
-Cmake 2.8.11.2
-Ruby 1.9.3p448
+Mac OSX 10.9.1 (Mavericks)
+XCode 5 (clang)
+Brew - QT 4.8.6
+Cmake 2.8.9
+Ruby 2.0.0p353 - Must be compiled with clang (rvm install <version> --with-gcc=clang)
 
 Windows XP SP3
 QT SDK 4.8.5
 Cmake 2.8.8
-Ruby 1.9.3p448 and Ruby 2.0.0p353 installed from rubyinstaller.org
+Ruby Ruby 2.0.0p481 installed from rubyinstaller.org
+
+Windows 7 SP1
+QT SDK 4.8.6
+Cmake 2.8.12.2
+Ruby 2.0.0p353 installed from rubyinstaller.org
 
 Ubuntu Linux 11.10
 QT SDK 4.8.1
@@ -52,7 +62,12 @@ Compiling qtbindings requires the following prerequisites:
 1. cmake 2.8.x installed and in your path
 2. QT 4.8.x installed and in your path
 3. Ruby installed and in your path
-4. gcc 4.x
+4. gcc 4.x (or clang for OSX 10.9)
+   For Windows this means getting MingGW-w64 from http://mingw-w64.sourceforge.net/download.php (Win-builds project)
+
+Note for OSX 10.9.  The default compiler has changed from gcc to clang.   All libraries 
+need to be compiled with clang or you will get segfaults.  This includes ruby, qt, and qtbindings.
+*** rvm does not compile with clang by default.  You must add --with-gcc=clang when installing a version of ruby *** 
 
 Additionally: all of the operating system prequisites for compiling,
 window system development, opengl, etc must be installed.
@@ -64,18 +79,20 @@ Perform the following steps to build the gem on Unix or Mac:
      Where the x is the subversion of QT and y is the patch level of qtbindings
 
 Perform the following steps to build the gem on Windows:
-1. Ensure you are running Ruby 1.9.3
-     ruby -v #=> ruby 1.9.3
+1. Ensure you are running Ruby 2.0.0
+     ruby -v #=> ruby 2.0.0
 2. rake distclean
 3. rake build
-4. Switch to Ruby 2.0.0
-     ruby -v #=> ruby 2.0.0
+4. Switch to Ruby 2.1.3
+     ruby -v #=> ruby 2.1.3
 5. rake build
 6. rake VERSION=4.8.x.y gemnative
      Where the x is the subversion of QT and y is the patch level of qtbindings
+7. rake VERSION=4.8.x.y gemqt
+     Where the x is the subversion of QT and y is the patch level of qtbindings
 
 Note: The gem is built twice to create the FAT binary which will work
-on both Ruby 1.9 and 2.0. The Windows utility called pik is useful for
+on both Ruby 2.0 and 2.1. The Windows utility called pik is useful for
 switching between Ruby versions.
 
 After building the gem, verify the examples work by running:
@@ -88,7 +105,7 @@ Debian Linux
 1. The following should get you the packages you need:
 sudo aptitude install build-essential bison openssl libreadline5
   libreadline-dev curl git-core zlib1g zlib1g-dev libssl-dev vim
-  libsqlite3-0 libsqlite3-dev sqlite3 libreadline5-dev libreadline6-dev
+  libsqlite3-0 libsqlite3-dev sqlite3
   libxml2-dev git-core subversion autoconf xorg-dev libgl1-mesa-dev
   libglu1-mesa-dev
 
@@ -100,7 +117,8 @@ Mac OSX Snow Leopard
 
 Windows - Note: Only necessary for debugging (binary gem available)
 --------
-1. mingw 4.4 in your path (from here or elsewhere: http://nosymbolfound.blogspot.com/2012/12/since-until-now-qt-under-windows-is.html#!/2012/12/since-until-now-qt-under-windows-is.html)
+QT 4.8.6 requires mingw 4.8.2 from http://mingw-w64.sourceforge.net/download.php (Win-builds project)
+QT 4.8.5 requires mingw 4.4 from here or elsewhere: http://nosymbolfound.blogspot.com/2012/12/since-until-now-qt-under-windows-is.html#!/2012/12/since-until-now-qt-under-windows-is.html)
 
 Install
 ------
@@ -121,6 +139,9 @@ License:
 This library is released under the LGPL Version 2.1.
 See COPYING.LIB.txt
 
+Contributing:
+Fork the project and submit pull requests.
+
 Disclaimer:
 Almost all of this code was written by the guys who worked on the KDE
 bindings project, particurly Arno Rehn and Richard Dale. I hope to increase

data/Rakefile

@@ -6,8 +6,14 @@ windows = true if platform =~ /mswin32/ or platform =~ /mingw32/
 
 if windows
   MAKE = 'mingw32-make'
+  SLASH = '\\'
+  COPY = 'copy'
+  DEL = 'del'
 else
   MAKE = 'make'
+  SLASH = '/'
+  COPY = 'cp'
+  DEL = 'rm'
 end
 
 def warn_version
@@ -92,7 +98,9 @@ end
 task :gemnative do
   warn_version()
   set_version()
+  system("#{COPY} gemspecs#{SLASH}qtbindingsnative.gemspec .")
   system("gem build qtbindingsnative.gemspec")
+  system("#{DEL} qtbindingsnative.gemspec")
   clear_version()
 end
 
@@ -100,7 +108,9 @@ task :gemqt do
   warn_version()
   set_version()
   system("#{MAKE} installqt")
+  system("#{COPY} gemspecs#{SLASH}qtbindings-qt.gemspec .")
   system("gem build qtbindings-qt.gemspec")
+  system("#{DEL} qtbindings-qt.gemspec")
   clear_version()
 end
 

data/bin/rbrcc

@@ -10,9 +10,5 @@ windows = true if platform =~ /mswin32/ or platform =~ /mingw32/
 extension = ''
 extension = '.exe' if windows
 
-if RUBY_VERSION.split('.')[0].to_i == 1
-  path = File.expand_path(File.join(File.dirname(__FILE__), '1.9', "rbrcc#{extension}"))
-else
-  path = File.expand_path(File.join(File.dirname(__FILE__), '2.0', "rbrcc#{extension}"))
-end
+path = File.expand_path(File.join(File.dirname(__FILE__), RUBY_VERSION.split('.')[0..1].join('.'), "rbrcc#{extension}"))
 exec(path, *ARGV)

data/bin/rbuic4

@@ -10,9 +10,5 @@ windows = true if platform =~ /mswin32/ or platform =~ /mingw32/
 extension = ''
 extension = '.exe' if windows
 
-if RUBY_VERSION.split('.')[0].to_i == 1
-  path = File.expand_path(File.join(File.dirname(__FILE__), '1.9', "rbuic4#{extension}"))
-else
-  path = File.expand_path(File.join(File.dirname(__FILE__), '2.0', "rbuic4#{extension}"))
-end
+path = File.expand_path(File.join(File.dirname(__FILE__), RUBY_VERSION.split('.')[0..1].join('.'), "rbuic4#{extension}"))
 exec(path, *ARGV)

data/bin/smokeapi

@@ -10,9 +10,5 @@ windows = true if platform =~ /mswin32/ or platform =~ /mingw32/
 extension = ''
 extension = '.exe' if windows
 
-if RUBY_VERSION.split('.')[0].to_i == 1
-  path = File.expand_path(File.join(File.dirname(__FILE__), '1.9', "smokeapi#{extension}"))
-else
-  path = File.expand_path(File.join(File.dirname(__FILE__), '2.0', "smokeapi#{extension}"))
-end
+path = File.expand_path(File.join(File.dirname(__FILE__), RUBY_VERSION.split('.')[0..1].join('.'), "smokeapi#{extension}"))
 exec(path, *ARGV)

data/bin/smokedeptool

@@ -10,9 +10,5 @@ windows = true if platform =~ /mswin32/ or platform =~ /mingw32/
 extension = ''
 extension = '.exe' if windows
 
-if RUBY_VERSION.split('.')[0].to_i == 1
-  path = File.expand_path(File.join(File.dirname(__FILE__), '1.9', "smokedeptool#{extension}"))
-else
-  path = File.expand_path(File.join(File.dirname(__FILE__), '2.0', "smokedeptool#{extension}"))
-end
+path = File.expand_path(File.join(File.dirname(__FILE__), RUBY_VERSION.split('.')[0..1].join('.'), "smokedeptool#{extension}"))
 exec(path, *ARGV)

data/examples/threading/main_thread.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/ruby -W
+require "Qt"
+
+app = Qt::Application.new(ARGV)
+
+hello = Qt::PushButton.new('Hello World!')
+hello.resize(100, 30)
+hello.show()
+
+# This code hangs the application because it is trying to access the GUI
+# (QT code) outside of the main thread
+#Thread.new { sleep 2; hello.resize(200,50) }
+
+# This code executes because it puts the GUI code inside
+# Qt.execute_in_main_thread
+Qt.execute_in_main_thread { sleep 2; hello.resize(200,50) }
+
+app.exec()
+

data/ext/CMakeLists.txt

@@ -10,6 +10,9 @@ include(MacroOptionalAddBindings)
 include(MacroLogFeature)
 include(CheckCXXSourceCompiles)
 
+# Call cmake/modules/FindQt4.cmake
+# We are using the version provided by the Github project Kitware/CMake
+# This sets a bunch of QT_XXX variables used throughout the build process
 FIND_PACKAGE (Qt4 REQUIRED)
 
 add_definitions (${QT_DEFINITIONS}  -DHAVE_CONFIG_H=1)

data/ext/cmake/modules/FindQt4.cmake

@@ -1012,7 +1012,10 @@ IF (QT4_QMAKE_FOUND)
   _QT4_ADJUST_LIB_VARS(QtAssistant)
   _QT4_ADJUST_LIB_VARS(QtAssistantClient)
   _QT4_ADJUST_LIB_VARS(QtCLucene)
-  _QT4_ADJUST_LIB_VARS(QtDBus)
+  # QtDBus doesn't work on WIN32
+  IF(NOT WIN32)
+    _QT4_ADJUST_LIB_VARS(QtDBus)
+  ENDIF(NOT WIN32)
   _QT4_ADJUST_LIB_VARS(QtDeclarative)
   _QT4_ADJUST_LIB_VARS(QtDesigner)
   _QT4_ADJUST_LIB_VARS(QtDesignerComponents)

data/ext/cmake/modules/FindRuby.cmake

@@ -81,8 +81,14 @@ IF(RUBY_EXECUTABLE  AND NOT  RUBY_MAJOR_VERSION)
    EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir']"
       OUTPUT_VARIABLE RUBY_HDR_DIR)
 
+   EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyarchhdrdir']"
+      OUTPUT_VARIABLE RUBY_ARCH_HDR_DIR)
+
    EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']"
-      OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_DIR)
+      OUTPUT_VARIABLE RUBY_LIB_DIR)
+
+   EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['archlibdir']"
+      OUTPUT_VARIABLE RUBY_ARCH_LIB_DIR)
 
    EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']"
       OUTPUT_VARIABLE RUBY_RUBY_LIB_DIR)
@@ -106,25 +112,33 @@ IF(RUBY_EXECUTABLE  AND NOT  RUBY_MAJOR_VERSION)
          OUTPUT_VARIABLE RUBY_VENDORARCH_DIR)
    ENDIF(RUBY_HAS_VENDOR_RUBY)
 
+   EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['RUBY_SO_NAME']"
+       OUTPUT_VARIABLE RUBY_SONAME)
+
    # save the results in the cache so we don't have to run ruby the next time again
    SET(RUBY_VERSION_MAJOR    ${RUBY_VERSION_MAJOR}    CACHE PATH "The Ruby major version" FORCE)
    SET(RUBY_VERSION_MINOR    ${RUBY_VERSION_MINOR}    CACHE PATH "The Ruby minor version" FORCE)
    SET(RUBY_VERSION_PATCH    ${RUBY_VERSION_PATCH}    CACHE PATH "The Ruby patch version" FORCE)
    SET(RUBY_ARCH_DIR         ${RUBY_ARCH_DIR}         CACHE PATH "The Ruby arch dir" FORCE)
    SET(RUBY_HDR_DIR          ${RUBY_HDR_DIR}          CACHE PATH "The Ruby header dir (1.9)" FORCE)
-   SET(RUBY_POSSIBLE_LIB_DIR ${RUBY_POSSIBLE_LIB_DIR} CACHE PATH "The Ruby lib dir" FORCE)
+   SET(RUBY_ARCH_HDR_DIR     ${RUBY_ARCH_HDR_DIR}     CACHE PATH "The Ruby header dir for architecture-specific headers" FORCE)
+   SET(RUBY_LIB_DIR          ${RUBY_LIB_DIR}          CACHE PATH "The Ruby base lib dir" FORCE)
+   SET(RUBY_ARCH_LIB_DIR     ${RUBY_ARCH_LIB_DIR}     CACHE PATH "The Ruby architecture-specific lib dir" FORCE)
    SET(RUBY_RUBY_LIB_DIR     ${RUBY_RUBY_LIB_DIR}     CACHE PATH "The Ruby ruby-lib dir" FORCE)
    SET(RUBY_SITEARCH_DIR     ${RUBY_SITEARCH_DIR}     CACHE PATH "The Ruby site arch dir" FORCE)
    SET(RUBY_SITELIB_DIR      ${RUBY_SITELIB_DIR}      CACHE PATH "The Ruby site lib dir" FORCE)
    SET(RUBY_HAS_VENDOR_RUBY  ${RUBY_HAS_VENDOR_RUBY}  CACHE BOOL "Vendor Ruby is available" FORCE)
    SET(RUBY_VENDORARCH_DIR   ${RUBY_VENDORARCH_DIR}   CACHE PATH "The Ruby vendor arch dir" FORCE)
    SET(RUBY_VENDORLIB_DIR    ${RUBY_VENDORLIB_DIR}    CACHE PATH "The Ruby vendor lib dir" FORCE)
+   SET(RUBY_SONAME           ${RUBY_SONAME}           CACHE PATH "The Ruby library's .so name" FORCE)
 
    MARK_AS_ADVANCED(
      RUBY_ARCH_DIR
      RUBY_ARCH
      RUBY_HDR_DIR
-     RUBY_POSSIBLE_LIB_DIR
+     RUBY_ARCH_HDR_DIR
+     RUBY_LIB_DIR
+     RUBY_ARCH_LIB_DIR
      RUBY_RUBY_LIB_DIR
      RUBY_SITEARCH_DIR
      RUBY_SITELIB_DIR
@@ -134,6 +148,7 @@ IF(RUBY_EXECUTABLE  AND NOT  RUBY_MAJOR_VERSION)
      RUBY_VERSION_MAJOR
      RUBY_VERSION_MINOR
      RUBY_VERSION_PATCH
+     RUBY_SONAME
      )
 ENDIF(RUBY_EXECUTABLE  AND NOT  RUBY_MAJOR_VERSION)
 
@@ -178,6 +193,7 @@ FIND_PATH(RUBY_INCLUDE_DIR
    HINTS
    ${RUBY_HDR_DIR}
    ${RUBY_ARCH_DIR}
+   ${RUBY_ARCH_HDR_DIR}
    /usr/lib/ruby/${_RUBY_VERSION_SHORT}/i586-linux-gnu/ )
 
 SET(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIR} )
@@ -188,6 +204,7 @@ IF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18  OR  ${_RUBY_VERSION_SHORT_NODOT
    FIND_PATH(RUBY_CONFIG_INCLUDE_DIR
      NAMES ruby/config.h  config.h
      HINTS 
+     ${RUBY_ARCH_HDR_DIR}
      ${RUBY_HDR_DIR}/${RUBY_ARCH}
      ${RUBY_ARCH_DIR} 
      )
@@ -197,7 +214,7 @@ ENDIF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18  OR  ${_RUBY_VERSION_SHORT_NO
 
 
 # Determine the list of possible names for the ruby library
-SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT} ruby-${RUBY_VERSION})
+SET(_RUBY_POSSIBLE_LIB_NAMES ${RUBY_SONAME} ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT} ruby-${RUBY_VERSION})
 
 IF(WIN32)
    SET( _RUBY_MSVC_RUNTIME "" )
@@ -226,7 +243,7 @@ IF(WIN32)
                "msvcrt-ruby${_RUBY_VERSION_LONG_NODOT}-static" )               
 ENDIF(WIN32)
 
-FIND_LIBRARY(RUBY_LIBRARY NAMES ${_RUBY_POSSIBLE_LIB_NAMES} HINTS ${RUBY_POSSIBLE_LIB_DIR} )
+FIND_LIBRARY(RUBY_LIBRARY NAMES ${_RUBY_POSSIBLE_LIB_NAMES} HINTS ${RUBY_ARCH_LIB_DIR} ${RUBY_LIB_DIR})
 
 INCLUDE(FindPackageHandleStandardArgs)
 SET(_RUBY_REQUIRED_VARS RUBY_EXECUTABLE RUBY_INCLUDE_DIR RUBY_LIBRARY)
@@ -259,3 +276,4 @@ MARK_AS_ADVANCED(
 SET(RUBY_POSSIBLE_LIB_PATH ${RUBY_POSSIBLE_LIB_DIR})
 SET(RUBY_RUBY_LIB_PATH ${RUBY_RUBY_LIB_DIR})
 SET(RUBY_INCLUDE_PATH ${RUBY_INCLUDE_DIRS})
+

data/ext/ruby/qtruby/src/CMakeLists.txt

@@ -1,4 +1,4 @@
-IF(QT_QTDBUS_FOUND)
+IF(QT_QTDBUS_FOUND AND NOT WIN32)
     ADD_DEFINITIONS (-DQT_QTDBUS)
 ENDIF(QT_QTDBUS_FOUND)
 
@@ -27,7 +27,7 @@ set(qtruby_LIB_SRCS qtruby.cpp)
 add_library(qtruby4shared SHARED ${qtrubyshared_LIB_SRCS})
 add_library(qtruby4 MODULE ${qtruby_LIB_SRCS})
 
-if(QT_QTDBUS_FOUND)
+if(QT_QTDBUS_FOUND AND NOT WIN32)
   target_link_libraries(  qtruby4shared 
                               ${QT_QTCORE_LIBRARY} 
                               ${QT_QTGUI_LIBRARY} 

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

@@ -153,36 +153,36 @@ inspectProperty(QMetaProperty property, const char * name, QVariant & value)
 	{
 		QFont f = value.value<QFont>();
 		return QString(	" %1=#<Qt::Font:0x0 family=%2, pointSize=%3, weight=%4, italic=%5, bold=%6, underline=%7, strikeOut=%8>")
-									.arg(name)
-									.arg(f.family())
-									.arg(f.pointSize())
-									.arg(f.weight())
-									.arg(f.italic() ? "true" : "false")
-									.arg(f.bold() ? "true" : "false")
-									.arg(f.underline() ? "true" : "false")
-									.arg(f.strikeOut() ? "true" : "false");
+			.arg(name)
+			.arg(f.family())
+			.arg(f.pointSize())
+			.arg(f.weight())
+			.arg(f.italic() ? "true" : "false")
+			.arg(f.bold() ? "true" : "false")
+			.arg(f.underline() ? "true" : "false")
+			.arg(f.strikeOut() ? "true" : "false");
 	}
 
 	case QVariant::Line:
 	{
 		QLine l = value.toLine();
 		return QString(" %1=#<Qt::Line:0x0 x1=%2, y1=%3, x2=%4, y2=%5>")
-						.arg(name)
-						.arg(l.x1())
-						.arg(l.y1())
-						.arg(l.x2())
-						.arg(l.y2());
+			.arg(name)
+			.arg(l.x1())
+			.arg(l.y1())
+			.arg(l.x2())
+			.arg(l.y2());
 	}
 
 	case QVariant::LineF:
 	{
 		QLineF l = value.toLineF();
 		return QString(" %1=#<Qt::LineF:0x0 x1=%2, y1=%3, x2=%4, y2=%5>")
-						.arg(name)
-						.arg(l.x1())
-						.arg(l.y1())
-						.arg(l.x2())
-						.arg(l.y2());
+			.arg(name)
+			.arg(l.x1())
+			.arg(l.y1())
+			.arg(l.x2())
+			.arg(l.y2());
 	}
 
 	case QVariant::Point:
@@ -201,41 +201,41 @@ inspectProperty(QMetaProperty property, const char * name, QVariant & value)
 	{
 		QRect r = value.toRect();
 		return QString(" %1=#<Qt::Rect:0x0 left=%2, right=%3, top=%4, bottom=%5>")
-									.arg(name)
-									.arg(r.left()).arg(r.right()).arg(r.top()).arg(r.bottom());
+			.arg(name)
+			.arg(r.left()).arg(r.right()).arg(r.top()).arg(r.bottom());
 	}
 
 	case QVariant::RectF:
 	{
 		QRectF r = value.toRectF();
 		return QString(" %1=#<Qt::RectF:0x0 left=%2, right=%3, top=%4, bottom=%5>")
-									.arg(name)
-									.arg(r.left()).arg(r.right()).arg(r.top()).arg(r.bottom());
+			.arg(name)
+			.arg(r.left()).arg(r.right()).arg(r.top()).arg(r.bottom());
 	}
 
 	case QVariant::Size:
 	{
 		QSize s = value.toSize();
 		return QString(" %1=#<Qt::Size:0x0 width=%2, height=%3>")
-									.arg(name)
-									.arg(s.width()).arg(s.height());
+			.arg(name)
+			.arg(s.width()).arg(s.height());
 	}
 
 	case QVariant::SizeF:
 	{
 		QSizeF s = value.toSizeF();
 		return QString(" %1=#<Qt::SizeF:0x0 width=%2, height=%3>")
-									.arg(name)
-									.arg(s.width()).arg(s.height());
+			.arg(name)
+			.arg(s.width()).arg(s.height());
 	}
 
 	case QVariant::SizePolicy:
 	{
 		QSizePolicy s = value.value<QSizePolicy>();
 		return QString(" %1=#<Qt::SizePolicy:0x0 horizontalPolicy=%2, verticalPolicy=%3>")
-									.arg(name)
-									.arg(s.horizontalPolicy())
-									.arg(s.verticalPolicy());
+			.arg(name)
+			.arg(s.horizontalPolicy())
+			.arg(s.verticalPolicy());
 	}
 
 	case QVariant::Brush:
@@ -250,7 +250,7 @@ inspectProperty(QMetaProperty property, const char * name, QVariant & value)
 
 	default:
 		return QString(" %1=%2").arg(name)
-									.arg((value.isNull() || value.toString().isNull()) ? "nil" : value.toString() );
+			.arg((value.isNull() || value.toString().isNull()) ? "nil" : value.toString() );
 	}
 }
 
@@ -272,7 +272,7 @@ inspect_qobject(VALUE self)
 	rb_str_resize(inspect_str, RSTRING_LEN(inspect_str) - 1);
 
 	smokeruby_object * o = 0;
-    Data_Get_Struct(self, smokeruby_object, o);
+	Data_Get_Struct(self, smokeruby_object, o);
 	QObject * qobject = (QObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QObject").index);
 
 	QString value_list;
@@ -281,10 +281,10 @@ inspect_qobject(VALUE self)
 	if (qobject->isWidgetType()) {
 		QWidget * w = (QWidget *) qobject;
 		value_list.append(QString(", x=%1, y=%2, width=%3, height=%4")
-												.arg(w->x())
-												.arg(w->y())
-												.arg(w->width())
-												.arg(w->height()) );
+			.arg(w->x())
+			.arg(w->y())
+			.arg(w->width())
+			.arg(w->height()) );
 	}
 
 	value_list.append(">");
@@ -317,7 +317,7 @@ pretty_print_qobject(VALUE self, VALUE pp)
 	rb_funcall(pp, rb_intern("breakable"), 0);
 
 	smokeruby_object * o = 0;
-    Data_Get_Struct(self, smokeruby_object, o);
+	Data_Get_Struct(self, smokeruby_object, o);
 	QObject * qobject = (QObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QObject").index);
 
 	QString value_list;
@@ -336,16 +336,16 @@ pretty_print_qobject(VALUE self, VALUE pp)
 		if (qobject->parent()->isWidgetType()) {
 			QWidget * w = (QWidget *) qobject->parent();
 			value_list = QString("  parent=%1 objectName=\"%2\", x=%3, y=%4, width=%5, height=%6>,\n")
-												.arg(parentInspectString)
-												.arg(w->objectName())
-												.arg(w->x())
-												.arg(w->y())
-												.arg(w->width())
-												.arg(w->height());
+				.arg(parentInspectString)
+				.arg(w->objectName())
+				.arg(w->x())
+				.arg(w->y())
+				.arg(w->width())
+				.arg(w->height());
 		} else {
 			value_list = QString("  parent=%1 objectName=\"%2\">,\n")
-												.arg(parentInspectString)
-												.arg(qobject->parent()->objectName());
+				.arg(parentInspectString)
+				.arg(qobject->parent()->objectName());
 		}
 
 		rb_funcall(pp, rb_intern("text"), 1, rb_str_new2(value_list.toLatin1()));
@@ -353,7 +353,7 @@ pretty_print_qobject(VALUE self, VALUE pp)
 
 	if (qobject->children().count() != 0) {
 		value_list = QString("  children=Array (%1 element(s)),\n")
-								.arg(qobject->children().count());
+			.arg(qobject->children().count());
 		rb_funcall(pp, rb_intern("text"), 1, rb_str_new2(value_list.toLatin1()));
 	}
 
@@ -362,7 +362,7 @@ pretty_print_qobject(VALUE self, VALUE pp)
 
 	if (qobject->metaObject()->superClass() != 0) {
 		value_list.append(	QString(", superClass=#<Qt::MetaObject:0x0 className=%1>")
-							.arg(qobject->metaObject()->superClass()->className()) );
+			.arg(qobject->metaObject()->superClass()->className()) );
 	}
 
 	value_list.append(">,\n");
@@ -420,7 +420,7 @@ q_unregister_resource_data(VALUE /*self*/, VALUE version, VALUE tree_value, VALU
 static VALUE
 qabstract_item_model_rowcount(int argc, VALUE * argv, VALUE self)
 {
-    smokeruby_object *o = value_obj_info(self);
+	smokeruby_object *o = value_obj_info(self);
 	QAbstractItemModel * model = (QAbstractItemModel *) o->ptr;
 	if (argc == 0) {
 		return INT2NUM(model->rowCount());
@@ -438,7 +438,7 @@ qabstract_item_model_rowcount(int argc, VALUE * argv, VALUE self)
 static VALUE
 qabstract_item_model_columncount(int argc, VALUE * argv, VALUE self)
 {
-    smokeruby_object *o = value_obj_info(self);
+	smokeruby_object *o = value_obj_info(self);
 	QAbstractItemModel * model = (QAbstractItemModel *) o->ptr;
 	if (argc == 0) {
 		return INT2NUM(model->columnCount());
@@ -456,9 +456,9 @@ qabstract_item_model_columncount(int argc, VALUE * argv, VALUE self)
 static VALUE
 qabstract_item_model_data(int argc, VALUE * argv, VALUE self)
 {
-    smokeruby_object * o = value_obj_info(self);
+	smokeruby_object * o = value_obj_info(self);
 	QAbstractItemModel * model = (QAbstractItemModel *) o->ptr;
-    smokeruby_object * mi = value_obj_info(argv[0]);
+	smokeruby_object * mi = value_obj_info(argv[0]);
 	QModelIndex * modelIndex = (QModelIndex *) mi->ptr;
 	QVariant value;
 	if (argc == 1) {
@@ -471,7 +471,7 @@ qabstract_item_model_data(int argc, VALUE * argv, VALUE self)
 
 
 	smokeruby_object  * result = alloc_smokeruby_object(	true,
-															o->smoke,
+								o->smoke,
 															o->smoke->findClass("QVariant").index,
 															new QVariant(value) );
 	return set_obj_info("Qt::Variant", result);
@@ -480,11 +480,11 @@ qabstract_item_model_data(int argc, VALUE * argv, VALUE self)
 static VALUE
 qabstract_item_model_setdata(int argc, VALUE * argv, VALUE self)
 {
-    smokeruby_object *o = value_obj_info(self);
+	smokeruby_object *o = value_obj_info(self);
 	QAbstractItemModel * model = (QAbstractItemModel *) o->ptr;
-    smokeruby_object * mi = value_obj_info(argv[0]);
+	smokeruby_object * mi = value_obj_info(argv[0]);
 	QModelIndex * modelIndex = (QModelIndex *) mi->ptr;
-    smokeruby_object * v = value_obj_info(argv[1]);
+	smokeruby_object * v = value_obj_info(argv[1]);
 	QVariant * variant = (QVariant *) v->ptr;
 
 	if (argc == 2) {
@@ -493,8 +493,8 @@ qabstract_item_model_setdata(int argc, VALUE * argv, VALUE self)
 
 	if (argc == 3) {
 		return (model->setData(	*modelIndex,
-								*variant,
-								NUM2INT(rb_funcall(argv[2], rb_intern("to_i"), 0)) ) ? Qtrue : Qfalse);
+					*variant,
+					NUM2INT(rb_funcall(argv[2], rb_intern("to_i"), 0)) ) ? Qtrue : Qfalse);
 	}
 
 	rb_raise(rb_eArgError, "Invalid argument list");
@@ -503,9 +503,9 @@ qabstract_item_model_setdata(int argc, VALUE * argv, VALUE self)
 static VALUE
 qabstract_item_model_flags(VALUE self, VALUE model_index)
 {
-    smokeruby_object *o = value_obj_info(self);
+	smokeruby_object *o = value_obj_info(self);
 	QAbstractItemModel * model = (QAbstractItemModel *) o->ptr;
-    smokeruby_object * mi = value_obj_info(model_index);
+	smokeruby_object * mi = value_obj_info(model_index);
 	const QModelIndex * modelIndex = (const QModelIndex *) mi->ptr;
 	return INT2NUM((int) model->flags(*modelIndex));
 }
@@ -513,7 +513,7 @@ qabstract_item_model_flags(VALUE self, VALUE model_index)
 static VALUE
 qabstract_item_model_insertrows(int argc, VALUE * argv, VALUE self)
 {
-    smokeruby_object *o = value_obj_info(self);
+	smokeruby_object *o = value_obj_info(self);
 	QAbstractItemModel * model = (QAbstractItemModel *) o->ptr;
 
 	if (argc == 2) {
@@ -521,7 +521,7 @@ qabstract_item_model_insertrows(int argc, VALUE * argv, VALUE self)
 	}
 
 	if (argc == 3) {
-    	smokeruby_object * mi = value_obj_info(argv[2]);
+		smokeruby_object * mi = value_obj_info(argv[2]);
 		const QModelIndex * modelIndex = (const QModelIndex *) mi->ptr;
 		return (model->insertRows(NUM2INT(argv[0]), NUM2INT(argv[1]), *modelIndex) ? Qtrue : Qfalse);
 	}
@@ -532,7 +532,7 @@ qabstract_item_model_insertrows(int argc, VALUE * argv, VALUE self)
 static VALUE
 qabstract_item_model_insertcolumns(int argc, VALUE * argv, VALUE self)
 {
-    smokeruby_object *o = value_obj_info(self);
+	smokeruby_object *o = value_obj_info(self);
 	QAbstractItemModel * model = (QAbstractItemModel *) o->ptr;
 
 	if (argc == 2) {
@@ -540,7 +540,7 @@ qabstract_item_model_insertcolumns(int argc, VALUE * argv, VALUE self)
 	}
 
 	if (argc == 3) {
-    	smokeruby_object * mi = value_obj_info(argv[2]);
+		smokeruby_object * mi = value_obj_info(argv[2]);
 		const QModelIndex * modelIndex = (const QModelIndex *) mi->ptr;
 		return (model->insertColumns(NUM2INT(argv[0]), NUM2INT(argv[1]), *modelIndex) ? Qtrue : Qfalse);
 	}
@@ -551,7 +551,7 @@ qabstract_item_model_insertcolumns(int argc, VALUE * argv, VALUE self)
 static VALUE
 qabstract_item_model_removerows(int argc, VALUE * argv, VALUE self)
 {
-    smokeruby_object *o = value_obj_info(self);
+	smokeruby_object *o = value_obj_info(self);
 	QAbstractItemModel * model = (QAbstractItemModel *) o->ptr;
 
 	if (argc == 2) {
@@ -559,7 +559,7 @@ qabstract_item_model_removerows(int argc, VALUE * argv, VALUE self)
 	}
 
 	if (argc == 3) {
-    	smokeruby_object * mi = value_obj_info(argv[2]);
+		smokeruby_object * mi = value_obj_info(argv[2]);
 		const QModelIndex * modelIndex = (const QModelIndex *) mi->ptr;
 		return (model->removeRows(NUM2INT(argv[0]), NUM2INT(argv[1]), *modelIndex) ? Qtrue : Qfalse);
 	}
@@ -570,7 +570,7 @@ qabstract_item_model_removerows(int argc, VALUE * argv, VALUE self)
 static VALUE
 qabstract_item_model_removecolumns(int argc, VALUE * argv, VALUE self)
 {
-    smokeruby_object *o = value_obj_info(self);
+	smokeruby_object *o = value_obj_info(self);
 	QAbstractItemModel * model = (QAbstractItemModel *) o->ptr;
 
 	if (argc == 2) {
@@ -578,7 +578,7 @@ qabstract_item_model_removecolumns(int argc, VALUE * argv, VALUE self)
 	}
 
 	if (argc == 3) {
-    	smokeruby_object * mi = value_obj_info(argv[2]);
+		smokeruby_object * mi = value_obj_info(argv[2]);
 		const QModelIndex * modelIndex = (const QModelIndex *) mi->ptr;
 		return (model->removeRows(NUM2INT(argv[0]), NUM2INT(argv[1]), *modelIndex) ? Qtrue : Qfalse);
 	}
@@ -592,7 +592,7 @@ qabstract_item_model_removecolumns(int argc, VALUE * argv, VALUE self)
 static VALUE
 qbytearray_append(VALUE self, VALUE str)
 {
-    smokeruby_object *o = value_obj_info(self);
+	smokeruby_object *o = value_obj_info(self);
 	QByteArray * bytes = (QByteArray *) o->ptr;
 	(*bytes) += (const char *) StringValuePtr(str);
 	return self;
@@ -601,34 +601,34 @@ qbytearray_append(VALUE self, VALUE str)
 static VALUE
 qbytearray_data(VALUE self)
 {
-  smokeruby_object *o = value_obj_info(self);
-  QByteArray * bytes = (QByteArray *) o->ptr;
-  return rb_str_new(bytes->data(), bytes->size());
+	smokeruby_object *o = value_obj_info(self);
+	QByteArray * bytes = (QByteArray *) o->ptr;
+	return rb_str_new(bytes->data(), bytes->size());
 }
 
 static VALUE
 qimage_bits(VALUE self)
 {
-  smokeruby_object *o = value_obj_info(self);
-  QImage * image = static_cast<QImage *>(o->ptr);
-  const uchar * bytes = image->bits();
-  return rb_str_new((const char *) bytes, image->numBytes());
+	smokeruby_object *o = value_obj_info(self);
+	QImage * image = static_cast<QImage *>(o->ptr);
+	const uchar * bytes = image->bits();
+	return rb_str_new((const char *) bytes, image->numBytes());
 }
 
 static VALUE
 qimage_scan_line(VALUE self, VALUE ix)
 {
-  smokeruby_object *o = value_obj_info(self);
-  QImage * image = static_cast<QImage *>(o->ptr);
-  const uchar * bytes = image->scanLine(NUM2INT(ix));
-  return rb_str_new((const char *) bytes, image->bytesPerLine());
+	smokeruby_object *o = value_obj_info(self);
+	QImage * image = static_cast<QImage *>(o->ptr);
+	const uchar * bytes = image->scanLine(NUM2INT(ix));
+	return rb_str_new((const char *) bytes, image->bytesPerLine());
 }
 
 #ifdef QT_QTDBUS
 static VALUE
 qdbusargument_endarraywrite(VALUE self)
 {
-    smokeruby_object *o = value_obj_info(self);
+	smokeruby_object *o = value_obj_info(self);
 	QDBusArgument * arg = (QDBusArgument *) o->ptr;
 	arg->endArray();
 	return self;
@@ -637,7 +637,7 @@ qdbusargument_endarraywrite(VALUE self)
 static VALUE
 qdbusargument_endmapwrite(VALUE self)
 {
-    smokeruby_object *o = value_obj_info(self);
+	smokeruby_object *o = value_obj_info(self);
 	QDBusArgument * arg = (QDBusArgument *) o->ptr;
 	arg->endMap();
 	return self;
@@ -646,7 +646,7 @@ qdbusargument_endmapwrite(VALUE self)
 static VALUE
 qdbusargument_endmapentrywrite(VALUE self)
 {
-    smokeruby_object *o = value_obj_info(self);
+	smokeruby_object *o = value_obj_info(self);
 	QDBusArgument * arg = (QDBusArgument *) o->ptr;
 	arg->endMapEntry();
 	return self;
@@ -655,7 +655,7 @@ qdbusargument_endmapentrywrite(VALUE self)
 static VALUE
 qdbusargument_endstructurewrite(VALUE self)
 {
-    smokeruby_object *o = value_obj_info(self);
+	smokeruby_object *o = value_obj_info(self);
 	QDBusArgument * arg = (QDBusArgument *) o->ptr;
 	arg->endStructure();
 	return self;
@@ -784,7 +784,7 @@ qabstractitemmodel_createindex(int argc, VALUE * argv, VALUE self)
 			if (	qstrcmp(	o->smoke->types[o->smoke->argumentList[o->smoke->methods[o->smoke->ambiguousMethodList[i]].args + 2]].name,
 							"void*" ) == 0 )
 			{
-	    		const Smoke::Method &m = o->smoke->methods[o->smoke->ambiguousMethodList[i]];
+				const Smoke::Method &m = o->smoke->methods[o->smoke->ambiguousMethodList[i]];
 				Smoke::ClassFn fn = o->smoke->classes[m.classId].classFn;
 				Smoke::StackItem stack[4];
 				stack[1].s_int = NUM2INT(argv[0]);
@@ -810,10 +810,77 @@ qabstractitemmodel_createindex(int argc, VALUE * argv, VALUE self)
 	return rb_call_super(argc, argv);
 }
 
+#if QT_VERSION >= 0x040600
+// copy the role names defined on the model instance into a ruby hash and return it
+static VALUE
+qabstractitemmodel_rolenames(int argc, VALUE * argv, VALUE self)
+{
+	smokeruby_object *o = value_obj_info(self);
+	if( !o->ptr )
+	{
+		// not ok
+		rb_raise(rb_eArgError, "NULL given, expected subclass of QAbstractItemModel");
+	}
+
+	QAbstractItemModel* model = (QAbstractItemModel*) o->ptr;
+
+	// convert QHash<int,QByteArray> to a ruby hash
+	VALUE result = rb_hash_new();
+	QHash<int, QByteArray>::const_iterator i;
+	for( i = model->roleNames().constBegin(); i != model->roleNames().constEnd(); i++)
+	{
+		rb_hash_aset(result,
+				 INT2NUM(i.key()),
+				 rb_str_new2(i.value().data()));
+	}
+
+	return result;
+}
+
+// let C++ call a protected member function from outside
+// NOTE: a little hacky, but setRoleNames is deprecated in Qt 5.0, anyway...
+struct SetRoleNamesExposer : QAbstractItemModel {
+  using QAbstractItemModel::setRoleNames;
+};
+
+// set the role names on the given model instance from the given hash
+static VALUE
+qabstractitemmodel_setrolenames(int argc, VALUE * argv, VALUE self)
+{
+	if( argc != 1 || TYPE(argv[0]) != T_HASH )
+	{
+	  rb_raise(rb_eArgError, "Invalid arguments");
+	}
+
+	// convert the ruby hash to a QHash<int,QByteArray>
+	QHash<int,QByteArray> rnames;
+	VALUE tmp = rb_funcall(argv[0], rb_intern("to_a"), 0);
+	for( long i=0; i<RARRAY_LEN(tmp); i++)
+	{
+		VALUE key = rb_ary_entry(rb_ary_entry(tmp, i), 0);
+		VALUE val = rb_ary_entry(rb_ary_entry(tmp, i), 1);
+		rnames[NUM2INT(key)] = QByteArray(StringValuePtr(val));
+	}
+
+	smokeruby_object *o = value_obj_info(self);
+	if( !o->ptr )
+	{
+		// not ok
+		rb_raise(rb_eArgError, "NULL given, expected subclass of QAbstractItemModel");
+	}
+
+	QAbstractItemModel* model = (QAbstractItemModel*) o->ptr;
+	(model->*&SetRoleNamesExposer::setRoleNames)(rnames);   // just a little hacky, since
+								// 'setRoleNames' is protected
+
+	return Qnil;
+}
+#endif
+
 static VALUE
 qmodelindex_internalpointer(VALUE self)
 {
-    smokeruby_object *o = value_obj_info(self);
+	smokeruby_object *o = value_obj_info(self);
 	QModelIndex * index = (QModelIndex *) o->ptr;
 	void * ptr = index->internalPointer();
 	return ptr != 0 ? (VALUE) ptr : Qnil;
@@ -822,7 +889,7 @@ qmodelindex_internalpointer(VALUE self)
 static VALUE
 qitemselection_at(VALUE self, VALUE i)
 {
-    smokeruby_object *o = value_obj_info(self);
+	smokeruby_object *o = value_obj_info(self);
 	QItemSelection * item = (QItemSelection *) o->ptr;
 	QItemSelectionRange range = item->at(NUM2INT(i));
 
@@ -837,7 +904,7 @@ qitemselection_at(VALUE self, VALUE i)
 static VALUE
 qitemselection_count(VALUE self)
 {
-    smokeruby_object *o = value_obj_info(self);
+	smokeruby_object *o = value_obj_info(self);
 	QItemSelection * item = (QItemSelection *) o->ptr;
 	return INT2NUM(item->count());
 }
@@ -845,8 +912,8 @@ qitemselection_count(VALUE self)
 static VALUE
 metaObject(VALUE self)
 {
-    VALUE metaObject = rb_funcall(qt_internal_module, rb_intern("getMetaObject"), 2, Qnil, self);
-    return metaObject;
+	VALUE metaObject = rb_funcall(qt_internal_module, rb_intern("getMetaObject"), 2, Qnil, self);
+	return metaObject;
 }
 
 /* This shouldn't be needed, but kalyptus doesn't generate a staticMetaObject
@@ -860,9 +927,9 @@ qobject_staticmetaobject(VALUE /*klass*/)
 	QMetaObject * meta = new QMetaObject(QObject::staticMetaObject);
 
 	smokeruby_object  * m = alloc_smokeruby_object(	true,
-													qtcore_Smoke,
-													qtcore_Smoke->idClass("QMetaObject").index,
-													meta );
+							qtcore_Smoke,
+							qtcore_Smoke->idClass("QMetaObject").index,
+							meta );
 
 	VALUE obj = set_obj_info("Qt::MetaObject", m);
 	return obj;
@@ -871,29 +938,29 @@ qobject_staticmetaobject(VALUE /*klass*/)
 static VALUE
 cast_object_to(VALUE /*self*/, VALUE object, VALUE new_klass)
 {
-    smokeruby_object *o = value_obj_info(object);
+	smokeruby_object *o = value_obj_info(object);
 
 	VALUE new_klassname = rb_funcall(new_klass, rb_intern("name"), 0);
 
-    Smoke::ModuleIndex * cast_to_id = classcache.value(StringValuePtr(new_klassname));
+	Smoke::ModuleIndex * cast_to_id = classcache.value(StringValuePtr(new_klassname));
 	if (cast_to_id == 0) {
 		rb_raise(rb_eArgError, "unable to find class \"%s\" to cast to\n", StringValuePtr(new_klassname));
 	}
 
-	smokeruby_object * o_cast = alloc_smokeruby_object(	o->allocated,
-														cast_to_id->smoke,
-														(int) cast_to_id->index,
-														o->smoke->cast(o->ptr, o->classId, (int) cast_to_id->index) );
+	smokeruby_object * o_cast = alloc_smokeruby_object(o->allocated,
+							   cast_to_id->smoke,
+							   (int) cast_to_id->index,
+							   o->smoke->cast(o->ptr, o->classId, (int) cast_to_id->index) );
 
-    VALUE obj = Data_Wrap_Struct(new_klass, smokeruby_mark, smokeruby_free, (void *) o_cast);
-    mapPointer(obj, o_cast, o_cast->classId, 0);
-    return obj;
+	VALUE obj = Data_Wrap_Struct(new_klass, smokeruby_mark, smokeruby_free, (void *) o_cast);
+	mapPointer(obj, o_cast, o_cast->classId, 0);
+	return obj;
 }
 
 static VALUE
 qobject_qt_metacast(VALUE self, VALUE klass)
 {
-    smokeruby_object *o = value_obj_info(self);
+	smokeruby_object *o = value_obj_info(self);
 	if (o == 0 || o->ptr == 0) {
 		return Qnil;
 	}
@@ -916,13 +983,13 @@ qobject_qt_metacast(VALUE self, VALUE klass)
 	}
 
 	smokeruby_object * o_cast = alloc_smokeruby_object(	o->allocated,
-														mi->smoke,
-														(int) mi->index,
-														ret );
+								mi->smoke,
+								(int) mi->index,
+								ret );
 
-    VALUE obj = Data_Wrap_Struct(klass, smokeruby_mark, smokeruby_free, (void *) o_cast);
-    mapPointer(obj, o_cast, o_cast->classId, 0);
-    return obj;
+	VALUE obj = Data_Wrap_Struct(klass, smokeruby_mark, smokeruby_free, (void *) o_cast);
+	mapPointer(obj, o_cast, o_cast->classId, 0);
+	return obj;
 }
 
 static VALUE
@@ -939,13 +1006,11 @@ qsignalmapper_mapping(int argc, VALUE * argv, VALUE self)
 		Smoke::Index i = meth.smoke->methodMaps[meth.index].method;
 		i = -i;		// turn into ambiguousMethodList index
 		while (meth.smoke->ambiguousMethodList[i] != 0) {
-			if (	(	qstrcmp(	meth.smoke->types[meth.smoke->argumentList[meth.smoke->methods[meth.smoke->ambiguousMethodList[i]].args]].name,
-									"QObject*" ) == 0
-						&& Smoke::isDerivedFrom(a->smoke->classes[a->classId].className, "QObject")
-						&& !Smoke::isDerivedFrom(a->smoke->classes[a->classId].className, "QWidget") )
-					|| (	qstrcmp(	meth.smoke->types[meth.smoke->argumentList[meth.smoke->methods[meth.smoke->ambiguousMethodList[i]].args]].name,
-										"QWidget*" ) == 0
-							&& Smoke::isDerivedFrom(a->smoke->classes[a->classId].className, "QWidget") ) )
+			if ((qstrcmp(meth.smoke->types[meth.smoke->argumentList[meth.smoke->methods[meth.smoke->ambiguousMethodList[i]].args]].name, "QObject*" ) == 0
+				&& Smoke::isDerivedFrom(a->smoke->classes[a->classId].className, "QObject")
+				&& !Smoke::isDerivedFrom(a->smoke->classes[a->classId].className, "QWidget") )
+				|| (qstrcmp(meth.smoke->types[meth.smoke->argumentList[meth.smoke->methods[meth.smoke->ambiguousMethodList[i]].args]].name, "QWidget*" ) == 0
+				&& Smoke::isDerivedFrom(a->smoke->classes[a->classId].className, "QWidget") ) )
 			{
 				_current_method.smoke = meth.smoke;
 				_current_method.index = meth.smoke->ambiguousMethodList[i];
@@ -975,13 +1040,11 @@ qsignalmapper_set_mapping(int argc, VALUE * argv, VALUE self)
 		Smoke::Index i = meth.smoke->methodMaps[meth.index].method;
 		i = -i;		// turn into ambiguousMethodList index
 		while (meth.smoke->ambiguousMethodList[i] != 0) {
-			if (	(	qstrcmp(	meth.smoke->types[meth.smoke->argumentList[meth.smoke->methods[meth.smoke->ambiguousMethodList[i]].args + 1]].name,
-									"QObject*" ) == 0
-						&& Smoke::isDerivedFrom(a->smoke->classes[a->classId].className, "QObject")
-						&& !Smoke::isDerivedFrom(a->smoke->classes[a->classId].className, "QWidget") )
-					|| (	qstrcmp(	meth.smoke->types[meth.smoke->argumentList[meth.smoke->methods[meth.smoke->ambiguousMethodList[i]].args + 1]].name,
-										"QWidget*" ) == 0
-							&& Smoke::isDerivedFrom(a->smoke->classes[a->classId].className, "QWidget") ) )
+			if ((qstrcmp(meth.smoke->types[meth.smoke->argumentList[meth.smoke->methods[meth.smoke->ambiguousMethodList[i]].args + 1]].name, "QObject*" ) == 0
+				&& Smoke::isDerivedFrom(a->smoke->classes[a->classId].className, "QObject")
+				&& !Smoke::isDerivedFrom(a->smoke->classes[a->classId].className, "QWidget") )
+				|| (qstrcmp(meth.smoke->types[meth.smoke->argumentList[meth.smoke->methods[meth.smoke->ambiguousMethodList[i]].args + 1]].name, "QWidget*" ) == 0
+				&& Smoke::isDerivedFrom(a->smoke->classes[a->classId].className, "QWidget") ) )
 			{
 				_current_method.smoke = meth.smoke;
 				_current_method.index = meth.smoke->ambiguousMethodList[i];
@@ -1027,7 +1090,7 @@ qvariant_value(VALUE /*self*/, VALUE variant_value_klass, VALUE variant_value)
 	VALUE result = Qnil;
 	smokeruby_object * vo = 0;
 
-    smokeruby_object *o = value_obj_info(variant_value);
+	smokeruby_object *o = value_obj_info(variant_value);
 	if (o == 0 || o->ptr == 0) {
 		return Qnil;
 	}
@@ -1057,7 +1120,7 @@ qvariant_value(VALUE /*self*/, VALUE variant_value_klass, VALUE variant_value)
 	}
 
 	const char * classname = rb_class2name(variant_value_klass);
-    Smoke::ModuleIndex * value_class_id = classcache.value(classname);
+	Smoke::ModuleIndex * value_class_id = classcache.value(classname);
 	if (value_class_id == 0) {
 		return Qnil;
 	}
@@ -1153,8 +1216,7 @@ qvariant_from_value(int argc, VALUE * argv, VALUE self)
 		Smoke::Index i = meth.smoke->methodMaps[meth.index].method;
 		i = -i;		// turn into ambiguousMethodList index
 		while (meth.smoke->ambiguousMethodList[i] != 0) {
-			if (	qstrcmp(	meth.smoke->types[meth.smoke->argumentList[meth.smoke->methods[meth.smoke->ambiguousMethodList[i]].args]].name,
-								typeName ) == 0 )
+			if (qstrcmp(meth.smoke->types[meth.smoke->argumentList[meth.smoke->methods[meth.smoke->ambiguousMethodList[i]].args]].name, typeName ) == 0 )
 			{
 				_current_method.smoke = meth.smoke;
 				_current_method.index = meth.smoke->ambiguousMethodList[i];
@@ -1172,7 +1234,7 @@ qvariant_from_value(int argc, VALUE * argv, VALUE self)
 	QVariant * v = 0;
 
 	const char * classname = rb_obj_classname(argv[0]);
-    smokeruby_object *o = value_obj_info(argv[0]);
+	smokeruby_object *o = value_obj_info(argv[0]);
 	int type = 0;
 
 	if (qstrcmp(classname, "Qt::Enum") == 0) {
@@ -1186,7 +1248,7 @@ qvariant_from_value(int argc, VALUE * argv, VALUE self)
 			return result;
 		} else {
 			VALUE lasterr = rb_gv_get("$!");
-			VALUE klass = rb_class_path(CLASS_OF(lasterr));
+			VALUE klass = rb_class_name(CLASS_OF(lasterr));
 			if (qstrcmp(StringValuePtr(klass), "ArgumentError") == 0) {
 				// ArgumentError - no suitable constructor found
 				// Create a QVariant that contains an rObject
@@ -1232,7 +1294,7 @@ static Smoke::Index new_qvariant_qmap = 0;
 		_current_method.index = new_qvariant_qmap;
 		QtRuby::MethodCall c(qtcore_Smoke, _current_method.index, self, argv, argc-1);
 		c.next();
-    	return *(c.var());
+		return *(c.var());
 	} else if (	argc == 1
 				&& TYPE(argv[0]) == T_ARRAY
 				&& RARRAY_LEN(argv[0]) > 0
@@ -1250,7 +1312,7 @@ static Smoke::Index new_qvariant_qmap = 0;
 
 static VALUE module_method_missing(int argc, VALUE * argv, VALUE klass)
 {
-    return class_method_missing(argc, argv, klass);
+	return class_method_missing(argc, argv, klass);
 }
 
 /*
@@ -1288,7 +1350,6 @@ initialize_qt(int argc, VALUE * argv, VALUE self)
 		if (rb_block_given_p()) {
 			rb_funcall(qt_internal_module, rb_intern("run_initializer_block"), 2, self, rb_block_proc());
 		}
-
 		return self;
 	}
 
@@ -1335,9 +1396,9 @@ initialize_qt(int argc, VALUE * argv, VALUE self)
 	Data_Get_Struct(temp_obj, smokeruby_object, p);
 
 	smokeruby_object  * o = alloc_smokeruby_object(	true,
-													p->smoke,
-													p->classId,
-													p->ptr );
+							p->smoke,
+							p->classId,
+							p->ptr );
 	p->ptr = 0;
 	p->allocated = false;
 
@@ -1352,7 +1413,7 @@ initialize_qt(int argc, VALUE * argv, VALUE self)
 VALUE
 new_qt(int argc, VALUE * argv, VALUE klass)
 {
-    VALUE * temp_stack = ALLOCA_N(VALUE, argc + 1);
+	VALUE * temp_stack = ALLOCA_N(VALUE, argc + 1);
 	temp_stack[0] = rb_obj_alloc(klass);
 
 	for (int count = 0; count < argc; count++) {
@@ -1387,7 +1448,7 @@ qt_signal(int argc, VALUE * argv, VALUE self)
 {
 	smokeruby_object *o = value_obj_info(self);
 	QObject *qobj = (QObject*)o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QObject").index);
-    if (qobj->signalsBlocked()) {
+	if (qobj->signalsBlocked()) {
 		return Qfalse;
 	}
 
@@ -1406,9 +1467,9 @@ qt_signal(int argc, VALUE * argv, VALUE self)
 		return Qnil;
 	}
 
-    int i = -1;
+	int i = -1;
 	const QMetaObject * m = (QMetaObject*) ometa->ptr;
-    for (i = m->methodCount() - 1; i > -1; i--) {
+	for (i = m->methodCount() - 1; i > -1; i--) {
 		if (m->method(i).methodType() == QMetaMethod::Signal) {
 			QString name(m->method(i).signature());
 static QRegExp * rx = 0;
@@ -1421,7 +1482,7 @@ static QRegExp * rx = 0;
 				break;
 			}
 		}
-    }
+	}
 
 	if (i == -1) {
 		return Qnil;
@@ -1474,7 +1535,7 @@ qt_metacall(int /*argc*/, VALUE * argv, VALUE self)
 			o->smoke->classes[o->classId].className );
 	}
 
-    if (_c != QMetaObject::InvokeMetaMethod) {
+	if (_c != QMetaObject::InvokeMetaMethod) {
 		return argv[1];
 	}
 
@@ -1501,7 +1562,7 @@ qt_metacall(int /*argc*/, VALUE * argv, VALUE self)
 		QList<MocArgument*> mocArgs = get_moc_arguments(o->smoke, method.typeName(), method.parameterTypes());
 
 		QString name(method.signature());
-static QRegExp * rx = 0;
+		static QRegExp * rx = 0;
 		if (rx == 0) {
 			rx = new QRegExp("\\(.*");
 		}
@@ -1555,38 +1616,38 @@ qtimer_single_shot(int argc, VALUE * argv, VALUE /*self*/)
 static VALUE
 getMethStat(VALUE /*self*/)
 {
-    VALUE result_list = rb_ary_new();
-    rb_ary_push(result_list, INT2NUM((int)methcache.size()));
-    rb_ary_push(result_list, INT2NUM((int)methcache.count()));
-    return result_list;
+	VALUE result_list = rb_ary_new();
+	rb_ary_push(result_list, INT2NUM((int)methcache.size()));
+	rb_ary_push(result_list, INT2NUM((int)methcache.count()));
+	return result_list;
 }
 
 static VALUE
 getClassStat(VALUE /*self*/)
 {
-    VALUE result_list = rb_ary_new();
-    rb_ary_push(result_list, INT2NUM((int)classcache.size()));
-    rb_ary_push(result_list, INT2NUM((int)classcache.count()));
-    return result_list;
+	VALUE result_list = rb_ary_new();
+	rb_ary_push(result_list, INT2NUM((int)classcache.size()));
+	rb_ary_push(result_list, INT2NUM((int)classcache.count()));
+	return result_list;
 }
 
 static VALUE
 getIsa(VALUE /*self*/, VALUE classId)
 {
-    VALUE parents_list = rb_ary_new();
+	VALUE parents_list = rb_ary_new();
 
-    int id = NUM2INT(rb_funcall(classId, rb_intern("index"), 0));
-    Smoke* smoke = smokeList[NUM2INT(rb_funcall(classId, rb_intern("smoke"), 0))];
+	int id = NUM2INT(rb_funcall(classId, rb_intern("index"), 0));
+	Smoke* smoke = smokeList[NUM2INT(rb_funcall(classId, rb_intern("smoke"), 0))];
 
-    Smoke::Index *parents =
+	Smoke::Index *parents =
 	smoke->inheritanceList +
 	smoke->classes[id].parents;
 
-    while(*parents) {
+	while(*parents) {
 	//logger("\tparent: %s", qtcore_Smoke->classes[*parents].className);
 	rb_ary_push(parents_list, rb_str_new2(smoke->classes[*parents++].className));
-    }
-    return parents_list;
+	}
+	return parents_list;
 }
 
 // Return the class name of a QObject. Note that the name will be in the
@@ -1594,8 +1655,8 @@ getIsa(VALUE /*self*/, VALUE classId)
 static VALUE
 class_name(VALUE self)
 {
-    VALUE klass = rb_funcall(self, rb_intern("class"), 0);
-    return rb_funcall(klass, rb_intern("name"), 0);
+	VALUE klass = rb_funcall(self, rb_intern("class"), 0);
+	return rb_funcall(klass, rb_intern("name"), 0);
 }
 
 // Allow classnames in both 'Qt::Widget' and 'QWidget' formats to be
@@ -1620,37 +1681,37 @@ inherits_qobject(int argc, VALUE * argv, VALUE /*self*/)
 /* Adapted from the internal function qt_qFindChildren() in qobject.cpp */
 static void
 rb_qFindChildren_helper(VALUE parent, const QString &name, VALUE re,
-                         const QMetaObject &mo, VALUE list)
+						 const QMetaObject &mo, VALUE list)
 {
-    if (parent == Qnil || list == Qnil)
-        return;
+	if (parent == Qnil || list == Qnil)
+		return;
 	VALUE children = rb_funcall(parent, rb_intern("children"), 0);
-    VALUE rv = Qnil;
-    for (int i = 0; i < RARRAY_LEN(children); ++i) {
-        rv = RARRAY_PTR(children)[i];
+	VALUE rv = Qnil;
+	for (int i = 0; i < RARRAY_LEN(children); ++i) {
+		rv = RARRAY_PTR(children)[i];
 		smokeruby_object *o = value_obj_info(rv);
 		QObject * obj = (QObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QObject").index);
 
 		// The original code had 'if (mo.cast(obj))' as a test, but it doesn't work here
-        if (obj->qt_metacast(mo.className()) != 0) {
-            if (re != Qnil) {
+		if (obj->qt_metacast(mo.className()) != 0) {
+			if (re != Qnil) {
 				VALUE re_test = rb_funcall(re, rb_intern("=~"), 1, rb_funcall(rv, rb_intern("objectName"), 0));
 				if (re_test != Qnil && re_test != Qfalse) {
 					rb_ary_push(list, rv);
 				}
-            } else {
-                if (name.isNull() || obj->objectName() == name) {
+			} else {
+				if (name.isNull() || obj->objectName() == name) {
 					rb_ary_push(list, rv);
 				}
-            }
-        }
-        rb_qFindChildren_helper(rv, name, re, mo, list);
-    }
+			}
+		}
+		rb_qFindChildren_helper(rv, name, re, mo, list);
+	}
 	return;
 }
 
 /* Should mimic Qt4's QObject::findChildren method with this syntax:
-     obj.findChildren(Qt::Widget, "Optional Widget Name")
+	 obj.findChildren(Qt::Widget, "Optional Widget Name")
 */
 static VALUE
 find_qobject_children(int argc, VALUE *argv, VALUE self)
@@ -1681,24 +1742,24 @@ find_qobject_children(int argc, VALUE *argv, VALUE self)
 static VALUE
 rb_qFindChild_helper(VALUE parent, const QString &name, const QMetaObject &mo)
 {
-    if (parent == Qnil)
-        return Qnil;
+	if (parent == Qnil)
+		return Qnil;
 	VALUE children = rb_funcall(parent, rb_intern("children"), 0);
-    VALUE rv;
+	VALUE rv;
 	int i;
-    for (i = 0; i < RARRAY_LEN(children); ++i) {
-        rv = RARRAY_PTR(children)[i];
+	for (i = 0; i < RARRAY_LEN(children); ++i) {
+		rv = RARRAY_PTR(children)[i];
 		smokeruby_object *o = value_obj_info(rv);
 		QObject * obj = (QObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QObject").index);
-        if (obj->qt_metacast(mo.className()) != 0 && (name.isNull() || obj->objectName() == name))
-            return rv;
-    }
-    for (i = 0; i < RARRAY_LEN(children); ++i) {
-        rv = rb_qFindChild_helper(RARRAY_PTR(children)[i], name, mo);
-        if (rv != Qnil)
-            return rv;
-    }
-    return Qnil;
+		if (obj->qt_metacast(mo.className()) != 0 && (name.isNull() || obj->objectName() == name))
+			return rv;
+	}
+	for (i = 0; i < RARRAY_LEN(children); ++i) {
+		rv = rb_qFindChild_helper(RARRAY_PTR(children)[i], name, mo);
+		if (rv != Qnil)
+			return rv;
+	}
+	return Qnil;
 }
 
 static VALUE
@@ -1721,50 +1782,50 @@ find_qobject_child(int argc, VALUE *argv, VALUE self)
 static VALUE
 setDebug(VALUE self, VALUE on_value)
 {
-    int on = NUM2INT(on_value);
-    do_debug = on;
-    return self;
+	int on = NUM2INT(on_value);
+	do_debug = on;
+	return self;
 }
 
 static VALUE
 debugging(VALUE /*self*/)
 {
-    return INT2NUM(do_debug);
+	return INT2NUM(do_debug);
 }
 
 static VALUE
 get_arg_type_name(VALUE /*self*/, VALUE method_value, VALUE idx_value)
 {
-    int method = NUM2INT(rb_funcall(method_value, rb_intern("index"), 0));
-    int smokeIndex = NUM2INT(rb_funcall(method_value, rb_intern("smoke"), 0));
-    Smoke * smoke = smokeList[smokeIndex];
-    int idx = NUM2INT(idx_value);
-    const Smoke::Method &m = smoke->methods[method];
-    Smoke::Index *args = smoke->argumentList + m.args;
-    return rb_str_new2((char*)smoke->types[args[idx]].name);
+	int method = NUM2INT(rb_funcall(method_value, rb_intern("index"), 0));
+	int smokeIndex = NUM2INT(rb_funcall(method_value, rb_intern("smoke"), 0));
+	Smoke * smoke = smokeList[smokeIndex];
+	int idx = NUM2INT(idx_value);
+	const Smoke::Method &m = smoke->methods[method];
+	Smoke::Index *args = smoke->argumentList + m.args;
+	return rb_str_new2((char*)smoke->types[args[idx]].name);
 }
 
 static VALUE
 classIsa(VALUE /*self*/, VALUE className_value, VALUE base_value)
 {
-    char *className = StringValuePtr(className_value);
-    char *base = StringValuePtr(base_value);
-    return Smoke::isDerivedFrom(className, base) ? Qtrue : Qfalse;
+	char *className = StringValuePtr(className_value);
+	char *base = StringValuePtr(base_value);
+	return Smoke::isDerivedFrom(className, base) ? Qtrue : Qfalse;
 }
 
 static VALUE
 isEnum(VALUE /*self*/, VALUE enumName_value)
 {
-    char *enumName = StringValuePtr(enumName_value);
-    Smoke::Index typeId = 0;
-    Smoke* s = 0;
-    for (int i = 0; i < smokeList.count(); i++) {
-         typeId = smokeList[i]->idType(enumName);
-         if (typeId > 0) {
-             s = smokeList[i];
-             break;
-         }
-    }
+	char *enumName = StringValuePtr(enumName_value);
+	Smoke::Index typeId = 0;
+	Smoke* s = 0;
+	for (int i = 0; i < smokeList.count(); i++) {
+		 typeId = smokeList[i]->idType(enumName);
+		 if (typeId > 0) {
+			 s = smokeList[i];
+			 break;
+		 }
+	}
 	return	typeId > 0
 			&& (	(s->types[typeId].flags & Smoke::tf_elem) == Smoke::t_enum
 					|| (s->types[typeId].flags & Smoke::tf_elem) == Smoke::t_ulong
@@ -1776,44 +1837,44 @@ isEnum(VALUE /*self*/, VALUE enumName_value)
 static VALUE
 insert_pclassid(VALUE self, VALUE p_value, VALUE mi_value)
 {
-    char *p = StringValuePtr(p_value);
-    int ix = NUM2INT(rb_funcall(mi_value, rb_intern("index"), 0));
-    int smokeidx = NUM2INT(rb_funcall(mi_value, rb_intern("smoke"), 0));
-    Smoke::ModuleIndex mi(smokeList[smokeidx], ix);
-    classcache.insert(QByteArray(p), new Smoke::ModuleIndex(mi));
-    IdToClassNameMap.insert(mi, new QByteArray(p));
-    return self;
+	char *p = StringValuePtr(p_value);
+	int ix = NUM2INT(rb_funcall(mi_value, rb_intern("index"), 0));
+	int smokeidx = NUM2INT(rb_funcall(mi_value, rb_intern("smoke"), 0));
+	Smoke::ModuleIndex mi(smokeList[smokeidx], ix);
+	classcache.insert(QByteArray(p), new Smoke::ModuleIndex(mi));
+	IdToClassNameMap.insert(mi, new QByteArray(p));
+	return self;
 }
 
 static VALUE
 classid2name(VALUE /*self*/, VALUE mi_value)
 {
-    int ix = NUM2INT(rb_funcall(mi_value, rb_intern("index"), 0));
-    int smokeidx = NUM2INT(rb_funcall(mi_value, rb_intern("smoke"), 0));
-    Smoke::ModuleIndex mi(smokeList[smokeidx], ix);
-    return rb_str_new2(IdToClassNameMap[mi]->constData());
+	int ix = NUM2INT(rb_funcall(mi_value, rb_intern("index"), 0));
+	int smokeidx = NUM2INT(rb_funcall(mi_value, rb_intern("smoke"), 0));
+	Smoke::ModuleIndex mi(smokeList[smokeidx], ix);
+	return rb_str_new2(IdToClassNameMap[mi]->constData());
 }
 
 static VALUE
 find_pclassid(VALUE /*self*/, VALUE p_value)
 {
-    if (NIL_P(p_value)) {
-       return rb_funcall(moduleindex_class, rb_intern("new"), 2, 0, 0);
-    }
+	if (NIL_P(p_value)) {
+	   return rb_funcall(moduleindex_class, rb_intern("new"), 2, 0, 0);
+	}
 
-    char *p = StringValuePtr(p_value);
-    Smoke::ModuleIndex *r = classcache.value(QByteArray(p));
-    if (r != 0) {
-        return rb_funcall(moduleindex_class, rb_intern("new"), 2, INT2NUM(smokeList.indexOf(r->smoke)), INT2NUM(r->index));
-    } else {
-        return rb_funcall(moduleindex_class, rb_intern("new"), 2, Qnil, Qnil);
-    }
+	char *p = StringValuePtr(p_value);
+	Smoke::ModuleIndex *r = classcache.value(QByteArray(p));
+	if (r != 0) {
+		return rb_funcall(moduleindex_class, rb_intern("new"), 2, INT2NUM(smokeList.indexOf(r->smoke)), INT2NUM(r->index));
+	} else {
+		return rb_funcall(moduleindex_class, rb_intern("new"), 2, Qnil, Qnil);
+	}
 }
 
 static VALUE
 get_value_type(VALUE /*self*/, VALUE ruby_value)
 {
-    return rb_str_new2(value_to_type_flag(ruby_value));
+	return rb_str_new2(value_to_type_flag(ruby_value));
 }
 
 static QMetaObject*
@@ -1874,12 +1935,12 @@ make_metaObject(VALUE /*self*/, VALUE obj, VALUE parentMeta, VALUE stringdata_va
 
 	printf(
 	" // content:\n"
-	"       %d,       // revision\n"
-	"       %d,       // classname\n"
-	"       %d,   %d, // classinfo\n"
-	"       %d,   %d, // methods\n"
-	"       %d,   %d, // properties\n"
-	"       %d,   %d, // enums/sets\n",
+	"	   %d,	   // revision\n"
+	"	   %d,	   // classname\n"
+	"	   %d,   %d, // classinfo\n"
+	"	   %d,   %d, // methods\n"
+	"	   %d,   %d, // properties\n"
+	"	   %d,   %d, // enums/sets\n",
 	data[0], data[1], data[2], data[3],
 	data[4], data[5], data[6], data[7], data[8], data[9]);
 
@@ -1888,7 +1949,7 @@ make_metaObject(VALUE /*self*/, VALUE obj, VALUE parentMeta, VALUE stringdata_va
 	if (data[2] > 0) {
 		printf("\n // classinfo: key, value\n");
 		for (uint j = 0; j < data[2]; j++) {
-			printf("      %d,    %d\n", data[s + (j * 2)], data[s + (j * 2) + 1]);
+			printf("	  %d,	%d\n", data[s + (j * 2)], data[s + (j * 2) + 1]);
 		}
 	}
 
@@ -1907,7 +1968,7 @@ make_metaObject(VALUE /*self*/, VALUE obj, VALUE parentMeta, VALUE stringdata_va
 			slot_headings = false;
 		}
 
-		printf("      %d,   %d,   %d,   %d, 0x%2.2x\n",
+		printf("	  %d,   %d,   %d,   %d, 0x%2.2x\n",
 			data[s + (j * 5)], data[s + (j * 5) + 1], data[s + (j * 5) + 2],
 			data[s + (j * 5) + 3], data[s + (j * 5) + 4]);
 	}
@@ -1915,24 +1976,24 @@ make_metaObject(VALUE /*self*/, VALUE obj, VALUE parentMeta, VALUE stringdata_va
 	s += (data[4] * 5);
 	for (uint j = 0; j < data[6]; j++) {
 		printf("\n // properties: name, type, flags\n");
-		printf("      %d,   %d,   0x%8.8x\n",
+		printf("	  %d,   %d,   0x%8.8x\n",
 			data[s + (j * 3)], data[s + (j * 3) + 1], data[s + (j * 3) + 2]);
 	}
 
 	s += (data[6] * 3);
 	for (int i = s; i < count; i++) {
-		printf("\n       %d        // eod\n", data[i]);
+		printf("\n	   %d		// eod\n", data[i]);
 	}
 
-	printf("\nqt_meta_stringdata:\n    \"");
+	printf("\nqt_meta_stringdata:\n	\"");
 
-    int strlength = 0;
+	int strlength = 0;
 	for (int j = 0; j < RSTRING_LEN(stringdata_value); j++) {
-        strlength++;
+		strlength++;
 		if (meta->d.stringdata[j] == 0) {
 			printf("\\0");
 			if (strlength > 40) {
-				printf("\"\n    \"");
+				printf("\"\n	\"");
 				strlength = 0;
 			}
 		} else {
@@ -1943,11 +2004,11 @@ make_metaObject(VALUE /*self*/, VALUE obj, VALUE parentMeta, VALUE stringdata_va
 
 #endif
 	smokeruby_object  * m = alloc_smokeruby_object(	true,
-													qtcore_Smoke,
-													qtcore_Smoke->idClass("QMetaObject").index,
-													meta );
+							qtcore_Smoke,
+							qtcore_Smoke->idClass("QMetaObject").index,
+							meta );
 
-    return Data_Wrap_Struct(qmetaobject_class, smokeruby_mark, smokeruby_free, m);
+	return Data_Wrap_Struct(qmetaobject_class, smokeruby_mark, smokeruby_free, m);
 }
 
 static VALUE
@@ -1971,10 +2032,10 @@ add_signal_methods(VALUE self, VALUE klass, VALUE signalNames)
 static VALUE
 dispose(VALUE self)
 {
-    smokeruby_object *o = value_obj_info(self);
-    if (o == 0 || o->ptr == 0) { return Qnil; }
+	smokeruby_object *o = value_obj_info(self);
+	if (o == 0 || o->ptr == 0) { return Qnil; }
 
-    const char *className = o->smoke->classes[o->classId].className;
+	const char *className = o->smoke->classes[o->classId].className;
 	if(do_debug & qtdb_gc) printf("Deleting (%s*)%p\n", className, o->ptr);
 
 	unmapPointer(o, o->classId, 0);
@@ -2009,60 +2070,60 @@ is_disposed(VALUE self)
 VALUE
 isQObject(VALUE /*self*/, VALUE c)
 {
-    return Smoke::isDerivedFrom(StringValuePtr(c), "QObject");
+	return Smoke::isDerivedFrom(StringValuePtr(c), "QObject");
 }
 
 // Returns the Smoke classId of a ruby instance
 static VALUE
 idInstance(VALUE /*self*/, VALUE instance)
 {
-    smokeruby_object *o = value_obj_info(instance);
-    if(!o)
-        return Qnil;
+	smokeruby_object *o = value_obj_info(instance);
+	if(!o)
+		return Qnil;
 
-    return rb_funcall(moduleindex_class, rb_intern("new"), 2, INT2NUM(smokeList.indexOf(o->smoke)), INT2NUM(o->classId));
+	return rb_funcall(moduleindex_class, rb_intern("new"), 2, INT2NUM(smokeList.indexOf(o->smoke)), INT2NUM(o->classId));
 }
 
 static VALUE
 findClass(VALUE /*self*/, VALUE name_value)
 {
-    char *name = StringValuePtr(name_value);
-    Smoke::ModuleIndex mi = Smoke::findClass(name);
-    return rb_funcall(moduleindex_class, rb_intern("new"), 2, INT2NUM(smokeList.indexOf(mi.smoke)), INT2NUM(mi.index));
+	char *name = StringValuePtr(name_value);
+	Smoke::ModuleIndex mi = Smoke::findClass(name);
+	return rb_funcall(moduleindex_class, rb_intern("new"), 2, INT2NUM(smokeList.indexOf(mi.smoke)), INT2NUM(mi.index));
 }
 
 // static VALUE
 // idMethodName(VALUE /*self*/, VALUE name_value)
 // {
-//     char *name = StringValuePtr(name_value);
-//     return INT2NUM(qtcore_Smoke->idMethodName(name).index);
+//	 char *name = StringValuePtr(name_value);
+//	 return INT2NUM(qtcore_Smoke->idMethodName(name).index);
 // }
 //
 // static VALUE
 // idMethod(VALUE /*self*/, VALUE idclass_value, VALUE idmethodname_value)
 // {
-//     int idclass = NUM2INT(idclass_value);
-//     int idmethodname = NUM2INT(idmethodname_value);
-//     return INT2NUM(qtcore_Smoke->idMethod(idclass, idmethodname).index);
+//	 int idclass = NUM2INT(idclass_value);
+//	 int idmethodname = NUM2INT(idmethodname_value);
+//	 return INT2NUM(qtcore_Smoke->idMethod(idclass, idmethodname).index);
 // }
 
 static VALUE
 dumpCandidates(VALUE /*self*/, VALUE rmeths)
 {
-    VALUE errmsg = rb_str_new2("");
-    if(rmeths != Qnil) {
+	VALUE errmsg = rb_str_new2("");
+	if(rmeths != Qnil) {
 	int count = RARRAY_LEN(rmeths);
-        for(int i = 0; i < count; i++) {
-	    rb_str_catf(errmsg, "\t");
-	    int id = NUM2INT(rb_funcall(rb_ary_entry(rmeths, i), rb_intern("index"), 0));
-	    Smoke* smoke = smokeList[NUM2INT(rb_funcall(rb_ary_entry(rmeths, i), rb_intern("smoke"), 0))];
-	    const Smoke::Method &meth = smoke->methods[id];
-	    const char *tname = smoke->types[meth.ret].name;
-	    if(meth.flags & Smoke::mf_enum) {
+		for(int i = 0; i < count; i++) {
+		rb_str_catf(errmsg, "\t");
+		int id = NUM2INT(rb_funcall(rb_ary_entry(rmeths, i), rb_intern("index"), 0));
+		Smoke* smoke = smokeList[NUM2INT(rb_funcall(rb_ary_entry(rmeths, i), rb_intern("smoke"), 0))];
+		const Smoke::Method &meth = smoke->methods[id];
+		const char *tname = smoke->types[meth.ret].name;
+		if(meth.flags & Smoke::mf_enum) {
 			rb_str_catf(errmsg, "enum ");
 			rb_str_catf(errmsg, "%s::%s", smoke->classes[meth.classId].className, smoke->methodNames[meth.name]);
 			rb_str_catf(errmsg, "\n");
-	    } else {
+		} else {
 			if(meth.flags & Smoke::mf_static) rb_str_catf(errmsg, "static ");
 			rb_str_catf(errmsg, "%s ", (tname ? tname:"void"));
 			rb_str_catf(errmsg, "%s::%s(", smoke->classes[meth.classId].className, smoke->methodNames[meth.name]);
@@ -2074,10 +2135,10 @@ dumpCandidates(VALUE /*self*/, VALUE rmeths)
 			rb_str_catf(errmsg, ")");
 			if(meth.flags & Smoke::mf_const) rb_str_catf(errmsg, " const");
 			rb_str_catf(errmsg, "\n");
-        	}
-        }
-    }
-    return errmsg;
+			}
+		}
+	}
+	return errmsg;
 }
 
 static VALUE
@@ -2092,70 +2153,70 @@ isConstMethod(VALUE /*self*/, VALUE idx)
 static VALUE
 isObject(VALUE /*self*/, VALUE obj)
 {
-    void * ptr = 0;
-    ptr = value_to_ptr(obj);
-    return (ptr > 0 ? Qtrue : Qfalse);
+	void * ptr = 0;
+	ptr = value_to_ptr(obj);
+	return (ptr > 0 ? Qtrue : Qfalse);
 }
 
 static VALUE
 setCurrentMethod(VALUE self, VALUE meth_value)
 {
-    int smokeidx = NUM2INT(rb_funcall(meth_value, rb_intern("smoke"), 0));
-    int meth = NUM2INT(rb_funcall(meth_value, rb_intern("index"), 0));
-    // FIXME: damn, this is lame, and it doesn't handle ambiguous methods
-    _current_method.smoke = smokeList[smokeidx];  //qtcore_Smoke->methodMaps[meth].method;
-    _current_method.index = meth;
-    return self;
+	int smokeidx = NUM2INT(rb_funcall(meth_value, rb_intern("smoke"), 0));
+	int meth = NUM2INT(rb_funcall(meth_value, rb_intern("index"), 0));
+	// FIXME: damn, this is lame, and it doesn't handle ambiguous methods
+	_current_method.smoke = smokeList[smokeidx];  //qtcore_Smoke->methodMaps[meth].method;
+	_current_method.index = meth;
+	return self;
 }
 
 static VALUE
 getClassList(VALUE /*self*/)
 {
-    VALUE class_list = rb_ary_new();
+	VALUE class_list = rb_ary_new();
 
-    for (int i = 1; i <= qtcore_Smoke->numClasses; i++) {
-        if (qtcore_Smoke->classes[i].className && !qtcore_Smoke->classes[i].external)
-            rb_ary_push(class_list, rb_str_new2(qtcore_Smoke->classes[i].className));
-    }
+	for (int i = 1; i <= qtcore_Smoke->numClasses; i++) {
+		if (qtcore_Smoke->classes[i].className && !qtcore_Smoke->classes[i].external)
+			rb_ary_push(class_list, rb_str_new2(qtcore_Smoke->classes[i].className));
+	}
 
-    for (int i = 1; i <= qtgui_Smoke->numClasses; i++) {
-        if (qtgui_Smoke->classes[i].className && !qtgui_Smoke->classes[i].external)
-            rb_ary_push(class_list, rb_str_new2(qtgui_Smoke->classes[i].className));
-    }
+	for (int i = 1; i <= qtgui_Smoke->numClasses; i++) {
+		if (qtgui_Smoke->classes[i].className && !qtgui_Smoke->classes[i].external)
+			rb_ary_push(class_list, rb_str_new2(qtgui_Smoke->classes[i].className));
+	}
 
-    for (int i = 1; i <= qtxml_Smoke->numClasses; i++) {
-        if (qtxml_Smoke->classes[i].className && !qtxml_Smoke->classes[i].external)
-            rb_ary_push(class_list, rb_str_new2(qtxml_Smoke->classes[i].className));
-    }
+	for (int i = 1; i <= qtxml_Smoke->numClasses; i++) {
+		if (qtxml_Smoke->classes[i].className && !qtxml_Smoke->classes[i].external)
+			rb_ary_push(class_list, rb_str_new2(qtxml_Smoke->classes[i].className));
+	}
 
-    for (int i = 1; i <= qtsql_Smoke->numClasses; i++) {
-        if (qtsql_Smoke->classes[i].className && !qtsql_Smoke->classes[i].external)
-            rb_ary_push(class_list, rb_str_new2(qtsql_Smoke->classes[i].className));
-    }
+	for (int i = 1; i <= qtsql_Smoke->numClasses; i++) {
+		if (qtsql_Smoke->classes[i].className && !qtsql_Smoke->classes[i].external)
+			rb_ary_push(class_list, rb_str_new2(qtsql_Smoke->classes[i].className));
+	}
 
-    for (int i = 1; i <= qtopengl_Smoke->numClasses; i++) {
-        if (qtopengl_Smoke->classes[i].className && !qtopengl_Smoke->classes[i].external)
-            rb_ary_push(class_list, rb_str_new2(qtopengl_Smoke->classes[i].className));
-    }
+	for (int i = 1; i <= qtopengl_Smoke->numClasses; i++) {
+		if (qtopengl_Smoke->classes[i].className && !qtopengl_Smoke->classes[i].external)
+			rb_ary_push(class_list, rb_str_new2(qtopengl_Smoke->classes[i].className));
+	}
 
-    for (int i = 1; i <= qtnetwork_Smoke->numClasses; i++) {
-        if (qtnetwork_Smoke->classes[i].className && !qtnetwork_Smoke->classes[i].external)
-            rb_ary_push(class_list, rb_str_new2(qtnetwork_Smoke->classes[i].className));
-    }
+	for (int i = 1; i <= qtnetwork_Smoke->numClasses; i++) {
+		if (qtnetwork_Smoke->classes[i].className && !qtnetwork_Smoke->classes[i].external)
+			rb_ary_push(class_list, rb_str_new2(qtnetwork_Smoke->classes[i].className));
+	}
 
-    for (int i = 1; i <= qtsvg_Smoke->numClasses; i++) {
-        if (qtsvg_Smoke->classes[i].className && !qtsvg_Smoke->classes[i].external)
-            rb_ary_push(class_list, rb_str_new2(qtsvg_Smoke->classes[i].className));
-    }
+	for (int i = 1; i <= qtsvg_Smoke->numClasses; i++) {
+		if (qtsvg_Smoke->classes[i].className && !qtsvg_Smoke->classes[i].external)
+			rb_ary_push(class_list, rb_str_new2(qtsvg_Smoke->classes[i].className));
+	}
 
 #ifdef QT_QTDBUS
-    for (int i = 1; i <= qtdbus_Smoke->numClasses; i++) {
-        if (qtdbus_Smoke->classes[i].className && !qtdbus_Smoke->classes[i].external)
-            rb_ary_push(class_list, rb_str_new2(qtdbus_Smoke->classes[i].className));
-    }
+	for (int i = 1; i <= qtdbus_Smoke->numClasses; i++) {
+		if (qtdbus_Smoke->classes[i].className && !qtdbus_Smoke->classes[i].external)
+			rb_ary_push(class_list, rb_str_new2(qtdbus_Smoke->classes[i].className));
+	}
 #endif
 
-    return class_list;
+	return class_list;
 }
 
 static VALUE
@@ -2215,6 +2276,13 @@ create_qobject_class(VALUE /*self*/, VALUE package_value, VALUE module_value)
 		rb_define_method(qlistmodel_class, "remove_rows", (VALUE (*) (...)) qabstract_item_model_removerows, -1);
 		rb_define_method(qlistmodel_class, "removeColumns", (VALUE (*) (...)) qabstract_item_model_removecolumns, -1);
 		rb_define_method(qlistmodel_class, "remove_columns", (VALUE (*) (...)) qabstract_item_model_removecolumns, -1);
+#if QT_VERSION >= 0x040600
+		// make it work with qml
+		rb_define_method(qlistmodel_class, "roleNames", (VALUE (*) (...)) qabstractitemmodel_rolenames, -1);
+		rb_define_method(qlistmodel_class, "role_names", (VALUE (*) (...)) qabstractitemmodel_rolenames, -1);
+		rb_define_method(qlistmodel_class, "setRoleNames", (VALUE (*) (...)) qabstractitemmodel_setrolenames, -1);
+		rb_define_method(qlistmodel_class, "set_role_names", (VALUE (*) (...)) qabstractitemmodel_setrolenames, -1);
+#endif
 	}
 	else if (packageName == "Qt::AbstractItemModel") {
 		rb_define_method(klass, "createIndex", (VALUE (*) (...)) qabstractitemmodel_createindex, -1);
@@ -2260,8 +2328,8 @@ create_qt_class(VALUE /*self*/, VALUE package_value, VALUE module_value)
 	QString packageName(package);
 
 /*
-    rb_define_singleton_method(module_value, "method_missing", (VALUE (*) (...)) module_method_missing, -1);
-    rb_define_singleton_method(module_value, "const_missing", (VALUE (*) (...)) module_method_missing, -1);
+	rb_define_singleton_method(module_value, "method_missing", (VALUE (*) (...)) module_method_missing, -1);
+	rb_define_singleton_method(module_value, "const_missing", (VALUE (*) (...)) module_method_missing, -1);
 */
 	foreach(QString s, packageName.mid(strlen(moduleName) + 2).split("::")) {
 		klass = rb_define_class_under(klass, (const char*) s.toLatin1(), qt_base_class);
@@ -2273,12 +2341,12 @@ create_qt_class(VALUE /*self*/, VALUE package_value, VALUE module_value)
 		qvariant_class = klass;
 		rb_define_singleton_method(qvariant_class, "fromValue", (VALUE (*) (...)) qvariant_from_value, -1);
 		rb_define_singleton_method(qvariant_class, "from_value", (VALUE (*) (...)) qvariant_from_value, -1);
-    	rb_define_singleton_method(qvariant_class, "new", (VALUE (*) (...)) new_qvariant, -1);
+		rb_define_singleton_method(qvariant_class, "new", (VALUE (*) (...)) new_qvariant, -1);
 	} else if (packageName == "Qt::ByteArray") {
 		rb_define_method(klass, "+", (VALUE (*) (...)) qbytearray_append, 1);
-    rb_define_method(klass, "data", (VALUE (*) (...)) qbytearray_data, 0);
-    rb_define_method(klass, "constData", (VALUE (*) (...)) qbytearray_data, 0);
-    rb_define_method(klass, "const_data", (VALUE (*) (...)) qbytearray_data, 0);
+		rb_define_method(klass, "data", (VALUE (*) (...)) qbytearray_data, 0);
+		rb_define_method(klass, "constData", (VALUE (*) (...)) qbytearray_data, 0);
+		rb_define_method(klass, "const_data", (VALUE (*) (...)) qbytearray_data, 0);
 	} else if (packageName == "Qt::Char") {
 		rb_define_method(klass, "to_s", (VALUE (*) (...)) qchar_to_s, 0);
 	} else if (packageName == "Qt::Image") {
@@ -2326,19 +2394,19 @@ create_qt_class(VALUE /*self*/, VALUE package_value, VALUE module_value)
 static VALUE
 version(VALUE /*self*/)
 {
-    return rb_str_new2(QT_VERSION_STR);
+	return rb_str_new2(QT_VERSION_STR);
 }
 
 static VALUE
 qtruby_version(VALUE /*self*/)
 {
-    return rb_str_new2(QTRUBY_VERSION);
+	return rb_str_new2(QTRUBY_VERSION);
 }
 
 static VALUE
 set_application_terminated(VALUE /*self*/, VALUE yn)
 {
-    application_terminated = (yn == Qtrue ? true : false);
+	application_terminated = (yn == Qtrue ? true : false);
 	return Qnil;
 }
 
@@ -2350,35 +2418,35 @@ set_qtruby_embedded_wrapped(VALUE /*self*/, VALUE yn)
 }
 
 #define INIT_BINDING(module) \
-    static QtRuby::Binding module##_binding = QtRuby::Binding(module##_Smoke); \
-    QtRubyModule module = { "QtRuby_" #module, resolve_classname_qt, 0, &module##_binding }; \
-    qtruby_modules[module##_Smoke] = module; \
+	static QtRuby::Binding module##_binding = QtRuby::Binding(module##_Smoke); \
+	QtRubyModule module = { "QtRuby_" #module, resolve_classname_qt, 0, &module##_binding }; \
+	qtruby_modules[module##_Smoke] = module; \
 	smokeList << module##_Smoke;
 
 extern Q_DECL_EXPORT void
 Init_qtruby4()
 {
-    init_qtcore_Smoke();
-    init_qtgui_Smoke();
-    init_qtxml_Smoke();
-    init_qtsql_Smoke();
-    init_qtopengl_Smoke();
-    init_qtnetwork_Smoke();
-    init_qtsvg_Smoke();
+	init_qtcore_Smoke();
+	init_qtgui_Smoke();
+	init_qtxml_Smoke();
+	init_qtsql_Smoke();
+	init_qtopengl_Smoke();
+	init_qtnetwork_Smoke();
+	init_qtsvg_Smoke();
 #ifdef QT_QTDBUS
-    init_qtdbus_Smoke();
+	init_qtdbus_Smoke();
 #endif
-    install_handlers(Qt_handlers);
-
-    INIT_BINDING(qtcore)
-    INIT_BINDING(qtgui)
-    INIT_BINDING(qtxml)
-    INIT_BINDING(qtsql)
-    INIT_BINDING(qtopengl)
-    INIT_BINDING(qtnetwork)
-    INIT_BINDING(qtsvg)
+	install_handlers(Qt_handlers);
+
+	INIT_BINDING(qtcore)
+	INIT_BINDING(qtgui)
+	INIT_BINDING(qtxml)
+	INIT_BINDING(qtsql)
+	INIT_BINDING(qtopengl)
+	INIT_BINDING(qtnetwork)
+	INIT_BINDING(qtsvg)
 #ifdef QT_QTDBUS
-    INIT_BINDING(qtdbus)
+	INIT_BINDING(qtdbus)
 #endif
 
 	if (qt_module == Qnil) {
@@ -2388,19 +2456,19 @@ Init_qtruby4()
 		moduleindex_class = rb_define_class_under(qt_internal_module, "ModuleIndex", rb_cObject);
 	}
 
-    rb_define_singleton_method(qt_base_class, "new", (VALUE (*) (...)) new_qt, -1);
-    rb_define_method(qt_base_class, "initialize", (VALUE (*) (...)) initialize_qt, -1);
-    rb_define_singleton_method(qt_base_class, "method_missing", (VALUE (*) (...)) class_method_missing, -1);
-    rb_define_singleton_method(qt_module, "method_missing", (VALUE (*) (...)) module_method_missing, -1);
-    rb_define_method(qt_base_class, "method_missing", (VALUE (*) (...)) method_missing, -1);
+	rb_define_singleton_method(qt_base_class, "new", (VALUE (*) (...)) new_qt, -1);
+	rb_define_method(qt_base_class, "initialize", (VALUE (*) (...)) initialize_qt, -1);
+	rb_define_singleton_method(qt_base_class, "method_missing", (VALUE (*) (...)) class_method_missing, -1);
+	rb_define_singleton_method(qt_module, "method_missing", (VALUE (*) (...)) module_method_missing, -1);
+	rb_define_method(qt_base_class, "method_missing", (VALUE (*) (...)) method_missing, -1);
 
-    rb_define_singleton_method(qt_base_class, "const_missing", (VALUE (*) (...)) class_method_missing, -1);
-    rb_define_singleton_method(qt_module, "const_missing", (VALUE (*) (...)) module_method_missing, -1);
-    rb_define_method(qt_base_class, "const_missing", (VALUE (*) (...)) method_missing, -1);
+	rb_define_singleton_method(qt_base_class, "const_missing", (VALUE (*) (...)) class_method_missing, -1);
+	rb_define_singleton_method(qt_module, "const_missing", (VALUE (*) (...)) module_method_missing, -1);
+	rb_define_method(qt_base_class, "const_missing", (VALUE (*) (...)) method_missing, -1);
 
-    rb_define_method(qt_base_class, "dispose", (VALUE (*) (...)) dispose, 0);
-    rb_define_method(qt_base_class, "isDisposed", (VALUE (*) (...)) is_disposed, 0);
-    rb_define_method(qt_base_class, "disposed?", (VALUE (*) (...)) is_disposed, 0);
+	rb_define_method(qt_base_class, "dispose", (VALUE (*) (...)) dispose, 0);
+	rb_define_method(qt_base_class, "isDisposed", (VALUE (*) (...)) is_disposed, 0);
+	rb_define_method(qt_base_class, "disposed?", (VALUE (*) (...)) is_disposed, 0);
 
 	rb_define_method(qt_base_class, "qVariantValue", (VALUE (*) (...)) qvariant_value, 2);
 	rb_define_method(qt_base_class, "qVariantFromValue", (VALUE (*) (...)) qvariant_from_value, -1);
@@ -2409,86 +2477,86 @@ Init_qtruby4()
 	rb_define_method(rb_cObject, "qFatal", (VALUE (*) (...)) qfatal, 1);
 	rb_define_method(rb_cObject, "qWarning", (VALUE (*) (...)) qwarning, 1);
 
-    rb_define_module_function(qt_internal_module, "getMethStat", (VALUE (*) (...)) getMethStat, 0);
-    rb_define_module_function(qt_internal_module, "getClassStat", (VALUE (*) (...)) getClassStat, 0);
-    rb_define_module_function(qt_internal_module, "getIsa", (VALUE (*) (...)) getIsa, 1);
-    rb_define_module_function(qt_internal_module, "setDebug", (VALUE (*) (...)) setDebug, 1);
-    rb_define_module_function(qt_internal_module, "debug", (VALUE (*) (...)) debugging, 0);
-    rb_define_module_function(qt_internal_module, "get_arg_type_name", (VALUE (*) (...)) get_arg_type_name, 2);
-    rb_define_module_function(qt_internal_module, "classIsa", (VALUE (*) (...)) classIsa, 2);
-    rb_define_module_function(qt_internal_module, "isEnum", (VALUE (*) (...)) isEnum, 1);
-    rb_define_module_function(qt_internal_module, "insert_pclassid", (VALUE (*) (...)) insert_pclassid, 2);
-    rb_define_module_function(qt_internal_module, "classid2name", (VALUE (*) (...)) classid2name, 1);
-    rb_define_module_function(qt_internal_module, "find_pclassid", (VALUE (*) (...)) find_pclassid, 1);
-    rb_define_module_function(qt_internal_module, "get_value_type", (VALUE (*) (...)) get_value_type, 1);
-
-    rb_define_module_function(qt_internal_module, "make_metaObject", (VALUE (*) (...)) make_metaObject, 4);
-    rb_define_module_function(qt_internal_module, "addMetaObjectMethods", (VALUE (*) (...)) add_metaobject_methods, 1);
-    rb_define_module_function(qt_internal_module, "addSignalMethods", (VALUE (*) (...)) add_signal_methods, 2);
-    rb_define_module_function(qt_internal_module, "mapObject", (VALUE (*) (...)) mapObject, 1);
-
-    rb_define_module_function(qt_internal_module, "isQObject", (VALUE (*) (...)) isQObject, 1);
-    rb_define_module_function(qt_internal_module, "idInstance", (VALUE (*) (...)) idInstance, 1);
-    rb_define_module_function(qt_internal_module, "findClass", (VALUE (*) (...)) findClass, 1);
-//     rb_define_module_function(qt_internal_module, "idMethodName", (VALUE (*) (...)) idMethodName, 1);
-//     rb_define_module_function(qt_internal_module, "idMethod", (VALUE (*) (...)) idMethod, 2);
-    rb_define_module_function(qt_internal_module, "findMethod", (VALUE (*) (...)) findMethod, 2);
-    rb_define_module_function(qt_internal_module, "findAllMethods", (VALUE (*) (...)) findAllMethods, -1);
-    rb_define_module_function(qt_internal_module, "findAllMethodNames", (VALUE (*) (...)) findAllMethodNames, 3);
-    rb_define_module_function(qt_internal_module, "dumpCandidates", (VALUE (*) (...)) dumpCandidates, 1);
-    rb_define_module_function(qt_internal_module, "isConstMethod", (VALUE (*) (...)) isConstMethod, 1);
-    rb_define_module_function(qt_internal_module, "isObject", (VALUE (*) (...)) isObject, 1);
-    rb_define_module_function(qt_internal_module, "setCurrentMethod", (VALUE (*) (...)) setCurrentMethod, 1);
-    rb_define_module_function(qt_internal_module, "getClassList", (VALUE (*) (...)) getClassList, 0);
-    rb_define_module_function(qt_internal_module, "create_qt_class", (VALUE (*) (...)) create_qt_class, 2);
-    rb_define_module_function(qt_internal_module, "create_qobject_class", (VALUE (*) (...)) create_qobject_class, 2);
-    rb_define_module_function(qt_internal_module, "cast_object_to", (VALUE (*) (...)) cast_object_to, 2);
-    rb_define_module_function(qt_module, "dynamic_cast", (VALUE (*) (...)) cast_object_to, 2);
-    rb_define_module_function(qt_internal_module, "kross2smoke", (VALUE (*) (...)) kross2smoke, 2);
-    rb_define_module_function(qt_internal_module, "set_qtruby_embedded", (VALUE (*) (...)) set_qtruby_embedded_wrapped, 1);
-
-    rb_define_module_function(qt_internal_module, "application_terminated=", (VALUE (*) (...)) set_application_terminated, 1);
+	rb_define_module_function(qt_internal_module, "getMethStat", (VALUE (*) (...)) getMethStat, 0);
+	rb_define_module_function(qt_internal_module, "getClassStat", (VALUE (*) (...)) getClassStat, 0);
+	rb_define_module_function(qt_internal_module, "getIsa", (VALUE (*) (...)) getIsa, 1);
+	rb_define_module_function(qt_internal_module, "setDebug", (VALUE (*) (...)) setDebug, 1);
+	rb_define_module_function(qt_internal_module, "debug", (VALUE (*) (...)) debugging, 0);
+	rb_define_module_function(qt_internal_module, "get_arg_type_name", (VALUE (*) (...)) get_arg_type_name, 2);
+	rb_define_module_function(qt_internal_module, "classIsa", (VALUE (*) (...)) classIsa, 2);
+	rb_define_module_function(qt_internal_module, "isEnum", (VALUE (*) (...)) isEnum, 1);
+	rb_define_module_function(qt_internal_module, "insert_pclassid", (VALUE (*) (...)) insert_pclassid, 2);
+	rb_define_module_function(qt_internal_module, "classid2name", (VALUE (*) (...)) classid2name, 1);
+	rb_define_module_function(qt_internal_module, "find_pclassid", (VALUE (*) (...)) find_pclassid, 1);
+	rb_define_module_function(qt_internal_module, "get_value_type", (VALUE (*) (...)) get_value_type, 1);
+
+	rb_define_module_function(qt_internal_module, "make_metaObject", (VALUE (*) (...)) make_metaObject, 4);
+	rb_define_module_function(qt_internal_module, "addMetaObjectMethods", (VALUE (*) (...)) add_metaobject_methods, 1);
+	rb_define_module_function(qt_internal_module, "addSignalMethods", (VALUE (*) (...)) add_signal_methods, 2);
+	rb_define_module_function(qt_internal_module, "mapObject", (VALUE (*) (...)) mapObject, 1);
+
+	rb_define_module_function(qt_internal_module, "isQObject", (VALUE (*) (...)) isQObject, 1);
+	rb_define_module_function(qt_internal_module, "idInstance", (VALUE (*) (...)) idInstance, 1);
+	rb_define_module_function(qt_internal_module, "findClass", (VALUE (*) (...)) findClass, 1);
+//	 rb_define_module_function(qt_internal_module, "idMethodName", (VALUE (*) (...)) idMethodName, 1);
+//	 rb_define_module_function(qt_internal_module, "idMethod", (VALUE (*) (...)) idMethod, 2);
+	rb_define_module_function(qt_internal_module, "findMethod", (VALUE (*) (...)) findMethod, 2);
+	rb_define_module_function(qt_internal_module, "findAllMethods", (VALUE (*) (...)) findAllMethods, -1);
+	rb_define_module_function(qt_internal_module, "findAllMethodNames", (VALUE (*) (...)) findAllMethodNames, 3);
+	rb_define_module_function(qt_internal_module, "dumpCandidates", (VALUE (*) (...)) dumpCandidates, 1);
+	rb_define_module_function(qt_internal_module, "isConstMethod", (VALUE (*) (...)) isConstMethod, 1);
+	rb_define_module_function(qt_internal_module, "isObject", (VALUE (*) (...)) isObject, 1);
+	rb_define_module_function(qt_internal_module, "setCurrentMethod", (VALUE (*) (...)) setCurrentMethod, 1);
+	rb_define_module_function(qt_internal_module, "getClassList", (VALUE (*) (...)) getClassList, 0);
+	rb_define_module_function(qt_internal_module, "create_qt_class", (VALUE (*) (...)) create_qt_class, 2);
+	rb_define_module_function(qt_internal_module, "create_qobject_class", (VALUE (*) (...)) create_qobject_class, 2);
+	rb_define_module_function(qt_internal_module, "cast_object_to", (VALUE (*) (...)) cast_object_to, 2);
+	rb_define_module_function(qt_module, "dynamic_cast", (VALUE (*) (...)) cast_object_to, 2);
+	rb_define_module_function(qt_internal_module, "kross2smoke", (VALUE (*) (...)) kross2smoke, 2);
+	rb_define_module_function(qt_internal_module, "set_qtruby_embedded", (VALUE (*) (...)) set_qtruby_embedded_wrapped, 1);
+
+	rb_define_module_function(qt_internal_module, "application_terminated=", (VALUE (*) (...)) set_application_terminated, 1);
 
 	rb_define_module_function(qt_module, "version", (VALUE (*) (...)) version, 0);
-    rb_define_module_function(qt_module, "qtruby_version", (VALUE (*) (...)) qtruby_version, 0);
-
-    rb_define_module_function(qt_module, "qRegisterResourceData", (VALUE (*) (...)) q_register_resource_data, 4);
-    rb_define_module_function(qt_module, "qUnregisterResourceData", (VALUE (*) (...)) q_unregister_resource_data, 4);
-
-    // A problem has been found with QtRuby when it is run with Ruby 1.9.1
-    // and GC.stess is true.
-    // In the smokeruby_mark() function called during garbage collection,
-    // any virtual methods which are called on the instances being checked
-    // could have overriden by Ruby methods.  So the Wt::Ruby runtime uses
-    // 'respond_to()' to find out whether they have been overriden.
-    // However, this involves calling 'rb_intern()' on the method name,
-    // which means memory could be allocated, giving an error when running under
-    // GC.stress mode. So workround it by pre-allocating any strings with
-    // rb_intern() for all the C++ methods used in smokeruby_mark()
-    rb_intern("children");
-    rb_intern("childItems");
-    rb_intern("childCount");
-    rb_intern("child");
-    rb_intern("hasChildren");
-    rb_intern("parent");
-    rb_intern("parentItem");
-    rb_intern("item");
-    rb_intern("items");
-    rb_intern("rowCount");
-    rb_intern("rowAt");
-    rb_intern("columnCount");
-    rb_intern("elementAt");
-    rb_intern("columnAt");
-    rb_intern("topLevelItem");
-    rb_intern("itemAt");
-    rb_intern("internalPointer");
+	rb_define_module_function(qt_module, "qtruby_version", (VALUE (*) (...)) qtruby_version, 0);
+
+	rb_define_module_function(qt_module, "qRegisterResourceData", (VALUE (*) (...)) q_register_resource_data, 4);
+	rb_define_module_function(qt_module, "qUnregisterResourceData", (VALUE (*) (...)) q_unregister_resource_data, 4);
+
+	// A problem has been found with QtRuby when it is run with Ruby 1.9.1
+	// and GC.stess is true.
+	// In the smokeruby_mark() function called during garbage collection,
+	// any virtual methods which are called on the instances being checked
+	// could have overriden by Ruby methods.  So the Wt::Ruby runtime uses
+	// 'respond_to()' to find out whether they have been overriden.
+	// However, this involves calling 'rb_intern()' on the method name,
+	// which means memory could be allocated, giving an error when running under
+	// GC.stress mode. So workround it by pre-allocating any strings with
+	// rb_intern() for all the C++ methods used in smokeruby_mark()
+	rb_intern("children");
+	rb_intern("childItems");
+	rb_intern("childCount");
+	rb_intern("child");
+	rb_intern("hasChildren");
+	rb_intern("parent");
+	rb_intern("parentItem");
+	rb_intern("item");
+	rb_intern("items");
+	rb_intern("rowCount");
+	rb_intern("rowAt");
+	rb_intern("columnCount");
+	rb_intern("elementAt");
+	rb_intern("columnAt");
+	rb_intern("topLevelItem");
+	rb_intern("itemAt");
+	rb_intern("internalPointer");
 
 	rb_require("Qt/qtruby4.rb");
 
 	rObject_typeId = QMetaType::registerType("rObject", &delete_ruby_object, &create_ruby_object);
 
-    // Do package initialization
-    rb_funcall(qt_internal_module, rb_intern("init_all_classes"), 0);
+	// Do package initialization
+	rb_funcall(qt_internal_module, rb_intern("init_all_classes"), 0);
 }
 
 }