[Kde-bindings] branches/work/kdebindings-smoke2

[Arno Rehn]

SVN commit 769146 by arnorehn:

* Fixed bug preventing KDE and QScintilla Ruby bindings being loaded at the same
  time.
* Added convenience rb file to QScintilla (you can do "require 'QScintilla'" now)

CCMAIL: kde-bindings at kde.org



 M  +3 -0      ChangeLog  
 M  +1 -1      ruby/korundum/korundum.cpp  
 M  +2 -1      ruby/qsci/CMakeLists.txt  
 M  +2 -1      ruby/qsci/example.rb  
 M  +2 -2      ruby/qsci/qscintilla.cpp  


--- branches/work/kdebindings-smoke2/ChangeLog #769145:769146
@@ -5,6 +5,9 @@
     * Restructured directory and file layout.
     * Korundum is now mostly complete, only minor things are still missing.
     * Fixed some #includes.
+    * Fixed bug preventing KDE and QScintilla Ruby bindings being loaded at the same
+      time.
+    * Added convenience rb file to QScintilla (you can do "require 'QScintilla'" now)
 
 2008-01-29  Arno Rehn  <arno at arnorehn.de>
 
--- branches/work/kdebindings-smoke2/ruby/korundum/korundum.cpp #769145:769146
@@ -16,7 +16,7 @@
 
 const char* resolve_classname_kde(Smoke* smoke, int classId, void* ptr);
 
-VALUE getClassList(VALUE /*self*/)
+static VALUE getClassList(VALUE /*self*/)
 {
     VALUE classList = rb_ary_new();
     for (int i = 1; i < kde_Smoke->numClasses; i++) {
--- branches/work/kdebindings-smoke2/ruby/qsci/CMakeLists.txt #769145:769146
@@ -6,4 +6,5 @@
 target_link_libraries(qsciruby ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokeqsci qtruby4shared)
 set_target_properties(qsciruby PROPERTIES PREFIX "")
 install(TARGETS qsciruby DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
-install(FILES qscintilla.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR})
+install(FILES qscintilla.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/Qsci)
+install(FILES lib/QScintilla.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR})
--- branches/work/kdebindings-smoke2/ruby/qsci/example.rb #769145:769146
@@ -1,6 +1,7 @@
 #/usr/bin/ruby
 
-require 'qsciruby'
+require 'Qt'
+require 'QScintilla'
 
 app = Qt::Application.new(ARGV)
 w = Qsci::Scintilla.new
--- branches/work/kdebindings-smoke2/ruby/qsci/qscintilla.cpp #769145:769146
@@ -10,7 +10,7 @@
 
 #include <iostream>
 
-VALUE getClassList(VALUE /*self*/)
+static VALUE getClassList(VALUE /*self*/)
 {
     VALUE classList = rb_ary_new();
     for (int i = 1; i < qsci_Smoke->numClasses; i++) {
@@ -49,7 +49,7 @@
 
     rb_define_singleton_method(qscintilla_internal_module, "getClassList", (VALUE (*) (...)) getClassList, 0);
 
-    rb_require("qscintilla.rb");
+    rb_require("Qsci/qscintilla.rb");
     rb_funcall(qscintilla_internal_module, rb_intern("init_all_classes"), 0);
 }