qtbindings 4.8.6.2 → 4.8.6.3

data/ext/generator/type_compiler.h

@@ -1,80 +1,80 @@
-/* This file is part of KDevelop
-    Copyright 2002-2005 Roberto Raggi <roberto@kdevelop.org>
-    Copyright 2009 Arno Rehn <arno@arnorehn.de>
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License version 2 as published by the Free Software Foundation.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; see the file COPYING.LIB.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef TYPE_COMPILER_H
-#define TYPE_COMPILER_H
-
-#include "generator_export.h"
-#include "default_visitor.h"
-#include "type.h"
-
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QList>
-#include <QtCore/QVector>
-
-class ParseSession;
-class GeneratorVisitor;
-
-class GENERATOR_EXPORT TypeCompiler: protected DefaultVisitor
-{
-public:
-  TypeCompiler(ParseSession* session, GeneratorVisitor* visitor);
-
-//   KDevelop::QualifiedIdentifier identifier() const;
-  inline const QStringList& qualifiedName() const { return m_type; }
-  inline QList<int> cv() const { return _M_cv; }
-
-  bool isConstant() const;
-  bool isVolatile() const;
-
-  QStringList cvString() const;
-
-  const Type& type() const { return m_realType; }
-
-  void run(TypeSpecifierAST *node, const DeclaratorAST* declarator = 0);
-  void run(const DeclaratorAST *declarator);
-  void run(const ListNode<PtrOperatorAST*> *ptr_ops);
-
-protected:
-  void setRealType();
-  
-  virtual void visitClassSpecifier(ClassSpecifierAST *node);
-  virtual void visitEnumSpecifier(EnumSpecifierAST *node);
-  virtual void visitElaboratedTypeSpecifier(ElaboratedTypeSpecifierAST *node);
-  virtual void visitParameterDeclaration(ParameterDeclarationAST* node);
-  virtual void visitPtrOperator(PtrOperatorAST* node);
-  virtual void visitSimpleTypeSpecifier(SimpleTypeSpecifierAST *node);
-
-  virtual void visitName(NameAST *node);
-
-private:
-  ParseSession* m_session;
-  GeneratorVisitor* m_visitor;
-  QStringList m_type;
-//   KDevelop::QualifiedIdentifier _M_type;
-  QList<int> _M_cv;
-  Type m_realType;
-  bool isRef;
-  QVector<bool> pointerDepth;
-  QMap<int, QList<Type> > m_templateArgs;
-};
-
-#endif // TYPE_COMPILER_H
-
+/* This file is part of KDevelop
+    Copyright 2002-2005 Roberto Raggi <roberto@kdevelop.org>
+    Copyright 2009 Arno Rehn <arno@arnorehn.de>
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License version 2 as published by the Free Software Foundation.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef TYPE_COMPILER_H
+#define TYPE_COMPILER_H
+
+#include "generator_export.h"
+#include "default_visitor.h"
+#include "type.h"
+
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QList>
+#include <QtCore/QVector>
+
+class ParseSession;
+class GeneratorVisitor;
+
+class GENERATOR_EXPORT TypeCompiler: protected DefaultVisitor
+{
+public:
+  TypeCompiler(ParseSession* session, GeneratorVisitor* visitor);
+
+//   KDevelop::QualifiedIdentifier identifier() const;
+  inline const QStringList& qualifiedName() const { return m_type; }
+  inline QList<int> cv() const { return _M_cv; }
+
+  bool isConstant() const;
+  bool isVolatile() const;
+
+  QStringList cvString() const;
+
+  const Type& type() const { return m_realType; }
+
+  void run(TypeSpecifierAST *node, const DeclaratorAST* declarator = 0);
+  void run(const DeclaratorAST *declarator);
+  void run(const ListNode<PtrOperatorAST*> *ptr_ops);
+
+protected:
+  void setRealType();
+  
+  virtual void visitClassSpecifier(ClassSpecifierAST *node);
+  virtual void visitEnumSpecifier(EnumSpecifierAST *node);
+  virtual void visitElaboratedTypeSpecifier(ElaboratedTypeSpecifierAST *node);
+  virtual void visitParameterDeclaration(ParameterDeclarationAST* node);
+  virtual void visitPtrOperator(PtrOperatorAST* node);
+  virtual void visitSimpleTypeSpecifier(SimpleTypeSpecifierAST *node);
+
+  virtual void visitName(NameAST *node);
+
+private:
+  ParseSession* m_session;
+  GeneratorVisitor* m_visitor;
+  QStringList m_type;
+//   KDevelop::QualifiedIdentifier _M_type;
+  QList<int> _M_cv;
+  Type m_realType;
+  bool isRef;
+  QVector<bool> pointerDepth;
+  QMap<int, QList<Type> > m_templateArgs;
+};
+
+#endif // TYPE_COMPILER_H
+

data/ext/ruby/CMakeLists.txt

@@ -1,64 +1,64 @@
-project(Ruby)
-
-set(COMPILE_RUBY FALSE CACHE INTERNAL "")
-
-macro_optional_find_package(Ruby)
-
-if (RUBY_LIBRARY AND RUBY_INCLUDE_DIRS AND RUBY_EXECUTABLE)
-    set(COMPILE_RUBY TRUE CACHE INTERNAL "")
-endif (RUBY_LIBRARY AND RUBY_INCLUDE_DIRS AND RUBY_EXECUTABLE)
-
-macro_log_feature(COMPILE_RUBY "Ruby" "Ruby interpreter and libraries" "http://www.ruby-lang.org" FALSE "" "Needed to compile the Ruby bindings")
-
-if (NOT COMPILE_RUBY)
-    message(STATUS "Ruby Not Found Successfully")
-endif (NOT COMPILE_RUBY)
-
-SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" )
-SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" )
-
-# compute an overall version number which can be compared at once
-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)
-macro_optional_add_bindings(QT_QTTEST_FOUND "QtTest" qttest)
-
-if (RUBY_EXECUTABLE AND RUBY_LIBRARY AND RUBY_INCLUDE_DIRS)
-    EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r mkmf -e "exit(have_func('rb_hash_foreach') ? 0 : 1)" RESULT_VARIABLE RUBY_HASH_FOREACH OUTPUT_QUIET)
-    if (RUBY_HASH_FOREACH EQUAL 0)
-
-        set(CMAKE_REQUIRED_INCLUDES ${RUBY_INCLUDE_DIRS})
-        set(CMAKE_REQUIRED_LIBRARIES ${RUBY_LIBRARY})
-        CHECK_CXX_SOURCE_COMPILES("
-            #include <ruby.h>
-            int main() { ruby_init(); return 0; }" RubyCompiles)
-        if(RubyCompiles)
-            if(ENABLE_KROSSRUBY)
-                set(BUILD_KrossRuby TRUE)
-            endif(ENABLE_KROSSRUBY)
-        else(RubyCompiles)
-            message(STATUS "Failed to compile a C++ program that embeds ruby.")
-        endif(RubyCompiles)
-
-    else (RUBY_HASH_FOREACH EQUAL 0)
-
-        # 2007-02-12 sebsauer; this is a workaround for the case we failed to load
-        # the "mkmf" library what is the case e.g. on some debian distributions.
-        #EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r mkmf -e "exit(0)" RESULT_VARIABLE RUBY_HASH_FOREACH OUTPUT_QUIET ERROR_QUIET)
-        #if (${RUBY_HASH_FOREACH} EQUAL 0)
-        message(STATUS "The detected Ruby is too old for kross. A Ruby which has rb_hash_foreach is required. Upgrade to 1.8.2 or later")
-        #else (${RUBY_HASH_FOREACH} EQUAL 0)
-        #    message(STATUS "Failed to load the Ruby mkmf library. Please install the Ruby developer packages.")
-        #endif (${RUBY_HASH_FOREACH} EQUAL 0)
-
-    endif (RUBY_HASH_FOREACH EQUAL 0)
-endif (RUBY_EXECUTABLE AND RUBY_LIBRARY AND RUBY_INCLUDE_DIRS)
-message(STATUS "Ruby Executable: " ${RUBY_EXECUTABLE})
-message(STATUS "Ruby Libraries: " ${RUBY_LIBRARY})
-message(STATUS "Ruby Include Directories: " ${RUBY_INCLUDE_DIRS})
-
-macro_display_bindings_log()
+project(Ruby)
+
+set(COMPILE_RUBY FALSE CACHE INTERNAL "")
+
+macro_optional_find_package(Ruby)
+
+if (RUBY_LIBRARY AND RUBY_INCLUDE_DIRS AND RUBY_EXECUTABLE)
+    set(COMPILE_RUBY TRUE CACHE INTERNAL "")
+endif (RUBY_LIBRARY AND RUBY_INCLUDE_DIRS AND RUBY_EXECUTABLE)
+
+macro_log_feature(COMPILE_RUBY "Ruby" "Ruby interpreter and libraries" "http://www.ruby-lang.org" FALSE "" "Needed to compile the Ruby bindings")
+
+if (NOT COMPILE_RUBY)
+    message(STATUS "Ruby Not Found Successfully")
+endif (NOT COMPILE_RUBY)
+
+SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" )
+SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" )
+
+# compute an overall version number which can be compared at once
+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)
+macro_optional_add_bindings(QT_QTTEST_FOUND "QtTest" qttest)
+
+if (RUBY_EXECUTABLE AND RUBY_LIBRARY AND RUBY_INCLUDE_DIRS)
+    EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r mkmf -e "exit(have_func('rb_hash_foreach') ? 0 : 1)" RESULT_VARIABLE RUBY_HASH_FOREACH OUTPUT_QUIET)
+    if (RUBY_HASH_FOREACH EQUAL 0)
+
+        set(CMAKE_REQUIRED_INCLUDES ${RUBY_INCLUDE_DIRS})
+        set(CMAKE_REQUIRED_LIBRARIES ${RUBY_LIBRARY})
+        CHECK_CXX_SOURCE_COMPILES("
+            #include <ruby.h>
+            int main() { ruby_init(); return 0; }" RubyCompiles)
+        if(RubyCompiles)
+            if(ENABLE_KROSSRUBY)
+                set(BUILD_KrossRuby TRUE)
+            endif(ENABLE_KROSSRUBY)
+        else(RubyCompiles)
+            message(STATUS "Failed to compile a C++ program that embeds ruby.")
+        endif(RubyCompiles)
+
+    else (RUBY_HASH_FOREACH EQUAL 0)
+
+        # 2007-02-12 sebsauer; this is a workaround for the case we failed to load
+        # the "mkmf" library what is the case e.g. on some debian distributions.
+        #EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r mkmf -e "exit(0)" RESULT_VARIABLE RUBY_HASH_FOREACH OUTPUT_QUIET ERROR_QUIET)
+        #if (${RUBY_HASH_FOREACH} EQUAL 0)
+        message(STATUS "The detected Ruby is too old for kross. A Ruby which has rb_hash_foreach is required. Upgrade to 1.8.2 or later")
+        #else (${RUBY_HASH_FOREACH} EQUAL 0)
+        #    message(STATUS "Failed to load the Ruby mkmf library. Please install the Ruby developer packages.")
+        #endif (${RUBY_HASH_FOREACH} EQUAL 0)
+
+    endif (RUBY_HASH_FOREACH EQUAL 0)
+endif (RUBY_EXECUTABLE AND RUBY_LIBRARY AND RUBY_INCLUDE_DIRS)
+message(STATUS "Ruby Executable: " ${RUBY_EXECUTABLE})
+message(STATUS "Ruby Libraries: " ${RUBY_LIBRARY})
+message(STATUS "Ruby Include Directories: " ${RUBY_INCLUDE_DIRS})
+
+macro_display_bindings_log()

data/ext/ruby/qtdeclarative/CMakeLists.txt

@@ -1,17 +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)
+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

@@ -1,67 +1,67 @@
-#include <ruby.h>
-#undef read
-#undef write
-#undef connect
-#undef accept
-#undef truncate
-
-#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);
-}
-
-}
+#include <ruby.h>
+#undef read
+#undef write
+#undef connect
+#undef accept
+#undef truncate
+
+#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);
+}
+
+}